Changeset 677cad5 in mainline for uspace/lib/c/generic/io/chardev_srv.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/lib/c/generic/io/chardev_srv.c (modified) (5 diffs)

uspace/lib/c/generic/io/chardev_srv.c

@@ -48 +48 @@
         void *buf;
         size_t size;
+        size_t nread;
         int rc;
         ipc_callid_t rcallid;
@@ -70 +71 @@
         }
 
-        rc = srv->srvs->ops->read(srv, buf, size);
-        if (rc < 0) {
+        rc = srv->srvs->ops->read(srv, buf, size, &nread);
+        if (rc != EOK && nread == 0) {
                 async_answer_0(rcallid, rc);
                 async_answer_0(callid, rc);
@@ -78 +79 @@
         }
 
-        async_data_read_finalize(rcallid, buf, size);
+        async_data_read_finalize(rcallid, buf, nread);
 
         free(buf);
-        async_answer_2(callid, EOK, EOK, rc /* nread */);
+        async_answer_2(callid, EOK, rc, nread);
 }
 
@@ -89 +90 @@
         void *data;
         size_t size;
+        size_t nwr;
         int rc;
 
@@ -102 +104 @@
         }
 
-        rc = srv->srvs->ops->write(srv, data, size);
+        rc = srv->srvs->ops->write(srv, data, size, &nwr);
         free(data);
-        if (rc < 0)
+        if (rc != EOK && nwr == 0) {
                 async_answer_0(callid, rc);
+                return;
+        }
 
-        async_answer_2(callid, EOK, EOK, rc /* nwritten */);
+        async_answer_2(callid, EOK, rc, nwr);
 }