diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-03-23 12:40:12 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-03-23 12:40:12 +0000 |
| commit | d12bb7fd4571caf79fb9177829d3c9aba60c175b (patch) | |
| tree | 775b9c41b960f72a37780f5e28ae504426f095b1 | |
| parent | b9cdcf46a0f4a3bc284983258bf2c482cff10bdd (diff) | |
| download | ChibiOS-d12bb7fd4571caf79fb9177829d3c9aba60c175b.tar.gz ChibiOS-d12bb7fd4571caf79fb9177829d3c9aba60c175b.tar.bz2 ChibiOS-d12bb7fd4571caf79fb9177829d3c9aba60c175b.zip | |
Fixed bug #928.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11845 110e8d01-0319-4d1e-a829-52ad28d1bb01
| -rw-r--r-- | os/hal/ports/STM32/STM32F7xx/hal_lld.h | 6 | ||||
| -rw-r--r-- | readme.txt | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/os/hal/ports/STM32/STM32F7xx/hal_lld.h b/os/hal/ports/STM32/STM32F7xx/hal_lld.h index 24498264e..47c91b62c 100644 --- a/os/hal/ports/STM32/STM32F7xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32F7xx/hal_lld.h @@ -1997,7 +1997,7 @@ */
#if (STM32_SDMMC1SEL == STM32_SDMMC1SEL_PLL48CLK) || defined(__DOXYGEN__)
#define STM32_SDMMC1CLK STM32_PLL48CLK
-#elif STM32_SDMMC1SEL == STM32_SDMMCSEL_SYSCLK
+#elif STM32_SDMMC1SEL == STM32_SDMMC1SEL_SYSCLK
#define STM32_SDMMC1CLK STM32_SYSCLK
#else
#error "invalid source selected for SDMMC1 clock"
@@ -2006,9 +2006,9 @@ /**
* @brief SDMMC2 frequency.
*/
-#if (STM32_SDMMC2SEL == STM32_SDMMC1SEL_PLL48CLK) || defined(__DOXYGEN__)
+#if (STM32_SDMMC2SEL == STM32_SDMMC2SEL_PLL48CLK) || defined(__DOXYGEN__)
#define STM32_SDMMC2CLK STM32_PLL48CLK
-#elif STM32_SDMMC2SEL == STM32_SDMMCSEL_SYSCLK
+#elif STM32_SDMMC2SEL == STM32_SDMMC2SEL_SYSCLK
#define STM32_SDMMC2CLK STM32_SYSCLK
#else
#error "invalid source selected for SDMMC2 clock"
diff --git a/readme.txt b/readme.txt index 99067edb3..8f59dfb04 100644 --- a/readme.txt +++ b/readme.txt @@ -110,6 +110,8 @@ - EX: Updated LIS302DL to 1.1.0 (backported to 18.2.1).
- EX: Updated LPS25H to 1.1.0 (backported to 18.2.1).
- EX: Updated LSM303DLHC to 1.1.0 (backported to 18.2.1).
+- HAL: Fixed invalid clock checks for SDMMC1 and SDMMC2 on STM32F7xx
+ (bug #928)(backported to 18.2.1 and 17.6.4).
- HAL: Fixed useless writes in read-only CFGR_SWS field on all STM32Fxx
(bug #927)(backported to 18.2.1 and 17.6.4).
- HAL: Fixed typo in hal_pal.h (bug #926)(backported to 18.2.1).
|