Changeset 925a21e in mainline for uspace/lib/c/include/ipc/services.h

Timestamp:

2011-09-24T14:20:29Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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) (1 diff)

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

@@ -43 +43 @@
         SERVICE_NONE       = 0,
         SERVICE_LOAD       = FOURCC('l', 'o', 'a', 'd'),
-        SERVICE_VIDEO      = FOURCC('v', 'i', 'd', ' '),
         SERVICE_VFS        = FOURCC('v', 'f', 's', ' '),
-        SERVICE_DEVMAP     = FOURCC('d', 'e', 'v', 'p'),
+        SERVICE_LOC        = FOURCC('l', 'o', 'c', ' '),
         SERVICE_DEVMAN     = FOURCC('d', 'e', 'v', 'n'),
         SERVICE_IRC        = FOURCC('i', 'r', 'c', ' '),