Changeset e3bc355 in mainline for uspace/lib/c/include/io/con_srv.h

Timestamp:

2013-07-28T23:07:18Z (13 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

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

Children:

2b55edb

Parents:

283ea3d (diff), ccdc63e (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.

Message:

mainline merge

File:

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

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

@@ -41 +41 @@
 #include <io/color.h>
 #include <io/concaps.h>
-#include <io/kbd_event.h>
+#include <io/cons_event.h>
 #include <io/pixel.h>
 #include <io/style.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -66 +66 @@
 } con_srv_t;
 
-typedef struct con_ops {
+struct con_ops {
         int (*open)(con_srvs_t *, con_srv_t *);
         int (*close)(con_srv_t *);
@@ -82 +82 @@
         void (*set_rgb_color)(con_srv_t *, pixel_t, pixel_t);
         void (*set_cursor_visibility)(con_srv_t *, bool);
-        int (*get_event)(con_srv_t *, kbd_event_t *);
-} con_ops_t;
+        int (*get_event)(con_srv_t *, cons_event_t *);
+};
 
 extern void con_srvs_init(con_srvs_t *);