Merge needed define.

[bertos.git] / drv / timer_test.c

diff --git a/drv/timer_test.c b/drv/timer_test.c
index 10b76c42f9bf68d1b52c8067f2d5742f9973541e..170105dea8a1ca9ba809e4305faa5bb10eeb01b2 100644 (file)
--- a/drv/timer_test.c
+++ b/drv/timer_test.c
@@ -36,26 +36,9 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.4  2006/07/19 12:56:26  bernie
- *#* Convert to new Doxygen style.
- *#*
- *#* Revision 1.3  2006/02/21 21:28:02  bernie
- *#* New time handling based on TIMER_TICKS_PER_SEC to support slow timers with ticks longer than 1ms.
- *#*
- *#* Revision 1.2  2005/11/27 03:58:18  bernie
- *#* Add POSIX timer emulator.
- *#*
- *#* Revision 1.1  2005/11/27 03:04:08  bernie
- *#* Move test code to timer_test.c; Add OS_HOSTED support.
- *#*
- *#*/
-
-#include <cpu/irq.h>
-#include "timer.h"
-#include <mware/event.h>
-//#include "os/hptime.c"
+#include "timer.c"
+#include "mware/event.c"
+#include "os/hptime.c"
 
 static void timer_test_constants(void)
 {
@@ -135,18 +118,14 @@ static void timer_test_poll(void)
                        start_time += 1000;
                        kprintf("seconds = %d, ticks=%ld\n", secs, now);
                }
-//             wdt_reset();
+               wdt_reset();
        }
 }
 
 int main(void)
 {
-//     wdt_init(7);
-       kdbg_init();
-       sysirq_init();
+       wdt_init(7);
        timer_init();
-       IRQ_ENABLE;
-
        timer_test_constants();
        timer_test_delay();
        timer_test_async();