chinky/rtt-f030
chinky/rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1495 from armink/fix_apollo429

Browse Source 
Fix apollo429
This commit is contained in:
Bernard Xiong 2018-05-31 17:47:25 +08:00 committed by GitHub
commit 37d8cc4ff2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp/stm32f429-apollo/drivers/drv_sdio_sd.c
View File

@ -21,7 +21,7 @@ rt_uint8_t SD_Init(void)
SDCARD_Handler.Init.ClockPowerSave=SDIO_CLOCK_POWER_SAVE_DISABLE; //空闲时不关闭时钟电源 SDCARD_Handler.Init.ClockPowerSave=SDIO_CLOCK_POWER_SAVE_DISABLE; //空闲时不关闭时钟电源
SDCARD_Handler.Init.BusWide=SDIO_BUS_WIDE_1B; //1位数据线 SDCARD_Handler.Init.BusWide=SDIO_BUS_WIDE_1B; //1位数据线
SDCARD_Handler.Init.HardwareFlowControl=SDIO_HARDWARE_FLOW_CONTROL_DISABLE;//关闭硬件流控 SDCARD_Handler.Init.HardwareFlowControl=SDIO_HARDWARE_FLOW_CONTROL_DISABLE;//关闭硬件流控
SDCARD_Handler.Init.ClockDiv=SDIO_TRANSFER_CLK_DIV; //SD传输时钟频率最大25MHZ SDCARD_Handler.Init.ClockDiv=SDIO_INIT_CLK_DIV; //初始化时钟为400KHZ
SD_Error=HAL_SD_Init(&SDCARD_Handler,&SDCardInfo); SD_Error=HAL_SD_Init(&SDCARD_Handler,&SDCardInfo);
if(SD_Error!=SD_OK) return 1; if(SD_Error!=SD_OK) return 1;

4
bsp/stm32f429-apollo/drivers/drv_spi.c
View File

@ -526,6 +526,7 @@ struct stm32f4_spi stm32f4_spi5 =
/* .spi_handle = */{ /* .spi_handle = */{
/* .Instance = */ SPI5, /* .Instance = */ SPI5,
}, },
#ifdef SPI_USE_DMA
/* .hdma_rx = */ { /* .hdma_rx = */ {
DMA2_Stream3, DMA2_Stream3,
DMA_CHANNEL_2, DMA_CHANNEL_2,
@ -537,6 +538,7 @@ struct stm32f4_spi stm32f4_spi5 =
DMA_CHANNEL_2, DMA_CHANNEL_2,
}, },
/* .hdma_tx_irq = */ DMA2_Stream4_IRQn, /* .hdma_tx_irq = */ DMA2_Stream4_IRQn,
#endif /* SPI_USE_DMA */
}; };
static struct rt_spi_bus spi5_bus; static struct rt_spi_bus spi5_bus;
@ -703,6 +705,7 @@ rt_err_t stm32_spi_bus_register(SPI_TypeDef * SPI,
return RT_ENOSYS; return RT_ENOSYS;
} }
#ifdef SPI_USE_DMA
/* Configure the DMA handler for Transmission process */ /* Configure the DMA handler for Transmission process */
p_spi_bus->hdma_tx.Init.Direction = DMA_MEMORY_TO_PERIPH; p_spi_bus->hdma_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
p_spi_bus->hdma_tx.Init.PeriphInc = DMA_PINC_DISABLE; p_spi_bus->hdma_tx.Init.PeriphInc = DMA_PINC_DISABLE;
@ -727,6 +730,7 @@ rt_err_t stm32_spi_bus_register(SPI_TypeDef * SPI,
p_spi_bus->hdma_rx.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL; p_spi_bus->hdma_rx.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL;
p_spi_bus->hdma_rx.Init.MemBurst = DMA_MBURST_INC4; p_spi_bus->hdma_rx.Init.MemBurst = DMA_MBURST_INC4;
p_spi_bus->hdma_rx.Init.PeriphBurst = DMA_PBURST_INC4; p_spi_bus->hdma_rx.Init.PeriphBurst = DMA_PBURST_INC4;
#endif /* SPI_USE_DMA */
spi_bus->parent.user_data = &stm32f4_spi5; spi_bus->parent.user_data = &stm32f4_spi5;

2
bsp/stm32f429-apollo/drivers/drv_spi.h
View File

@ -20,7 +20,7 @@
#include "stm32f4xx_hal.h" #include "stm32f4xx_hal.h"
#define SPI_USE_DMA //#define SPI_USE_DMA
struct stm32f4_spi struct stm32f4_spi
{ {