Changeset db6e419 in mainline for uspace/srv/hid/input/include

Timestamp:

2011-08-16T18:53:00Z (15 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

49160c4

Parents:

e0e922d (diff), 45058baa (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.

Location:

uspace/srv/hid/input/include

Files:

• kbd.h (modified) (2 diffs)
• mouse.h (modified) (2 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 */

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

@@ -39 +39 @@
 
 #include <adt/list.h>
+#include <ipc/loc.h>
 
 struct mouse_port_ops;
@@ -47 +48 @@
         link_t mouse_devs;
         
-        /** Path to the device (only for mouseev devices) */
-        const char *dev_path;
+        /** Service ID (only for mousedev devices) */
+        service_id_t svc_id;
+        
+        /** Device service name (only for mousedev devices) */
+        char *svc_name;
         
         /** Port ops */