Merge da SC: fixato namespace dell'include guard

[bertos.git] / drv / timer.c

diff --git a/drv/timer.c b/drv/timer.c
index 0621336856fb561587d4d7ea00a68ae2f4be7ad0..24287cb982569748ea4e0165355aa1865ae0174b 100755 (executable)
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -15,6 +15,12 @@
 
 /*
  * $Log$
+ * Revision 1.11  2004/08/02 20:20:29  aleph
+ * Merge from project_ks
+ *
+ * Revision 1.10  2004/07/30 14:15:53  rasky
+ * Nuovo supporto unificato per detect della CPU
+ *
  * Revision 1.9  2004/07/21 00:15:13  bernie
  * Put timer driver on diet.
  *
@@ -44,24 +50,12 @@
 #include "hw.h"
 #include "kdebug.h"
 #include "timer.h"
+#include CPU_HEADER(timer)
 
 #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
        #include <kern/proc.h>
 #endif
 
-#if defined(ARCH_EMUL) && (ARCH & ARCH_EMUL)
-       #error To be recoded
-#elif defined(__AVR__)
-       #include "timer_avr.h"
-#elif defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__) /* 80C196 */
-       #include "timer_i196.h"
-#elif defined (__m56800__)
-       #include "timer_dsp56k.h"
-#else
-       #error Unknown system
-#endif
-
-
 //! Master system clock (1ms accuracy)
 volatile time_t _clock;
 
@@ -225,7 +219,7 @@ DEFINE_TIMER_ISR
                REMOVE((Node *)timer);
 
                /* Execute the associated event */
-               event_doIntr(&timer->expire);
+               event_do(&timer->expire);
        }
 #endif /* CONFIG_TIMER_DISABLE_EVENTS */