Changeset 6843a9c in mainline for uspace/lib/c/include/ipc/services.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/lib/c/include/ipc/services.h (modified) (1 diff)

uspace/lib/c/include/ipc/services.h

@@ -48 +48 @@
         SERVICE_IRC        = FOURCC('i', 'r', 'c', ' '),
         SERVICE_CLIPBOARD  = FOURCC('c', 'l', 'i', 'p'),
-        SERVICE_NETWORKING = FOURCC('n', 'e', 't', ' '),
-        SERVICE_ETHERNET   = FOURCC('e', 't', 'h', ' '),
-        SERVICE_NILDUMMY   = FOURCC('n', 'i', 'l', 'd'),
-        SERVICE_IP         = FOURCC('i', 'p', 'v', '4'),
-        SERVICE_ARP        = FOURCC('a', 'r', 'p', ' '),
-        SERVICE_ICMP       = FOURCC('i', 'c', 'm', 'p'),
         SERVICE_UDP        = FOURCC('u', 'd', 'p', ' '),
         SERVICE_TCP        = FOURCC('t', 'c', 'p', ' ')
 } services_t;
+
+#define SERVICE_NAME_INET     "net/inet"
+#define SERVICE_NAME_INETCFG  "net/inetcfg"
+#define SERVICE_NAME_INETPING "net/inetping"
 
 #endif