From d67a7b7959342e93c6ae63d5dac5149dec76d0e6 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 30 Oct 2013 12:20:00 +0700 Subject: [PATCH] fix dcd_data declared with TUSB_CFG_ATTR_USBRAM fix lpc43xx UM: non-control unused endpoint type should be set to different than control in ENDPTCTRL add hid mouse device fix mouse descriptor with vertical wheel support --- demos/device/keyboard/main.c | 23 +++--- demos/device/keyboard/tusb_descriptors.c | 95 +++++++++++++----------- demos/device/keyboard/tusb_descriptors.h | 68 +++++++++-------- tinyusb/class/hid_device.c | 62 +++++++++++----- tinyusb/class/hid_device.h | 4 +- tinyusb/device/dcd_lpc43xx.c | 17 ++++- tinyusb/device/usbd.c | 1 + tinyusb/device/usbd.h | 6 +- 8 files changed, 163 insertions(+), 113 deletions(-) diff --git a/demos/device/keyboard/main.c b/demos/device/keyboard/main.c index e6c78f60d..a4f6f899c 100644 --- a/demos/device/keyboard/main.c +++ b/demos/device/keyboard/main.c @@ -90,9 +90,9 @@ void keyboard_device_app_task(void * p_para) static uint32_t count =0; if (count++ < 10) { - keyboard_report.keycode[0] = (count%2) ? 0x04 : 0x00; if (!tusbd_hid_keyboard_is_busy(0)) { + keyboard_report.keycode[0] = (count%2) ? 0x04 : 0x00; tusbd_hid_keyboard_send(0, &keyboard_report ); } } @@ -104,15 +104,18 @@ void keyboard_device_app_task(void * p_para) hid_mouse_report_t mouse_report TUSB_CFG_ATTR_USBRAM; void mouse_device_app_task(void * p_para) { -// if (tusbd_is_configured(0)) -// { -// static uint32_t count =0; -// if (count++ < 10) -// { -// mouse_report.x = mouse_report.y = 20; -// tusbd_hid_mouse_send( &mouse_report ); -// } -// } + if (tusbd_is_configured(0)) + { + static uint32_t count =0; + if (count++ < 10) + { + if ( !tusbd_hid_mouse_is_busy(0) ) + { + mouse_report.x = mouse_report.y = 20; + tusbd_hid_mouse_send(0, &mouse_report ); + } + } + } } #endif diff --git a/demos/device/keyboard/tusb_descriptors.c b/demos/device/keyboard/tusb_descriptors.c index 14ff41a0d..da17fbcaf 100644 --- a/demos/device/keyboard/tusb_descriptors.c +++ b/demos/device/keyboard/tusb_descriptors.c @@ -1,39 +1,40 @@ -/* - * tusb_descriptors.c - * - * Created on: Nov 26, 2012 - * Author: hathach - */ +/**************************************************************************/ +/*! + @file tusb_descriptors.c + @author hathach (tinyusb.org) -/* - * Software License Agreement (BSD License) - * Copyright (c) 2012, hathach (tinyusb.org) - * 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 tinyUSB stack - */ + @section LICENSE + + Software License Agreement (BSD License) + + Copyright (c) 2013, hathach (tinyusb.org) + 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. Neither the name of the copyright holders nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''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 COPYRIGHT HOLDER 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 tinyusb stack. +*/ +/**************************************************************************/ #include "tusb_descriptors.h" @@ -49,12 +50,12 @@ uint8_t app_tusb_keyboard_desc_report[] = { HID_LOGICAL_MIN ( 0 ), HID_LOGICAL_MAX ( 1 ), - HID_REPORT_COUNT ( 8 ), /* 8 bits */ HID_REPORT_SIZE ( 1 ), + HID_REPORT_COUNT ( 8 ), /* 8 bits */ HID_INPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ), /* maskable modifier key */ - HID_REPORT_COUNT ( 1 ), HID_REPORT_SIZE ( 8 ), + HID_REPORT_COUNT ( 1 ), HID_INPUT ( HID_CONSTANT ), /* reserved */ HID_USAGE_PAGE ( HID_USAGE_PAGE_LED ), @@ -64,8 +65,8 @@ uint8_t app_tusb_keyboard_desc_report[] = { HID_REPORT_SIZE ( 1 ), HID_OUTPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ), /* 5-bit Led report */ - HID_REPORT_COUNT ( 1 ), HID_REPORT_SIZE ( 3 ), /* led padding */ + HID_REPORT_COUNT ( 1 ), HID_OUTPUT ( HID_CONSTANT ), HID_USAGE_PAGE (HID_USAGE_PAGE_KEYBOARD), @@ -74,8 +75,8 @@ uint8_t app_tusb_keyboard_desc_report[] = { HID_LOGICAL_MIN ( 0 ), HID_LOGICAL_MAX ( 101 ), - HID_REPORT_COUNT ( 6 ), HID_REPORT_SIZE ( 8 ), + HID_REPORT_COUNT ( 6 ), HID_INPUT ( HID_DATA | HID_ARRAY | HID_ABSOLUTE ), /* keycodes array 6 items */ HID_COLLECTION_END }; @@ -96,13 +97,13 @@ uint8_t app_tusb_mouse_desc_report[] = { HID_LOGICAL_MIN ( 0 ), HID_LOGICAL_MAX ( 1 ), - HID_REPORT_COUNT ( 3 ), /* Left, Right and Middle mouse*/ HID_REPORT_SIZE ( 1 ), + HID_REPORT_COUNT ( 3 ), /* Left, Right and Middle mouse*/ HID_INPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ), - HID_REPORT_COUNT ( 1 ), HID_REPORT_SIZE ( 5 ), - HID_INPUT ( HID_CONSTANT ), /* reserved */ + HID_REPORT_COUNT ( 1 ), + HID_INPUT ( HID_CONSTANT ), /* 5 bit padding followed 3 bit buttons */ HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ), HID_USAGE ( HID_USAGE_DESKTOP_X ), @@ -110,9 +111,17 @@ uint8_t app_tusb_mouse_desc_report[] = { HID_LOGICAL_MIN ( 0x81 ), /* -127 */ HID_LOGICAL_MAX ( 0x7f ), /* 127 */ - HID_REPORT_COUNT ( 2 ), /* X, Y position */ HID_REPORT_SIZE ( 8 ), + HID_REPORT_COUNT ( 2 ), /* X, Y position */ HID_INPUT ( HID_DATA | HID_VARIABLE | HID_RELATIVE ), /* relative values */ + + HID_USAGE ( HID_USAGE_DESKTOP_WHEEL ), /* mouse scroll */ + HID_LOGICAL_MIN ( 0x81 ), /* -127 */ + HID_LOGICAL_MAX ( 0x7f ), /* 127 */ + HID_REPORT_COUNT( 1 ), + HID_REPORT_SIZE ( 8 ), /* 8-bit value */ + HID_INPUT ( HID_DATA | HID_VARIABLE | HID_RELATIVE ), /* relative values */ + HID_COLLECTION_END, HID_COLLECTION_END diff --git a/demos/device/keyboard/tusb_descriptors.h b/demos/device/keyboard/tusb_descriptors.h index 311eb543d..2795d17be 100644 --- a/demos/device/keyboard/tusb_descriptors.h +++ b/demos/device/keyboard/tusb_descriptors.h @@ -1,34 +1,40 @@ -/* - * tusb_descriptors.h - * - * Created on: Nov 26, 2012 - * Author: hathachtware License Agreement (BSD License) - * Copyright (c) 2012, hathach (tinyusb.org)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 tinyUSB stack - */ +/**************************************************************************/ +/*! + @file tusb_descriptors.h + @author hathach (tinyusb.org) + + @section LICENSE + + Software License Agreement (BSD License) + + Copyright (c) 2013, hathach (tinyusb.org) + 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. Neither the name of the copyright holders nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''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 COPYRIGHT HOLDER 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 tinyusb stack. +*/ +/**************************************************************************/ #ifndef _TUSB_DESCRIPTORS_H_ #define _TUSB_DESCRIPTORS_H_ diff --git a/tinyusb/class/hid_device.c b/tinyusb/class/hid_device.c index 20e0d0407..52dc8bdc7 100644 --- a/tinyusb/class/hid_device.c +++ b/tinyusb/class/hid_device.c @@ -59,42 +59,64 @@ typedef struct { uint8_t interface_number; uint8_t idle_rate; // need to be in usb ram - hid_keyboard_report_t report; + hid_keyboard_report_t report; // need to be in usb ram }hidd_interface_t; + +//--------------------------------------------------------------------+ +// KEYBOARD APPLICATION API +//--------------------------------------------------------------------+ #if TUSB_CFG_DEVICE_HID_KEYBOARD STATIC_VAR TUSB_CFG_ATTR_USBRAM hidd_interface_t keyboardd_data = { .p_report_desc = app_tusb_keyboard_desc_report }; -#endif -#if TUSB_CFG_DEVICE_HID_MOUSE -STATIC_VAR TUSB_CFG_ATTR_USBRAM hidd_interface_t moused_data = -{ - .p_report_desc = app_tusb_mouse_desc_report -}; -#endif - - -//--------------------------------------------------------------------+ -// APPLICATION API -//--------------------------------------------------------------------+ bool tusbd_hid_keyboard_is_busy(uint8_t coreid) { return dcd_pipe_is_busy(keyboardd_data.ept_handle); } -tusb_error_t tusbd_hid_keyboard_send(uint8_t coreid, hid_keyboard_report_t const *p_kbd_report) +tusb_error_t tusbd_hid_keyboard_send(uint8_t coreid, hid_keyboard_report_t const *p_report) { //------------- verify data -------------// hidd_interface_t * p_kbd = &keyboardd_data; // TODO &keyboardd_data[coreid]; - ASSERT_STATUS( dcd_pipe_xfer(p_kbd->ept_handle, p_kbd_report, sizeof(hid_keyboard_report_t), false) ) ; + ASSERT_STATUS( dcd_pipe_xfer(p_kbd->ept_handle, p_report, sizeof(hid_keyboard_report_t), false) ) ; return TUSB_ERROR_NONE; } +#endif + +//--------------------------------------------------------------------+ +// MOUSE APPLICATION API +//--------------------------------------------------------------------+ +#if TUSB_CFG_DEVICE_HID_MOUSE +STATIC_VAR TUSB_CFG_ATTR_USBRAM hidd_interface_t moused_data = +{ + .p_report_desc = app_tusb_mouse_desc_report +}; + +bool tusbd_hid_mouse_is_busy(uint8_t coreid) +{ + return dcd_pipe_is_busy(moused_data.ept_handle); +} + + +tusb_error_t tusbd_hid_mouse_send(uint8_t coreid, hid_mouse_report_t const *p_report) +{ + //------------- verify data -------------// + + hidd_interface_t * p_mouse = &moused_data; // TODO &keyboardd_data[coreid]; + + ASSERT_STATUS( dcd_pipe_xfer(p_mouse->ept_handle, p_report, sizeof(hid_mouse_report_t), false) ) ; + + return TUSB_ERROR_NONE; +} + +#endif + //--------------------------------------------------------------------+ // USBD-CLASS API @@ -105,7 +127,7 @@ tusb_error_t hidd_control_request(uint8_t coreid, tusb_control_request_t const * #if TUSB_CFG_DEVICE_HID_KEYBOARD (p_request->wIndex == keyboardd_data.interface_number) ? &keyboardd_data : #endif - #if TUSB_CFG_DEVICE_HID_KEYBOARD + #if TUSB_CFG_DEVICE_HID_MOUSE (p_request->wIndex == moused_data.interface_number) ? &moused_data : #endif NULL; @@ -183,8 +205,8 @@ tusb_error_t hidd_open(uint8_t coreid, tusb_descriptor_interface_t const * p_int // memclr_(&keyboardd_data, sizeof(hidd_interface_t)); keyboardd_data.interface_number = p_interface_desc->bInterfaceNumber; - keyboardd_data.report_length = p_desc_hid->wReportLength; - keyboardd_data.ept_handle = dcd_pipe_open(coreid, p_desc_endpoint); + keyboardd_data.report_length = p_desc_hid->wReportLength; + keyboardd_data.ept_handle = dcd_pipe_open(coreid, p_desc_endpoint); ASSERT( endpointhandle_is_valid(keyboardd_data.ept_handle), TUSB_ERROR_DCD_FAILED); break; #endif @@ -192,8 +214,8 @@ tusb_error_t hidd_open(uint8_t coreid, tusb_descriptor_interface_t const * p_int #if TUSB_CFG_DEVICE_HID_MOUSE case HID_PROTOCOL_MOUSE: moused_data.interface_number = p_interface_desc->bInterfaceNumber; - moused_data.report_length = p_desc_hid->wReportLength; - moused_data.ept_handle = dcd_pipe_open(coreid, p_desc_endpoint); + moused_data.report_length = p_desc_hid->wReportLength; + moused_data.ept_handle = dcd_pipe_open(coreid, p_desc_endpoint); ASSERT( endpointhandle_is_valid(moused_data.ept_handle), TUSB_ERROR_DCD_FAILED); break; #endif diff --git a/tinyusb/class/hid_device.h b/tinyusb/class/hid_device.h index 9cf65af58..c3b0f041a 100644 --- a/tinyusb/class/hid_device.h +++ b/tinyusb/class/hid_device.h @@ -100,7 +100,9 @@ void tusbd_hid_keyboard_isr(uint8_t coreid, tusb_event_t event); /** \defgroup Mouse_Device Device * @{ */ -tusb_error_t tusbd_hid_mouse_send(uint8_t coreid, hid_mouse_report_t const *p_mouse_report); +bool tusbd_hid_mouse_is_busy(uint8_t coreid); + +tusb_error_t tusbd_hid_mouse_send(uint8_t coreid, hid_mouse_report_t const *p_report); /** @} */ /** @} */ diff --git a/tinyusb/device/dcd_lpc43xx.c b/tinyusb/device/dcd_lpc43xx.c index f10383d9c..213de5a6c 100644 --- a/tinyusb/device/dcd_lpc43xx.c +++ b/tinyusb/device/dcd_lpc43xx.c @@ -122,7 +122,7 @@ typedef struct { }dcd_data_t; -ATTR_ALIGNED(2048) dcd_data_t dcd_data; +ATTR_ALIGNED(2048) dcd_data_t dcd_data TUSB_CFG_ATTR_USBRAM; //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION @@ -200,6 +200,14 @@ void bus_reset(uint8_t coreid) { // TODO mutliple core id support + // The reset value for all endpoint types is the control endpoint. If one endpoint + //direction is enabled and the paired endpoint of opposite direction is disabled, then the + //endpoint type of the unused direction must bechanged from the control type to any other + //type (e.g. bulk). Leaving an unconfigured endpoint control will cause undefined behavior + //for the data PID tracking on the active endpoint. + LPC_USB0->ENDPTCTRL1 = LPC_USB0->ENDPTCTRL2 = LPC_USB0->ENDPTCTRL3 = LPC_USB0->ENDPTCTRL4 = LPC_USB0->ENDPTCTRL5 = + (TUSB_XFER_BULK << 2) | (TUSB_XFER_BULK << 18); + //------------- Clear All Registers -------------// LPC_USB0->ENDPTNAK = LPC_USB0->ENDPTNAK; LPC_USB0->ENDPTNAKEN = 0; @@ -327,7 +335,7 @@ endpoint_handle_t dcd_pipe_open(uint8_t coreid, tusb_descriptor_endpoint_t const //------------- Endpoint Control Register -------------// volatile uint32_t * reg_control = (&LPC_USB0->ENDPTCTRL0) + (p_endpoint_desc->bEndpointAddress & 0x0f); - (*reg_control) = ((p_endpoint_desc->bmAttributes.xfer << 2) | ENDPTCTRL_MASK_ENABLE | ENDPTCTRL_MASK_TOGGLE_RESET) << ((p_endpoint_desc->bEndpointAddress & TUSB_DIR_DEV_TO_HOST_MASK) ? 16 : 0); + (*reg_control) |= ((p_endpoint_desc->bmAttributes.xfer << 2) | ENDPTCTRL_MASK_ENABLE | ENDPTCTRL_MASK_TOGGLE_RESET) << ((p_endpoint_desc->bEndpointAddress & TUSB_DIR_DEV_TO_HOST_MASK) ? 16 : 0); return (endpoint_handle_t) { .coreid = coreid, .xfer_type = p_endpoint_desc->bmAttributes.xfer, .index = ep_idx }; } @@ -383,7 +391,7 @@ void dcd_isr(uint8_t coreid) if (int_status & INT_MASK_USB) { if (LPC_USB0->ENDPTSETUPSTAT) - { + { // 23.10.10.2 Operational model for setup transfers tusb_control_request_t control_request = dcd_data.qhd[0].setup_request; LPC_USB0->ENDPTSETUPSTAT = LPC_USB0->ENDPTSETUPSTAT; @@ -392,7 +400,8 @@ void dcd_isr(uint8_t coreid) if (LPC_USB0->ENDPTCOMPLETE) { -// TransferCompleteISR(DeviceID); +// hal_debugger_breakpoint(); + LPC_USB0->ENDPTCOMPLETE = LPC_USB0->ENDPTCOMPLETE; } } diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c index bf202f6d8..521e1f6b4 100644 --- a/tinyusb/device/usbd.c +++ b/tinyusb/device/usbd.c @@ -146,6 +146,7 @@ tusb_error_t usbh_set_configure_received(uint8_t coreid, uint8_t config_number) } #endif + return TUSB_ERROR_NONE; } void usbd_setup_received_isr(uint8_t coreid, tusb_control_request_t * p_request) diff --git a/tinyusb/device/usbd.h b/tinyusb/device/usbd.h index 39bbceee0..be389f182 100644 --- a/tinyusb/device/usbd.h +++ b/tinyusb/device/usbd.h @@ -50,11 +50,9 @@ // INCLUDE //--------------------------------------------------------------------+ #include "common/common.h" -#include "osal/osal.h" // TODO refractor move to common.h ? +#include "osal/osal.h" +#include "dcd.h" -#ifdef _TINY_USB_SOURCE_FILE_ -#include "dcd.h" // TODO hide from application include -#endif //#include "tusb_descriptors.h" #ifdef __cplusplus