X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer.h;h=bb8c89dda02c34ce168e6cc7bbb937752528236e;hb=5f6b4b226d25c237d9d0831785f19acd1d7fb316;hp=3180e1b81e8e914aa3baf23adfa5ea3037271108;hpb=22240d0455c6bd837fe928b29068e795be3febae;p=bertos.git

diff --git a/drv/timer.h b/drv/timer.h
index 3180e1b8..bb8c89dd 100755
--- a/drv/timer.h
+++ b/drv/timer.h
@@ -13,49 +13,58 @@
  * \brief Hardware independent timer driver (interface)
  */
 
-/*
- * $Log$
- * Revision 1.13  2004/08/02 20:20:29  aleph
- * Merge from project_ks
- *
- * Revision 1.12  2004/07/30 14:34:10  rasky
- * Vari fix per documentazione e commenti
- * Aggiunte PP_CATn e STATIC_ASSERT
- *
- * Revision 1.11  2004/07/29 22:40:12  bernie
- * Spelling fix.
- *
- * Revision 1.10  2004/07/21 00:13:57  bernie
- * Put timer driver on diet.
- *
- * Revision 1.9  2004/07/20 23:45:01  bernie
- * Finally remove redundant protos.
- *
- * Revision 1.8  2004/07/18 21:57:32  bernie
- * timer_gettick(): Rename to timer_tick() and document better.
- *
- * Revision 1.7  2004/06/27 15:26:17  aleph
- * Declaration fix for build with GCC 3.4
- *
- * Revision 1.6  2004/06/07 18:10:06  aleph
- * Remove free pool of timers; use user-provided Timer structure instead
- *
- * Revision 1.5  2004/06/07 15:57:12  aleph
- * Add function prototypes
- *
- * Revision 1.4  2004/06/06 18:25:44  bernie
- * Rename event macros to look like regular functions.
- *
- * Revision 1.3  2004/06/06 16:57:18  bernie
- * Mark some functions INLINE instead of 'extern inline'.
- *
- * Revision 1.2  2004/06/03 11:27:09  bernie
- * Add dual-license information.
- *
- * Revision 1.1  2004/05/23 18:23:30  bernie
- * Import drv/timer module.
- *
- */
+/*#*
+ *#* $Log$
+ *#* Revision 1.18  2004/11/16 23:09:52  bernie
+ *#* Disable timer_minutes() for targets with 16bit time_t.
+ *#*
+ *#* Revision 1.17  2004/11/16 22:37:14  bernie
+ *#* Replace IPTR with iptr_t.
+ *#*
+ *#* Revision 1.16  2004/08/25 14:12:08  rasky
+ *#* Aggiornato il comment block dei log RCS
+ *#*
+ *#* Revision 1.15  2004/08/10 06:59:09  bernie
+ *#* timer_gettick(): Rename to timer_ticks() and add backwards compatibility inline.
+ *#*
+ *#* Revision 1.12  2004/07/30 14:34:10  rasky
+ *#* Vari fix per documentazione e commenti
+ *#* Aggiunte PP_CATn e STATIC_ASSERT
+ *#*
+ *#* Revision 1.11  2004/07/29 22:40:12  bernie
+ *#* Spelling fix.
+ *#*
+ *#* Revision 1.10  2004/07/21 00:13:57  bernie
+ *#* Put timer driver on diet.
+ *#*
+ *#* Revision 1.9  2004/07/20 23:45:01  bernie
+ *#* Finally remove redundant protos.
+ *#*
+ *#* Revision 1.8  2004/07/18 21:57:32  bernie
+ *#* timer_gettick(): Rename to timer_tick() and document better.
+ *#*
+ *#* Revision 1.7  2004/06/27 15:26:17  aleph
+ *#* Declaration fix for build with GCC 3.4
+ *#*
+ *#* Revision 1.6  2004/06/07 18:10:06  aleph
+ *#* Remove free pool of timers; use user-provided Timer structure instead
+ *#*
+ *#* Revision 1.5  2004/06/07 15:57:12  aleph
+ *#* Add function prototypes
+ *#*
+ *#* Revision 1.4  2004/06/06 18:25:44  bernie
+ *#* Rename event macros to look like regular functions.
+ *#*
+ *#* Revision 1.3  2004/06/06 16:57:18  bernie
+ *#* Mark some functions INLINE instead of 'extern inline'.
+ *#*
+ *#* Revision 1.2  2004/06/03 11:27:09  bernie
+ *#* Add dual-license information.
+ *#*
+ *#* Revision 1.1  2004/05/23 18:23:30  bernie
+ *#* Import drv/timer module.
+ *#*
+ *#*/
 #ifndef DRV_TIMER_H
 #define DRV_TIMER_H
 
@@ -78,7 +87,7 @@ extern void timer_udelay(utime_t utime);
 
 #ifndef CONFIG_TIMER_DISABLE_EVENTS
 
-#ifdef CONFIG_KERNEL
+#if CONFIG_KERNEL
 	#include <kern/event.h>
 #else
 	#include <mware/event.h>
@@ -152,7 +161,7 @@ extern volatile time_t _clock;
  * clock variable is larger than the processor word size and can't
  * be copied atomically.
  */
-INLINE time_t timer_tick(void)
+INLINE time_t timer_ticks(void)
 {
 	time_t result;
 	cpuflags_t flags;
@@ -164,25 +173,25 @@ INLINE time_t timer_tick(void)
 	return result;
 }
 
-/* OBSOLETE */
-#define timer_gettick timer_tick
-
 
 /*!
- * Faster version of timer_tick(), to be called only when the timer
+ * Faster version of timer_ticks(), to be called only when the timer
  * interrupt is disabled (DISABLE_INTS) or overridden by a
  * higher-priority or non-nesting interrupt.
  *
- * \sa timer_tick
+ * \sa timer_ticks
  */
-INLINE time_t timer_tick_unlocked(void)
+INLINE time_t timer_ticks_unlocked(void)
 {
 	return _clock;
 }
 
-/* OBSOLETE */
-#define timer_gettick_irq timer_tick_unlocked
 
+/*
+ * timer_minutes() makes no sense when time_t is 16bit because
+ * it overflows every 65.536 seconds.
+ */
+#if SIZEOF_TIME_T >= 4
 
 /*!
  * Return the minutes passed since timer start.
@@ -193,8 +202,10 @@ INLINE time_t timer_tick_unlocked(void)
  */
 INLINE time_t timer_minutes(void)
 {
-	return timer_gettick() / (TICKS_PER_SEC * 60);
+	return timer_ticks() / (TICKS_PER_SEC * 60);
 }
 
+#endif /* SIZEOF_TIME_T >= 4 */
+
 #endif /* DRV_TIMER_H */