Changeset 06f9d8fb in mainline for uspace/drv/usbhid/subdrivers.c

Timestamp:

2011-05-30T20:02:17Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

c3dafe1

Parents:

be8d907 (diff), 63862a0 (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 with usb/development

File:

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

uspace/drv/usbhid/subdrivers.c

@@ -58 +58 @@
 };
 
-//static usb_hid_subdriver_usage_t generic_hid_key_path[] = {
-//      {0, 0}
-//};
-
 const usb_hid_subdriver_mapping_t usb_hid_subdrivers[] = {
         {
@@ -103 +99 @@
                 }
         },
-//      {
-//              generic_hid_key_path,
-//              0,
-//              USB_HID_PATH_COMPARE_ANYWHERE,
-//              -1,
-//              -1,
-//              {
-//                      .init = usb_generic_hid_init,
-//                      .deinit = NULL,
-//                      .poll = usb_generic_hid_polling_callback,
-//                      .poll_end = NULL
-//              }
-//      },
         {NULL, -1, 0, -1, -1, {NULL, NULL, NULL, NULL, NULL}}
 };