Changeset b0f00a9 in mainline for uspace/app/trace/ipc_desc.c

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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:

• uspace/app/trace/ipc_desc.c (modified) (2 diffs)

uspace/app/trace/ipc_desc.c

@@ -33 +33 @@
  */
 
-#include <ipc/common.h>
+#include <abi/ipc/methods.h>
 #include <stdlib.h>
 #include "ipc_desc.h"
@@ -39 +39 @@
 ipc_m_desc_t ipc_methods[] = {
         /* System methods */
-        { IPC_M_CONNECT_TO_ME,  "CONNECT_TO_ME" },
-        { IPC_M_CONNECT_ME_TO,  "CONNECT_ME_TO" },
-        { IPC_M_PHONE_HUNGUP,   "PHONE_HUNGUP" },
-        { IPC_M_SHARE_OUT,      "SHARE_OUT" },
-        { IPC_M_SHARE_IN,       "SHARE_IN" },
-        { IPC_M_DATA_WRITE,     "DATA_WRITE" },
-        { IPC_M_DATA_READ,      "DATA_READ" },
-        { IPC_M_DEBUG_ALL,      "DEBUG_ALL" },
-
-        /* Well-known methods */
-        { IPC_M_PING,           "PING" },
-
+        { IPC_M_PHONE_HUNGUP,  "PHONE_HUNGUP" },
+        { IPC_M_CONNECT_ME,    "CONNECT_ME" },
+        { IPC_M_CONNECT_ME_TO, "CONNECT_ME_TO" },
+        { IPC_M_CONNECT_TO_ME, "CONNECT_TO_ME" },
+        { IPC_M_SHARE_OUT,     "SHARE_OUT" },
+        { IPC_M_SHARE_IN,      "SHARE_IN" },
+        { IPC_M_DATA_WRITE,    "DATA_WRITE" },
+        { IPC_M_DATA_READ,     "DATA_READ" },
+        { IPC_M_DEBUG,         "DEBUG" },
+        
         /* Terminating entry */
         { 0, NULL }