Changeset 46c20c8 in mainline for kernel/generic/include/time/timeout.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/include/time/timeout.h (modified) (3 diffs)

kernel/generic/include/time/timeout.h

@@ -36 +36 @@
 #define KERN_TIMEOUT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 #include <cpu.h>
@@ -43 +43 @@
 
 typedef struct {
-        SPINLOCK_DECLARE(lock);
-
+        IRQ_SPINLOCK_DECLARE(lock);
+        
         /** Link to the list of active timeouts on THE->cpu */
         link_t link;
-        /** Timeout will be activated in this amount of clock() ticks. */       
+        /** Timeout will be activated in this amount of clock() ticks. */
         uint64_t ticks;
         /** Function that will be called on timeout activation. */
@@ -57 +57 @@
 } timeout_t;
 
-#define us2ticks(us)    ((uint64_t) (((uint32_t) (us) / (1000000 / HZ))))
+#define us2ticks(us)  ((uint64_t) (((uint32_t) (us) / (1000000 / HZ))))
 
 extern void timeout_init(void);
-extern void timeout_initialize(timeout_t *t);
-extern void timeout_reinitialize(timeout_t *t);
-extern void timeout_register(timeout_t *t, uint64_t usec, timeout_handler_t f,
-    void *arg);
-extern bool timeout_unregister(timeout_t *t);
+extern void timeout_initialize(timeout_t *);
+extern void timeout_reinitialize(timeout_t *);
+extern void timeout_register(timeout_t *, uint64_t, timeout_handler_t, void *);
+extern bool timeout_unregister(timeout_t *);
 
 #endif