Changeset 897fd8f1 in mainline for kernel/generic/include

Timestamp:

2017-12-19T18:18:15Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

55b56f4

Parents:

7f11dc6

Message:

Use <errno.h> instead of special ESYNCH_xx error codes.

Location:

kernel/generic/include/synch

Files:

• semaphore.h (modified) (2 diffs)
• waitq.h (modified) (1 diff)

kernel/generic/include/synch/semaphore.h

@@ -36 +36 @@
 #define KERN_SEMAPHORE_H_
 
+#include <errno.h>
 #include <stdint.h>
 #include <synch/waitq.h>
@@ -54 +55 @@
 
 #define semaphore_down_interruptable(s) \
-        (ESYNCH_INTERRUPTED != _semaphore_down_timeout((s), SYNCH_NO_TIMEOUT, \
-                SYNCH_FLAGS_INTERRUPTIBLE))
+        (_semaphore_down_timeout((s), SYNCH_NO_TIMEOUT, \
+                SYNCH_FLAGS_INTERRUPTIBLE) != EINTR)
 
 extern void semaphore_initialize(semaphore_t *, int);

kernel/generic/include/synch/waitq.h

@@ -67 +67 @@
 
 #define waitq_sleep(wq) \
-        waitq_sleep_timeout((wq), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
+        waitq_sleep_timeout((wq), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE, NULL)
 
 struct thread;
 
 extern void waitq_initialize(waitq_t *);
-extern int waitq_sleep_timeout(waitq_t *, uint32_t, unsigned int);
+extern int waitq_sleep_timeout(waitq_t *, uint32_t, unsigned int, bool *);
 extern ipl_t waitq_sleep_prepare(waitq_t *);
-extern int waitq_sleep_timeout_unsafe(waitq_t *, uint32_t, unsigned int);
-extern void waitq_sleep_finish(waitq_t *, int, ipl_t);
+extern int waitq_sleep_timeout_unsafe(waitq_t *, uint32_t, unsigned int, bool *);
+extern void waitq_sleep_finish(waitq_t *, bool, ipl_t);
 extern void waitq_wakeup(waitq_t *, wakeup_mode_t);
 extern void _waitq_wakeup_unsafe(waitq_t *, wakeup_mode_t);