aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2018-07-27 09:02:01 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2018-07-27 09:02:01 +0000
commit0af5ddacc3c8a4fe0e4f41e18cbba6dfff0f4bd4 (patch)
tree14de8359c5fc13979ede0035d349c8975156571b
parent06246dd30bb460f7b1eabac7cd9fea16b26c6681 (diff)
downloadChibiOS-0af5ddacc3c8a4fe0e4f41e18cbba6dfff0f4bd4.tar.gz
ChibiOS-0af5ddacc3c8a4fe0e4f41e18cbba6dfff0f4bd4.tar.bz2
ChibiOS-0af5ddacc3c8a4fe0e4f41e18cbba6dfff0f4bd4.zip
Fixed bug #968.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12197 110e8d01-0319-4d1e-a829-52ad28d1bb01
-rw-r--r--os/hal/ports/STM32/STM32L4xx/hal_lld.h8
-rw-r--r--readme.txt2
2 files changed, 6 insertions, 4 deletions
diff --git a/os/hal/ports/STM32/STM32L4xx/hal_lld.h b/os/hal/ports/STM32/STM32L4xx/hal_lld.h
index d18ed02e2..3722fd0ee 100644
--- a/os/hal/ports/STM32/STM32L4xx/hal_lld.h
+++ b/os/hal/ports/STM32/STM32L4xx/hal_lld.h
@@ -1033,8 +1033,8 @@
#error "HSI16 not enabled, required by STM32_SAI1SEL"
#endif
-#if ((STM32_SAI2SEL == STM32_SAI1SEL_PLLSAI1) || \
- (STM32_SAI2SEL == STM32_SAI1SEL_PLLSAI2)) && \
+#if ((STM32_SAI2SEL == STM32_SAI2SEL_PLLSAI1) || \
+ (STM32_SAI2SEL == STM32_SAI2SEL_PLLSAI2)) && \
(STM32_PLLSRC == STM32_PLLSRC_HSI16)
#error "HSI16 not enabled, required by STM32_SAI2SEL"
#endif
@@ -1095,8 +1095,8 @@
#error "HSE not enabled, required by STM32_SAI1SEL"
#endif
- #if ((STM32_SAI2SEL == STM32_SAI1SEL_PLLSAI1) | \
- (STM32_SAI2SEL == STM32_SAI1SEL_PLLSAI2)) && \
+ #if ((STM32_SAI2SEL == STM32_SAI2SEL_PLLSAI1) | \
+ (STM32_SAI2SEL == STM32_SAI2SEL_PLLSAI2)) && \
(STM32_PLLSRC == STM32_PLLSRC_HSE)
#error "HSE not enabled, required by STM32_SAI2SEL"
#endif
diff --git a/readme.txt b/readme.txt
index d6af48955..19328ead0 100644
--- a/readme.txt
+++ b/readme.txt
@@ -141,6 +141,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 incorrect checks on STM32_SAI2SEL option in STM32L4 HAL
+ (bug #968)(backported to 18.2.2 and 17.6.5).
- HAL: Fixed incorrect handling of PDIV dividers in STM32L4 HAL (bug #967)
(backported to 18.2.2).
- HAL: Fixed documentation error in spiStop() (bug #966)(backported