Changeset 677cad5 in mainline for uspace/drv/char/i8042/i8042.c

Timestamp:

2017-11-20T20:29:03Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b2f542a

Parents:

19ea61d

Message:

Chardev server-side error reporting should match client side.

File:

• uspace/drv/char/i8042/i8042.c (modified) (5 diffs)

uspace/drv/char/i8042/i8042.c

@@ -67 +67 @@
 
 static void i8042_char_conn(ipc_callid_t, ipc_call_t *, void *);
-static int i8042_read(chardev_srv_t *, void *, size_t);
-static int i8042_write(chardev_srv_t *, const void *, size_t);
+static int i8042_read(chardev_srv_t *, void *, size_t, size_t *);
+static int i8042_write(chardev_srv_t *, const void *, size_t, size_t *);
 
 static chardev_ops_t i8042_chardev_ops = {
@@ -333 +333 @@
  * @param buffer Data source
  * @param size   Data size
- *
- * @return Bytes written.
- *
- */
-static int i8042_write(chardev_srv_t *srv, const void *data, size_t size)
+ * @param nwr    Place to store number of bytes successfully written
+ *
+ * @return EOK on success or non-zero error code
+ *
+ */
+static int i8042_write(chardev_srv_t *srv, const void *data, size_t size,
+    size_t *nwr)
 {
         i8042_port_t *port = (i8042_port_t *)srv->srvs->sarg;
@@ -357 +359 @@
         
         fibril_mutex_unlock(&i8042->write_guard);
-        return size;
+        *nwr = size;
+        return EOK;
 }
 
@@ -365 +368 @@
  * @param buffer Data place
  * @param size   Data place size
- *
- * @return Bytes read.
- *
- */
-static int i8042_read(chardev_srv_t *srv, void *dest, size_t size)
+ * @param nread  Place to store number of bytes successfully read
+ *
+ * @return EOK on success or non-zero error code
+ *
+ */
+static int i8042_read(chardev_srv_t *srv, void *dest, size_t size,
+    size_t *nread)
 {
         i8042_port_t *port = (i8042_port_t *)srv->srvs->sarg;
@@ -387 +392 @@
         }
         
-        return i;
+        *nread = i;
+        return EOK;
 }