X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Ftimer_test.c;h=c3414d79f697dfca648042873be8e70431e61cc2;hb=ce455a07c3f2d0055f3b7971e91fe5a6e3903395;hp=22b18761d2e9e84b3d15c55e750ff5e994a745a2;hpb=3b9a407e4f8ed59e5d31f3e5abe395e5d7129500;p=bertos.git

diff --git a/bertos/drv/timer_test.c b/bertos/drv/timer_test.c
index 22b18761..c3414d79 100644
--- a/bertos/drv/timer_test.c
+++ b/bertos/drv/timer_test.c
@@ -34,6 +34,7 @@
  *
  * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
+ *
  */
 
 #include <cfg/test.h>
@@ -47,29 +48,31 @@
 
 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)
@@ -89,7 +92,7 @@ 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);
 }
 
@@ -104,7 +107,7 @@ static void timer_test_async(void)
 	{
 		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);
 	}
 }
@@ -122,7 +125,7 @@ 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();
 	}
@@ -131,7 +134,7 @@ static void timer_test_poll(void)
 int timer_testSetup(void)
 {
 	IRQ_ENABLE;
-	wdt_init(7);
+	wdt_start(7);
 	timer_init();
 	kdbg_init();
 	return 0;
@@ -154,12 +157,5 @@ int timer_testTearDown(void)
 	return 0;
 }
 
-#include TEST_ONLY(drv/timer.c)
-#include TEST_ONLY(drv/kdebug.c)
-#include TEST_ONLY(mware/event.c)
-#include TEST_ONLY(mware/formatwr.c)
-#include TEST_ONLY(mware/hex.c)
-#include TEST_ONLY(os/hptime.c)
-
 TEST_MAIN(timer);