Changeset 89c57b6 in mainline for kernel/generic/src/ipc/kbox.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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 mainline changes.

File:

• kernel/generic/src/ipc/kbox.c (modified) (3 diffs)

kernel/generic/src/ipc/kbox.c

@@ -107 +107 @@
                 /* Terminate debugging session (if any). */
                 LOG("Terminate debugging session.");
-                irq_spinlock_lock(&TASK->lock, true);
+                mutex_lock(&TASK->udebug.lock);
                 udebug_task_cleanup(TASK);
-                irq_spinlock_unlock(&TASK->lock, true);
+                mutex_unlock(&TASK->udebug.lock);
         } else {
                 LOG("Was not debugger.");
@@ -167 +167 @@
                         continue;  /* Try again. */
                 
-                switch (IPC_GET_METHOD(call->data)) {
+                switch (IPC_GET_IMETHOD(call->data)) {
                 
                 case IPC_M_DEBUG_ALL:
@@ -192 +192 @@
 }
 
-
 /** Connect phone to a task kernel-box specified by id.
  *