X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Ftimer_test.c;h=c3414d79f697dfca648042873be8e70431e61cc2;hb=8baedd5c716fca8f63e9c9b2e64071f12c29dc9d;hp=2171db0662960795b58850a38e1ed26d6d5e962b;hpb=e94a42a80537a6a2bd92be602d308eff4bc6d127;p=bertos.git

diff --git a/bertos/drv/timer_test.c b/bertos/drv/timer_test.c
index 2171db06..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>
@@ -67,7 +68,9 @@ static void timer_test_constants(void)
 	kprintf("ticks_to_us(10000) = %lu\n",   (unsigned long)ticks_to_us(10000));
 	kprintf("\n");
 	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));
+	#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));
 }
@@ -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,14 +157,5 @@ int timer_testTearDown(void)
 	return 0;
 }
 
-#if UNIT_TEST
-	#include <drv/timer.c>
-	#include <drv/kdebug.c>
-	#include <mware/event.c>
-	#include <mware/formatwr.c>
-	#include <mware/hex.c>
-	#include <os/hptime.c>
-
-	TEST_MAIN(timer);
-#endif
+TEST_MAIN(timer);