Add preliminary FreeRTOS support; Enforce CONFIG_* definitions.

[bertos.git] / drv / timer.h

diff --git a/drv/timer.h b/drv/timer.h
index 7bde5f5bb9667d2d0b2917fd89cc605afca5f3f2..3bf12e17050b94bc914074047f5618bc3a9b7f1a 100755 (executable)
--- a/drv/timer.h
+++ b/drv/timer.h
@@ -3,7 +3,7 @@
  * <!--
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \version $Id$
@@ -15,6 +15,12 @@
 
 /*#*
  *#* $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.
+ *#*
  *#* Revision 1.25  2005/07/19 07:26:37  bernie
  *#* Refactor to decouple timer ticks from milliseconds.
  *#*
@@ -89,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>
 
@@ -190,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 */
 }