move TIMER_AFTER() and TIMER_BEFORE() macros in drv/timer.h

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

diff --git a/bertos/drv/timer.h b/bertos/drv/timer.h
index 83483b9975c4f5a9bc26693a723be828ac2271ae..a68ee5b21dd9703735582fdad4c701ea7f10ec69 100644 (file)
--- a/bertos/drv/timer.h
+++ b/bertos/drv/timer.h
@@ -100,6 +100,9 @@ STATIC_ASSERT(sizeof(hptime_t) == SIZEOF_HPTIME_T);
 
 extern volatile ticks_t _clock;
 
+#define TIMER_AFTER(x, y) ((long)(y) - (long)(x) < 0)
+#define TIMER_BEFORE(x, y) TIMER_AFTER(y, x)
+
 /**
  * \brief Return the system tick counter (expressed in ticks)
  *

diff --git a/bertos/mware/event.h b/bertos/mware/event.h
index 3d00605962e3a4aaca7b1c74d474a66eef2999ce..5bc94e9ef3b875ad6ce84654ec90867273271a2c 100644 (file)
--- a/bertos/mware/event.h
+++ b/bertos/mware/event.h
@@ -246,10 +246,6 @@ INLINE void event_wait(Event *e)
 #if CONFIG_TIMER_EVENTS
 #include <drv/timer.h> /* timer_clock() */
 
-/* TODO: move these macros to drv/timer.h */
-#define TIMER_AFTER(x, y) ((long)(y) - (long)(x) < 0)
-#define TIMER_BEFORE(x, y) TIMER_AFTER(y, x)
-
 /**
  * Wait the completion of event \a e or \a timeout elapses.
  *