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

Timestamp:

2011-05-27T09:58:08Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

e89bb50

Parents:

63d4d4fd (diff), 848dafc (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 from usb/development

File:

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

uspace/drv/usbhid/subdrivers.c

@@ -38 +38 @@
 #include <usb/hid/hidpath.h>
 
-//#include "lgtch-ultrax/lgtch-ultrax.h"
 #include "multimedia/multimedia.h"
 #include "mouse/mousedev.h"
+#include "generic/hiddev.h"
 
 static usb_hid_subdriver_usage_t path_kbd[] = {
@@ -58 +58 @@
 };
 
+//static usb_hid_subdriver_usage_t generic_hid_key_path[] = {
+//      {0, 0}
+//};
+
 const usb_hid_subdriver_mapping_t usb_hid_subdrivers[] = {
         {
                 path_kbd,
-                -1,
+                0,
                 USB_HID_PATH_COMPARE_BEGIN,
                 -1,
@@ -88 +92 @@
         {
                 path_mouse,
-                -1,
+                0,
                 USB_HID_PATH_COMPARE_BEGIN,
                 -1,
@@ -99 +103 @@
                 }
         },
+//      {
+//              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}}
 };