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

Timestamp:

2013-04-29T14:26:22Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

533e2d7, 94dfb92

Parents:

b2fa2d86 (diff), 9e7898e (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:

Merge mainline changes

File:

• uspace/lib/c/include/io/con_srv.h (modified) (2 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>
@@ -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 *);
+        int (*get_event)(con_srv_t *, cons_event_t *);
 } con_ops_t;