Changeset f2d88f3 in mainline for uspace/lib/c/include

Timestamp:

2019-01-04T21:22:17Z (7 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

Location:

uspace/lib/c/include

Files:

• io/chardev.h (modified) (2 diffs)
• io/chardev_srv.h (modified) (2 diffs)
• types/io/chardev.h (modified) (1 diff)

uspace/lib/c/include/io/chardev.h

@@ -36 +36 @@
 #include <async.h>
 #include <stddef.h>
+#include <types/io/chardev.h>
 
 typedef struct {
@@ -43 +44 @@
 extern errno_t chardev_open(async_sess_t *, chardev_t **);
 extern void chardev_close(chardev_t *);
-extern errno_t chardev_read(chardev_t *, void *, size_t, size_t *);
+extern errno_t chardev_read(chardev_t *, void *, size_t, size_t *,
+    chardev_flags_t);
 extern errno_t chardev_write(chardev_t *, const void *, size_t, size_t *);
 

uspace/lib/c/include/io/chardev_srv.h

@@ -41 +41 @@
 #include <stdbool.h>
 #include <stddef.h>
+#include <types/io/chardev.h>
 
 typedef struct chardev_ops chardev_ops_t;
@@ -59 +60 @@
         errno_t (*open)(chardev_srvs_t *, chardev_srv_t *);
         errno_t (*close)(chardev_srv_t *);
-        errno_t (*read)(chardev_srv_t *, void *, size_t, size_t *);
+        errno_t (*read)(chardev_srv_t *, void *, size_t, size_t *,
+            chardev_flags_t);
         errno_t (*write)(chardev_srv_t *, const void *, size_t, size_t *);
         void (*def_handler)(chardev_srv_t *, ipc_call_t *);

uspace/lib/c/include/types/io/chardev.h

@@ -35 +35 @@
 /** Chardev read/write operation flags */
 typedef enum {
+        /** No flags */
+        chardev_f_none = 0,
         /** Do not block even if no bytes can be transferred */
         chardev_f_nonblock = 0x1