X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fpwm.c;h=d09d9627caa16a0d9da491ee06409ac376203d94;hb=1c11ac0ab0636d07db3899b02c5d89e2d0b020bc;hp=3946188262263c0f406062adef2fac522a19d77b;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/drv/pwm.c b/bertos/drv/pwm.c
index 39461882..d09d9627 100644
--- a/bertos/drv/pwm.c
+++ b/bertos/drv/pwm.c
@@ -32,21 +32,30 @@
  *
  * \brief PWM driver (implementation)
  *
- * \version $Id$
  *
  * \author Francesco Sacchi <batt@develer.com>
  * \author Daniele Basile <asterix@develer.com>
  */
 
-#include <cpu/types.h>
-#include <cpu/irq.h>
-
-#include <drv/pwm.h>
-#include <drv/pwm_at91.h>
+#include "cfg/cfg_pwm.h"
 
 #include <cfg/macros.h>
+#include <cfg/module.h>
+
+// Define logging setting (for cfg/log.h module).
+#define LOG_LEVEL         PWM_LOG_LEVEL
+#define LOG_VERBOSITY     PWM_LOG_FORMAT
+
+#include <cfg/log.h>
 #include <cfg/debug.h>
 
+#include <drv/pwm.h>
+
+#include CPU_HEADER(pwm)
+
+#include <cpu/types.h>
+#include <cpu/irq.h>
+
 
 /**
  * Set duty of pwm channel \p dev.
@@ -56,13 +65,13 @@ void pwm_setDuty(PwmDev dev, pwm_duty_t duty)
 	pwm_period_t period = 0;
 	pwm_duty_t real_duty = 0;
 
-	duty = MIN(duty, (pwm_duty_t)PWM_MAX_DUTY);
+	duty = MIN(duty, PWM_MAX_DUTY);
 
 	period = pwm_hw_getPeriod(dev);
 
 	real_duty = (uint64_t)(duty * period) >> (uint64_t)PWM_MAX_PERIOD_LOG2;
 
-// 	kprintf("real_duty[%d] duty[%d], period[%d]\n", real_duty, duty, period);
+	LOG_INFO("real_duty[%d] duty[%d], period[%d]\n", real_duty, duty, period);
 	pwm_hw_setDutyUnlock(dev, real_duty);
 }
 
@@ -85,23 +94,26 @@ void pwm_enable(PwmDev dev, bool state)
 		pwm_hw_disable(dev);
 }
 
+MOD_DEFINE(pwm);
+
 /**
  * Initialize PWM hw.
  */
 void pwm_init(void)
 {
-	cpuflags_t flags;
+	cpu_flags_t flags;
 	PwmDev dev;
 
 	IRQ_SAVE_DISABLE(flags);
 
+	pwm_hw_init();
+
 	/* set all pwm to 0 */
 	for (dev = 0; dev < PWM_CNT; dev++)
 		pwm_setDuty(dev, 0);
 
-	pwm_hw_init();
-
 	IRQ_RESTORE(flags);
+	MOD_INIT(pwm);
 }