aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-03-19 20:28:33 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-03-19 20:28:33 +0000
commit5aa11291a362cfeb949dfe91397e8bbda46dc436 (patch)
treec176b06505dcb68a7af208fb32ac5d3ce7f2221b
parente5c320a0d1a00915f88b379f27e981b89a787e33 (diff)
downloadChibiOS-5aa11291a362cfeb949dfe91397e8bbda46dc436.tar.gz
ChibiOS-5aa11291a362cfeb949dfe91397e8bbda46dc436.tar.bz2
ChibiOS-5aa11291a362cfeb949dfe91397e8bbda46dc436.zip
Fixed bug 3508758.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4052 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/platforms/STM32/icu_lld.c6
-rw-r--r--readme.txt2
2 files changed, 5 insertions, 3 deletions
diff --git a/os/hal/platforms/STM32/icu_lld.c b/os/hal/platforms/STM32/icu_lld.c
index 849241c2b..d5511ec01 100644
--- a/os/hal/platforms/STM32/icu_lld.c
+++ b/os/hal/platforms/STM32/icu_lld.c
@@ -282,7 +282,7 @@ void icu_lld_init(void) {
#if STM32_ICU_USE_TIM8
/* Driver initialization.*/
icuObjectInit(&ICUD8);
- ICUD5.tim = STM32_TIM8;
+ ICUD8.tim = STM32_TIM8;
#endif
}
@@ -350,8 +350,8 @@ void icu_lld_start(ICUDriver *icup) {
#endif
#if STM32_ICU_USE_TIM8
if (&ICUD8 == icup) {
- rccEnableTIM5(FALSE);
- rccResetTIM5();
+ rccEnableTIM8(FALSE);
+ rccResetTIM8();
nvicEnableVector(TIM8_CC_IRQn,
CORTEX_PRIORITY_MASK(STM32_ICU_TIM8_IRQ_PRIORITY));
icup->clock = STM32_TIMCLK2;
diff --git a/readme.txt b/readme.txt
index d12fe1727..499ae13ab 100644
--- a/readme.txt
+++ b/readme.txt
@@ -79,6 +79,8 @@
*****************************************************************************
*** 2.5.0 ***
+- FIX: Fixed STM32 ICUD8 not functional because wrong initialization (bug
+ 3508758)(backported to 2.4.1).
- FIX: Fixed chMBFetchI does not decrement mb_fullsem (bug 3504450)(backported
to 2.2.9 and 2.4.1).
- FIX: Fixed USART3 not working on STM32F2/F4 UART driver (bug 3496981)