Changes in / [9e195e2c:c372e03] in mainline

Location:

uspace

Files:

• Makefile (modified) (2 diffs)
• drv/usbhid/Makefile (modified) (1 diff)
• drv/usbhid/lgtch-ultrax/keymap.c (added)
• drv/usbhid/lgtch-ultrax/keymap.h (added)
• drv/usbhid/lgtch-ultrax/lgtch-ultrax.c (added)
• drv/usbhid/lgtch-ultrax/lgtch-ultrax.h (added)
• drv/usbhid/multimedia/keymap.c (deleted)
• drv/usbhid/multimedia/keymap.h (deleted)
• drv/usbhid/multimedia/multimedia.c (deleted)
• drv/usbhid/multimedia/multimedia.h (deleted)
• drv/usbhid/subdrivers.c (modified) (3 diffs)
• drv/usbkbd/Makefile (added)
• drv/usbkbd/conv.c (added)
• drv/usbkbd/conv.h (added)
• drv/usbkbd/kbd.h (added)
• drv/usbkbd/kbddev.c (added)
• drv/usbkbd/kbddev.h (added)
• drv/usbkbd/kbdrepeat.c (added)
• drv/usbkbd/kbdrepeat.h (added)
• drv/usbkbd/layout.h (added)
• drv/usbkbd/main.c (added)
• drv/usbkbd/usbkbd.ma (added)
• 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 \
@@ -143 +144 @@
                 drv/uhci-rhd \
                 drv/usbflbk \
+                drv/usbkbd \
                 drv/usbhid \
                 drv/usbhub \

uspace/drv/usbhid/Makefile

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

uspace/drv/usbhid/subdrivers.c

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