diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-12-23 09:53:42 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-12-23 09:53:42 +0000 |
| commit | 64431d076bc0c3415b54960a518289ec99ef9cbd (patch) | |
| tree | 892ec48826c14ef93dc273d23df2604173ac436f | |
| parent | 11a55ca41a489a805d512e2709c5fe72875c0724 (diff) | |
| download | ChibiOS-64431d076bc0c3415b54960a518289ec99ef9cbd.tar.gz ChibiOS-64431d076bc0c3415b54960a518289ec99ef9cbd.tar.bz2 ChibiOS-64431d076bc0c3415b54960a518289ec99ef9cbd.zip | |
Fixed bug 3598177.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4952 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/platforms/STM32/icu_lld.c | 3 | ||||
| -rw-r--r-- | os/hal/platforms/STM32/pwm_lld.c | 3 | ||||
| -rw-r--r-- | readme.txt | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/os/hal/platforms/STM32/icu_lld.c b/os/hal/platforms/STM32/icu_lld.c index 82fb39769..703c9dea5 100644 --- a/os/hal/platforms/STM32/icu_lld.c +++ b/os/hal/platforms/STM32/icu_lld.c @@ -103,7 +103,8 @@ ICUDriver ICUD8; static void icu_lld_serve_interrupt(ICUDriver *icup) {
uint16_t sr;
- sr = icup->tim->SR & icup->tim->DIER;
+ sr = icup->tim->SR;
+ sr &= icup->tim->DIER;
icup->tim->SR = ~sr;
if (icup->config->channel == ICU_CHANNEL_1) {
if ((sr & TIM_SR_CC1IF) != 0)
diff --git a/os/hal/platforms/STM32/pwm_lld.c b/os/hal/platforms/STM32/pwm_lld.c index dcd0d166f..a90c0b44a 100644 --- a/os/hal/platforms/STM32/pwm_lld.c +++ b/os/hal/platforms/STM32/pwm_lld.c @@ -104,7 +104,8 @@ PWMDriver PWMD8; static void pwm_lld_serve_interrupt(PWMDriver *pwmp) {
uint16_t sr;
- sr = pwmp->tim->SR & pwmp->tim->DIER;
+ sr = pwmp->tim->SR;
+ sr &= pwmp->tim->DIER;
pwmp->tim->SR = ~sr;
if ((sr & TIM_SR_CC1IF) != 0)
pwmp->config->channels[0].callback(pwmp);
diff --git a/readme.txt b/readme.txt index db9a49c8d..229f3a8e4 100644 --- a/readme.txt +++ b/readme.txt @@ -82,7 +82,9 @@ *****************************************************************************
*** 2.5.2 ***
-- FIX: Fixed twrong SPI path in platform_f105_f107.mk (bug 3598151).
+- FIX: Fixed warning in STM32 ICU driver using IAR compiler (bug 3598177)
+ (backported to 2.4.3).
+- FIX: Fixed wrong SPI path in platform_f105_f107.mk (bug 3598151).
- NEW: Added support for Olimex board STM32-LCD.
*** 2.5.1 ***
|