Changeset ab936440 in mainline for uspace/drv/char/ski-con/ski-con.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/drv/char/ski-con/ski-con.c (modified) (4 diffs)

uspace/drv/char/ski-con/ski-con.c

@@ -55 +55 @@
 static void ski_con_connection(ipc_call_t *, void *);
 
-static errno_t ski_con_read(chardev_srv_t *, void *, size_t, size_t *);
+static errno_t ski_con_read(chardev_srv_t *, void *, size_t, size_t *,
+    chardev_flags_t);
 static errno_t ski_con_write(chardev_srv_t *, const void *, size_t, size_t *);
 
@@ -112 +113 @@
         }
 
-        ddf_fun_add_to_category(fun, "console");
-
         bound = true;
+
+        rc = ddf_fun_add_to_category(fun, "console");
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Error adding function 'a' to category "
+                    "'console'.");
+                goto error;
+        }
 
         fid = fibril_create(ski_con_fibril, con);
@@ -255 +261 @@
 /** Read from Ski console device */
 static errno_t ski_con_read(chardev_srv_t *srv, void *buf, size_t size,
-    size_t *nread)
+    size_t *nread, chardev_flags_t flags)
 {
         ski_con_t *con = (ski_con_t *) srv->srvs->sarg;
@@ -264 +270 @@
         fibril_mutex_lock(&con->buf_lock);
 
-        while (circ_buf_nused(&con->cbuf) == 0)
+        while ((flags & chardev_f_nonblock) == 0 &&
+            circ_buf_nused(&con->cbuf) == 0)
                 fibril_condvar_wait(&con->buf_cv, &con->buf_lock);