Changeset 5a6cc679 in mainline for uspace/lib/c/generic/io/console.c

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

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

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

@@ -90 +90 @@
 }
 
-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);
+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);
         async_exchange_end(exch);
         
@@ -129 +129 @@
 }
 
-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);
+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);
         async_exchange_end(exch);
         
@@ -138 +138 @@
 }
 
-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);
+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);
         async_exchange_end(exch);
         
@@ -154 +154 @@
 }
 
-static int console_ev_decode(ipc_call_t *call, cons_event_t *event)
+static errno_t console_ev_decode(ipc_call_t *call, cons_event_t *event)
 {
         event->type = IPC_GET_ARG1(*call);
@@ -188 +188 @@
                 async_exchange_end(exch);
                 
-                int rc;
+                errno_t rc;
                 async_wait_for(aid, &rc);
                 
@@ -202 +202 @@
                 }
         } else {
-                int retval;
+                errno_t retval;
                 async_wait_for(ctrl->input_aid, &retval);
                 
@@ -212 +212 @@
                 }
                 
-                int rc = console_ev_decode(&ctrl->input_call, event);
+                errno_t rc = console_ev_decode(&ctrl->input_call, event);
                 if (rc != EOK) {
                         errno = rc;
@@ -235 +235 @@
         }
         
-        int retval;
-        int rc = async_wait_timeout(ctrl->input_aid, &retval, *timeout);
+        errno_t retval;
+        errno_t rc = async_wait_timeout(ctrl->input_aid, &retval, *timeout);
         if (rc != EOK) {
                 *timeout = 0;