Changeset 90e6025 in mainline

Timestamp:

2007-09-28T16:48:16Z (17 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

0e0476ad

Parents:

12a56fa

Message:

Fixed naming convention in IPC.

Files:

• kernel/generic/include/ipc/ipc.h (modified) (1 diff)
• uspace/lib/libc/include/ipc/fb.h (modified) (1 diff)
• uspace/srv/devmap/devmap.c (modified) (1 diff)
• uspace/srv/devmap/devmap.h (modified) (1 diff)
• uspace/srv/vfs/vfs.h (modified) (1 diff)

kernel/generic/include/ipc/ipc.h

@@ -178 +178 @@
 #define IPC_M_PING              512
 /* User methods */
-#define FIRST_USER_METHOD       1024
+#define IPC_FIRST_USER_METHOD   1024
 
 #ifdef KERNEL

uspace/lib/libc/include/ipc/fb.h

@@ -36 +36 @@
 #define LIBC_FB_H_
 
-#define FB_PUTCHAR           1025
-#define FB_CLEAR             1026
-#define FB_GET_CSIZE         1027
-#define FB_CURSOR_VISIBILITY 1028
-#define FB_CURSOR_GOTO       1029
-#define FB_SCROLL            1030
-#define FB_VIEWPORT_SWITCH   1031
-#define FB_VIEWPORT_CREATE   1032
-#define FB_VIEWPORT_DELETE   1033
-#define FB_SET_STYLE         1034
-#define FB_GET_RESOLUTION    1035
-#define FB_DRAW_TEXT_DATA    1036
-#define FB_FLUSH             1037
-#define FB_VIEWPORT_DB       1038
+#include <ipc/ipc.h>
 
-#define FB_DRAW_PPM          1100
-#define FB_PREPARE_SHM       1101
-#define FB_DROP_SHM          1102
-#define FB_SHM2PIXMAP        1103
+typedef enum {
+        FB_PUTCHAR = IPC_FIRST_USER_METHOD,
+        FB_CLEAR,
+        FB_GET_CSIZE,
+        FB_CURSOR_VISIBILITY,
+        FB_CURSOR_GOTO,
+        FB_SCROLL,
+        FB_VIEWPORT_SWITCH,
+        FB_VIEWPORT_CREATE,
+        FB_VIEWPORT_DELETE,
+        FB_SET_STYLE,
+        FB_GET_RESOLUTION,
+        FB_DRAW_TEXT_DATA,
+        FB_FLUSH,
+        FB_VIEWPORT_DB,
+        FB_DRAW_PPM,
+        FB_PREPARE_SHM,
+        FB_DROP_SHM,
+        FB_SHM2PIXMAP,
+        FB_VP_DRAW_PIXMAP,
+        FB_VP2PIXMAP,
+        FB_DROP_PIXMAP,
+        FB_TRANS_PUTCHAR,
+        FB_ANIM_CREATE,
+        FB_ANIM_DROP,
+        FB_ANIM_ADDPIXMAP,
+        FB_ANIM_CHGVP,
+        FB_ANIM_START,
+        FB_ANIM_STOP,
+        FB_POINTER_MOVE
+} fb_request_t;
 
-#define FB_VP_DRAW_PIXMAP    1104
-#define FB_VP2PIXMAP         1105
-#define FB_DROP_PIXMAP       1106
-#define FB_TRANS_PUTCHAR     1107
-
-#define FB_ANIM_CREATE       1200
-#define FB_ANIM_DROP         1201
-#define FB_ANIM_ADDPIXMAP    1202
-#define FB_ANIM_CHGVP        1203
-#define FB_ANIM_START        1204
-#define FB_ANIM_STOP         1205
-
-#define FB_POINTER_MOVE      1300
 
 #endif

uspace/srv/devmap/devmap.c

@@ -36 +36 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/ns.h>

uspace/srv/devmap/devmap.h

@@ -34 +34 @@
 #define DEVMAP_DEVMAP_H_
 
+#include <ipc/ipc.h>
+
 typedef enum {
-        DEVMAP_REGISTER = FIRST_USER_METHOD,
+        DEVMAP_REGISTER = IPC_FIRST_USER_METHOD,
         DEVMAP_UNREGISTER,
         DEVMAP_CONNECT_TO_DEVICE

uspace/srv/vfs/vfs.h

@@ -38 +38 @@
 #include <atomic.h>
 #include <sys/types.h>
+#include <bool.h>
 
 #define dprintf(...)    printf(__VA_ARGS__)
 
-#define VFS_FIRST       FIRST_USER_METHOD
+#define VFS_FIRST       IPC_FIRST_USER_METHOD
 
 #define IPC_METHOD_TO_VFS_OP(m) ((m) - VFS_FIRST)