Changeset ab936440 in mainline for uspace/lib/c/generic/io/chardev_srv.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/lib/c/generic/io/chardev_srv.c (modified) (2 diffs)

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

@@ -48 +48 @@
         size_t size;
         size_t nread;
+        chardev_flags_t flags;
         errno_t rc;
+
+        flags = IPC_GET_ARG1(*icall);
 
         ipc_call_t call;
@@ -70 +73 @@
         }
 
-        rc = srv->srvs->ops->read(srv, buf, size, &nread);
+        rc = srv->srvs->ops->read(srv, buf, size, &nread, flags);
         if (rc != EOK && nread == 0) {
                 async_answer_0(&call, rc);