Changeset 97c7682 in mainline for uspace/app/trace/ipc_desc.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/app/trace/ipc_desc.c (modified) (1 diff)

uspace/app/trace/ipc_desc.c

@@ -39 +39 @@
 ipc_m_desc_t ipc_methods[] = {
         /* System methods */
-        { 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" },
+        { IPC_M_PHONE_HUNGUP,     "PHONE_HUNGUP" },
+        { IPC_M_CONNECTION_CLONE, "CONNECTION_CLONE" },
+        { IPC_M_CLONE_ESTABLISH,  "CLONE_ESTABLISH" },
+        { 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 */