Changes in uspace/srv/hid/fb/ega.c [ffa2c8ef:369a5f8] in mainline

File:

• uspace/srv/hid/fb/ega.c (modified) (11 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>
@@ -45 +46 @@
 #include <as.h>
 #include <ipc/fb.h>
+#include <ipc/ipc.h>
 #include <ipc/ns.h>
 #include <ipc/services.h>
@@ -228 +230 @@
 static int save_screen(void)
 {
-        sysarg_t i;
+        ipcarg_t i;
         
         /* Find empty screen */
@@ -243 +245 @@
 }
 
-static int print_screen(sysarg_t i)
+static int print_screen(ipcarg_t i)
 {
         if ((i >= MAX_SAVED_SCREENS) || (saved_screens[i].data))
@@ -260 +262 @@
         
         if (client_connected) {
-                async_answer_0(iid, ELIMIT);
+                ipc_answer_0(iid, ELIMIT);
                 return;
         }
@@ -266 +268 @@
         /* Accept connection */
         client_connected = 1;
-        async_answer_0(iid, EOK);
+        ipc_answer_0(iid, EOK);
         
         while (true) {
@@ -274 +276 @@
                 wchar_t c;
                 
-                sysarg_t col;
-                sysarg_t row;
-                sysarg_t w;
-                sysarg_t h;
+                ipcarg_t col;
+                ipcarg_t row;
+                ipcarg_t w;
+                ipcarg_t h;
                 
                 ssize_t rows;
@@ -288 +290 @@
                 uint32_t bg_rgb;
                 
-                sysarg_t scr;
+                ipcarg_t scr;
                 int retval;
                 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         client_connected = 0;
-                        async_answer_0(callid, EOK);
+                        ipc_answer_0(callid, EOK);
                         
                         /* Exit thread */
@@ -330 +332 @@
                         break;
                 case FB_GET_CSIZE:
-                        async_answer_2(callid, EOK, scr_width, scr_height);
+                        ipc_answer_2(callid, EOK, scr_width, scr_height);
                         continue;
                 case FB_GET_COLOR_CAP:
-                        async_answer_1(callid, EOK, FB_CCAP_INDEXED);
+                        ipc_answer_1(callid, EOK, FB_CCAP_INDEXED);
                         continue;
                 case FB_CLEAR:
@@ -368 +370 @@
                         
                         if (rows >= 0) {
-                                if ((sysarg_t) rows > scr_height) {
+                                if ((ipcarg_t) rows > scr_height) {
                                         retval = EINVAL;
                                         break;
                                 }
                         } else {
-                                if ((sysarg_t) (-rows) > scr_height) {
+                                if ((ipcarg_t) (-rows) > scr_height) {
                                         retval = EINVAL;
                                         break;
@@ -438 +440 @@
                         retval = EINVAL;
                 }
-                async_answer_0(callid, retval);
+                ipc_answer_0(callid, retval);
         }
 }