X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fpwm.c;h=3946188262263c0f406062adef2fac522a19d77b;hb=af9cba1c451a41879ceddeab818bc265fb4923ff;hp=452e94136cb57e82a303f363687324307d2b48c8;hpb=41625d1b16c8f1904c3a2a40b6972725311c66a8;p=bertos.git

diff --git a/drv/pwm.c b/drv/pwm.c
old mode 100755
new mode 100644
index 452e9413..39461882
--- a/drv/pwm.c
+++ b/drv/pwm.c
@@ -1,57 +1,91 @@
-/*!
+/**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2005 Develer S.r.l. (http://www.develer.com/)
  * -->
  *
- * \version $Id$
  *
  * \brief PWM driver (implementation)
  *
  * \version $Id$
+ *
  * \author Francesco Sacchi <batt@develer.com>
+ * \author Daniele Basile <asterix@develer.com>
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.1  2005/11/04 18:08:49  bernie
- *#* Import into DevLib.
- *#*
- *#* Revision 1.2  2005/05/24 13:35:01  batt
- *#* Add missing; reformat.
- *#*
- *#* Revision 1.1  2005/05/24 09:17:58  batt
- *#* Move drivers to top-level.
- *#*
- *#* Revision 1.4  2005/05/09 16:36:12  batt
- *#* Change some function names to accomplish coding standard.
- *#*
- *#* Revision 1.3  2005/05/02 16:35:47  batt
- *#* Add some comments.
- *#*
- *#* Revision 1.2  2005/05/02 16:02:58  batt
- *#* Remove unusefull interrupt saving.
- *#*
- *#* Revision 1.1  2005/05/02 12:36:39  batt
- *#* Add pwm driver.
- *#*
- *#*/
-
-#include <hw_pwm.h>
+#include <cpu/types.h>
+#include <cpu/irq.h>
+
 #include <drv/pwm.h>
+#include <drv/pwm_at91.h>
+
 #include <cfg/macros.h>
+#include <cfg/debug.h>
+
 
-/*!
- * Set duty of pwm channel \a dev.
+/**
+ * Set duty of pwm channel \p dev.
  */
 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);
 
-	pwm_hw_setDutyUnlock(dev, 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);
+	pwm_hw_setDutyUnlock(dev, real_duty);
 }
 
-/*!
+/**
+ * Set frequency of pwm channel \p dev at \p freq in Hz.
+ */
+void pwm_setFrequency(PwmDev dev, pwm_freq_t freq)
+{
+	pwm_hw_setFrequency(dev, freq);
+}
+
+/**
+ * Set duty of pwm channel \p dev.
+ */
+void pwm_enable(PwmDev dev, bool state)
+{
+	if (state)
+		pwm_hw_enable(dev);
+	else
+		pwm_hw_disable(dev);
+}
+
+/**
  * Initialize PWM hw.
  */
 void pwm_init(void)
@@ -65,7 +99,11 @@ void pwm_init(void)
 	for (dev = 0; dev < PWM_CNT; dev++)
 		pwm_setDuty(dev, 0);
 
-	PWM_HW_INIT;
+	pwm_hw_init();
 
 	IRQ_RESTORE(flags);
 }
+
+
+
+