Changeset ab936440 in mainline for uspace/lib/c/include/io/chardev_srv.h

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/lib/c/include/io/chardev_srv.h (modified) (3 diffs)

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

@@ -33 +33 @@
  */
 
-#ifndef LIBC_IO_CHARDEV_SRV_H_
-#define LIBC_IO_CHARDEV_SRV_H_
+#ifndef _LIBC_IO_CHARDEV_SRV_H_
+#define _LIBC_IO_CHARDEV_SRV_H_
 
 #include <adt/list.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 *);