Make nightly build test works.

[bertos.git] / bertos / drv / phase.c

diff --git a/bertos/drv/phase.c b/bertos/drv/phase.c
index e30f46681e2694a562dc537ec21807df9ed9df72..3a400a369c1a023c1e39449ad34a62ed38bd8852 100644 (file)
--- a/bertos/drv/phase.c
+++ b/bertos/drv/phase.c
@@ -29,24 +29,23 @@
  * Copyright 2005 Develer S.r.l. (http://www.develer.com/)
  * -->
  *
- * \version $Id$
- *
  * \brief Phase control driver (implementation)
  *
  * \version $Id$
+ *
  * \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>
@@ -101,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);
@@ -171,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 */
@@ -181,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);
 
@@ -190,3 +189,4 @@ void phase_init(void)
        DB(phase_initialized = true;)
        IRQ_RESTORE(flags);
 }
+