Changeset 5a6cc679 in mainline for kernel/generic/src/synch/condvar.c

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• kernel/generic/src/synch/condvar.c (modified) (3 diffs)

kernel/generic/src/synch/condvar.c

@@ -85 +85 @@
  * @return              See comment for waitq_sleep_timeout().
  */
-int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec, int flags)
+errno_t _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec, int flags)
 {
-        int rc;
+        errno_t rc;
         ipl_t ipl;
         bool blocked;
@@ -124 +124 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock, 
+errno_t _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock, 
         uint32_t usec, int flags)
 {
-        int rc;
+        errno_t rc;
         ipl_t ipl;
         bool blocked;
@@ -161 +161 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _condvar_wait_timeout_irq_spinlock(condvar_t *cv, irq_spinlock_t *irq_lock, 
+errno_t _condvar_wait_timeout_irq_spinlock(condvar_t *cv, irq_spinlock_t *irq_lock, 
         uint32_t usec, int flags)
 {
-        int rc;
+        errno_t rc;
         /* Save spinlock's state so we can restore it correctly later on. */
         ipl_t ipl = irq_lock->ipl;