Changeset 1e94e09 in mainline

Timestamp:

2014-05-16T23:34:14Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b5674b2

Parents:

7d68e5c7

Message:

implement driver support for blink(1) USB LED devices
add simple LED device DDF interface

Location:

uspace

Files:

• drv/bus/usb/usbhid/Makefile (modified) (1 diff)
• drv/bus/usb/usbhid/blink1/blink1.c (added)
• drv/bus/usb/usbhid/blink1/blink1.h (added)
• drv/bus/usb/usbhid/subdrivers.c (modified) (3 diffs)
• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/device/led_dev.c (added)
• lib/c/include/device/led_dev.h (added)
• lib/c/include/ipc/dev_iface.h (modified) (1 diff)
• lib/drv/Makefile (modified) (1 diff)
• lib/drv/generic/dev_iface.c (modified) (2 diffs)
• lib/drv/generic/private/remote_led_dev.h (added)
• lib/drv/generic/remote_led_dev.c (added)
• lib/drv/include/ops/led_dev.h (added)
• srv/locsrv/locsrv.c (modified) (1 diff)

uspace/drv/bus/usb/usbhid/Makefile

@@ -50 +50 @@
         mouse/mousedev.c \
         multimedia/multimedia.c \
-        multimedia/keymap.c
+        multimedia/keymap.c \
+        blink1/blink1.c
 
 SOURCES = \

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
+                }
+        }
 };
 

uspace/lib/c/Makefile

@@ -65 +65 @@
         generic/device/pio_window.c \
         generic/device/clock_dev.c \
+        generic/device/led_dev.c \
         generic/dhcp.c \
         generic/dnsr.c \

uspace/lib/c/include/ipc/dev_iface.h

@@ -65 +65 @@
         CLOCK_DEV_IFACE,
 
+        /** Interface provided by LED devices */
+        LED_DEV_IFACE,
+
         /** Interface provided by battery powered devices */
         BATTERY_DEV_IFACE,

uspace/lib/drv/Makefile

@@ -54 +54 @@
         generic/remote_usbhid.c \
         generic/remote_clock_dev.c \
+        generic/remote_led_dev.c \
         generic/remote_battery_dev.c \
         generic/remote_ahci.c

uspace/lib/drv/generic/dev_iface.c

@@ -43 +43 @@
 #include "remote_char_dev.h"
 #include "remote_clock_dev.h"
+#include "remote_led_dev.h"
 #include "remote_battery_dev.h"
 #include "remote_graph_dev.h"
@@ -68 +69 @@
                 [USBHID_DEV_IFACE] = &remote_usbhid_iface,
                 [CLOCK_DEV_IFACE] = &remote_clock_dev_iface,
+                [LED_DEV_IFACE] = &remote_led_dev_iface,
                 [BATTERY_DEV_IFACE] = &remote_battery_dev_iface,
                 [AHCI_DEV_IFACE] = &remote_ahci_iface,

uspace/srv/locsrv/locsrv.c

@@ -1332 +1332 @@
         categ_dir_add_cat(&cdir, cat);
 
+        cat = category_new("led");
+        categ_dir_add_cat(&cdir, cat);
+
         cat = category_new("serial");
         categ_dir_add_cat(&cdir, cat);