Changeset edb3cf2 in mainline for uspace/drv/bus/usb/usbhid/mouse/mousedev.c

Timestamp:

2011-12-28T11:46:33Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

70172dc4

Parents:

acac2ef

Message:

input: Move mouse wheel handling to input service.

File:

• uspace/drv/bus/usb/usbhid/mouse/mousedev.c (modified) (3 diffs)

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

@@ -152 +152 @@
 
 /*----------------------------------------------------------------------------*/
-
+#if 0
 static void usb_mouse_send_wheel(const usb_mouse_t *mouse_dev, int wheel)
 {
@@ -177 +177 @@
         }
 }
-
+#endif
 /*----------------------------------------------------------------------------*/
 
@@ -221 +221 @@
             &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL);
 
-        if ((shift_x != 0) || (shift_y != 0)) {
+        if (shift_x || shift_y || wheel) {
                 async_exch_t *exch =
                     async_exchange_begin(mouse_dev->mouse_sess);
                 if (exch != NULL) {
-                        async_req_2_0(exch, MOUSEEV_MOVE_EVENT, shift_x, shift_y);
+                        async_msg_3(exch, MOUSEEV_MOVE_EVENT,
+                            shift_x, shift_y, wheel);
                         async_exchange_end(exch);
                 }
         }
-
+#if 0
         if (wheel != 0)
-                usb_mouse_send_wheel(mouse_dev, wheel);
-
+                (void)usb_mouse_send_wheel(mouse_dev, wheel);
+#endif
         /* Buttons */
         usb_hid_report_path_t *path = usb_hid_report_path();