Changeset b5e68c8 in mainline for uspace/srv/hid/fb/fb.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/srv/hid/fb/fb.c (modified) (20 diffs)

uspace/srv/hid/fb/fb.c

@@ -47 +47 @@
 #include <as.h>
 #include <ipc/fb.h>
-#include <ipc/ipc.h>
 #include <ipc/ns.h>
 #include <ipc/services.h>
@@ -199 +198 @@
 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 +1071 @@
         
         static unsigned char *shm = NULL;
-        static ipcarg_t shm_id = 0;
+        static sysarg_t shm_id = 0;
         static size_t shm_size;
         
@@ -1083 +1082 @@
         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 */
@@ -1089 +1088 @@
                         void *dest = as_get_mappable_page(IPC_GET_ARG2(*call));
                         shm_size = IPC_GET_ARG2(*call);
-                        if (ipc_answer_1(callid, EOK, (sysarg_t) dest)) {
+                        if (async_answer_1(callid, EOK, (sysarg_t) dest)) {
                                 shm_id = 0;
                                 return false;
@@ -1166 +1165 @@
         
         if (handled)
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         return handled;
 }
@@ -1360 +1359 @@
         int newval;
         
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case FB_ANIM_CREATE:
                 nvp = IPC_GET_ARG1(*call);
@@ -1435 +1434 @@
                         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;
@@ -1445 +1444 @@
         }
         if (handled)
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         return handled;
 }
@@ -1459 +1458 @@
         int i, nvp;
         
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case FB_VP_DRAW_PIXMAP:
                 nvp = IPC_GET_ARG1(*call);
@@ -1498 +1497 @@
         
         if (handled)
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         return handled;
         
@@ -1529 +1528 @@
 }
 
-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 +1561 @@
 }
 
-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);
@@ -1582 +1581 @@
         
         if (client_connected) {
-                ipc_answer_0(iid, ELIMIT);
+                async_answer_0(iid, ELIMIT);
                 return;
         }
@@ -1588 +1587 @@
         /* Accept connection */
         client_connected = true;
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         while (true) {
@@ -1621 +1620 @@
                         continue;
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         client_connected = false;
@@ -1641 +1640 @@
                                 break;
                         }
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         
                         draw_char(vport, ch, col, row);
@@ -1674 +1673 @@
                         break;
                 case FB_GET_CSIZE:
-                        ipc_answer_2(callid, EOK, vport->cols, vport->rows);
+                        async_answer_2(callid, EOK, vport->cols, vport->rows);
                         continue;
                 case FB_GET_COLOR_CAP:
-                        ipc_answer_1(callid, EOK, FB_CCAP_RGB);
+                        async_answer_1(callid, EOK, FB_CCAP_RGB);
                         continue;
                 case FB_SCROLL:
@@ -1742 +1741 @@
                         break;
                 case FB_GET_RESOLUTION:
-                        ipc_answer_2(callid, EOK, screen.xres, screen.yres);
+                        async_answer_2(callid, EOK, screen.xres, screen.yres);
                         continue;
                 case FB_POINTER_MOVE:
@@ -1756 +1755 @@
                         retval = ENOENT;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }