More #912.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11348 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
86fed9342d
commit
10ad7f4525
|
@ -139,7 +139,7 @@
|
||||||
* @brief Enables the SDC subsystem.
|
* @brief Enables the SDC subsystem.
|
||||||
*/
|
*/
|
||||||
#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
|
#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
|
||||||
#define HAL_USE_SDC FALSE
|
#define HAL_USE_SDC TRUE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -258,8 +258,8 @@
|
||||||
/*
|
/*
|
||||||
* SDC driver system settings.
|
* SDC driver system settings.
|
||||||
*/
|
*/
|
||||||
#define STM32_SDC_USE_SDMMC1 FALSE
|
#define STM32_SDC_USE_SDMMC1 TRUE
|
||||||
#define STM32_SDC_USE_SDMMC2 FALSE
|
#define STM32_SDC_USE_SDMMC2 TRUE
|
||||||
#define STM32_SDC_SDMMC_UNALIGNED_SUPPORT TRUE
|
#define STM32_SDC_SDMMC_UNALIGNED_SUPPORT TRUE
|
||||||
#define STM32_SDC_SDMMC_WRITE_TIMEOUT 1000
|
#define STM32_SDC_SDMMC_WRITE_TIMEOUT 1000
|
||||||
#define STM32_SDC_SDMMC_READ_TIMEOUT 1000
|
#define STM32_SDC_SDMMC_READ_TIMEOUT 1000
|
||||||
|
|
|
@ -427,8 +427,7 @@ void sdc_lld_start(SDCDriver *sdcp) {
|
||||||
sdcp->config = &sdc_default_cfg;
|
sdcp->config = &sdc_default_cfg;
|
||||||
}
|
}
|
||||||
|
|
||||||
sdcp->dmamode = STM32_DMA_CR_PL(STM32_SDC_SDMMC1_DMA_PRIORITY) |
|
sdcp->dmamode = STM32_DMA_CR_PSIZE_WORD |
|
||||||
STM32_DMA_CR_PSIZE_WORD |
|
|
||||||
STM32_DMA_CR_MSIZE_WORD |
|
STM32_DMA_CR_MSIZE_WORD |
|
||||||
STM32_DMA_CR_MINC;
|
STM32_DMA_CR_MINC;
|
||||||
|
|
||||||
|
@ -447,7 +446,8 @@ void sdc_lld_start(SDCDriver *sdcp) {
|
||||||
|
|
||||||
osalDbgAssert(!b, "stream already allocated");
|
osalDbgAssert(!b, "stream already allocated");
|
||||||
|
|
||||||
sdcp->dmamode |= STM32_DMA_CR_CHSEL(SDMMC1_DMA_CHANNEL);
|
sdcp->dmamode |= STM32_DMA_CR_CHSEL(SDMMC1_DMA_CHANNEL) |
|
||||||
|
STM32_DMA_CR_PL(STM32_SDC_SDMMC1_DMA_PRIORITY);
|
||||||
dmaStreamSetPeripheral(sdcp->dma, &sdcp->sdmmc->FIFO);
|
dmaStreamSetPeripheral(sdcp->dma, &sdcp->sdmmc->FIFO);
|
||||||
#if STM32_DMA_ADVANCED
|
#if STM32_DMA_ADVANCED
|
||||||
dmaStreamSetFIFO(sdcp->dma, STM32_DMA_FCR_DMDIS |
|
dmaStreamSetFIFO(sdcp->dma, STM32_DMA_FCR_DMDIS |
|
||||||
|
@ -464,7 +464,8 @@ void sdc_lld_start(SDCDriver *sdcp) {
|
||||||
|
|
||||||
osalDbgAssert(!b, "stream already allocated");
|
osalDbgAssert(!b, "stream already allocated");
|
||||||
|
|
||||||
sdcp->dmamode |= STM32_DMA_CR_CHSEL(SDMMC2_DMA_CHANNEL);
|
sdcp->dmamode |= STM32_DMA_CR_CHSEL(SDMMC2_DMA_CHANNEL) |
|
||||||
|
STM32_DMA_CR_PL(STM32_SDC_SDMMC2_DMA_PRIORITY);
|
||||||
dmaStreamSetPeripheral(sdcp->dma, &sdcp->sdmmc->FIFO);
|
dmaStreamSetPeripheral(sdcp->dma, &sdcp->sdmmc->FIFO);
|
||||||
#if STM32_DMA_ADVANCED
|
#if STM32_DMA_ADVANCED
|
||||||
dmaStreamSetFIFO(sdcp->dma, STM32_DMA_FCR_DMDIS |
|
dmaStreamSetFIFO(sdcp->dma, STM32_DMA_FCR_DMDIS |
|
||||||
|
|
Loading…
Reference in New Issue