X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer.c;h=8036816cf1d66e4dbbe31d221ce604e0de0c64a7;hb=9ffcd0c4865a64d7fc713eb038dcba199d11fccb;hp=0fe4d2c22c270e2b3743fa6d1a02c26a1378fb6f;hpb=76c53bfa0136be55cf17e57b1ee098e5dfeefa70;p=bertos.git diff --git a/drv/timer.c b/drv/timer.c index 0fe4d2c2..8036816c 100755 --- a/drv/timer.c +++ b/drv/timer.c @@ -1,7 +1,7 @@ /*! * \file * @@ -14,6 +14,15 @@ /*#* *#* $Log$ + *#* Revision 1.29 2006/02/17 22:24:07 bernie + *#* Add MOD_CHECK() checks. + *#* + *#* Revision 1.28 2006/02/10 12:32:52 bernie + *#* Update Copyright year. + *#* + *#* Revision 1.27 2005/11/27 03:04:08 bernie + *#* Move test code to timer_test.c; Add OS_HOSTED support. + *#* *#* Revision 1.26 2005/11/04 16:20:02 bernie *#* Fix reference to README.devlib in header. *#* @@ -38,11 +47,20 @@ #include "timer.h" #include -#include +#include #include +#include #include -#include CPU_CSOURCE(timer) +/* + * Include platform-specific binding code if we're hosted. + * Try the CPU specific one for bare-metal environments. + */ +#if OS_HOSTED + #include OS_CSOURCE(timer) +#else + #include CPU_CSOURCE(timer) +#endif /* * Sanity check for config parameters required by this module. @@ -289,6 +307,7 @@ DEFINE_TIMER_ISR TIMER_STROBE_OFF; } +MOD_DEFINE(timer) /*! * Initialize timer @@ -304,96 +323,6 @@ void timer_init(void) _clock = 0; timer_hw_init(); -} - -#if CONFIG_TEST - -static void timer_test_constants(void) -{ - kprintf("TIMER_PRESCALER=%d\n", TIMER_PRESCALER); - kprintf("TIMER_HW_HPTICKS_PER_SEC=%lu\n", TIMER_HW_HPTICKS_PER_SEC); - #ifdef TIMER1_OVF_COUNT - kprintf("TIMER1_OVF_COUNT=%d\n", (int)TIMER1_OVF_COUNT); - #endif - kprintf("TIMER_TICKS_PER_MSEC=%d\n", (int)TIMER_TICKS_PER_MSEC); - 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("\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("\n"); - kprintf("hptime_to_us(100)=%lu\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)); + MOD_INIT(timer); } - -static void timer_test_delay(void) -{ - int i; - - kputs("Delay test\n"); - for (i = 0; i < 1000; i += 100) - { - kprintf("delay %d...", i); - timer_delay(i); - kputs("done\n"); - } -} - -static void timer_test_hook(iptr_t _timer) -{ - Timer *timer = (Timer *)(void *)_timer; - - kprintf("Timer %ld expired\n", ticks_to_ms(timer->_delay)); - timer_add(timer); -} - -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_add(timer); - } -} - -static void timer_test_poll(void) -{ - int secs = 0; - mtime_t start_time = ticks_to_ms(timer_clock()); - mtime_t now; - - while (secs <= 10) - { - now = ticks_to_ms(timer_clock()); - if (now - start_time >= 1000) - { - ++secs; - start_time += 1000; - kprintf("seconds = %d, ticks=%ld\n", secs, now); - } - } -} - -void timer_test(void) -{ - timer_test_constants(); - timer_test_delay(); - timer_test_async(); - timer_test_poll(); -} - -#endif /* CONFIG_TEST */