Changes in uspace/drv/char/ns8250/ns8250.c [4f87a85a:f2d88f3] in mainline

File:

• uspace/drv/char/ns8250/ns8250.c (modified) (2 diffs)

uspace/drv/char/ns8250/ns8250.c

@@ -246 +246 @@
  * @param count         The number of bytes to be read.
  * @param nread         Place to store number of bytes actually read
+ * @param flags         @c chardev_f_nonblock not to block waiting for data
+ *                      even if no data is available
  *
  * @return              EOK on success or non-zero error code
  */
-static errno_t ns8250_read(chardev_srv_t *srv, void *buf, size_t count, size_t *nread)
+static errno_t ns8250_read(chardev_srv_t *srv, void *buf, size_t count, size_t *nread,
+    chardev_flags_t flags)
 {
         ns8250_t *ns = srv_ns8250(srv);
@@ -261 +264 @@
 
         fibril_mutex_lock(&ns->mutex);
-        while (buf_is_empty(&ns->input_buffer))
+        while ((flags & chardev_f_none) == 0 &&
+            buf_is_empty(&ns->input_buffer))
                 fibril_condvar_wait(&ns->input_buffer_available, &ns->mutex);
         while (!buf_is_empty(&ns->input_buffer) && pos < count) {