Changeset f2d88f3 in mainline for uspace/drv/char/ski-con/ski-con.c

Timestamp:

2019-01-04T21:22:17Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

af7b85b

Parents:

06412ba

Message:

Add forgotten changes to enable non-blocking chardev read

File:

• uspace/drv/char/ski-con/ski-con.c (modified) (3 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 *);
 
@@ -260 +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;
@@ -269 +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);