Changeset 8b655705 in mainline for uspace/lib/c/include/ipc/services.h

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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 {
@@ -47 +47 @@
         SERVICE_DEVMAP,
         SERVICE_DEVMAN,
-        SERVICE_FHC,
-        SERVICE_OBIO,
-        SERVICE_APIC,
-        SERVICE_I8259,
+        SERVICE_IRC,
         SERVICE_CLIPBOARD,
         SERVICE_NETWORKING,
@@ -66 +63 @@
 } services_t;
 
-/* Memory area to be received from NS */
-#define SERVICE_MEM_REALTIME    1
-#define SERVICE_MEM_KLOG        2
-
 #endif