Changeset fe1776c2 in mainline for uspace/srv/hid/fb/ega.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/ega.c (modified) (7 diffs)

uspace/srv/hid/fb/ega.c

@@ -39 +39 @@
 #include <align.h>
 #include <async.h>
-#include <ipc/ipc.h>
 #include <errno.h>
 #include <stdio.h>
@@ -46 +45 @@
 #include <as.h>
 #include <ipc/fb.h>
-#include <ipc/ipc.h>
 #include <ipc/ns.h>
 #include <ipc/services.h>
@@ -262 +260 @@
         
         if (client_connected) {
-                ipc_answer_0(iid, ELIMIT);
+                async_answer_0(iid, ELIMIT);
                 return;
         }
@@ -268 +266 @@
         /* Accept connection */
         client_connected = 1;
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         while (true) {
@@ -296 +294 @@
                 case IPC_M_PHONE_HUNGUP:
                         client_connected = 0;
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         
                         /* Exit thread */
@@ -332 +330 @@
                         break;
                 case FB_GET_CSIZE:
-                        ipc_answer_2(callid, EOK, scr_width, scr_height);
+                        async_answer_2(callid, EOK, scr_width, scr_height);
                         continue;
                 case FB_GET_COLOR_CAP:
-                        ipc_answer_1(callid, EOK, FB_CCAP_INDEXED);
+                        async_answer_1(callid, EOK, FB_CCAP_INDEXED);
                         continue;
                 case FB_CLEAR:
@@ -440 +438 @@
                         retval = EINVAL;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }