Diff: TimerEvent.h

Revision:

8:c14af7958ef5

Parent:

2:e9a661555b58

Child:

9:663789d7729f

--- a/TimerEvent.h	Tue Oct 23 09:20:18 2012 +0000
+++ b/TimerEvent.h	Fri Nov 09 11:33:53 2012 +0000
@@ -1,7 +1,6 @@
 /* mbed Microcontroller Library - TimerEvent
  * Copyright (c) 2007-2009 ARM Limited. All rights reserved.
- */ 
- 
+ */
 #ifndef MBED_TIMEREVENT_H
 #define MBED_TIMEREVENT_H
 
@@ -9,21 +8,21 @@
 
 namespace mbed {
 
-// Base abstraction for timer interrupts
+/** Base abstraction for timer interrupts
+*/
 class TimerEvent {
-
 public:
-
     TimerEvent();
     
-    // The handler registered with the underlying timer interrupt
-    static void irq();
-
-    // Destruction removes it...
+    /** The handler registered with the underlying timer interrupt
+     */
+    static void irq(uint32_t id);
+    
+    /** Destruction removes it...
+     */
     virtual ~TimerEvent();
 
 protected:
-
     // The handler called to service the timer event of the derived class
     virtual void handler() = 0;
     
@@ -33,10 +32,7 @@
     // remove from linked list, if in it
     void remove();
     
-    static TimerEvent *_head;   // The head of the list of the events, NULL if none
-    TimerEvent *_next;          // Pointer to the next in the list, NULL if last
-    unsigned int _timestamp;    // The timestamp at which the even should be triggered
-
+    ticker_event event;
 };
 
 } // namespace mbed