Changes in uspace/drv/bus/usb/usbhid/subdrivers.c [1e94e09:9d58539] in mainline

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 "multimedia/multimedia.h"
 #include "mouse/mousedev.h"
-#include "multimedia/multimedia.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 path_multim_key[] = {
-        {
-                USB_HIDUT_PAGE_CONSUMER,
-                USB_HIDUT_USAGE_CONSUMER_CONSUMER_CONTROL
-        },
+static const usb_hid_subdriver_usage_t multim_key_path[] = {
+        {USB_HIDUT_PAGE_CONSUMER, USB_HIDUT_USAGE_CONSUMER_CONSUMER_CONTROL},
         {0, 0}
 };
@@ -82 +73 @@
         },
         {
-                path_multim_key,
+                multim_key_path,
                 1,
                 USB_HID_PATH_COMPARE_BEGIN,
@@ -107 +98 @@
                 }
         },
-        {
-                NULL,
-                0,
-                USB_HID_PATH_COMPARE_BEGIN,
-                0x27b8,
-                0x01ed,
-                {
-                        .init = usb_blink1_init,
-                        .deinit = usb_blink1_deinit,
-                        .poll = NULL,
-                        .poll_end = NULL
-                }
-        }
 };