Changes in uspace/srv/hid/console/console.c [38d150e:1d6dd2a] in mainline

File:

• uspace/srv/hid/console/console.c (modified) (19 diffs)

uspace/srv/hid/console/console.c

@@ -51 +51 @@
 #include <fibril_synch.h>
 #include <stdlib.h>
+#include <str.h>
 #include "console.h"
 
@@ -101 +102 @@
 static console_t *active_console = &consoles[0];
 
-static int input_ev_active(input_t *);
-static int input_ev_deactive(input_t *);
-static int input_ev_key(input_t *, kbd_event_type_t, keycode_t, keymod_t, wchar_t);
-static int input_ev_move(input_t *, int, int);
-static int input_ev_abs_move(input_t *, unsigned, unsigned, unsigned, unsigned);
-static int input_ev_button(input_t *, int, int);
+static errno_t input_ev_active(input_t *);
+static errno_t input_ev_deactive(input_t *);
+static errno_t input_ev_key(input_t *, kbd_event_type_t, keycode_t, keymod_t, wchar_t);
+static errno_t input_ev_move(input_t *, int, int);
+static errno_t input_ev_abs_move(input_t *, unsigned, unsigned, unsigned, unsigned);
+static errno_t input_ev_button(input_t *, int, int);
 
 static input_ev_ops_t input_ev_ops = {
@@ -117 +118 @@
 };
 
-static int cons_open(con_srvs_t *, con_srv_t *);
-static int cons_close(con_srv_t *);
-static int cons_read(con_srv_t *, void *, size_t);
-static int cons_write(con_srv_t *, void *, size_t);
+static errno_t cons_open(con_srvs_t *, con_srv_t *);
+static errno_t cons_close(con_srv_t *);
+static errno_t cons_read(con_srv_t *, void *, size_t, size_t *);
+static errno_t cons_write(con_srv_t *, void *, size_t, size_t *);
 static void cons_sync(con_srv_t *);
 static void cons_clear(con_srv_t *);
 static void cons_set_pos(con_srv_t *, sysarg_t col, sysarg_t row);
-static int cons_get_pos(con_srv_t *, sysarg_t *, sysarg_t *);
-static int cons_get_size(con_srv_t *, sysarg_t *, sysarg_t *);
-static int cons_get_color_cap(con_srv_t *, console_caps_t *);
+static errno_t cons_get_pos(con_srv_t *, sysarg_t *, sysarg_t *);
+static errno_t cons_get_size(con_srv_t *, sysarg_t *, sysarg_t *);
+static errno_t cons_get_color_cap(con_srv_t *, console_caps_t *);
 static void cons_set_style(con_srv_t *, console_style_t);
 static void cons_set_color(con_srv_t *, console_color_t, console_color_t,
@@ -132 +133 @@
 static void cons_set_rgb_color(con_srv_t *, pixel_t, pixel_t);
 static void cons_set_cursor_visibility(con_srv_t *, bool);
-static int cons_get_event(con_srv_t *, cons_event_t *);
+static errno_t cons_get_event(con_srv_t *, cons_event_t *);
 
 static con_ops_t con_ops = {
@@ -230 +231 @@
 }
 
-static int input_ev_active(input_t *input)
+static errno_t input_ev_active(input_t *input)
 {
         active = true;
@@ -239 +240 @@
 }
 
-static int input_ev_deactive(input_t *input)
+static errno_t input_ev_deactive(input_t *input)
 {
         active = false;
@@ -247 +248 @@
 }
 
-static int input_ev_key(input_t *input, kbd_event_type_t type, keycode_t key,
+static errno_t input_ev_key(input_t *input, kbd_event_type_t type, keycode_t key,
     keymod_t mods, wchar_t c)
 {
@@ -274 +275 @@
 }
 
-static int input_ev_move(input_t *input, int dx, int dy)
-{
-        return EOK;
-}
-
-static int input_ev_abs_move(input_t *input, unsigned x , unsigned y,
+static errno_t input_ev_move(input_t *input, int dx, int dy)
+{
+        return EOK;
+}
+
+static errno_t input_ev_abs_move(input_t *input, unsigned x , unsigned y,
     unsigned max_x, unsigned max_y)
 {
@@ -285 +286 @@
 }
 
-static int input_ev_button(input_t *input, int bnum, int bpress)
+static errno_t input_ev_button(input_t *input, int bnum, int bpress)
 {
         return EOK;
@@ -328 +329 @@
 }
 
-static int cons_open(con_srvs_t *srvs, con_srv_t *srv)
-{
-        return EOK;
-}
-
-static int cons_close(con_srv_t *srv)
-{
-        return EOK;
-}
-
-static int cons_read(con_srv_t *srv, void *buf, size_t size)
+static errno_t cons_open(con_srvs_t *srvs, con_srv_t *srv)
+{
+        return EOK;
+}
+
+static errno_t cons_close(con_srv_t *srv)
+{
+        return EOK;
+}
+
+static errno_t cons_read(con_srv_t *srv, void *buf, size_t size, size_t *nread)
 {
         uint8_t *bbuf = buf;
@@ -378 +379 @@
         }
         
-        return size;
-}
-
-static int cons_write(con_srv_t *srv, void *data, size_t size)
+        *nread = size;
+        return EOK;
+}
+
+static errno_t cons_write(con_srv_t *srv, void *data, size_t size, size_t *nwritten)
 {
         console_t *cons = srv_to_console(srv);
@@ -389 +391 @@
                 cons_write_char(cons, str_decode(data, &off, size));
         
-        return size;
+        *nwritten = size;
+        return EOK;
 }
 
@@ -421 +424 @@
 }
 
-static int cons_get_pos(con_srv_t *srv, sysarg_t *col, sysarg_t *row)
+static errno_t cons_get_pos(con_srv_t *srv, sysarg_t *col, sysarg_t *row)
 {
         console_t *cons = srv_to_console(srv);
@@ -432 +435 @@
 }
 
-static int cons_get_size(con_srv_t *srv, sysarg_t *cols, sysarg_t *rows)
+static errno_t cons_get_size(con_srv_t *srv, sysarg_t *cols, sysarg_t *rows)
 {
         console_t *cons = srv_to_console(srv);
@@ -444 +447 @@
 }
 
-static int cons_get_color_cap(con_srv_t *srv, console_caps_t *ccaps)
+static errno_t cons_get_color_cap(con_srv_t *srv, console_caps_t *ccaps)
 {
         console_t *cons = srv_to_console(srv);
@@ -491 +494 @@
 }
 
-static int cons_get_event(con_srv_t *srv, cons_event_t *event)
+static errno_t cons_get_event(con_srv_t *srv, cons_event_t *event)
 {
         console_t *cons = srv_to_console(srv);
@@ -526 +529 @@
 }
 
-static int input_connect(const char *svc)
+static errno_t input_connect(const char *svc)
 {
         async_sess_t *sess;
         service_id_t dsid;
         
-        int rc = loc_service_get_id(svc, &dsid, 0);
+        errno_t rc = loc_service_get_id(svc, &dsid, 0);
         if (rc != EOK) {
                 printf("%s: Input service %s not found\n", NAME, svc);
@@ -560 +563 @@
         service_id_t dsid;
         
-        int rc = loc_service_get_id(svc, &dsid, 0);
+        errno_t rc = loc_service_get_id(svc, &dsid, 0);
         if (rc == EOK) {
                 sess = loc_service_connect(dsid, INTERFACE_OUTPUT, 0);
@@ -577 +580 @@
 {
         /* Connect to input service */
-        int rc = input_connect(input_svc);
+        errno_t rc = input_connect(input_svc);
         if (rc != EOK)
                 return false;