Index: uspace/drv/bus/usb/usbhid/Makefile =================================================================== --- uspace/drv/bus/usb/usbhid/Makefile (revision 378bf85e5d08bc77a7e01cfbca468d76993d2e6f) +++ uspace/drv/bus/usb/usbhid/Makefile (revision b5674b2be9e6bbc7533983b78fdc0f5d9f5dc5fc) @@ -50,5 +50,6 @@ mouse/mousedev.c \ multimedia/multimedia.c \ - multimedia/keymap.c + multimedia/keymap.c \ + blink1/blink1.c SOURCES = \ Index: uspace/drv/bus/usb/usbhid/blink1/blink1.c =================================================================== --- uspace/drv/bus/usb/usbhid/blink1/blink1.c (revision b5674b2be9e6bbc7533983b78fdc0f5d9f5dc5fc) +++ uspace/drv/bus/usb/usbhid/blink1/blink1.c (revision b5674b2be9e6bbc7533983b78fdc0f5d9f5dc5fc) @@ -0,0 +1,171 @@ +/* + * Copyright (c) 2014 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup drvusbhid + * @{ + */ +/** + * @file + * USB blink(1) subdriver. + */ + +#include +#include +#include +#include +#include "blink1.h" + +const char *HID_BLINK1_FUN_NAME = "blink1"; +const char *HID_BLINK1_CATEGORY = "led"; + +#define BLINK1_REPORT_ID 0x0001 + +#define BLINK1_COMMAND_SET 0x006e + +typedef struct { + uint8_t id; + uint8_t command; + uint8_t arg0; + uint8_t arg1; + uint8_t arg2; + uint8_t arg3; + uint8_t arg4; + uint8_t arg5; +} blink1_report_t; + +static int usb_blink1_color_set(ddf_fun_t *fun, pixel_t pixel) +{ + usb_blink1_t *blink1_dev = (usb_blink1_t *) ddf_fun_data_get(fun); + if (blink1_dev == NULL) { + usb_log_debug("Missing parameters.\n"); + return EINVAL; + } + + blink1_report_t report; + + report.id = BLINK1_REPORT_ID; + report.command = BLINK1_COMMAND_SET; + report.arg0 = RED(pixel); + report.arg1 = GREEN(pixel); + report.arg2 = BLUE(pixel); + report.arg3 = 0; + report.arg4 = 0; + report.arg5 = 0; + + return usbhid_req_set_report(&blink1_dev->hid_dev->usb_dev->ctrl_pipe, + blink1_dev->hid_dev->usb_dev->interface_no, USB_HID_REPORT_TYPE_FEATURE, + (uint8_t *) &report, sizeof(report)); +} + +static led_dev_ops_t usb_blink1_iface = { + .color_set = usb_blink1_color_set +}; + +static ddf_dev_ops_t blink1_ops = { + .interfaces[LED_DEV_IFACE] = &usb_blink1_iface +}; + +int usb_blink1_init(usb_hid_dev_t *hid_dev, void **data) +{ + if (hid_dev == NULL) { + usb_log_error("Failed to init blink(1) structure: no structure " + "given.\n"); + return EINVAL; + } + + /* Create the exposed function. */ + ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, + HID_BLINK1_FUN_NAME); + if (fun == NULL) { + usb_log_error("Could not create DDF function node `%s'.\n", + HID_BLINK1_FUN_NAME); + return ENOMEM; + } + + usb_blink1_t *blink1_dev = (usb_blink1_t *) + ddf_fun_data_alloc(fun, sizeof(usb_blink1_t)); + if (blink1_dev == NULL) { + usb_log_error("Error while creating USB/HID blink(1) device " + "structure.\n"); + ddf_fun_destroy(fun); + return ENOMEM; + } + + ddf_fun_set_ops(fun, &blink1_ops); + + int rc = ddf_fun_bind(fun); + if (rc != EOK) { + usb_log_error("Could not bind DDF function `%s': %s.\n", + ddf_fun_get_name(fun), str_error(rc)); + ddf_fun_destroy(fun); + return rc; + } + + rc = ddf_fun_add_to_category(fun, HID_BLINK1_CATEGORY); + if (rc != EOK) { + usb_log_error("Could not add DDF function to category %s: %s.\n", + HID_BLINK1_CATEGORY, str_error(rc)); + + rc = ddf_fun_unbind(fun); + if (rc != EOK) { + usb_log_error("Could not unbind function `%s', it " + "will not be destroyed.\n", ddf_fun_get_name(fun)); + return rc; + } + + ddf_fun_destroy(fun); + return rc; + } + + blink1_dev->fun = fun; + blink1_dev->hid_dev = hid_dev; + *data = blink1_dev; + + return EOK; +} + +void usb_blink1_deinit(usb_hid_dev_t *hid_dev, void *data) +{ + if (data == NULL) + return; + + usb_blink1_t *blink1_dev = (usb_blink1_t *) data; + + int rc = ddf_fun_unbind(blink1_dev->fun); + if (rc != EOK) { + usb_log_error("Could not unbind function `%s', it " + "will not be destroyed.\n", ddf_fun_get_name(blink1_dev->fun)); + return; + } + + ddf_fun_destroy(blink1_dev->fun); +} + +/** + * @} + */ Index: uspace/drv/bus/usb/usbhid/blink1/blink1.h =================================================================== --- uspace/drv/bus/usb/usbhid/blink1/blink1.h (revision b5674b2be9e6bbc7533983b78fdc0f5d9f5dc5fc) +++ uspace/drv/bus/usb/usbhid/blink1/blink1.h (revision b5674b2be9e6bbc7533983b78fdc0f5d9f5dc5fc) @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2014 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup drvusbhid + * @{ + */ +/** @file + * USB blink(1) subdriver. + */ + +#ifndef USB_HID_BLINK1_H_ +#define USB_HID_BLINK1_H_ + +#include +#include "../usbhid.h" + +/** Container for USB blink(1) device. */ +typedef struct { + /** DDF blink(1) function */ + ddf_fun_t *fun; + + /** USB HID device */ + usb_hid_dev_t *hid_dev; +} usb_blink1_t; + +extern const char *HID_BLINK1_FUN_NAME; +extern const char *HID_BLINK1_CATEGORY; + +extern int usb_blink1_init(usb_hid_dev_t *, void **); +extern void usb_blink1_deinit(usb_hid_dev_t *, void *); + +#endif // USB_HID_BLINK1_H_ + +/** + * @} + */ Index: uspace/drv/bus/usb/usbhid/subdrivers.c =================================================================== --- uspace/drv/bus/usb/usbhid/subdrivers.c (revision 378bf85e5d08bc77a7e01cfbca468d76993d2e6f) +++ uspace/drv/bus/usb/usbhid/subdrivers.c (revision b5674b2be9e6bbc7533983b78fdc0f5d9f5dc5fc) @@ -37,22 +37,31 @@ #include #include - +#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,5 +82,5 @@ }, { - multim_key_path, + path_multim_key, 1, USB_HID_PATH_COMPARE_BEGIN, @@ -98,4 +107,17 @@ } }, + { + NULL, + 0, + USB_HID_PATH_COMPARE_BEGIN, + 0x27b8, + 0x01ed, + { + .init = usb_blink1_init, + .deinit = usb_blink1_deinit, + .poll = NULL, + .poll_end = NULL + } + } };