Changeset 132ab5d1 in mainline for uspace/srv/hid/console/console.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

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);
-static int cons_write(con_srv_t *, void *, size_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 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)
+static int cons_read(con_srv_t *srv, void *buf, size_t size, size_t *nread)
 {
         uint8_t *bbuf = buf;
@@ -378 +378 @@
         }
         
-        return size;
-}
-
-static int cons_write(con_srv_t *srv, void *data, size_t size)
+        *nread = size;
+        return EOK;
+}
+
+static int cons_write(con_srv_t *srv, void *data, size_t size, size_t *nwritten)
 {
         console_t *cons = srv_to_console(srv);
@@ -389 +390 @@
                 cons_write_char(cons, str_decode(data, &off, size));
         
-        return size;
+        *nwritten = size;
+        return EOK;
 }