Changes in kernel/generic/include/synch/semaphore.h [597fa24:e88eb48] in mainline

File:

• kernel/generic/include/synch/semaphore.h (modified) (1 diff)

kernel/generic/include/synch/semaphore.h

@@ -45 +45 @@
 } semaphore_t;
 
-#define SEMAPHORE_INITIALIZER(name, count) (semaphore_t) { \
-        .wq = WAITQ_INITIALIZER_WITH_COUNT((name).wq, count), \
-}
+#define semaphore_down(s) \
+        _semaphore_down_timeout((s), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
 
-#define SEMAPHORE_INITIALIZE(name, count) \
-        semaphore_t name = SEMAPHORE_INITIALIZER(name, count)
+#define semaphore_trydown(s) \
+        _semaphore_down_timeout((s), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NON_BLOCKING)
+
+#define semaphore_down_timeout(s, usec) \
+        _semaphore_down_timeout((s), (usec), SYNCH_FLAGS_NONE)
+
+#define semaphore_down_interruptable(s) \
+        (_semaphore_down_timeout((s), SYNCH_NO_TIMEOUT, \
+                SYNCH_FLAGS_INTERRUPTIBLE) != EINTR)
 
 extern void semaphore_initialize(semaphore_t *, int);
-extern errno_t semaphore_down_timeout(semaphore_t *, uint32_t);
-extern errno_t semaphore_trydown(semaphore_t *);
-extern void semaphore_down(semaphore_t *);
+extern errno_t _semaphore_down_timeout(semaphore_t *, uint32_t, unsigned int);
 extern void semaphore_up(semaphore_t *);
+extern int semaphore_count_get(semaphore_t *);
 
 #endif