Changeset f2d88f3 in mainline for uspace/drv/char/pl050/pl050.c

Timestamp:

2019-01-04T21:22:17Z (6 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/pl050/pl050.c (modified) (3 diffs)

uspace/drv/char/pl050/pl050.c

@@ -59 +59 @@
 static errno_t pl050_fun_offline(ddf_fun_t *);
 static void pl050_char_conn(ipc_call_t *, void *);
-static errno_t pl050_read(chardev_srv_t *, void *, size_t, size_t *);
+static errno_t pl050_read(chardev_srv_t *, void *, size_t, size_t *,
+    chardev_flags_t);
 static errno_t pl050_write(chardev_srv_t *, const void *, size_t, size_t *);
 
@@ -242 +243 @@
 
 static errno_t pl050_read(chardev_srv_t *srv, void *buffer, size_t size,
-    size_t *nread)
+    size_t *nread, chardev_flags_t flags)
 {
         pl050_t *pl050 = (pl050_t *)srv->srvs->sarg;
@@ -252 +253 @@
         left = size;
         while (left > 0) {
-                while (left == size && pl050->buf_rp == pl050->buf_wp)
+                while ((flags & chardev_f_nonblock) == 0 &&
+                    left == size && pl050->buf_rp == pl050->buf_wp)
                         fibril_condvar_wait(&pl050->buf_cv, &pl050->buf_lock);
                 if (pl050->buf_rp == pl050->buf_wp)