Changes in kernel/generic/src/udebug/udebug.c [feeac0d:63e27ef] in mainline

File:

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

kernel/generic/src/udebug/udebug.c

@@ -38 +38 @@
  */
 
+#include <assert.h>
+#include <debug.h>
 #include <synch/waitq.h>
-#include <debug.h>
 #include <udebug/udebug.h>
 #include <errno.h>
 #include <print.h>
 #include <arch.h>
+#include <proc/task.h>
+#include <proc/thread.h>
 
 /** Initialize udebug part of task structure.
@@ -114 +117 @@
 void udebug_stoppable_begin(void)
 {
-        ASSERT(THREAD);
-        ASSERT(TASK);
+        assert(THREAD);
+        assert(TASK);
         
         mutex_lock(&TASK->udebug.lock);
@@ -123 +126 @@
         /* Lock order OK, THREAD->udebug.lock is after TASK->udebug.lock */
         mutex_lock(&THREAD->udebug.lock);
-        ASSERT(THREAD->udebug.stoppable == false);
+        assert(THREAD->udebug.stoppable == false);
         THREAD->udebug.stoppable = true;
         
@@ -134 +137 @@
                 
                 call_t *db_call = TASK->udebug.begin_call;
-                ASSERT(db_call);
+                assert(db_call);
                 
                 TASK->udebug.dt_state = UDEBUG_TS_ACTIVE;
@@ -156 +159 @@
                         call_t *go_call = THREAD->udebug.go_call;
                         THREAD->udebug.go_call = NULL;
-                        ASSERT(go_call);
+                        assert(go_call);
                         
                         IPC_SET_RETVAL(go_call->data, 0);
@@ -193 +196 @@
         } else {
                 ++TASK->udebug.not_stoppable_count;
-                ASSERT(THREAD->udebug.stoppable == true);
+                assert(THREAD->udebug.stoppable == true);
                 THREAD->udebug.stoppable = false;
                 
@@ -396 +399 @@
 int udebug_task_cleanup(struct task *task)
 {
-        ASSERT(mutex_locked(&task->udebug.lock));
+        assert(mutex_locked(&task->udebug.lock));
 
         if ((task->udebug.dt_state != UDEBUG_TS_BEGINNING) &&