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

Timestamp:

2011-02-11T12:41:11Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d81ef61c

Parents:

78d1525 (diff), 5d4193c (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 from usb/development

File:

• uspace/srv/hid/fb/fb.c (modified) (11 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>
@@ -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;
 }
@@ -1445 +1444 @@
         }
         if (handled)
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         return handled;
 }
@@ -1498 +1497 @@
         
         if (handled)
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         return handled;
         
@@ -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) {
@@ -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);
         }
 }