Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 37f87fa in mainline


Ignore:
Timestamp:
2011-05-13T13:39:16Z (11 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master
Children:
4880210
Parents:
65b458c4
Message:

Fixed setting of data to mouse wheel function

Location:
uspace/drv/usbhid
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/usbhid/mouse/mousedev.c

    r65b458c4 r37f87fa  
    131131        }
    132132       
     133        usb_log_debug("default_connection_handler: fun->name: %s\n",
     134                      fun->name);
     135        usb_log_debug("default_connection_handler: mouse_phone: %d, wheel "
     136            "phone: %d\n", mouse_dev->mouse_phone, mouse_dev->wheel_phone);
     137       
    133138        int *phone = (str_cmp(fun->name, HID_MOUSE_FUN_NAME) == 0)
    134139                     ? &mouse_dev->mouse_phone : &mouse_dev->wheel_phone;
     
    145150
    146151                *phone = callback;
    147                 usb_log_debug("Console phone to mouse set ok (%d).\n", callback);
     152                usb_log_debug("Console phone to mouse set ok (%d).\n", *phone);
    148153                async_answer_0(icallid, EOK);
    149154                return;
     
    427432         */
    428433        fun->ops = &mouse->ops;
    429         fun->driver_data = hid_dev;   // TODO: maybe change to hid_dev->data
     434        fun->driver_data = mouse;   // TODO: maybe change to hid_dev->data
    430435
    431436        rc = ddf_fun_bind(fun);
  • uspace/drv/usbhid/subdrivers.c

    r65b458c4 r37f87fa  
    6262                path_kbd,
    6363                -1,
    64                 USB_HID_PATH_COMPARE_ANYWHERE,
     64                USB_HID_PATH_COMPARE_BEGIN,
    6565                -1,
    6666                -1,
     
    7676                multim_key_path,
    7777                1,
    78                 USB_HID_PATH_COMPARE_ANYWHERE,
     78                USB_HID_PATH_COMPARE_BEGIN,
    7979                -1,
    8080                -1,
     
    8989                path_mouse,
    9090                -1,
    91                 USB_HID_PATH_COMPARE_ANYWHERE,
     91                USB_HID_PATH_COMPARE_BEGIN,
    9292                -1,
    9393                -1,
Note: See TracChangeset for help on using the changeset viewer.