Changes in uspace/srv/hid/console/console.c [c8211849:2f6ad06] in mainline

File:

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

uspace/srv/hid/console/console.c

@@ -47 +47 @@
 #include <io/output.h>
 #include <align.h>
+#include <malloc.h>
 #include <as.h>
 #include <task.h>
 #include <fibril_synch.h>
-#include <stdlib.h>
 #include "console.h"
 
@@ -119 +119 @@
 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, size_t *);
-static int cons_write(con_srv_t *, void *, size_t, size_t *);
+static int cons_read(con_srv_t *, void *, size_t);
+static int cons_write(con_srv_t *, void *, size_t);
 static void cons_sync(con_srv_t *);
 static void cons_clear(con_srv_t *);
@@ -338 +338 @@
 }
 
-static int cons_read(con_srv_t *srv, void *buf, size_t size, size_t *nread)
+static int cons_read(con_srv_t *srv, void *buf, size_t size)
 {
         uint8_t *bbuf = buf;
@@ -378 +378 @@
         }
         
-        *nread = size;
-        return EOK;
-}
-
-static int cons_write(con_srv_t *srv, void *data, size_t size, size_t *nwritten)
+        return size;
+}
+
+static int cons_write(con_srv_t *srv, void *data, size_t size)
 {
         console_t *cons = srv_to_console(srv);
@@ -390 +389 @@
                 cons_write_char(cons, str_decode(data, &off, size));
         
-        *nwritten = size;
-        return EOK;
+        return size;
 }