Changeset 37f87fa in mainline

Timestamp:

2011-05-13T13:39:16Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

4880210

Parents:

65b458c4

Message:

Fixed setting of data to mouse wheel function

Location:

uspace/drv/usbhid

Files:

• mouse/mousedev.c (modified) (3 diffs)
• subdrivers.c (modified) (3 diffs)

uspace/drv/usbhid/mouse/mousedev.c

@@ -131 +131 @@
         }
         
+        usb_log_debug("default_connection_handler: fun->name: %s\n",
+                      fun->name);
+        usb_log_debug("default_connection_handler: mouse_phone: %d, wheel "
+            "phone: %d\n", mouse_dev->mouse_phone, mouse_dev->wheel_phone);
+        
         int *phone = (str_cmp(fun->name, HID_MOUSE_FUN_NAME) == 0) 
                      ? &mouse_dev->mouse_phone : &mouse_dev->wheel_phone;
@@ -145 +150 @@
 
                 *phone = callback;
-                usb_log_debug("Console phone to mouse set ok (%d).\n", callback);
+                usb_log_debug("Console phone to mouse set ok (%d).\n", *phone);
                 async_answer_0(icallid, EOK);
                 return;
@@ -427 +432 @@
          */
         fun->ops = &mouse->ops;
-        fun->driver_data = hid_dev;   // TODO: maybe change to hid_dev->data
+        fun->driver_data = mouse;   // TODO: maybe change to hid_dev->data
 
         rc = ddf_fun_bind(fun);

uspace/drv/usbhid/subdrivers.c

@@ -62 +62 @@
                 path_kbd,
                 -1,
-                USB_HID_PATH_COMPARE_ANYWHERE,
+                USB_HID_PATH_COMPARE_BEGIN,
                 -1,
                 -1,
@@ -76 +76 @@
                 multim_key_path,
                 1,
-                USB_HID_PATH_COMPARE_ANYWHERE,
+                USB_HID_PATH_COMPARE_BEGIN,
                 -1,
                 -1,
@@ -89 +89 @@
                 path_mouse,
                 -1,
-                USB_HID_PATH_COMPARE_ANYWHERE,
+                USB_HID_PATH_COMPARE_BEGIN,
                 -1,
                 -1,