Changeset 26e7d6d in mainline for uspace/srv/hid/input/include/mouse.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/mouse.h (modified) (1 diff)

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

@@ -39 +39 @@
 
 #include <adt/list.h>
+#include <ipc/loc.h>
+
+struct mouse_port_ops;
+struct mouse_proto_ops;
 
 typedef struct mouse_dev {
         /** Link to mouse_devs list */
         link_t mouse_devs;
-
-        /** Path to the device */
-        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 */
+        struct mouse_port_ops *port_ops;
+        
+        /** Protocol ops */
+        struct mouse_proto_ops *proto_ops;
 } mouse_dev_t;
 
-int mouse_add_dev(const char *dev_path);
+extern void mouse_push_data(mouse_dev_t *, sysarg_t);
+extern void mouse_push_event_move(mouse_dev_t *, int, int);
+extern void mouse_push_event_button(mouse_dev_t *, int, int);
 
 #endif