diff options
Diffstat (limited to 'tinyusb')
| -rw-r--r-- | tinyusb/class/hid_host.c | 70 | ||||
| -rw-r--r-- | tinyusb/class/hid_host.h | 24 | ||||
| -rw-r--r-- | tinyusb/class/hid_host_keyboard.c | 135 | ||||
| -rw-r--r-- | tinyusb/class/hid_host_keyboard.h | 91 | ||||
| -rw-r--r-- | tinyusb/host/usbh.c | 2 |
5 files changed, 85 insertions, 237 deletions
diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c index a01c57963..00ef1848c 100644 --- a/tinyusb/class/hid_host.c +++ b/tinyusb/class/hid_host.c @@ -54,6 +54,13 @@ //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ +STATIC_ hidh_keyboard_info_t keyboard_data[TUSB_CFG_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1 + +static inline hidh_keyboard_info_t* get_kbd_data(uint8_t dev_addr) ATTR_PURE ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; +static inline hidh_keyboard_info_t* get_kbd_data(uint8_t dev_addr) +{ + return &keyboard_data[dev_addr-1]; +} //--------------------------------------------------------------------+ // CLASS-USBD API (don't require to verify parameters) @@ -61,7 +68,7 @@ void hidh_init(void) { #if TUSB_CFG_HOST_HID_KEYBOARD - hidh_keyboard_init(); + memclr_(&keyboard_data, sizeof(hidh_keyboard_info_t)*TUSB_CFG_HOST_DEVICE_MAX); #endif #if TUSB_CFG_HOST_HID_MOUSE @@ -73,6 +80,36 @@ void hidh_init(void) #endif } + +tusb_error_t hidh_keyboard_open_subtask(uint8_t dev_addr, uint8_t const *descriptor, uint16_t *p_length) +{ + hidh_keyboard_info_t *p_keyboard = get_kbd_data(dev_addr); + uint8_t const *p_desc = descriptor; + + p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH]; // skip interface + (*p_length) = p_desc - descriptor; // set ASAP, in case of error, p_length has to be not zero to prevent infinite re-open + + //------------- HID descriptor -------------// + tusb_hid_descriptor_hid_t* const p_desc_hid = (tusb_hid_descriptor_hid_t* const) p_desc; + ASSERT_INT(HID_DESC_HID, p_desc_hid->bDescriptorType, TUSB_ERROR_INVALID_PARA); + + p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH]; // TODO skip HID, only support std keyboard + (*p_length) = p_desc - descriptor; + + //------------- Endpoint Descriptor -------------// + ASSERT_INT(TUSB_DESC_ENDPOINT, p_desc[DESCRIPTOR_OFFSET_TYPE], TUSB_ERROR_INVALID_PARA); + + p_keyboard->pipe_hdl = hcd_pipe_open(dev_addr, (tusb_descriptor_endpoint_t*) p_desc, TUSB_CLASS_HID); + p_keyboard->report_size = ( ((tusb_descriptor_endpoint_t*) p_desc)->wMaxPacketSize & (BIT_(12)-1) ); + + p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH]; // advance endpoint descriptor + (*p_length) = p_desc - descriptor; + + ASSERT (pipehandle_is_valid(p_keyboard->pipe_hdl), TUSB_ERROR_HCD_FAILED); + + return TUSB_ERROR_NONE; +} + tusb_error_t hidh_open_subtask(uint8_t dev_addr, uint8_t const *descriptor, uint16_t *p_length) { tusb_descriptor_interface_t* p_interface = (tusb_descriptor_interface_t*) descriptor; @@ -82,6 +119,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, uint8_t const *descriptor, uint { #if TUSB_CFG_HOST_HID_KEYBOARD case HID_PROTOCOL_KEYBOARD: + return hidh_keyboard_open_subtask(dev_addr, descriptor, p_length); break; #endif @@ -112,7 +150,7 @@ void hidh_isr(pipe_handle_t pipe_hdl, tusb_bus_event_t event) void hidh_close(uint8_t dev_addr) { #if TUSB_CFG_HOST_HID_KEYBOARD - hidh_keyboard_close(dev_addr); +// hidh_keyboard_close(dev_addr); #endif #if TUSB_CFG_HOST_HID_MOUSE @@ -124,4 +162,32 @@ void hidh_close(uint8_t dev_addr) #endif } +//--------------------------------------------------------------------+ +// KEYBOARD PUBLIC API (parameter validation required) +//--------------------------------------------------------------------+ +#if TUSB_CFG_HOST_HID_KEYBOARD + +bool tusbh_hid_keyboard_is_supported(uint8_t dev_addr) +{ + return tusbh_device_is_configured(dev_addr) && pipehandle_is_valid(keyboard_data[dev_addr-1].pipe_hdl); +} + +tusb_error_t tusbh_hid_keyboard_get_report(uint8_t dev_addr, uint8_t instance_num, tusb_keyboard_report_t * const report) +{ + //------------- parameters validation -------------// + ASSERT_INT(TUSB_DEVICE_STATE_CONFIGURED, tusbh_device_get_state(dev_addr), TUSB_ERROR_DEVICE_NOT_READY); + ASSERT_PTR(report, TUSB_ERROR_INVALID_PARA); + + (void) instance_num; + + hidh_keyboard_info_t *p_keyboard = get_kbd_data(dev_addr); + + // TODO abstract to use hidh service + ASSERT_STATUS( hcd_pipe_xfer(p_keyboard->pipe_hdl, (uint8_t*) report, p_keyboard->report_size, true) ) ; + + return TUSB_ERROR_NONE; +} + +#endif + #endif diff --git a/tinyusb/class/hid_host.h b/tinyusb/class/hid_host.h index b06d74eed..87c38b7c7 100644 --- a/tinyusb/class/hid_host.h +++ b/tinyusb/class/hid_host.h @@ -59,20 +59,28 @@ #include "host/usbh.h" #include "hid.h" -#if TUSB_CFG_HOST_HID_KEYBOARD - #include "hid_host_keyboard.h" -#endif +//--------------------------------------------------------------------+ +// KEYBOARD Public API +//--------------------------------------------------------------------+ +typedef struct { + pipe_handle_t pipe_hdl; + uint16_t report_size; +}hidh_keyboard_info_t; -#if TUSB_CFG_HOST_HID_MOUSE - #include "hid_host_mouse.h" -#endif +bool tusbh_hid_keyboard_is_supported(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT; +tusb_error_t tusbh_hid_keyboard_get_report(uint8_t dev_addr, uint8_t instance_num, tusb_keyboard_report_t * const report) ATTR_WARN_UNUSED_RESULT; +pipe_status_t tusbh_hid_keyboard_status(uint8_t dev_addr, uint8_t instance_num) ATTR_WARN_UNUSED_RESULT; + +//--------------------------------------------------------------------+ +// MOUSE Public API +//--------------------------------------------------------------------+ //--------------------------------------------------------------------+ -// APPLICATION API +// GENERIC Public API //--------------------------------------------------------------------+ //--------------------------------------------------------------------+ -// CLASS DRIVER FUNCTION +// USBH-CLASS DRIVER API //--------------------------------------------------------------------+ #ifdef _TINY_USB_SOURCE_FILE_ diff --git a/tinyusb/class/hid_host_keyboard.c b/tinyusb/class/hid_host_keyboard.c deleted file mode 100644 index 110f2c83a..000000000 --- a/tinyusb/class/hid_host_keyboard.c +++ /dev/null @@ -1,135 +0,0 @@ -/* - * hid_host_keyboard.c - * - * Created on: Mar 25, 2013 - * Author: hathach - */ - -/* - * Software License Agreement (BSD License) - * Copyright (c) 2012, hathach (tinyusb.net) - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. 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. - * 3. 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. - * - * This file is part of the tiny usb stack. - */ - -#include "tusb_option.h" - -#if (MODE_HOST_SUPPORTED && TUSB_CFG_HOST_HID_KEYBOARD) - -#define _TINY_USB_SOURCE_FILE_ - -//--------------------------------------------------------------------+ -// INCLUDE -//--------------------------------------------------------------------+ -#include "common/common.h" -#include "hid_host.h" - -//--------------------------------------------------------------------+ -// MACRO CONSTANT TYPEDEF -//--------------------------------------------------------------------+ - -//--------------------------------------------------------------------+ -// INTERNAL OBJECT & FUNCTION DECLARATION -//--------------------------------------------------------------------+ -STATIC_ hidh_keyboard_info_t keyboard_data[TUSB_CFG_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1 - -static inline hidh_keyboard_info_t* get_kbd_data(uint8_t dev_addr) ATTR_PURE ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; -static inline hidh_keyboard_info_t* get_kbd_data(uint8_t dev_addr) -{ - return &keyboard_data[dev_addr-1]; -} - -//--------------------------------------------------------------------+ -// IMPLEMENTATION -//--------------------------------------------------------------------+ - -//--------------------------------------------------------------------+ -// PUBLIC API (parameter validation required) -//--------------------------------------------------------------------+ -bool tusbh_hid_keyboard_is_supported(uint8_t dev_addr) -{ - return tusbh_device_is_configured(dev_addr) && pipehandle_is_valid(keyboard_data[dev_addr-1].pipe_hdl); -} - -tusb_error_t tusbh_hid_keyboard_get(uint8_t dev_addr, uint8_t instance_num, tusb_keyboard_report_t * const report) -{ - //------------- parameters validation -------------// - ASSERT_INT(TUSB_DEVICE_STATE_CONFIGURED, tusbh_device_get_state(dev_addr), TUSB_ERROR_DEVICE_NOT_READY); - ASSERT_PTR(report, TUSB_ERROR_INVALID_PARA); - - (void) instance_num; - - hidh_keyboard_info_t *p_keyboard = get_kbd_data(dev_addr); - - // TODO abstract to use hidh service - ASSERT_STATUS( hcd_pipe_xfer(p_keyboard->pipe_hdl, (uint8_t*) report, p_keyboard->report_size, true) ) ; - - return TUSB_ERROR_NONE; -} - -//--------------------------------------------------------------------+ -// INTERNAL API (no need for parameter validation) -//--------------------------------------------------------------------+ -void hidh_keyboard_init(void) -{ - memclr_(&keyboard_data, sizeof(hidh_keyboard_info_t)*TUSB_CFG_HOST_DEVICE_MAX); -} - -tusb_error_t hidh_keyboard_open_subtask(uint8_t dev_addr, uint8_t const *descriptor, uint16_t *p_length) -{ - hidh_keyboard_info_t *p_keyboard = get_kbd_data(dev_addr); - uint8_t const *p_desc = descriptor; - - p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH]; // skip interface - (*p_length) = p_desc - descriptor; // set ASAP, in case of error, p_length has to be not zero to prevent infinite re-open - - //------------- HID descriptor -------------// - tusb_hid_descriptor_hid_t* const p_desc_hid = (tusb_hid_descriptor_hid_t* const) p_desc; - ASSERT_INT(HID_DESC_HID, p_desc_hid->bDescriptorType, TUSB_ERROR_INVALID_PARA); - - p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH]; // TODO skip HID, only support std keyboard - (*p_length) = p_desc - descriptor; - - //------------- Endpoint Descriptor -------------// - ASSERT_INT(TUSB_DESC_ENDPOINT, p_desc[DESCRIPTOR_OFFSET_TYPE], TUSB_ERROR_INVALID_PARA); - - p_keyboard->pipe_hdl = hcd_pipe_open(dev_addr, (tusb_descriptor_endpoint_t*) p_desc, TUSB_CLASS_HID); - p_keyboard->report_size = ( ((tusb_descriptor_endpoint_t*) p_desc)->wMaxPacketSize & (BIT_(12)-1) ); - - p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH]; // advance endpoint descriptor - (*p_length) = p_desc - descriptor; - - ASSERT (pipehandle_is_valid(p_keyboard->pipe_hdl), TUSB_ERROR_HCD_FAILED); - - return TUSB_ERROR_NONE; -} - -void hidh_keyboard_close(uint8_t dev_addr) -{ - -} - -#endif diff --git a/tinyusb/class/hid_host_keyboard.h b/tinyusb/class/hid_host_keyboard.h deleted file mode 100644 index 0d4d17a52..000000000 --- a/tinyusb/class/hid_host_keyboard.h +++ /dev/null @@ -1,91 +0,0 @@ -/* - * hid_host_keyboard.h - * - * Created on: Mar 25, 2013 - * Author: hathach - */ - -/* - * Software License Agreement (BSD License) - * Copyright (c) 2012, hathach (tinyusb.net) - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. 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. - * 3. 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. - * - * This file is part of the tiny usb stack. - */ - -/** \file - * \brief TBD - * - * \note TBD - */ - -/** \ingroup TBD - * \defgroup TBD - * \brief TBD - * - * @{ - */ - -#ifndef _TUSB_HID_HOST_KEYBOARD_H_ -#define _TUSB_HID_HOST_KEYBOARD_H_ - -#include "common/common.h" -#include "host/usbh.h" // TODO refractor -#include "hid.h" - -#ifdef __cplusplus - extern "C" { -#endif - -//--------------------------------------------------------------------+ -// PUBLIC API (parameter validation required) -//--------------------------------------------------------------------+ -bool tusbh_hid_keyboard_is_supported(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT; -tusb_error_t tusbh_hid_keyboard_get(uint8_t dev_addr, uint8_t instance_num, tusb_keyboard_report_t * const report) ATTR_WARN_UNUSED_RESULT; -pipe_status_t tusbh_hid_keyboard_pipe_status(uint8_t dev_addr, uint8_t instance_num) ATTR_WARN_UNUSED_RESULT; - -//--------------------------------------------------------------------+ -// INTERNAL API (no need for parameter validation) -//--------------------------------------------------------------------+ -#ifdef _TINY_USB_SOURCE_FILE_ - -typedef struct { - pipe_handle_t pipe_hdl; - uint16_t report_size; -}hidh_keyboard_info_t; - -void hidh_keyboard_init(void); -tusb_error_t hidh_keyboard_open_subtask(uint8_t dev_addr, uint8_t const *descriptor, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT; -void hidh_keyboard_close(uint8_t dev_addr); - -#endif - -#ifdef __cplusplus - } -#endif - -#endif /* _TUSB_HID_HOST_KEYBOARD_H_ */ - -/** @} */ diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c index 7559142c2..208139276 100644 --- a/tinyusb/host/usbh.c +++ b/tinyusb/host/usbh.c @@ -317,7 +317,7 @@ OSAL_TASK_DECLARE(usbh_enumeration_task) usbh_pipe_control_close(0); usbh_devices[0].state = TUSB_DEVICE_STATE_UNPLUG; -// hcd_port_reset( usbh_device_info_pool[new_addr].core_id ); TODO verified +// hcd_port_reset( usbh_device_info_pool[new_addr].core_id ); TODO may need to reset device after set address // open control pipe for new address TASK_ASSERT_STATUS ( usbh_pipe_control_open(new_addr, ((tusb_descriptor_device_t*) enum_data_buffer)->bMaxPacketSize0 ) ); |