Move test code to timer_test.c; Add OS_HOSTED support.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@447 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/drv/timer.c b/drv/timer.c
index 0fe4d2c22c270e2b3743fa6d1a02c26a1378fb6f..bf65778db7df61918ceba16d0586505b02b3f1c9 100755 (executable)
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $Log$
+ *#* 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 +41,19 @@
 
 #include "timer.h"
 #include <cfg/cpu.h>
-#include <hw.h>
+#include <cfg/os.h>
 #include <cfg/debug.h>
 #include <appconfig.h>
 
-#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.
@@ -305,95 +316,3 @@ void timer_init(void)
 
        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));
-}
-
-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 */

diff --git a/drv/timer.h b/drv/timer.h
index a2c05757d7bd75bf2d6a635a81d26f4ad6ce9db0..3bf12e17050b94bc914074047f5618bc3a9b7f1a 100755 (executable)
--- a/drv/timer.h
+++ b/drv/timer.h
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.27  2005/11/27 03:04:19  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.
  *#*
@@ -92,11 +95,21 @@
 #ifndef DRV_TIMER_H
 #define DRV_TIMER_H
 
-#include <cfg/debug.h>
+#include <cfg/os.h>
+#include <cfg/cpu.h>
+
+/*
+ * Include platform-specific binding header if we're hosted.
+ * Try the CPU specific one for bare-metal environments.
+ */
+#if OS_HOSTED
+       #include OS_HEADER(timer)
+#else
+       #include CPU_HEADER(timer)
+#endif
 
-#include CPU_HEADER(timer)
 #include <mware/list.h>
-#include <cfg/cpu.h>
+#include <cfg/debug.h>
 #include <cfg/compiler.h>
 #include <appconfig.h>
 
@@ -193,7 +206,7 @@ INLINE hptime_t us_to_hptime(utime_t us)
        #if TIMER_HW_HPTICKS_PER_SEC > 10000000UL
                return(us * ((TIMER_HW_HPTICKS_PER_SEC + 500000UL) / 1000000UL));
        #else
-               return((us * TIMER_HW_HPTICKS_PER_SEC + 500000UL) / 1000000UL));
+               return((us * TIMER_HW_HPTICKS_PER_SEC + 500000UL) / 1000000UL);
        #endif /* TIMER_HW_HPTICKS_PER_SEC > 10000000UL */
 }
 

diff --git a/drv/timer_test.c b/drv/timer_test.c
new file mode 100755 (executable)
index 0000000..cc15f11
--- /dev/null
+++ b/drv/timer_test.c
@@ -0,0 +1,114 @@
+/*!
+ * \file
+ * <!--
+ * Copyright 2005 Develer S.r.l. (http://www.develer.com/)
+ * This file is part of DevLib - See README.devlib for information.
+ * -->
+ *
+ * \brief Hardware independent timer driver (implementation)
+ *
+ * \version $Id$
+ * \author Bernardo Innocenti <bernie@develer.com>
+ */
+
+/*#*
+ *#* $Log$
+ *#* Revision 1.1  2005/11/27 03:04:08  bernie
+ *#* Move test code to timer_test.c; Add OS_HOSTED support.
+ *#*
+ *#*/
+
+#include "timer.c"
+#include "mware/event.c"
+
+static void timer_test_constants(void)
+{
+       kprintf("TIMER_HW_HPTICKS_PER_SEC=%lu\n", TIMER_HW_HPTICKS_PER_SEC);
+       #ifdef TIMER_PRESCALER
+               kprintf("TIMER_PRESCALER=%d\n", TIMER_PRESCALER);
+       #endif
+       #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));
+}
+
+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);
+               }
+               wdt_reset();
+       }
+}
+
+int main(void)
+{
+       wdt_init(7);
+       timer_init();
+       timer_test_constants();
+       timer_test_delay();
+       timer_test_async();
+       timer_test_poll();
+}