Changeset 132ab5d1 in mainline for kernel/generic/src/udebug/udebug.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

kernel/generic/src/udebug/udebug.c

@@ -98 +98 @@
         
         wq->missed_wakeups = 0;  /* Enforce blocking. */
-        int rc = waitq_sleep_timeout_unsafe(wq, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE);
-        
-        waitq_sleep_finish(wq, rc, ipl);
+        bool blocked;
+        (void) waitq_sleep_timeout_unsafe(wq, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE, &blocked);
+        waitq_sleep_finish(wq, blocked, ipl);
 }
 
@@ -394 +394 @@
  * @param task Task structure. task->udebug.lock must be already locked.
  *
- * @return Zero on success or negative error code.
+ * @return Zero on success or an error code.
  *
  */