X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fphase.c;h=81e73f919c44b2730c14b6aca138d3ce76e9ac88;hb=82f680048d359567d43f9f9d118dbd6190c7ccdd;hp=8a64c708ef42a89d9e5a2653e5c534d8f7dc68f5;hpb=bdc388981b38532c41faa398da07c1a9f36aaa73;p=bertos.git

diff --git a/bertos/drv/phase.c b/bertos/drv/phase.c
index 8a64c708..81e73f91 100644
--- a/bertos/drv/phase.c
+++ b/bertos/drv/phase.c
@@ -36,16 +36,16 @@
  * \author Francesco Sacchi <batt@develer.com>
  */
 
-#include <drv/timer.h>
 
+#include "hw/hw_phase.h"
 
 #include <cfg/macros.h>
-#include <cpu/irq.h>
-#include <cpu/types.h>
 #include <cfg/compiler.h>
 
+#include <cpu/irq.h>
+#include <cpu/types.h>
 
-#include <hw_phase.h>
+#include <drv/timer.h>
 #include <drv/phase.h>
 
 #include <math.h>
@@ -74,10 +74,10 @@ DEFINE_ZEROCROSS_ISR()
 	for (dev = 0; dev < TRIAC_CNT; dev++)
 	{
 		/* Only turn off triac if duty is != 100% */
-		if (triacs[dev].duty != TRIAC_MAX_DUTY)
+		if (triacs[dev].duty != CONFIG_TRIAC_MAX_DUTY)
 			TRIAC_OFF(dev);
 		/* Compute delay from duty */
-		timer_setDelay(&triacs[dev].timer, DIV_ROUND(period * (TRIAC_MAX_DUTY - triacs[dev].duty), TRIAC_MAX_DUTY));
+		timer_setDelay(&triacs[dev].timer, DIV_ROUND(period * (CONFIG_TRIAC_MAX_DUTY - triacs[dev].duty), CONFIG_TRIAC_MAX_DUTY));
 
 		/* This check avoids inserting the same timer twice
 		 * in case of an intempestive zerocross or spike */
@@ -100,7 +100,7 @@ DEFINE_ZEROCROSS_ISR()
  */
 void phase_setDuty(TriacDev dev, triac_duty_t duty)
 {
-	cpuflags_t flags;
+	cpu_flags_t flags;
 	IRQ_SAVE_DISABLE(flags);
 
 	phase_setDutyUnlock(dev,duty);
@@ -115,7 +115,7 @@ void phase_setDuty(TriacDev dev, triac_duty_t duty)
  */
 void phase_setDutyUnlock(TriacDev dev, triac_duty_t duty)
 {
-	triacs[dev].duty = MIN(duty, (triac_duty_t)TRIAC_MAX_DUTY);
+	triacs[dev].duty = MIN(duty, (triac_duty_t)CONFIG_TRIAC_MAX_DUTY);
 }
 
 
@@ -131,18 +131,18 @@ void phase_setPower(TriacDev dev, triac_power_t power)
 	bool greater_fifty = false;
 	triac_duty_t duty;
 
-	power = MIN(power, (triac_power_t)TRIAC_MAX_POWER);
+	power = MIN(power, (triac_power_t)CONFIG_TRIAC_MAX_POWER);
 
-	if (power > TRIAC_MAX_POWER / 2)
+	if (power > CONFIG_TRIAC_MAX_POWER / 2)
 	{
 		greater_fifty = true;
-		power = TRIAC_MAX_POWER - power;
+		power = CONFIG_TRIAC_MAX_POWER - power;
 	}
 
 	duty = TRIAC_POWER_K * sqrt(power);
 
 	if (greater_fifty)
-		duty = TRIAC_MAX_DUTY - duty;
+		duty = CONFIG_TRIAC_MAX_DUTY - duty;
 	phase_setDuty(dev, duty);
 }
 
@@ -170,7 +170,7 @@ static void phase_softint(void *_dev)
  */
 void phase_init(void)
 {
-	cpuflags_t flags;
+	cpu_flags_t flags;
 	TriacDev dev;
 
 	/* Init timers and ensure that all triac are off */
@@ -180,7 +180,7 @@ void phase_init(void)
 		triacs[dev].running = false;
 		SET_TRIAC_DDR(dev);
 		TRIAC_OFF(dev);
-		timer_set_event_softint(&triacs[dev].timer, (Hook)phase_softint, (void *)dev);
+		timer_setSoftint(&triacs[dev].timer, (Hook)phase_softint, (void *)dev);
 	}
 	IRQ_SAVE_DISABLE(flags);
 
@@ -189,3 +189,4 @@ void phase_init(void)
 	DB(phase_initialized = true;)
 	IRQ_RESTORE(flags);
 }
+