Changeset 15d0046 in mainline for uspace/lib/c/include/io/input.h

Timestamp:

2014-09-12T13:22:33Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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/input.h (modified) (2 diffs)

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

@@ -49 +49 @@
 
 typedef struct input_ev_ops {
+        int (*active)(input_t *);
+        int (*deactive)(input_t *);
         int (*key)(input_t *, kbd_event_type_t, keycode_t, keymod_t, wchar_t);
         int (*move)(input_t *, int, int);
@@ -57 +59 @@
 extern int input_open(async_sess_t *, input_ev_ops_t *, void *, input_t **);
 extern void input_close(input_t *);
-extern int input_yield(input_t *);
-extern int input_reclaim(input_t *);
+extern int input_activate(input_t *);
 
 #endif