Changeset 5863a95 in mainline for uspace/srv/hid/fb/fb.c

Timestamp:

2010-12-17T08:59:35Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

58854f2

Parents:

70e5ad5 (diff), 11658b64 (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 development/ changes

File:

• uspace/srv/hid/fb/fb.c (modified) (9 diffs)

uspace/srv/hid/fb/fb.c

@@ -199 +199 @@
 static int rgb_from_attr(attr_rgb_t *rgb, const attrs_t *a);
 static int rgb_from_style(attr_rgb_t *rgb, int style);
-static int rgb_from_idx(attr_rgb_t *rgb, ipcarg_t fg_color,
-    ipcarg_t bg_color, ipcarg_t flags);
-
-static int fb_set_color(viewport_t *vport, ipcarg_t fg_color,
-    ipcarg_t bg_color, ipcarg_t attr);
+static int rgb_from_idx(attr_rgb_t *rgb, sysarg_t fg_color,
+    sysarg_t bg_color, sysarg_t flags);
+
+static int fb_set_color(viewport_t *vport, sysarg_t fg_color,
+    sysarg_t bg_color, sysarg_t attr);
 
 static void draw_glyph_aligned(unsigned int x, unsigned int y, bool cursor,
@@ -1072 +1072 @@
         
         static unsigned char *shm = NULL;
-        static ipcarg_t shm_id = 0;
+        static sysarg_t shm_id = 0;
         static size_t shm_size;
         
@@ -1083 +1083 @@
         unsigned int h;
         
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_SHARE_OUT:
                 /* We accept one area for data interchange */
@@ -1360 +1360 @@
         int newval;
         
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case FB_ANIM_CREATE:
                 nvp = IPC_GET_ARG1(*call);
@@ -1435 +1435 @@
                         break;
                 }
-                newval = (IPC_GET_METHOD(*call) == FB_ANIM_START);
+                newval = (IPC_GET_IMETHOD(*call) == FB_ANIM_START);
                 if (newval ^ animations[i].enabled) {
                         animations[i].enabled = newval;
@@ -1459 +1459 @@
         int i, nvp;
         
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case FB_VP_DRAW_PIXMAP:
                 nvp = IPC_GET_ARG1(*call);
@@ -1529 +1529 @@
 }
 
-static int rgb_from_idx(attr_rgb_t *rgb, ipcarg_t fg_color,
-    ipcarg_t bg_color, ipcarg_t flags)
+static int rgb_from_idx(attr_rgb_t *rgb, sysarg_t fg_color,
+    sysarg_t bg_color, sysarg_t flags)
 {
         fg_color = (fg_color & 7) | ((flags & CATTR_BRIGHT) ? 8 : 0);
@@ -1562 +1562 @@
 }
 
-static int fb_set_style(viewport_t *vport, ipcarg_t style)
+static int fb_set_style(viewport_t *vport, sysarg_t style)
 {
         return rgb_from_style(&vport->attr, (int) style);
 }
 
-static int fb_set_color(viewport_t *vport, ipcarg_t fg_color,
-    ipcarg_t bg_color, ipcarg_t flags)
+static int fb_set_color(viewport_t *vport, sysarg_t fg_color,
+    sysarg_t bg_color, sysarg_t flags)
 {
         return rgb_from_idx(&vport->attr, fg_color, bg_color, flags);
@@ -1621 +1621 @@
                         continue;
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         client_connected = false;