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

Timestamp:

2017-11-20T20:29:03Z (8 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/pl050/pl050.c (modified) (4 diffs)

uspace/drv/char/pl050/pl050.c

@@ -54 +54 @@
 static int pl050_fun_offline(ddf_fun_t *);
 static void pl050_char_conn(ipc_callid_t, ipc_call_t *, void *);
-static int pl050_read(chardev_srv_t *, void *, size_t);
-static int pl050_write(chardev_srv_t *, const void *, size_t);
+static int pl050_read(chardev_srv_t *, void *, size_t, size_t *);
+static int pl050_write(chardev_srv_t *, const void *, size_t, size_t *);
 
 static driver_ops_t driver_ops = {
@@ -236 +236 @@
 }
 
-static int pl050_read(chardev_srv_t *srv, void *buffer, size_t size)
+static int pl050_read(chardev_srv_t *srv, void *buffer, size_t size,
+    size_t *nread)
 {
         pl050_t *pl050 = (pl050_t *)srv->srvs->sarg;
@@ -257 +258 @@
         fibril_mutex_unlock(&pl050->buf_lock);
 
-        return size - left;
-}
-
-static int pl050_write(chardev_srv_t *srv, const void *data, size_t size)
+        *nread = size - left;
+        return EOK;
+}
+
+static int pl050_write(chardev_srv_t *srv, const void *data, size_t size,
+    size_t *nwritten)
 {
         pl050_t *pl050 = (pl050_t *)srv->srvs->sarg;
@@ -278 +281 @@
         ddf_msg(LVL_NOTE, "%s/pl050_write() success", pl050->name);
 
-        return size;
+        *nwritten = size;
+        return EOK;
 }