Changeset 89c57b6 in mainline for uspace/lib/c/include/ipc/services.h

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/lib/c/include/ipc/services.h (modified) (3 diffs)

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

@@ -35 +35 @@
  */
 
-#ifndef LIBIPC_SERVICES_H_
-#define LIBIPC_SERVICES_H_
+#ifndef LIBC_SERVICES_H_
+#define LIBC_SERVICES_H_
 
 typedef enum {
-        SERVICE_LOAD = 1,
+        SERVICE_NONE = 0,
+        SERVICE_LOAD,
         SERVICE_PCI,
         SERVICE_VIDEO,
@@ -45 +46 @@
         SERVICE_VFS,
         SERVICE_DEVMAP,
-        SERVICE_FHC,
-        SERVICE_OBIO,
+        SERVICE_DEVMAN,
+        SERVICE_IRC,
         SERVICE_CLIPBOARD,
         SERVICE_NETWORKING,
         SERVICE_LO,
-        SERVICE_DP8390,
+        SERVICE_NE2000,
         SERVICE_ETHERNET,
         SERVICE_NILDUMMY,
@@ -62 +63 @@
 } services_t;
 
-/* Memory area to be received from NS */
-#define SERVICE_MEM_REALTIME    1
-#define SERVICE_MEM_KLOG        2
-
 #endif