Changes in / [c372e03:9e195e2c] in mainline

Location:

uspace

Files:

• Makefile (modified) (2 diffs)
• drv/usbhid/Makefile (modified) (1 diff)
• drv/usbhid/lgtch-ultrax/keymap.c (deleted)
• drv/usbhid/lgtch-ultrax/keymap.h (deleted)
• drv/usbhid/lgtch-ultrax/lgtch-ultrax.c (deleted)
• drv/usbhid/lgtch-ultrax/lgtch-ultrax.h (deleted)
• drv/usbhid/multimedia/keymap.c (added)
• drv/usbhid/multimedia/keymap.h (added)
• drv/usbhid/multimedia/multimedia.c (added)
• drv/usbhid/multimedia/multimedia.h (added)
• drv/usbhid/subdrivers.c (modified) (3 diffs)
• drv/usbkbd/Makefile (deleted)
• drv/usbkbd/conv.c (deleted)
• drv/usbkbd/conv.h (deleted)
• drv/usbkbd/kbd.h (deleted)
• drv/usbkbd/kbddev.c (deleted)
• drv/usbkbd/kbddev.h (deleted)
• drv/usbkbd/kbdrepeat.c (deleted)
• drv/usbkbd/kbdrepeat.h (deleted)
• drv/usbkbd/layout.h (deleted)
• drv/usbkbd/main.c (deleted)
• drv/usbkbd/usbkbd.ma (deleted)
• lib/usbhid/include/usb/classes/hidut.h (modified) (1 diff)

uspace/Makefile

@@ -122 +122 @@
                 drv/uhci-rhd \
                 drv/usbflbk \
-                drv/usbkbd \
                 drv/usbhid \
                 drv/usbhub \
@@ -144 +143 @@
                 drv/uhci-rhd \
                 drv/usbflbk \
-                drv/usbkbd \
                 drv/usbhid \
                 drv/usbhub \

uspace/drv/usbhid/Makefile

@@ -57 +57 @@
         generic/hiddev.c \
         mouse/mousedev.c \
-        lgtch-ultrax/lgtch-ultrax.c \
-        lgtch-ultrax/keymap.c \
+        multimedia/multimedia.c \
+        multimedia/keymap.c \
         $(STOLEN_LAYOUT_SOURCES)
 

uspace/drv/usbhid/subdrivers.c

@@ -38 +38 @@
 #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_ANYWHERE,
                 -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_ANYWHERE,
+                -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_ANYWHERE,
                 -1,
                 -1,

uspace/lib/usbhid/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