Changes in uspace/srv/hid/fb/serial_console.c [32e7411:4f14e1f8] in mainline

File:

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

uspace/srv/hid/fb/serial_console.c

@@ -39 +39 @@
 
 #include <stdio.h>
-#include <ipc/ipc.h>
 #include <async.h>
 #include <ipc/fb.h>
@@ -47 +46 @@
 #include <io/style.h>
 #include <str.h>
+#include <inttypes.h>
 #include <io/screenbuffer.h>
 
@@ -54 +54 @@
 #define MAX_CONTROL 20
 
-static ipcarg_t scr_width;
-static ipcarg_t scr_height;
+static sysarg_t scr_width;
+static sysarg_t scr_height;
 static bool color = true;    /**< True if producing color output. */
 static bool utf8 = false;    /**< True if producing UTF8 output. */
 static putc_function_t putc_function;
 
-static ipcarg_t lastcol = 0;
-static ipcarg_t lastrow = 0;
+static sysarg_t lastcol = 0;
+static sysarg_t lastrow = 0;
 static attrs_t cur_attr = {
         .t = at_style,
@@ -129 +129 @@
 }
 
-void serial_goto(const ipcarg_t col, const ipcarg_t row)
+void serial_goto(const sysarg_t col, const sysarg_t row)
 {
         if ((col > scr_width) || (row > scr_height))
@@ -135 +135 @@
         
         char control[MAX_CONTROL];
-        snprintf(control, MAX_CONTROL, "\033[%u;%uf", row + 1, col + 1);
+        snprintf(control, MAX_CONTROL, "\033[%" PRIun ";%" PRIun "f",
+            row + 1, col + 1);
         serial_puts(control);
 }
@@ -250 +251 @@
 
 /** Set scrolling region. */
-void serial_set_scroll_region(ipcarg_t last_row)
+void serial_set_scroll_region(sysarg_t last_row)
 {
         char control[MAX_CONTROL];
-        snprintf(control, MAX_CONTROL, "\033[0;%ur", last_row);
+        snprintf(control, MAX_CONTROL, "\033[0;%" PRIun "r", last_row);
         serial_puts(control);
 }
@@ -267 +268 @@
 }
 
-void serial_console_init(putc_function_t putc_fn, ipcarg_t w, ipcarg_t h)
+void serial_console_init(putc_function_t putc_fn, sysarg_t w, sysarg_t h)
 {
         scr_width = w;
@@ -284 +285 @@
  *
  */
-static void draw_text_data(keyfield_t *data, ipcarg_t x0, ipcarg_t y0,
-    ipcarg_t width, ipcarg_t height)
+static void draw_text_data(keyfield_t *data, sysarg_t x0, sysarg_t y0,
+    sysarg_t width, sysarg_t height)
 {
         attrs_t *a0 = &data[0].attrs;
         serial_set_attrs(a0);
         
-        ipcarg_t y;
+        sysarg_t y;
         for (y = 0; y < height; y++) {
                 serial_goto(x0, y0 + y);
                 
-                ipcarg_t x;
+                sysarg_t x;
                 for (x = 0; x < width; x++) {
                         attrs_t *attr = &data[y * width + x].attrs;
@@ -317 +318 @@
         
         if (client_connected) {
-                ipc_answer_0(iid, ELIMIT);
+                async_answer_0(iid, ELIMIT);
                 return;
         }
         
         client_connected = 1;
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         /* Clear the terminal, set scrolling region
@@ -335 +336 @@
                 
                 wchar_t c;
-                ipcarg_t col;
-                ipcarg_t row;
-                ipcarg_t w;
-                ipcarg_t h;
+                sysarg_t col;
+                sysarg_t row;
+                sysarg_t w;
+                sysarg_t h;
                 ssize_t rows;
                 
                 int retval;
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         client_connected = 0;
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         
                         /* Exit thread */
@@ -405 +406 @@
                         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, color ? FB_CCAP_INDEXED :
+                        async_answer_1(callid, EOK, color ? FB_CCAP_INDEXED :
                             FB_CCAP_STYLE);
                         continue;
@@ -440 +441 @@
                         
                         if (rows >= 0) {
-                                if ((ipcarg_t) rows > scr_height) {
+                                if ((sysarg_t) rows > scr_height) {
                                         retval = EINVAL;
                                         break;
                                 }
                         } else {
-                                if ((ipcarg_t) (-rows) > scr_height) {
+                                if ((sysarg_t) (-rows) > scr_height) {
                                         retval = EINVAL;
                                         break;
@@ -476 +477 @@
                         retval = ENOENT;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }