Update to new kernel config: kernel if OFF by default now.

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

diff --git a/bertos/drv/timer_test.c b/bertos/drv/timer_test.c
index 98412233200850e629457d6eca56056e39d8dc74..19522768cbfe36fb68608cdadf16583d209bc866 100644 (file)
--- a/bertos/drv/timer_test.c
+++ b/bertos/drv/timer_test.c
@@ -33,7 +33,8 @@
  * \brief Hardware independent timer driver (implementation)
  *
  * \version $Id$
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
+ *
  */
 
 #include <cfg/test.h>
@@ -43,33 +44,33 @@
 
 #include <mware/event.h>
 
-#warning TODO:Refactor this test to comply whit BeRTOS test policy.
+#include <cfg/debug.h>
 
 static void timer_test_constants(void)
 {
-       kprintf("TIMER_HW_HPTICKS_PER_SEC=%lu\n", TIMER_HW_HPTICKS_PER_SEC);
+       kprintf("TIMER_HW_HPTICKS_PER_SEC=%lu\n", (unsigned long)TIMER_HW_HPTICKS_PER_SEC);
        #ifdef TIMER_PRESCALER
-               kprintf("TIMER_PRESCALER=%d\n", TIMER_PRESCALER);
+               kprintf("TIMER_PRESCALER    = %lu\n", (unsigned long)TIMER_PRESCALER);
        #endif
        #ifdef TIMER1_OVF_COUNT
-               kprintf("TIMER1_OVF_COUNT=%d\n", (int)TIMER1_OVF_COUNT);
+               kprintf("TIMER1_OVF_COUNT   = %lu\n", (unsigned long)TIMER1_OVF_COUNT);
        #endif
-       kprintf("TIMER_TICKS_PER_SEC=%d\n", (int)TIMER_TICKS_PER_SEC);
+       kprintf("TIMER_TICKS_PER_SEC= %lu\n",  (unsigned long)TIMER_TICKS_PER_SEC);
        kprintf("\n");
-       kprintf("ms_to_ticks(100)=%lu\n", ms_to_ticks(100));
-       kprintf("ms_to_ticks(10000)=%lu\n", ms_to_ticks(10000));
-       kprintf("us_to_ticks(100)=%lu\n", us_to_ticks(100));
-       kprintf("us_to_ticks(10000)=%lu\n", us_to_ticks(10000));
+       kprintf("ms_to_ticks(100)   = %lu\n",   (unsigned long)ms_to_ticks(100));
+       kprintf("ms_to_ticks(10000) = %lu\n",   (unsigned long)ms_to_ticks(10000));
+       kprintf("us_to_ticks(100)   = %lu\n",   (unsigned long)us_to_ticks(100));
+       kprintf("us_to_ticks(10000) = %lu\n",   (unsigned long)us_to_ticks(10000));
        kprintf("\n");
-       kprintf("ticks_to_ms(100)=%lu\n", ticks_to_ms(100));
-       kprintf("ticks_to_ms(10000)=%lu\n", ticks_to_ms(10000));
-       kprintf("ticks_to_us(100)=%lu\n", ticks_to_us(100));
-       kprintf("ticks_to_us(10000)=%lu\n", ticks_to_us(10000));
+       kprintf("ticks_to_ms(100)   = %lu\n",   (unsigned long)ticks_to_ms(100));
+       kprintf("ticks_to_ms(10000) = %lu\n",   (unsigned long)ticks_to_ms(10000));
+       kprintf("ticks_to_us(100)   = %lu\n",   (unsigned long)ticks_to_us(100));
+       kprintf("ticks_to_us(10000) = %lu\n",   (unsigned long)ticks_to_us(10000));
        kprintf("\n");
-       kprintf("hptime_to_us(100)=%ld\n", hptime_to_us(100));
-       kprintf("hptime_to_us(10000)=%lu\n", hptime_to_us(10000));
-       kprintf("us_to_hptime(100)=%lu\n", us_to_hptime(100));
-       kprintf("us_to_hptime(10000)=%lu\n", us_to_hptime(10000));
+       kprintf("hptime_to_us(100)  = %lu\n",   (unsigned long)hptime_to_us(100));
+       kprintf("hptime_to_us(10000)= %lu\n",   (unsigned long)hptime_to_us(10000));
+       kprintf("us_to_hptime(100)  = %lu\n",   (unsigned long)us_to_hptime(100));
+       kprintf("us_to_hptime(10000)= %lu\n",   (unsigned long)us_to_hptime(10000));
 }
 
 static void timer_test_delay(void)
@@ -89,21 +90,22 @@ static void timer_test_hook(iptr_t _timer)
 {
        Timer *timer = (Timer *)(void *)_timer;
 
-       kprintf("Timer %ld expired\n", ticks_to_ms(timer->_delay));
+       kprintf("Timer %lu expired\n", (unsigned long)ticks_to_ms(timer->_delay));
        timer_add(timer);
 }
 
+static Timer test_timers[5];
+static const mtime_t test_delays[5] = { 170, 50, 310, 1500, 310 };
+
 static void timer_test_async(void)
 {
-       static Timer test_timers[5];
-       static const mtime_t test_delays[5] = { 170, 50, 310, 1500, 310 };
        size_t i;
 
        for (i = 0; i < countof(test_timers); ++i)
        {
                Timer *timer = &test_timers[i];
                timer_setDelay(timer, ms_to_ticks(test_delays[i]));
-               timer_set_event_softint(timer, timer_test_hook, (iptr_t)timer);
+               timer_setSoftint(timer, timer_test_hook, (iptr_t)timer);
                timer_add(timer);
        }
 }
@@ -121,27 +123,37 @@ static void timer_test_poll(void)
                {
                        ++secs;
                        start_time += 1000;
-                       kprintf("seconds = %d, ticks=%ld\n", secs, now);
+                       kprintf("seconds = %d, ticks=%lu\n", secs, (unsigned long)now);
                }
                wdt_reset();
        }
 }
 
-#ifdef _TEST
-
-#include "timer.c"
-#include "mware/event.c"
-#include "os/hptime.c"
-
-int main(void)
+int timer_testSetup(void)
 {
-       wdt_init(7);
+       IRQ_ENABLE;
+       wdt_start(7);
        timer_init();
+       kdbg_init();
+       return 0;
+}
+
+int timer_testRun(void)
+{
        timer_test_constants();
        timer_test_delay();
        timer_test_async();
        timer_test_poll();
        return 0;
 }
-#endif
+
+int timer_testTearDown(void)
+{
+       unsigned i;
+       for (i = 0; i < countof(test_timers); ++i)
+               timer_abort(&test_timers[i]);
+       return 0;
+}
+
+TEST_MAIN(timer);