Changeset fb295b6 in mainline for uspace/drv/usbhid/subdrivers.c

Timestamp:

2011-05-07T08:50:46Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

1c3fcf9

Parents:

78dbf5b (diff), c7fbb90 (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:

Fix

File:

• uspace/drv/usbhid/subdrivers.c (modified) (2 diffs)

uspace/drv/usbhid/subdrivers.c

@@ -46 +46 @@
 };
 
-static usb_hid_subdriver_usage_t path_mouse[] = {
-        {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_MOUSE},
-        {USB_HIDUT_PAGE_GENERIC_DESKTOP, 
-         USB_HIDUT_USAGE_GENERIC_DESKTOP_POINTER},
-        {0, 0}
-};
-
 static usb_hid_subdriver_usage_t path_mouse2[] = {
         {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_X},
@@ -94 +87 @@
         },
         {
-                path_mouse,
-                -1,
-                USB_HID_PATH_COMPARE_COLLECTION_ONLY,
-                -1,
-                -1,
-                {
-                        .init = usb_mouse_init,
-                        .deinit = usb_mouse_deinit,
-                        .poll = usb_mouse_polling_callback,
-                        .poll_end = NULL
-                }
-        },
-        {
                 path_mouse2,
                 -1,