Changes in uspace/lib/c/generic/io/console.c [b7fd2a0:38d150e] in mainline

File:

• uspace/lib/c/generic/io/console.c (modified) (9 diffs)

uspace/lib/c/generic/io/console.c

@@ -90 +90 @@
 }
 
-errno_t console_get_size(console_ctrl_t *ctrl, sysarg_t *cols, sysarg_t *rows)
-{
-        async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
-        errno_t rc = async_req_0_2(exch, CONSOLE_GET_SIZE, cols, rows);
+int console_get_size(console_ctrl_t *ctrl, sysarg_t *cols, sysarg_t *rows)
+{
+        async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
+        int rc = async_req_0_2(exch, CONSOLE_GET_SIZE, cols, rows);
         async_exchange_end(exch);
         
@@ -129 +129 @@
 }
 
-errno_t console_get_color_cap(console_ctrl_t *ctrl, sysarg_t *ccap)
-{
-        async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
-        errno_t rc = async_req_0_1(exch, CONSOLE_GET_COLOR_CAP, ccap);
+int console_get_color_cap(console_ctrl_t *ctrl, sysarg_t *ccap)
+{
+        async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
+        int rc = async_req_0_1(exch, CONSOLE_GET_COLOR_CAP, ccap);
         async_exchange_end(exch);
         
@@ -138 +138 @@
 }
 
-errno_t console_get_pos(console_ctrl_t *ctrl, sysarg_t *col, sysarg_t *row)
-{
-        async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
-        errno_t rc = async_req_0_2(exch, CONSOLE_GET_POS, col, row);
+int console_get_pos(console_ctrl_t *ctrl, sysarg_t *col, sysarg_t *row)
+{
+        async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
+        int rc = async_req_0_2(exch, CONSOLE_GET_POS, col, row);
         async_exchange_end(exch);
         
@@ -154 +154 @@
 }
 
-static errno_t console_ev_decode(ipc_call_t *call, cons_event_t *event)
+static int console_ev_decode(ipc_call_t *call, cons_event_t *event)
 {
         event->type = IPC_GET_ARG1(*call);
@@ -188 +188 @@
                 async_exchange_end(exch);
                 
-                errno_t rc;
+                sysarg_t rc;
                 async_wait_for(aid, &rc);
                 
@@ -202 +202 @@
                 }
         } else {
-                errno_t retval;
+                sysarg_t retval;
                 async_wait_for(ctrl->input_aid, &retval);
                 
@@ -208 +208 @@
                 
                 if (retval != EOK) {
-                        errno = retval;
-                        return false;
-                }
-                
-                errno_t rc = console_ev_decode(&ctrl->input_call, event);
+                        errno = (int) retval;
+                        return false;
+                }
+                
+                int rc = console_ev_decode(&ctrl->input_call, event);
                 if (rc != EOK) {
                         errno = rc;
@@ -235 +235 @@
         }
         
-        errno_t retval;
-        errno_t rc = async_wait_timeout(ctrl->input_aid, &retval, *timeout);
+        sysarg_t retval;
+        int rc = async_wait_timeout(ctrl->input_aid, &retval, *timeout);
         if (rc != EOK) {
                 *timeout = 0;
@@ -246 +246 @@
         
         if (retval != EOK) {
-                errno = retval;
+                errno = (int) retval;
                 return false;
         }