git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2527 35acf78f-673a-0410-8e92-d51de3d6d3f4

3 files changed, 4 insertions, 2 deletions

diff --git a/os/hal/platforms/STM32/adc_lld.h b/os/hal/platforms/STM32/adc_lld.h
index 92fa21b9d..3e9e07349 100644
--- a/os/hal/platforms/STM32/adc_lld.h
+++ b/os/hal/platforms/STM32/adc_lld.h
@@ -211,6 +211,7 @@ typedef struct {
  * @note    It could be empty on some architectures.

  */

 typedef struct {

+  uint32_t                  dummy;

 } ADCConfig;

 

 /**

diff --git a/os/hal/platforms/STM32/pwm_lld.c b/os/hal/platforms/STM32/pwm_lld.c
index 8c8f56920..6970217e7 100644
--- a/os/hal/platforms/STM32/pwm_lld.c
+++ b/os/hal/platforms/STM32/pwm_lld.c
@@ -105,7 +105,8 @@ PWMDriver PWMD5;
 static void serve_interrupt(PWMDriver *pwmp) {

   uint16_t sr;

 

-  sr = pwmp->pd_tim->SR & pwmp->pd_tim->DIER;

+  sr  = pwmp->pd_tim->SR;

+  sr &= pwmp->pd_tim->DIER;

   pwmp->pd_tim->SR = ~(TIM_SR_CC1IF | TIM_SR_CC2IF | TIM_SR_CC3IF |

                        TIM_SR_CC4IF | TIM_SR_UIF);

   if ((sr & TIM_SR_CC1IF) != 0)

diff --git a/os/hal/platforms/STM32/pwm_lld.h b/os/hal/platforms/STM32/pwm_lld.h
index 9a63c3e38..7b1ad3286 100644
--- a/os/hal/platforms/STM32/pwm_lld.h
+++ b/os/hal/platforms/STM32/pwm_lld.h
@@ -262,7 +262,7 @@ struct PWMDriver {
  *          make sure that the source clock frequency is a multiple of the

  *          requested PWM clock frequency.

  * @note    The calculated value must fit into an unsigned 16 bits integer.

- *
+ *

  * @param[in] clksrc    clock source frequency, depending on the target timer

  *                      cell it can be one of:

  *                      - STM32_TIMCLK1