Changeset cecb1a97 in mainline

Timestamp:

2011-05-07T09:31:48Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

d3b6d5e

Parents:

84b240f

Message:

Subdriver mapping for multimedia keys.

Location:

uspace

Files:

• drv/usbhid/subdrivers.c (modified) (4 diffs)
• lib/usb/include/usb/classes/hidut.h (modified) (1 diff)

uspace/drv/usbhid/subdrivers.c

@@ -42 +42 @@
 
 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}
 };
@@ -51 +52 @@
 };
 
-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 +61 @@
                 path_kbd,
                 -1,
-                USB_HID_PATH_COMPARE_END 
-                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                USB_HID_PATH_COMPARE_ANYWHERE,
                 -1,
                 -1,
@@ -73 +73 @@
         },
         {
-                lgtch_path,
+                multim_key_path,
                 1,
-                USB_HID_PATH_COMPARE_END 
-                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
-                0x046d,
-                0xc30e,
+                USB_HID_PATH_COMPARE_ANYWHERE,
+                -1,
+                -1,
                 {
                         .init = usb_lgtch_init,

uspace/lib/usb/include/usb/classes/hidut.h

@@ -67 +67 @@
 } usb_hidut_usage_generic_desktop_t;
 
+typedef enum {
+        USB_HIDUT_USAGE_CONSUMER_CONSUMER_CONTROL = 1
+} usb_hidut_usage_consumer_t;
+
 
 #endif