Merge branch "preempt" in "trunk".

[bertos.git] / bertos / cpu / arm / drv / stepper_at91.c

diff --git a/bertos/cpu/arm/drv/stepper_at91.c b/bertos/cpu/arm/drv/stepper_at91.c
index d6fc286d7866c50b6855d2699a6f90cfe1d0e926..2c2e193d1257604bd84e1eafb9d6f40ee4bbbd18 100644 (file)
--- a/bertos/cpu/arm/drv/stepper_at91.c
+++ b/bertos/cpu/arm/drv/stepper_at91.c
@@ -74,9 +74,9 @@
 /*
  * Forward declaration for interrupt handler
  */
-static void stepper_tc0_irq(void);
-static void stepper_tc1_irq(void);
-static void stepper_tc2_irq(void);
+static ISR_PROTO(stepper_tc0_irq);
+static ISR_PROTO(stepper_tc1_irq);
+static ISR_PROTO(stepper_tc2_irq);
 
 ///< Static array of timer counter struct for stepper.
 static struct TimerCounter stepper_timers[CONFIG_TC_STEPPER_MAX_NUM] =
@@ -253,7 +253,7 @@ INLINE void stepper_tc_tio_irq(struct TimerCounter * t)
 /*
  * Interrupt handler for timer counter TCKL0
  */
-static void ISR_FUNC stepper_tc0_irq(void)
+DECLARE_ISR(stepper_tc0_irq)
 {
        /*
         * Warning: when we read the status_reg register, we reset it.
@@ -277,7 +277,7 @@ static void ISR_FUNC stepper_tc0_irq(void)
 /*
  * Interrupt handler for timer counter TCKL1
  */
-static void ISR_FUNC stepper_tc1_irq(void)
+DECLARE_ISR(stepper_tc1_irq)
 {
        /*
         * Warning: when we read the status_reg register, we reset it.
@@ -302,7 +302,7 @@ static void ISR_FUNC stepper_tc1_irq(void)
 /*
  * Interrupt handler for timer counter TCKL2
  */
-static void ISR_FUNC stepper_tc2_irq(void)
+DECLARE_ISR(stepper_tc2_irq)
 {
 
        /*
@@ -362,7 +362,7 @@ void stepper_tc_setup(int index, stepper_isr_t callback, struct Stepper *motor)
        *motor->timer->comp_c_reg = 0;
 
        //Register interrupt vector
-       cpuflags_t flags;
+       cpu_flags_t flags;
        IRQ_SAVE_DISABLE(flags);
 
        /*