Changeset d408ea0 in mainline

Timestamp:

2011-06-27T18:33:39Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

166c26f3

Parents:

b511c200

Message:

towards stable ABI: define system-wide singleton service numbers using FOURCCs

Files:

• tools/autotool.py (modified) (1 diff)
• uspace/lib/c/include/fourcc.h (added)
• uspace/lib/c/include/ipc/services.h (modified) (1 diff)

tools/autotool.py

@@ -361 +361 @@
                 typedefs.append({'oldtype': "signed %s" % probe['signed_sizes'][b], 'newtype': "int%u_t" % (b * 8)})
                 
+                macros.append({'oldmacro': "unsigned %s" % probe['unsigned_sizes'][b], 'newmacro': "UINT%u_T" % (b * 8)})
+                macros.append({'oldmacro': "signed %s" % probe['signed_sizes'][b], 'newmacro': "INT%u_T" % (b * 8)})
+                
                 macros.append({'oldmacro': "\"%so\"" % probe['unsigned_strcs'][b], 'newmacro': "PRIo%u" % (b * 8)})
                 macros.append({'oldmacro': "\"%su\"" % probe['unsigned_strcs'][b], 'newmacro': "PRIu%u" % (b * 8)})

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

@@ -38 +38 @@
 #define LIBC_SERVICES_H_
 
+#include <fourcc.h>
+
 typedef enum {
-        SERVICE_NONE = 0,
-        SERVICE_LOAD,
-        SERVICE_VIDEO,
-        SERVICE_VFS,
-        SERVICE_DEVMAP,
-        SERVICE_DEVMAN,
-        SERVICE_IRC,
-        SERVICE_CLIPBOARD,
-        SERVICE_NETWORKING,
-        SERVICE_LO,
-        SERVICE_NE2000,
-        SERVICE_ETHERNET,
-        SERVICE_NILDUMMY,
-        SERVICE_IP,
-        SERVICE_ARP,
-        SERVICE_ICMP,
-        SERVICE_UDP,
-        SERVICE_TCP
+        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_DEVMAN     = FOURCC('d', 'e', 'v', 'n'),
+        SERVICE_IRC        = FOURCC('i', 'r', 'c', ' '),
+        SERVICE_CLIPBOARD  = FOURCC('c', 'l', 'i', 'p'),
+        SERVICE_NETWORKING = FOURCC('n', 'e', 't', ' '),
+        SERVICE_LO         = FOURCC('l', 'o', ' ', ' '),
+        SERVICE_NE2000     = FOURCC('n', 'e', '2', 'k'),
+        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;