Changeset 15d0046 in mainline for uspace/drv/bus/usb/usbhid/subdrivers.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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 mainline changes

File:

• uspace/drv/bus/usb/usbhid/subdrivers.c (modified) (3 diffs)

uspace/drv/bus/usb/usbhid/subdrivers.c

@@ -37 +37 @@
 #include <usb/hid/usages/core.h>
 #include <usb/hid/hidpath.h>
-
+#include "kbd/kbddev.h"
+#include "mouse/mousedev.h"
 #include "multimedia/multimedia.h"
-#include "mouse/mousedev.h"
+#include "blink1/blink1.h"
 #include "generic/hiddev.h"
 
 static const usb_hid_subdriver_usage_t path_kbd[] = {
-        {USB_HIDUT_PAGE_GENERIC_DESKTOP,
-         USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD},
+        {
+                USB_HIDUT_PAGE_GENERIC_DESKTOP,
+                USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD
+        },
         {0, 0}
 };
 
 static const usb_hid_subdriver_usage_t path_mouse[] = {
-        {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_MOUSE},
+        {
+                USB_HIDUT_PAGE_GENERIC_DESKTOP,
+                USB_HIDUT_USAGE_GENERIC_DESKTOP_MOUSE
+        },
         {0, 0}
 };
 
-static const usb_hid_subdriver_usage_t multim_key_path[] = {
-        {USB_HIDUT_PAGE_CONSUMER, USB_HIDUT_USAGE_CONSUMER_CONSUMER_CONTROL},
+static const usb_hid_subdriver_usage_t path_multim_key[] = {
+        {
+                USB_HIDUT_PAGE_CONSUMER,
+                USB_HIDUT_USAGE_CONSUMER_CONSUMER_CONTROL
+        },
         {0, 0}
 };
@@ -73 +82 @@
         },
         {
-                multim_key_path,
+                path_multim_key,
                 1,
                 USB_HID_PATH_COMPARE_BEGIN,
@@ -98 +107 @@
                 }
         },
+        {
+                NULL,
+                0,
+                USB_HID_PATH_COMPARE_BEGIN,
+                0x27b8,
+                0x01ed,
+                {
+                        .init = usb_blink1_init,
+                        .deinit = usb_blink1_deinit,
+                        .poll = NULL,
+                        .poll_end = NULL
+                }
+        }
 };