Changeset 1a23f6e in mainline for uspace/app

Timestamp:

2012-05-04T10:41:44Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

af42a2b

Parents:

6efb4d2 (diff), d21e935c (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

Location:

uspace/app

Files:

• inetcfg/inetcfg.c (modified) (1 diff)
• init/init.c (modified) (2 diffs)
• trace/ipc_desc.c (modified) (1 diff)

uspace/app/inetcfg/inetcfg.c

@@ -35 +35 @@
  */
 
-#include <async.h>
 #include <errno.h>
 #include <inet/inetcfg.h>

uspace/app/init/init.c

@@ -302 +302 @@
         spawn("/srv/obio");
         srv_start("/srv/cuda_adb");
-        srv_start("/srv/s3c24ser");
-        srv_start("/srv/s3c24ts");
+        srv_start("/srv/s3c24xx_uart");
+        srv_start("/srv/s3c24xx_ts");
         
         spawn("/srv/loopip");
@@ -315 +315 @@
         console("hid/input", "hid/fb0");
         
-        spawn("/srv/clip");
+        spawn("/srv/clipboard");
         spawn("/srv/remcons");
         

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 */