Changes in uspace/drv/usbhid/subdrivers.c [faa44e58:37f87fa] in mainline

File:

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

uspace/drv/usbhid/subdrivers.c

@@ -35 +35 @@
 
 #include "subdrivers.h"
-#include <usb/hid/usages/core.h>
-#include <usb/hid/hidpath.h>
+#include "usb/classes/hidut.h"
+#include "usb/classes/hidpath.h"
 
-#include "lgtch-ultrax/lgtch-ultrax.h"
+//#include "lgtch-ultrax/lgtch-ultrax.h"
+#include "multimedia/multimedia.h"
 #include "mouse/mousedev.h"
 
 static usb_hid_subdriver_usage_t path_kbd[] = {
-        {USB_HIDUT_PAGE_KEYBOARD, 0}, 
+        {USB_HIDUT_PAGE_GENERIC_DESKTOP, 
+         USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD}, 
         {0, 0}
 };
 
-static usb_hid_subdriver_usage_t path_mouse2[] = {
-        {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_X},
+static usb_hid_subdriver_usage_t path_mouse[] = {
+        {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_MOUSE},
         {0, 0}
 };
 
-static usb_hid_subdriver_usage_t lgtch_path[] = {
-        {0xc, 0},
+static usb_hid_subdriver_usage_t multim_key_path[] = {
+        {USB_HIDUT_PAGE_CONSUMER, USB_HIDUT_USAGE_CONSUMER_CONSUMER_CONTROL},
         {0, 0}
 };
@@ -60 +62 @@
                 path_kbd,
                 -1,
-                USB_HID_PATH_COMPARE_END 
-                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                USB_HID_PATH_COMPARE_BEGIN,
                 -1,
                 -1,
@@ -73 +74 @@
         },
         {
-                lgtch_path,
+                multim_key_path,
                 1,
-                USB_HID_PATH_COMPARE_END 
-                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
-                0x046d,
-                0xc30e,
+                USB_HID_PATH_COMPARE_BEGIN,
+                -1,
+                -1,
                 {
-                        .init = usb_lgtch_init,
-                        .deinit = usb_lgtch_deinit,
-                        .poll = usb_lgtch_polling_callback,
+                        .init = usb_multimedia_init,
+                        .deinit = usb_multimedia_deinit,
+                        .poll = usb_multimedia_polling_callback,
                         .poll_end = NULL
                 }
         },
         {
-                path_mouse2,
+                path_mouse,
                 -1,
-                USB_HID_PATH_COMPARE_END 
-                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                USB_HID_PATH_COMPARE_BEGIN,
                 -1,
                 -1,
@@ -100 +99 @@
                 }
         },
-        {NULL, -1, 0, -1, -1, {NULL, NULL, NULL, NULL}}
+        {NULL, -1, 0, -1, -1, {NULL, NULL, NULL, NULL, NULL}}
 };