From 81935c91e98e76108d045df2581772c3a34a99ce Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 10 Apr 2018 14:43:13 +0700 Subject: [PATCH] rename CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE to CFG_TUSB_DEVICE_ENDOINT0_SIZE --- doxygen/configuration.txt | 2 +- .../device_virtual_com/src/tusb_config.h | 16 ++++---- .../device_virtual_com/src/tusb_descriptors.c | 2 +- examples/device/nrf52840/src/tusb_config.h | 21 +++++----- .../device/nrf52840/src/tusb_descriptors.c | 2 +- examples/obsolete/device/src/tusb_config.h | 14 +++---- .../obsolete/device/src/tusb_descriptors.c | 2 +- examples/obsolete/host/src/tusb_config.h | 18 ++++----- tests/support/tusb_config.h | 32 +++++++-------- tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c | 6 +-- .../nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c | 2 +- tinyusb/tusb_option.h | 39 +++++++++++-------- 12 files changed, 80 insertions(+), 76 deletions(-) diff --git a/doxygen/configuration.txt b/doxygen/configuration.txt index 8f588771..de373c53 100644 --- a/doxygen/configuration.txt +++ b/doxygen/configuration.txt @@ -57,7 +57,7 @@ /** \defgroup CFG_TUSB_DEVICE Device Options * @{ */ -#define CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE ///< Max packet size of Cotnrol Endpoint, default is 64 +#define CFG_TUSB_DEVICE_ENDOINT0_SIZE ///< Max packet size of Cotnrol Endpoint, default is 64 /// Application MUST define this variable and initialize its pointers's member to all required USB descriptors including /// Device Descriptor, Configuration Descriptor, String Descriptors, HID Report Descriptors etc ... diff --git a/examples/device/device_virtual_com/src/tusb_config.h b/examples/device/device_virtual_com/src/tusb_config.h index d0737de1..d5139e38 100644 --- a/examples/device/device_virtual_com/src/tusb_config.h +++ b/examples/device/device_virtual_com/src/tusb_config.h @@ -54,23 +54,23 @@ //--------------------------------------------------------------------+ // DEVICE CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE 64 +#define CFG_TUSB_DEVICE_ENDOINT0_SIZE 64 //------------- CLASS -------------// -#define CFG_TUSB_DEVICE_HID_KEYBOARD 0 -#define CFG_TUSB_DEVICE_HID_MOUSE 0 -#define CFG_TUSB_DEVICE_HID_GENERIC 0 // not supported yet -#define CFG_TUSB_DEVICE_MSC 0 -#define CFG_TUSB_DEVICE_CDC 1 +#define CFG_TUSB_DEVICE_HID_KEYBOARD 0 +#define CFG_TUSB_DEVICE_HID_MOUSE 0 +#define CFG_TUSB_DEVICE_HID_GENERIC 0 // not supported yet +#define CFG_TUSB_DEVICE_MSC 0 +#define CFG_TUSB_DEVICE_CDC 1 //--------------------------------------------------------------------+ // COMMON CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_DEBUG 2 +#define CFG_TUSB_DEBUG 2 //#define CFG_TUSB_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching //#define CFG_TUSB_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching -#define CFG_TUSB_TICKS_HZ 1000 +#define CFG_TUSB_TICKS_HZ 1000 //#define CFG_TUSB_OS TUSB_OS_NONE diff --git a/examples/device/device_virtual_com/src/tusb_descriptors.c b/examples/device/device_virtual_com/src/tusb_descriptors.c index f0867585..6a057d0a 100644 --- a/examples/device/device_virtual_com/src/tusb_descriptors.c +++ b/examples/device/device_virtual_com/src/tusb_descriptors.c @@ -53,7 +53,7 @@ tusb_desc_device_t const desc_device = .bDeviceSubClass = MISC_SUBCLASS_COMMON, .bDeviceProtocol = MISC_PROTOCOL_IAD, - .bMaxPacketSize0 = CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE, + .bMaxPacketSize0 = CFG_TUSB_DEVICE_ENDOINT0_SIZE, .idVendor = CFG_VENDORID, .idProduct = CFG_PRODUCTID, diff --git a/examples/device/nrf52840/src/tusb_config.h b/examples/device/nrf52840/src/tusb_config.h index 54ec51cc..75d137d1 100644 --- a/examples/device/nrf52840/src/tusb_config.h +++ b/examples/device/nrf52840/src/tusb_config.h @@ -48,29 +48,28 @@ //--------------------------------------------------------------------+ //#define CFG_TUSB_MCU will be passed from IDE/command line for easy board/mcu switching -#define CFG_TUSB_CONTROLLER_0_MODE (TUSB_MODE_DEVICE) -//#define CFG_TUSB_CONTROLLER_1_MODE (TUSB_MODE_DEVICE) +#define CFG_TUSB_CONTROLLER_0_MODE (TUSB_MODE_DEVICE) //--------------------------------------------------------------------+ // DEVICE CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE 64 +#define CFG_TUSB_DEVICE_ENDOINT0_SIZE 64 //------------- CLASS -------------// -#define CFG_TUSB_DEVICE_HID_KEYBOARD 0 -#define CFG_TUSB_DEVICE_HID_MOUSE 0 -#define CFG_TUSB_DEVICE_HID_GENERIC 0 // not supported yet -#define CFG_TUSB_DEVICE_MSC 1 -#define CFG_TUSB_DEVICE_CDC 1 +#define CFG_TUSB_DEVICE_HID_KEYBOARD 0 +#define CFG_TUSB_DEVICE_HID_MOUSE 0 +#define CFG_TUSB_DEVICE_HID_GENERIC 0 // not supported yet +#define CFG_TUSB_DEVICE_MSC 1 +#define CFG_TUSB_DEVICE_CDC 1 //--------------------------------------------------------------------+ // COMMON CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_DEBUG 2 +#define CFG_TUSB_DEBUG 2 -#define CFG_TUSB_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching +#define CFG_TUSB_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching //#define CFG_TUSB_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching -#define CFG_TUSB_TICKS_HZ 1000 +#define CFG_TUSB_TICKS_HZ 1000 //#define CFG_TUSB_OS TUSB_OS_NONE diff --git a/examples/device/nrf52840/src/tusb_descriptors.c b/examples/device/nrf52840/src/tusb_descriptors.c index 99a47618..b8f0a89d 100644 --- a/examples/device/nrf52840/src/tusb_descriptors.c +++ b/examples/device/nrf52840/src/tusb_descriptors.c @@ -53,7 +53,7 @@ tusb_desc_device_t const desc_device = .bDeviceSubClass = MISC_SUBCLASS_COMMON, .bDeviceProtocol = MISC_PROTOCOL_IAD, - .bMaxPacketSize0 = CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE, + .bMaxPacketSize0 = CFG_TUSB_DEVICE_ENDOINT0_SIZE, .idVendor = CFG_VENDORID, .idProduct = CFG_PRODUCTID, diff --git a/examples/obsolete/device/src/tusb_config.h b/examples/obsolete/device/src/tusb_config.h index 6a841d28..abbb8f6f 100644 --- a/examples/obsolete/device/src/tusb_config.h +++ b/examples/obsolete/device/src/tusb_config.h @@ -54,19 +54,19 @@ //--------------------------------------------------------------------+ // DEVICE CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE 64 +#define CFG_TUSB_DEVICE_ENDOINT0_SIZE 64 //------------- CLASS -------------// -#define CFG_TUSB_DEVICE_HID_KEYBOARD 1 -#define CFG_TUSB_DEVICE_HID_MOUSE 1 -#define CFG_TUSB_DEVICE_HID_GENERIC 0 // not supported yet -#define CFG_TUSB_DEVICE_MSC 1 -#define CFG_TUSB_DEVICE_CDC 1 +#define CFG_TUSB_DEVICE_HID_KEYBOARD 1 +#define CFG_TUSB_DEVICE_HID_MOUSE 1 +#define CFG_TUSB_DEVICE_HID_GENERIC 0 // not supported yet +#define CFG_TUSB_DEVICE_MSC 1 +#define CFG_TUSB_DEVICE_CDC 1 //--------------------------------------------------------------------+ // COMMON CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_DEBUG 2 +#define CFG_TUSB_DEBUG 2 //#define CFG_TUSB_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching //#define CFG_TUSB_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching diff --git a/examples/obsolete/device/src/tusb_descriptors.c b/examples/obsolete/device/src/tusb_descriptors.c index ca71d60e..75ea1a88 100644 --- a/examples/obsolete/device/src/tusb_descriptors.c +++ b/examples/obsolete/device/src/tusb_descriptors.c @@ -152,7 +152,7 @@ tusb_desc_device_t const desc_device = .bDeviceProtocol = 0x00, #endif - .bMaxPacketSize0 = CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE, + .bMaxPacketSize0 = CFG_TUSB_DEVICE_ENDOINT0_SIZE, .idVendor = CFG_VENDORID, .idProduct = CFG_PRODUCTID, diff --git a/examples/obsolete/host/src/tusb_config.h b/examples/obsolete/host/src/tusb_config.h index 501f6304..02ce4f8f 100644 --- a/examples/obsolete/host/src/tusb_config.h +++ b/examples/obsolete/host/src/tusb_config.h @@ -47,26 +47,26 @@ // CONTROLLER CONFIGURATION //--------------------------------------------------------------------+ //#define CFG_TUSB_MCU will be passed from IDE for easy board/mcu switching -#define CFG_TUSB_CONTROLLER_0_MODE (TUSB_MODE_HOST) +#define CFG_TUSB_CONTROLLER_0_MODE (TUSB_MODE_HOST) //--------------------------------------------------------------------+ // HOST CONFIGURATION //--------------------------------------------------------------------+ //------------- CLASS -------------// -#define CFG_TUSB_HOST_HUB 1 -#define CFG_TUSB_HOST_HID_KEYBOARD 1 -#define CFG_TUSB_HOST_HID_MOUSE 1 -#define CFG_TUSB_HOST_HID_GENERIC 0 // (not yet supported) -#define CFG_TUSB_HOST_MSC 1 -#define CFG_TUSB_HOST_CDC 1 +#define CFG_TUSB_HOST_HUB 1 +#define CFG_TUSB_HOST_HID_KEYBOARD 1 +#define CFG_TUSB_HOST_HID_MOUSE 1 +#define CFG_TUSB_HOST_HID_GENERIC 0 // (not yet supported) +#define CFG_TUSB_HOST_MSC 1 +#define CFG_TUSB_HOST_CDC 1 -#define CFG_TUSB_HOST_DEVICE_MAX (CFG_TUSB_HOST_HUB ? 5 : 1) // normal hub has 4 ports +#define CFG_TUSB_HOST_DEVICE_MAX (CFG_TUSB_HOST_HUB ? 5 : 1) // normal hub has 4 ports //--------------------------------------------------------------------+ // COMMON CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_DEBUG 2 +#define CFG_TUSB_DEBUG 2 //#define CFG_TUSB_OS TUSB_OS_NONE // defined using eclipse build //#define CFG_TUSB_OS_TASK_PRIO 0 // defined using eclipse build diff --git a/tests/support/tusb_config.h b/tests/support/tusb_config.h index 964f3a03..62d1f681 100644 --- a/tests/support/tusb_config.h +++ b/tests/support/tusb_config.h @@ -46,22 +46,22 @@ //--------------------------------------------------------------------+ // CONTROLLER CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_CONTROLLER_0_MODE (TUSB_MODE_HOST | TUSB_MODE_DEVICE) -#define CFG_TUSB_CONTROLLER_1_MODE (TUSB_MODE_NONE) +#define CFG_TUSB_CONTROLLER_0_MODE (TUSB_MODE_HOST | TUSB_MODE_DEVICE) +#define CFG_TUSB_CONTROLLER_1_MODE (TUSB_MODE_NONE) //--------------------------------------------------------------------+ // HOST CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_HOST_DEVICE_MAX 5 // TODO be a part of HUB config +#define CFG_TUSB_HOST_DEVICE_MAX 5 // TODO be a part of HUB config //------------- CLASS -------------// -#define CFG_TUSB_HOST_HUB 0 -#define CFG_TUSB_HOST_HID_KEYBOARD 1 -#define CFG_TUSB_HOST_HID_MOUSE 1 -#define CFG_TUSB_HOST_HID_GENERIC 0 -#define CFG_TUSB_HOST_MSC 1 -#define CFG_TUSB_HOST_CDC 1 -#define CFG_TUSB_HOST_CDC_RNDIS 0 +#define CFG_TUSB_HOST_HUB 0 +#define CFG_TUSB_HOST_HID_KEYBOARD 1 +#define CFG_TUSB_HOST_HID_MOUSE 1 +#define CFG_TUSB_HOST_MSC 1 +#define CFG_TUSB_HOST_HID_GENERIC 0 +#define CFG_TUSB_HOST_CDC 1 +#define CFG_TUSB_HOST_CDC_RNDIS 0 // Test support #define TEST_CONTROLLER_HOST_START_INDEX \ @@ -70,14 +70,14 @@ //--------------------------------------------------------------------+ // DEVICE CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE 64 +#define CFG_TUSB_DEVICE_ENDOINT0_SIZE 64 //------------- CLASS -------------// -#define CFG_TUSB_DEVICE_HID_KEYBOARD 1 -#define CFG_TUSB_DEVICE_HID_MOUSE 1 -#define CFG_TUSB_DEVICE_HID_GENERIC 0 -#define CFG_TUSB_DEVICE_MSC 1 -#define CFG_TUSB_DEVICE_CDC 1 +#define CFG_TUSB_DEVICE_HID_KEYBOARD 1 +#define CFG_TUSB_DEVICE_HID_MOUSE 1 +#define CFG_TUSB_DEVICE_HID_GENERIC 0 +#define CFG_TUSB_DEVICE_MSC 1 +#define CFG_TUSB_DEVICE_CDC 1 //--------------------------------------------------------------------+ diff --git a/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c b/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c index 73645631..9061aab5 100644 --- a/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c +++ b/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c @@ -128,8 +128,8 @@ bool dcd_init(uint8_t rhport) //------------- user manual 11.13 usb device controller initialization -------------// LPC_USB->USBEpInd = 0; // step 6 : set up control endpoint - edpt_set_max_packet_size(0, CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE); - edpt_set_max_packet_size(1, CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE); + edpt_set_max_packet_size(0, CFG_TUSB_DEVICE_ENDOINT0_SIZE); + edpt_set_max_packet_size(1, CFG_TUSB_DEVICE_ENDOINT0_SIZE); bus_reset(); @@ -312,7 +312,7 @@ static inline uint16_t length_byte2dword(uint16_t length_in_bytes) static tusb_error_t pipe_control_xfer(uint8_t ep_id, uint8_t* p_buffer, uint16_t length) { - uint16_t const packet_len = min16_of(length, CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE); + uint16_t const packet_len = min16_of(length, CFG_TUSB_DEVICE_ENDOINT0_SIZE); if (ep_id) { diff --git a/tinyusb/portable/nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c b/tinyusb/portable/nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c index df572761..e4d01e2f 100644 --- a/tinyusb/portable/nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c +++ b/tinyusb/portable/nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c @@ -138,7 +138,7 @@ static void bus_reset(uint8_t rhport) //------------- Set up Control Endpoints (0 OUT, 1 IN) -------------// p_dcd->qhd[0].zero_length_termination = p_dcd->qhd[1].zero_length_termination = 1; - p_dcd->qhd[0].max_package_size = p_dcd->qhd[1].max_package_size = CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE; + p_dcd->qhd[0].max_package_size = p_dcd->qhd[1].max_package_size = CFG_TUSB_DEVICE_ENDOINT0_SIZE; p_dcd->qhd[0].qtd_overlay.next = p_dcd->qhd[1].qtd_overlay.next = QTD_NEXT_INVALID; p_dcd->qhd[0].int_on_setup = 1; // OUT only diff --git a/tinyusb/tusb_option.h b/tinyusb/tusb_option.h index a1ce5a27..1c83abc5 100644 --- a/tinyusb/tusb_option.h +++ b/tinyusb/tusb_option.h @@ -143,6 +143,28 @@ #define tu_free free #endif +//--------------------------------------------------------------------+ +// DEVICE OPTIONS +//--------------------------------------------------------------------+ +#if MODE_DEVICE_SUPPORTED + + #define DEVICE_CLASS_HID ( CFG_TUSB_DEVICE_HID_KEYBOARD + CFG_TUSB_DEVICE_HID_MOUSE + CFG_TUSB_DEVICE_HID_GENERIC ) + + #ifndef CFG_TUSB_DEVICE_ENDOINT0_SIZE + #define CFG_TUSB_DEVICE_ENDOINT0_SIZE 64 + #endif + + + #if CFG_TUSB_DEVICE_ENDOINT0_SIZE > 64 + #error Control Endpoint Max Package Size cannot larger than 64 + #endif + + #ifndef CFG_TUSB_DEVICE_ENUM_BUFFER_SIZE + #define CFG_TUSB_DEVICE_ENUM_BUFFER_SIZE 256 + #endif + +#endif // MODE_DEVICE_SUPPORTED + //--------------------------------------------------------------------+ // HOST OPTIONS //--------------------------------------------------------------------+ @@ -170,23 +192,6 @@ //------------- CLASS -------------// #endif // MODE_HOST_SUPPORTED -//--------------------------------------------------------------------+ -// DEVICE OPTIONS -//--------------------------------------------------------------------+ -#if MODE_DEVICE_SUPPORTED - - #define DEVICE_CLASS_HID ( CFG_TUSB_DEVICE_HID_KEYBOARD + CFG_TUSB_DEVICE_HID_MOUSE + CFG_TUSB_DEVICE_HID_GENERIC ) - - #if CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE > 64 - #error Control Endpoint Max Package Size cannot larger than 64 - #endif - - #ifndef CFG_TUSB_DEVICE_ENUM_BUFFER_SIZE - #define CFG_TUSB_DEVICE_ENUM_BUFFER_SIZE 256 - #endif - -#endif // MODE_DEVICE_SUPPORTED - #endif /* _TUSB_TUSB_OPTION_H_ */ /** @} */