fix pit timer, but vtimer still not working

jfischer-no · jfischer-no · commit 9cec32b92b16 · 2014-12-11T17:52:46.000+01:00
diff --git a/cpu/mkw2x/periph/timer.c b/cpu/mkw2x/periph/timer.c
@@ -32,6 +32,7 @@
 /** Type for timer state */
 typedef struct {
     void (*cb)(int);
+    uint32_t value;
 } timer_conf_t;
 
 /** Timer state memory */
@@ -87,6 +88,7 @@ int timer_init(tim_t dev, unsigned int ticks_per_us, void (*callback)(int))
 
     /* set callback function */
     config[dev].cb = callback;
+    config[dev].value = 0;
 
     /* enable the timer's interrupt */
     timer_irq_enable(dev);
@@ -99,13 +101,14 @@ int timer_init(tim_t dev, unsigned int ticks_per_us, void (*callback)(int))
 
 int timer_set(tim_t dev, int channel, unsigned int timeout)
 {
-    //int now = timer_read(dev);
-    //return timer_set_absolute(dev, channel, now + timeout - 1);
-    return timer_set_absolute(dev, channel, timeout);
+    int now = timer_read(dev);
+    return timer_set_absolute(dev, channel, now + timeout - 1);
+    //return timer_set_absolute(dev, channel, timeout);
 }
 
 int timer_set_absolute(tim_t dev, int channel, unsigned int value)
 {
+    config[dev].value = value;
     switch (dev) {
 #if TIMER_0_EN
         case TIMER_0:
@@ -135,6 +138,7 @@ int timer_clear(tim_t dev, int channel)
     switch (dev) {
 #if TIMER_0_EN
         case TIMER_0:
+            config[dev].value = 0;
             TIMER_0_DEV->CHANNEL[1].TCTRL |= (1 << PIT_TCTRL_TIE_SHIFT);
             TIMER_0_DEV->CHANNEL[1].TFLG = (1 << PIT_TFLG_TIF_SHIFT);
             break;
@@ -158,12 +162,12 @@ unsigned int timer_read(tim_t dev)
     switch (dev) {
 #if TIMER_0_EN
         case TIMER_0:
-            return TIMER_0_DEV->CHANNEL[1].CVAL;
+            return config[dev].value - TIMER_0_DEV->CHANNEL[1].CVAL;
             break;
 #endif
 #if TIMER_1_EN
         case TIMER_1:
-            return TIMER_1_DEV->CHANNEL[3].CVAL;
+            return TIMER_1_MAX_VALUE - TIMER_1_DEV->CHANNEL[3].CVAL;
             break;
 #endif
         case TIMER_UNDEFINED:
@@ -196,6 +200,7 @@ void timer_stop(tim_t dev)
 #if TIMER_0_EN
         case TIMER_0:
             TIMER_0_DEV->CHANNEL[1].TCTRL &= ~(1 << PIT_TCTRL_TEN_SHIFT);
+            config[dev].value = 0;
             break;
 #endif
 #if TIMER_1_EN
@@ -249,6 +254,7 @@ void timer_reset(tim_t dev)
     switch (dev) {
 #if TIMER_0_EN
         case TIMER_0:
+            config[dev].value = 0;
             TIMER_0_DEV->CHANNEL[1].LDVAL = TIMER_0_MAX_VALUE;
             break;
 #endif
@@ -264,6 +270,7 @@ void timer_reset(tim_t dev)
 
 void TIMER_0_ISR(void)
 {
+    LED_RED_TOGGLE;
     TIMER_0_DEV->CHANNEL[1].TFLG = (1 << PIT_TFLG_TIF_SHIFT);
     config[0].cb(0);
     if (sched_context_switch_request) {
