zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug 3598177. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4952 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
gdisirio 2012-12-23 09:53:42 +00:00
parent 11a55ca41a
commit 64431d076b
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
os/hal/platforms/STM32/icu_lld.c
View File

@ -103,7 +103,8 @@ ICUDriver ICUD8;
static void icu_lld_serve_interrupt(ICUDriver *icup) { static void icu_lld_serve_interrupt(ICUDriver *icup) {
uint16_t sr; uint16_t sr;
sr = icup->tim->SR & icup->tim->DIER; sr = icup->tim->SR;
sr &= icup->tim->DIER;
icup->tim->SR = ~sr; icup->tim->SR = ~sr;
if (icup->config->channel == ICU_CHANNEL_1) { if (icup->config->channel == ICU_CHANNEL_1) {
if ((sr & TIM_SR_CC1IF) != 0) if ((sr & TIM_SR_CC1IF) != 0)

3
os/hal/platforms/STM32/pwm_lld.c
View File

@ -104,7 +104,8 @@ PWMDriver PWMD8;
static void pwm_lld_serve_interrupt(PWMDriver *pwmp) { static void pwm_lld_serve_interrupt(PWMDriver *pwmp) {
uint16_t sr; uint16_t sr;
sr = pwmp->tim->SR & pwmp->tim->DIER; sr = pwmp->tim->SR;
sr &= pwmp->tim->DIER;
pwmp->tim->SR = ~sr; pwmp->tim->SR = ~sr;
if ((sr & TIM_SR_CC1IF) != 0) if ((sr & TIM_SR_CC1IF) != 0)
pwmp->config->channels[0].callback(pwmp); pwmp->config->channels[0].callback(pwmp);

4
readme.txt
View File

@ -82,7 +82,9 @@
***************************************************************************** *****************************************************************************
*** 2.5.2 *** *** 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. - NEW: Added support for Olimex board STM32-LCD.
*** 2.5.1 *** *** 2.5.1 ***