Changes in kernel/generic/src/synch/semaphore.c [e88eb48:597fa24] in mainline

File:

• kernel/generic/src/synch/semaphore.c (modified) (2 diffs)

kernel/generic/src/synch/semaphore.c

@@ -52 +52 @@
 void semaphore_initialize(semaphore_t *sem, int val)
 {
-        waitq_initialize(&sem->wq);
-        waitq_count_set(&sem->wq, val);
+        *sem = SEMAPHORE_INITIALIZER(*sem, val);
 }
 
-/** Semaphore down
- *
- * Semaphore down.
- * Conditional mode and mode with timeout can be requested.
+errno_t semaphore_trydown(semaphore_t *sem)
+{
+        return semaphore_down_timeout(sem, 0);
+}
+
+/** Semaphore down with timeout
  *
  * @param sem   Semaphore.
  * @param usec  Timeout in microseconds.
- * @param flags Select mode of operation.
- *
- * For exact description of possible combinations of
- * usec and flags, see comment for waitq_sleep_timeout().
  *
  * @return See comment for waitq_sleep_timeout().
  *
  */
-errno_t _semaphore_down_timeout(semaphore_t *sem, uint32_t usec, unsigned int flags)
+errno_t semaphore_down_timeout(semaphore_t *sem, uint32_t usec)
 {
-        return waitq_sleep_timeout(&sem->wq, usec, flags, NULL);
+        errno_t rc = waitq_sleep_timeout(&sem->wq, usec);
+        assert(rc == EOK || rc == ETIMEOUT || rc == EAGAIN);
+        return rc;
+}
+
+void semaphore_down(semaphore_t *sem)
+{
+        errno_t rc = waitq_sleep(&sem->wq);
+        assert(rc == EOK);
 }
 
@@ -85 +90 @@
 void semaphore_up(semaphore_t *sem)
 {
-        waitq_wakeup(&sem->wq, WAKEUP_FIRST);
-}
-
-/** Get the semaphore counter value.
- *
- * @param sem           Semaphore.
- * @return              The number of threads that can down the semaphore
- *                      without blocking.
- */
-int semaphore_count_get(semaphore_t *sem)
-{
-        return waitq_count_get(&sem->wq);
+        waitq_wake_one(&sem->wq);
 }