Changeset 26e7d6d in mainline for uspace/srv/hid/input/include/kbd.h

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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/srv/hid/input/include/kbd.h (modified) (3 diffs)

uspace/srv/hid/input/include/kbd.h

@@ -40 +40 @@
 
 #include <adt/list.h>
+#include <ipc/loc.h>
 
 struct kbd_port_ops;
@@ -49 +50 @@
         link_t kbd_devs;
 
-        /** Path to the device (only for kbdev devices) */
-        const char *dev_path;
+        /** Service ID (only for kbdev devices) */
+        service_id_t svc_id;
+
+        /** Device service name (only for kbdev devices) */
+        char *svc_name;
 
         /** Port ops */
@@ -71 +75 @@
 } kbd_dev_t;
 
-extern void kbd_push_scancode(kbd_dev_t *, int);
-extern void kbd_push_ev(kbd_dev_t *, int, unsigned int);
+extern void kbd_push_data(kbd_dev_t *, sysarg_t);
+extern void kbd_push_event(kbd_dev_t *, int, unsigned int);
 
 #endif