Changeset 5a6cc679 in mainline for kernel/generic/src/synch/waitq.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/waitq.c (modified) (3 diffs)

kernel/generic/src/synch/waitq.c

@@ -268 +268 @@
  *
  */
-int waitq_sleep_timeout(waitq_t *wq, uint32_t usec, unsigned int flags, bool *blocked)
+errno_t waitq_sleep_timeout(waitq_t *wq, uint32_t usec, unsigned int flags, bool *blocked)
 {
         assert((!PREEMPTION_DISABLED) || (PARAM_NON_BLOCKING(flags, usec)));
@@ -274 +274 @@
         ipl_t ipl = waitq_sleep_prepare(wq);
         bool nblocked;
-        int rc = waitq_sleep_timeout_unsafe(wq, usec, flags, &nblocked);
+        errno_t rc = waitq_sleep_timeout_unsafe(wq, usec, flags, &nblocked);
         waitq_sleep_finish(wq, nblocked, ipl);
 
@@ -373 +373 @@
  *
  */
-int waitq_sleep_timeout_unsafe(waitq_t *wq, uint32_t usec, unsigned int flags, bool *blocked)
+errno_t waitq_sleep_timeout_unsafe(waitq_t *wq, uint32_t usec, unsigned int flags, bool *blocked)
 {
         *blocked = false;