Changeset 41811af in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

• kernel/generic/src/ipc/sysipc.c (modified) (4 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -40 +40 @@
 #include <debug.h>
 #include <ipc/ipc.h>
+#include <ipc/ipc_methods.h>
 #include <ipc/sysipc.h>
 #include <ipc/irq.h>
@@ -460 +461 @@
         }
 #ifdef CONFIG_UDEBUG
-        case IPC_M_DEBUG_ALL:
+        case IPC_M_DEBUG:
                 return udebug_request_preprocess(call, phone);
 #endif
@@ -495 +496 @@
                 /*
                  * This must be an affirmative answer to IPC_M_DATA_READ
-                 * or IPC_M_DEBUG_ALL/UDEBUG_M_MEM_READ...
+                 * or IPC_M_DEBUG/UDEBUG_M_MEM_READ...
                  *
                  */
@@ -531 +532 @@
         
         switch (IPC_GET_IMETHOD(call->data)) {
-        case IPC_M_DEBUG_ALL:
+        case IPC_M_DEBUG:
                 return -1;
         default: