From 3a21dac552115e2ae053b2af5f49f044ccfec621 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 6 Jan 2011 16:14:40 +0000
Subject: Fixed bug 3152482.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2599 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/platforms/STM32/pwm_lld.c | 10 +++++-----
 os/hal/platforms/STM32/pwm_lld.h | 10 +++++-----
 readme.txt                       |  2 ++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/os/hal/platforms/STM32/pwm_lld.c b/os/hal/platforms/STM32/pwm_lld.c
index 6970217e7..f78896e95 100644
--- a/os/hal/platforms/STM32/pwm_lld.c
+++ b/os/hal/platforms/STM32/pwm_lld.c
@@ -50,7 +50,7 @@
  * @brief   PWM1 driver identifier.
  * @note    The driver PWM1 allocates the complex timer TIM1 when enabled.
  */
-#if defined(STM32_PWM_USE_TIM1) || defined(__DOXYGEN__)
+#if STM32_PWM_USE_TIM1 || defined(__DOXYGEN__)
 PWMDriver PWMD1;
 #endif
 
@@ -58,7 +58,7 @@ PWMDriver PWMD1;
  * @brief   PWM2 driver identifier.
  * @note    The driver PWM2 allocates the timer TIM2 when enabled.
  */
-#if defined(STM32_PWM_USE_TIM2) || defined(__DOXYGEN__)
+#if STM32_PWM_USE_TIM2 || defined(__DOXYGEN__)
 PWMDriver PWMD2;
 #endif
 
@@ -66,7 +66,7 @@ PWMDriver PWMD2;
  * @brief   PWM3 driver identifier.
  * @note    The driver PWM3 allocates the timer TIM3 when enabled.
  */
-#if defined(STM32_PWM_USE_TIM3) || defined(__DOXYGEN__)
+#if STM32_PWM_USE_TIM3 || defined(__DOXYGEN__)
 PWMDriver PWMD3;
 #endif
 
@@ -74,7 +74,7 @@ PWMDriver PWMD3;
  * @brief   PWM4 driver identifier.
  * @note    The driver PWM4 allocates the timer TIM4 when enabled.
  */
-#if defined(STM32_PWM_USE_TIM4) || defined(__DOXYGEN__)
+#if STM32_PWM_USE_TIM4 || defined(__DOXYGEN__)
 PWMDriver PWMD4;
 #endif
 
@@ -82,7 +82,7 @@ PWMDriver PWMD4;
  * @brief   PWM5 driver identifier.
  * @note    The driver PWM5 allocates the timer TIM5 when enabled.
  */
-#if defined(STM32_PWM_USE_TIM5) || defined(__DOXYGEN__)
+#if STM32_PWM_USE_TIM5 || defined(__DOXYGEN__)
 PWMDriver PWMD5;
 #endif
 
diff --git a/os/hal/platforms/STM32/pwm_lld.h b/os/hal/platforms/STM32/pwm_lld.h
index 7b1ad3286..1e9dd855a 100644
--- a/os/hal/platforms/STM32/pwm_lld.h
+++ b/os/hal/platforms/STM32/pwm_lld.h
@@ -344,23 +344,23 @@ struct PWMDriver {
 /* External declarations.                                                    */
 /*===========================================================================*/
 
-#if defined(STM32_PWM_USE_TIM1) && !defined(__DOXYGEN__)
+#if STM32_PWM_USE_TIM1 && !defined(__DOXYGEN__)
 extern PWMDriver PWMD1;
 #endif
 
-#if defined(STM32_PWM_USE_TIM2) && !defined(__DOXYGEN__)
+#if STM32_PWM_USE_TIM2 && !defined(__DOXYGEN__)
 extern PWMDriver PWMD2;
 #endif
 
-#if defined(STM32_PWM_USE_TIM3) && !defined(__DOXYGEN__)
+#if STM32_PWM_USE_TIM3 && !defined(__DOXYGEN__)
 extern PWMDriver PWMD3;
 #endif
 
-#if defined(STM32_PWM_USE_TIM4) && !defined(__DOXYGEN__)
+#if STM32_PWM_USE_TIM4 && !defined(__DOXYGEN__)
 extern PWMDriver PWMD4;
 #endif
 
-#if defined(STM32_PWM_USE_TIM5) && !defined(__DOXYGEN__)
+#if STM32_PWM_USE_TIM5 && !defined(__DOXYGEN__)
 extern PWMDriver PWMD5;
 #endif
 
diff --git a/readme.txt b/readme.txt
index 6d1c5a063..4edd43bec 100644
--- a/readme.txt
+++ b/readme.txt
@@ -65,6 +65,8 @@
 *****************************************************************************
 
 *** 2.1.7 ***
+- FIX: Fixed switch condition error in STM32 PWM driver (bug 3152482)
+  (backported to 2.0.10).
 - FIX: Fixed error in output queues static initializer (bug 3149141)
   (backported to 2.0.9).
 - FIX: Fixed extra notifications in input queues (bug 3148525)(backported
-- 
cgit v1.2.3