From dfc15ba56d3529d12d5d2806dfe1280250438649 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Thu, 17 Sep 2015 13:38:08 +0000 Subject: SDC on SDMMCv1 peripheral for STM32F7, not tested. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8304 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- .../RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/halconf.h | 2 +- demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c | 2 +- .../RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/mcuconf.h | 15 ++++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB') diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/halconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/halconf.h index 36a7ef467..d14d03c01 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/halconf.h +++ b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/halconf.h @@ -132,7 +132,7 @@ * @brief Enables the SDC subsystem. */ #if !defined(HAL_USE_SDC) || defined(__DOXYGEN__) -#define HAL_USE_SDC FALSE +#define HAL_USE_SDC TRUE #endif /** diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c index 093329ec8..f7e4851c8 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c +++ b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c @@ -663,7 +663,7 @@ int main(void) { * configuration. */ sdStart(&SD1, NULL); -// sdcStart(&SDCD1, NULL); + sdcStart(&SDCD1, NULL); /* * Activates the card insertion monitor. diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/mcuconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/mcuconf.h index 5eae8dff9..0ecab7cda 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/mcuconf.h +++ b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/mcuconf.h @@ -252,13 +252,14 @@ /* * SDC driver system settings. */ -#define STM32_SDC_SDIO_DMA_PRIORITY 3 -#define STM32_SDC_SDIO_IRQ_PRIORITY 9 -#define STM32_SDC_WRITE_TIMEOUT_MS 250 -#define STM32_SDC_READ_TIMEOUT_MS 25 -#define STM32_SDC_CLOCK_ACTIVATION_DELAY 10 -#define STM32_SDC_SDIO_UNALIGNED_SUPPORT TRUE -#define STM32_SDC_SDIO_DMA_STREAM STM32_DMA_STREAM_ID(2, 3) +#define STM32_SDC_USE_SDMMC1 TRUE +#define STM32_SDC_SDMMC_UNALIGNED_SUPPORT TRUE +#define STM32_SDC_SDMMC_WRITE_TIMEOUT 250 +#define STM32_SDC_SDMMC_READ_TIMEOUT 25 +#define STM32_SDC_SDMMC_CLOCK_DELAY 10 +#define STM32_SDC_SDMMC1_DMA_STREAM STM32_DMA_STREAM_ID(2, 3) +#define STM32_SDC_SDMMC1_DMA_PRIORITY 3 +#define STM32_SDC_SDMMC1_IRQ_PRIORITY 9 /* * SERIAL driver system settings. -- cgit v1.2.3