X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Ftimer_test.c;h=421f746ebbb4b625f28fa5834a7a85c5063ffa82;hb=976d522209efc4c11a019ae6b34657b6b3f59ba0;hp=694d18c565ed86ca35d402bc602433da8d00da77;hpb=27544838f61b2d94ecdd609fbd5a76901acebfaa;p=bertos.git diff --git a/bertos/drv/timer_test.c b/bertos/drv/timer_test.c index 694d18c5..421f746e 100644 --- a/bertos/drv/timer_test.c +++ b/bertos/drv/timer_test.c @@ -32,8 +32,8 @@ * * \brief Hardware independent timer driver (implementation) * - * \version $Id$ - * \author Bernardo Innocenti + * \author Bernie Innocenti + * */ #include @@ -43,35 +43,35 @@ #include -#warning TODO:Refactor this test to comply whit BeRTOS test policy. - -#ifdef _TEST +#include 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)); + #if (SIZEOF_HPTIME_T > 1) + kprintf("hptime_to_us(10000)= %lu\n", (unsigned long)hptime_to_us(10000)); + #endif + 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) @@ -91,21 +91,34 @@ 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]; + +List synctimer_list; +static Timer synctimer_timers[5]; + +static void synctimer_test_hook(iptr_t _timer) +{ + Timer *timer = (Timer *)(void *)_timer; + kprintf("Sync timer process %lu expired\n", (unsigned long)ticks_to_ms(timer->_delay)); + synctimer_add(timer, &synctimer_list); +} + + +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); } } @@ -123,26 +136,74 @@ 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(); } } +static void synctimer_test(void) +{ + size_t i; -#include "timer.c" -#include "mware/event.c" -#include "os/hptime.c" + LIST_INIT(&synctimer_list); + for (i = 0; i < countof(synctimer_timers); ++i) + { + Timer *timer = &synctimer_timers[i]; + timer_setDelay(timer, ms_to_ticks(test_delays[i])); + timer_setSoftint(timer, synctimer_test_hook, (iptr_t)timer); + synctimer_add(timer, &synctimer_list); + } -int main(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()); + synctimer_poll(&synctimer_list); + if (now - start_time >= 1000) + { + ++secs; + start_time += 1000; + kprintf("seconds = %d, ticks=%lu\n", secs, (unsigned long)now); + } + wdt_reset(); + } + + for (i = 0; i < countof(synctimer_timers); ++i) + { + synctimer_abort(&synctimer_timers[i]); + } +} + +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(); + synctimer_test(); 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);