STM32F4-Discovery demo working.

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

1 files changed, 9 insertions, 9 deletions

diff --git a/os/hal/platforms/STM32/pwm_lld.c b/os/hal/platforms/STM32/pwm_lld.c
index ab3c1c2bb..fb5d12adf 100644
--- a/os/hal/platforms/STM32/pwm_lld.c
+++ b/os/hal/platforms/STM32/pwm_lld.c
@@ -419,13 +419,13 @@ void pwm_lld_start(PWMDriver *pwmp) {
   }

   else {

     /* Driver re-configuration scenario, it must be stopped first.*/

-    pwmp->tim->CR1  = 0;                    /* Timer disabled.              */

-    pwmp->tim->DIER = 0;                    /* All IRQs disabled.           */

-    pwmp->tim->SR   = 0;                    /* Clear eventual pending IRQs. */

-    pwmp->tim->CCR1 = 0;                    /* Comparator 1 disabled.       */

-    pwmp->tim->CCR2 = 0;                    /* Comparator 2 disabled.       */

-    pwmp->tim->CCR3 = 0;                    /* Comparator 3 disabled.       */

-    pwmp->tim->CCR4 = 0;                    /* Comparator 4 disabled.       */

+    pwmp->tim->CR1    = 0;                  /* Timer disabled.              */

+    pwmp->tim->DIER   = 0;                  /* All IRQs disabled.           */

+    pwmp->tim->SR     = 0;                  /* Clear eventual pending IRQs. */

+    pwmp->tim->CCR[0] = 0;                  /* Comparator 1 disabled.       */

+    pwmp->tim->CCR[1] = 0;                  /* Comparator 2 disabled.       */

+    pwmp->tim->CCR[2] = 0;                  /* Comparator 3 disabled.       */

+    pwmp->tim->CCR[3] = 0;                  /* Comparator 4 disabled.       */

     pwmp->tim->CNT  = 0;                    /* Counter reset to zero.       */

   }

 

@@ -599,7 +599,7 @@ void pwm_lld_enable_channel(PWMDriver *pwmp,
                             pwmchannel_t channel,

                             pwmcnt_t width) {

 

-  *(&pwmp->tim->CCR1 + (channel * 2)) = width;      /* New duty cycle.      */

+  pwmp->tim->CCR[channel] = width;                  /* New duty cycle.      */

   /* If there is a callback defined for the channel then the associated

      interrupt must be enabled.*/

   if (pwmp->config->channels[channel].callback != NULL) {

@@ -627,7 +627,7 @@ void pwm_lld_enable_channel(PWMDriver *pwmp,
  */

 void pwm_lld_disable_channel(PWMDriver *pwmp, pwmchannel_t channel) {

 

-  *(&pwmp->tim->CCR1 + (channel * 2)) = 0;

+  pwmp->tim->CCR[channel] = 0;

   pwmp->tim->DIER &= ~(2 << channel);

 }