aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-12-23 08:34:35 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-12-23 08:34:35 +0000
commitc34a873cc9d92578924f06b7d96c00e632c41e6e (patch)
tree1b3e7acbf3764b8f09c2ed9e837cda527d042127
parentc5c818534297303fe8f91e78009d9389c146e359 (diff)
downloadChibiOS-c34a873cc9d92578924f06b7d96c00e632c41e6e.tar.gz
ChibiOS-c34a873cc9d92578924f06b7d96c00e632c41e6e.tar.bz2
ChibiOS-c34a873cc9d92578924f06b7d96c00e632c41e6e.zip
Fixed bug #447.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6573 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/platforms/STM32F4xx/hal_lld.h4
-rw-r--r--readme.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/os/hal/platforms/STM32F4xx/hal_lld.h b/os/hal/platforms/STM32F4xx/hal_lld.h
index c7da5d8a9..bbfffd8ce 100644
--- a/os/hal/platforms/STM32F4xx/hal_lld.h
+++ b/os/hal/platforms/STM32F4xx/hal_lld.h
@@ -1141,9 +1141,7 @@
#error "HSI not enabled, required by STM32_MCO1SEL"
#endif
-#if (STM32_MCO2SEL == STM32_MCO2SEL_HSI) || \
- ((STM32_MCO2SEL == STM32_MCO2SEL_PLL) && \
- (STM32_PLLSRC == STM32_PLLSRC_HSI))
+#if (STM32_MCO2SEL == STM32_MCO2SEL_PLL) && (STM32_PLLSRC == STM32_PLLSRC_HSI)
#error "HSI not enabled, required by STM32_MCO2SEL"
#endif
diff --git a/readme.txt b/readme.txt
index 5ad6ab798..5a81fc76b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -89,6 +89,8 @@
*****************************************************************************
*** 2.7.0 ***
+- FIX: Fixed rong MCO2 check in STM32F4xx HAL driver (bug #447)(backported
+ to 2.4.6 and 2.6.2).
- FIX: Fixed spurious half buffer callback in STM32 ADC drivers (bug #446)
(backported to 2.4.6 and 2.6.2).
- FIX: Fixed callbacks changes to the ADC high level driver (bug #445)