From 81935c91e98e76108d045df2581772c3a34a99ce Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 10 Apr 2018 14:43:13 +0700 Subject: rename CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE to CFG_TUSB_DEVICE_ENDOINT0_SIZE --- tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c | 6 ++-- tinyusb/portable/nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c | 2 +- tinyusb/tusb_option.h | 39 ++++++++++++---------- 3 files changed, 26 insertions(+), 21 deletions(-) (limited to 'tinyusb') diff --git a/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c b/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c index 73645631e..9061aab55 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 df572761a..e4d01e2fe 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 a1ce5a273..1c83abc50 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_ */ /** @} */ -- cgit v1.3.1