Changeset f2d88f3 in mainline for uspace/drv/char/sun4v-con/sun4v-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/sun4v-con/sun4v-con.c (modified) (3 diffs)

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

@@ -46 +46 @@
 #define POLL_INTERVAL  10000
 
-static errno_t sun4v_con_read(chardev_srv_t *, void *, size_t, size_t *);
+static errno_t sun4v_con_read(chardev_srv_t *, void *, size_t, size_t *,
+    chardev_flags_t);
 static errno_t sun4v_con_write(chardev_srv_t *, const void *, size_t, size_t *);
 
@@ -154 +155 @@
 /** Read from Sun4v console device */
 static errno_t sun4v_con_read(chardev_srv_t *srv, void *buf, size_t size,
-    size_t *nread)
+    size_t *nread, chardev_flags_t flags)
 {
         sun4v_con_t *con = (sun4v_con_t *) srv->srvs->sarg;
@@ -161 +162 @@
         char c;
 
-        while (con->input_buffer->read_ptr == con->input_buffer->write_ptr)
+        while ((flags & chardev_f_nonblock) == 0 &&
+            con->input_buffer->read_ptr == con->input_buffer->write_ptr)
                 fibril_usleep(POLL_INTERVAL);