Changeset 44b1674 in mainline for uspace/drv/usbhid/subdrivers.c

Timestamp:

2011-04-18T21:48:55Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

9014dcd

Parents:

618f9ed (diff), 84a04dd (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 form usb/development

File:

• uspace/drv/usbhid/subdrivers.c (modified) (1 diff)

uspace/drv/usbhid/subdrivers.c

@@ -37 +37 @@
 #include "usb/classes/hidut.h"
 
-static usb_hid_subdriver_usage_t path_kbd[] = {{USB_HIDUT_PAGE_KEYBOARD, 0}};
+#include "lgtch-ultrax/lgtch-ultrax.h"
+
+static usb_hid_subdriver_usage_t path_kbd[] = {
+        {USB_HIDUT_PAGE_KEYBOARD, 0}, 
+        {0, 0}
+};
+
+static usb_hid_subdriver_usage_t lgtch_path[] = {
+        {0xc, 0},
+        {0, 0}
+};
 
 const usb_hid_subdriver_mapping_t usb_hid_subdrivers[] = {
         {
                 path_kbd,
+                -1,
+                USB_HID_PATH_COMPARE_END 
+                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                0,
+                0,
+                {
+                        .init = usb_kbd_init,
+                        .deinit = usb_kbd_deinit,
+                        .poll = usb_kbd_polling_callback,
+                        .poll_end = NULL
+                },
+                
+        },
+        {
+                lgtch_path,
                 1,
                 USB_HID_PATH_COMPARE_END 
                 | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
-                NULL,
-                NULL,
+                0x046d,
+                0xc30e,
                 {
-                        usb_kbd_init,
-                        usb_kbd_deinit,
-                        usb_kbd_polling_callback,
-                        NULL
-                },
-                
+                        .init = NULL,
+                        .deinit = NULL,
+                        .poll = usb_lgtch_polling_callback,
+                        .poll_end = NULL
+                }
         },
-        {NULL, 0, 0, NULL, NULL, {NULL, NULL, NULL, NULL}}
+        {NULL, -1, 0, 0, 0, {NULL, NULL, NULL, NULL}}
 };