← Back to branch summary

~vojtech-horky/helenos/numa

« back to all changes in this revision

Viewing changes to uspace/lib/c/include/ipc/services.h

  • Committer: Vojtech Horky
  • Date: 2011-09-28 15:13:08 UTC
  • mfrom: (538.1.714 helenos-mainline)
  • Revision ID: vojtechhorky@users.sourceforge.net-20110928151308-2pz4s2w035n48o8a
Merge mainline changes

Conflicts fixed without problems (mostly caused by separating
ABI into /abi/).

Show diffs side-by-side

added added

removed removed

Lines of Context:
uspace/lib/c/include/ipc/services.h
42
42
typedef enum {
43
43
        SERVICE_NONE       = 0,
44
44
        SERVICE_LOAD       = FOURCC('l', 'o', 'a', 'd'),
45
 
        SERVICE_VIDEO      = FOURCC('v', 'i', 'd', ' '),
46
45
        SERVICE_VFS        = FOURCC('v', 'f', 's', ' '),
47
 
        SERVICE_DEVMAP     = FOURCC('d', 'e', 'v', 'p'),
 
46
        SERVICE_LOC        = FOURCC('l', 'o', 'c', ' '),
48
47
        SERVICE_DEVMAN     = FOURCC('d', 'e', 'v', 'n'),
49
48
        SERVICE_IRC        = FOURCC('i', 'r', 'c', ' '),
50
49
        SERVICE_CLIPBOARD  = FOURCC('c', 'l', 'i', 'p'),