Changeset 26e7d6d in mainline for uspace/drv/bus/usb/usbhid/mouse/mousedev.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/drv/bus/usb/usbhid/mouse/mousedev.h (moved) (moved from uspace/drv/usbhid/mouse/mousedev.h ) (3 diffs)

uspace/drv/bus/usb/usbhid/mouse/mousedev.h

@@ -38 +38 @@
 
 #include <usb/dev/driver.h>
+#include <async.h>
 
 struct usb_hid_dev;
@@ -45 +46 @@
 /** Container for USB mouse device. */
 typedef struct {
-        /** IPC phone to console (consumer). */
-        int mouse_phone;
-        int wheel_phone;
+        /** IPC session to console (consumer). */
+        async_sess_t *mouse_sess;
+        async_sess_t *wheel_sess;
         
         int32_t *buttons;
@@ -59 +60 @@
 
 const char *HID_MOUSE_FUN_NAME;
-const char *HID_MOUSE_CLASS_NAME;
+const char *HID_MOUSE_CATEGORY;
 
 /*----------------------------------------------------------------------------*/