From 4b660175beea2c76a1a761e3840937d9784ab201 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 12 Apr 2018 13:23:52 +0700 Subject: rename CFG_TUSB_DEVICE_* to CFG_TUD_* --- tinyusb/class/cdc/cdc_device.c | 2 +- tinyusb/class/hid/hid_device.c | 8 ++++---- tinyusb/class/msc/msc_device.c | 2 +- tinyusb/device/usbd.c | 8 ++++---- tinyusb/device/usbd.h | 4 ++-- tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c | 6 +++--- tinyusb/portable/nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c | 2 +- tinyusb/portable/nxp/lpc43xx_lpc18xx/hal_lpc43xx.c | 2 +- tinyusb/tusb.h | 4 ++-- tinyusb/tusb_option.h | 12 ++++++------ 10 files changed, 25 insertions(+), 25 deletions(-) (limited to 'tinyusb') diff --git a/tinyusb/class/cdc/cdc_device.c b/tinyusb/class/cdc/cdc_device.c index c0a5ff6cf..26994362b 100644 --- a/tinyusb/class/cdc/cdc_device.c +++ b/tinyusb/class/cdc/cdc_device.c @@ -38,7 +38,7 @@ #include "tusb_option.h" -#if (MODE_DEVICE_SUPPORTED && CFG_TUSB_DEVICE_CDC) +#if (MODE_DEVICE_SUPPORTED && CFG_TUD_CDC) #define _TINY_USB_SOURCE_FILE_ //--------------------------------------------------------------------+ diff --git a/tinyusb/class/hid/hid_device.c b/tinyusb/class/hid/hid_device.c index da296260e..a6080e69d 100644 --- a/tinyusb/class/hid/hid_device.c +++ b/tinyusb/class/hid/hid_device.c @@ -78,7 +78,7 @@ static hidd_class_driver_t const hidd_class_driver[HIDD_NUMBER_OF_SUBCLASS] = { // [HID_PROTOCOL_NONE] = for HID Generic -#if CFG_TUSB_DEVICE_HID_KEYBOARD +#if CFG_TUD_HID_KEYBOARD [HID_PROTOCOL_KEYBOARD] = { .p_interface = &keyboardd_data, @@ -88,7 +88,7 @@ static hidd_class_driver_t const hidd_class_driver[HIDD_NUMBER_OF_SUBCLASS] = }, #endif -#if CFG_TUSB_DEVICE_HID_MOUSE +#if CFG_TUD_HID_MOUSE [HID_PROTOCOL_MOUSE] = { .p_interface = &moused_data, @@ -105,7 +105,7 @@ CFG_TUSB_ATTR_USBRAM STATIC_VAR uint8_t m_hid_buffer[ HIDD_BUFFER_SIZE ]; //--------------------------------------------------------------------+ // KEYBOARD APPLICATION API //--------------------------------------------------------------------+ -#if CFG_TUSB_DEVICE_HID_KEYBOARD +#if CFG_TUD_HID_KEYBOARD STATIC_VAR hidd_interface_t keyboardd_data; bool tud_hid_keyboard_busy(uint8_t rhport) @@ -128,7 +128,7 @@ tusb_error_t tud_hid_keyboard_send(uint8_t rhport, hid_keyboard_report_t const * //--------------------------------------------------------------------+ // MOUSE APPLICATION API //--------------------------------------------------------------------+ -#if CFG_TUSB_DEVICE_HID_MOUSE +#if CFG_TUD_HID_MOUSE STATIC_VAR hidd_interface_t moused_data; bool tud_hid_mouse_is_busy(uint8_t rhport) diff --git a/tinyusb/class/msc/msc_device.c b/tinyusb/class/msc/msc_device.c index 4c0659292..afb341f61 100644 --- a/tinyusb/class/msc/msc_device.c +++ b/tinyusb/class/msc/msc_device.c @@ -38,7 +38,7 @@ #include "tusb_option.h" -#if (MODE_DEVICE_SUPPORTED && CFG_TUSB_DEVICE_MSC) +#if (MODE_DEVICE_SUPPORTED && CFG_TUD_MSC) #define _TINY_USB_SOURCE_FILE_ //--------------------------------------------------------------------+ diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c index 8929212a7..4a13f471a 100644 --- a/tinyusb/device/usbd.c +++ b/tinyusb/device/usbd.c @@ -76,7 +76,7 @@ typedef struct { // MACRO CONSTANT TYPEDEF //--------------------------------------------------------------------+ usbd_device_info_t usbd_devices[CONTROLLER_DEVICE_NUMBER]; -CFG_TUSB_ATTR_USBRAM CFG_TUSB_MEM_ALIGN uint8_t usbd_enum_buffer[CFG_TUSB_DEVICE_ENUM_BUFFER_SIZE]; +CFG_TUSB_ATTR_USBRAM CFG_TUSB_MEM_ALIGN uint8_t usbd_enum_buffer[CFG_TUD_ENUM_BUFFER_SIZE]; static usbd_class_driver_t const usbd_class_drivers[] = { @@ -93,7 +93,7 @@ static usbd_class_driver_t const usbd_class_drivers[] = }, #endif - #if CFG_TUSB_DEVICE_MSC + #if CFG_TUD_MSC [TUSB_CLASS_MSC] = { .init = mscd_init, @@ -106,7 +106,7 @@ static usbd_class_driver_t const usbd_class_drivers[] = }, #endif - #if CFG_TUSB_DEVICE_CDC + #if CFG_TUD_CDC [TUSB_CLASS_CDC] = { .init = cdcd_init, @@ -489,7 +489,7 @@ static uint16_t get_descriptor(uint8_t rhport, tusb_control_request_t const * co // up to Host's length len = min16_of(p_request->wLength, len ); - TU_ASSERT( len <= CFG_TUSB_DEVICE_ENUM_BUFFER_SIZE, 0); + TU_ASSERT( len <= CFG_TUD_ENUM_BUFFER_SIZE, 0); memcpy(usbd_enum_buffer, desc_data, len); (*pp_buffer) = usbd_enum_buffer; diff --git a/tinyusb/device/usbd.h b/tinyusb/device/usbd.h index 3f8fc1be9..d6955ffc7 100644 --- a/tinyusb/device/usbd.h +++ b/tinyusb/device/usbd.h @@ -63,8 +63,8 @@ typedef struct { uint8_t const * p_configuration; ///< pointer to the whole configuration descriptor, starting by \ref tusb_desc_configuration_t uint8_t const** p_string_arr; ///< a array of pointers to string descriptors - uint8_t const * p_hid_keyboard_report; ///< pointer to HID report descriptor of Keybaord interface. Only needed if CFG_TUSB_DEVICE_HID_KEYBOARD is enabled - uint8_t const * p_hid_mouse_report; ///< pointer to HID report descriptor of Mouse interface. Only needed if CFG_TUSB_DEVICE_HID_MOUSE is enabled + uint8_t const * p_hid_keyboard_report; ///< pointer to HID report descriptor of Keybaord interface. Only needed if CFG_TUD_HID_KEYBOARD is enabled + uint8_t const * p_hid_mouse_report; ///< pointer to HID report descriptor of Mouse interface. Only needed if CFG_TUD_HID_MOUSE is enabled }tusbd_descriptor_pointer_t; // define by application diff --git a/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c b/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c index 0a6ad97ed..09325ab88 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_ENDOINT0_SIZE); - edpt_set_max_packet_size(1, CFG_TUSB_DEVICE_ENDOINT0_SIZE); + edpt_set_max_packet_size(0, CFG_TUD_ENDOINT0_SIZE); + edpt_set_max_packet_size(1, CFG_TUD_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_ENDOINT0_SIZE); + uint16_t const packet_len = min16_of(length, CFG_TUD_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 460e305ac..084231b14 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_ENDOINT0_SIZE; + p_dcd->qhd[0].max_package_size = p_dcd->qhd[1].max_package_size = CFG_TUD_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/portable/nxp/lpc43xx_lpc18xx/hal_lpc43xx.c b/tinyusb/portable/nxp/lpc43xx_lpc18xx/hal_lpc43xx.c index 80e26cb42..65895b5dd 100644 --- a/tinyusb/portable/nxp/lpc43xx_lpc18xx/hal_lpc43xx.c +++ b/tinyusb/portable/nxp/lpc43xx_lpc18xx/hal_lpc43xx.c @@ -98,7 +98,7 @@ bool tusb_hal_init(void) #else // TODO OTG LPC_USB0->USBMODE_D = LPC43XX_USBMODE_DEVICE; LPC_USB0->OTGSC = (1<<3) | (1<<0) /*| (1<<16)| (1<<24)| (1<<25)| (1<<26)| (1<<27)| (1<<28)| (1<<29)| (1<<30)*/; - #if CFG_TUSB_DEVICE_FULLSPEED // TODO for easy testing + #if CFG_TUD_FULLSPEED // TODO for easy testing LPC_USB0->PORTSC1_D |= (1<<24); // force full speed #endif #endif diff --git a/tinyusb/tusb.h b/tinyusb/tusb.h index f469ca33e..f719e159d 100644 --- a/tinyusb/tusb.h +++ b/tinyusb/tusb.h @@ -80,11 +80,11 @@ #include "class/hid/hid_device.h" #endif - #if CFG_TUSB_DEVICE_CDC + #if CFG_TUD_CDC #include "class/cdc/cdc_device.h" #endif - #if CFG_TUSB_DEVICE_MSC + #if CFG_TUD_MSC #include "class/msc/msc_device.h" #endif #endif diff --git a/tinyusb/tusb_option.h b/tinyusb/tusb_option.h index 060850f82..2777dfbb3 100644 --- a/tinyusb/tusb_option.h +++ b/tinyusb/tusb_option.h @@ -157,19 +157,19 @@ //--------------------------------------------------------------------+ #if MODE_DEVICE_SUPPORTED - #define DEVICE_CLASS_HID ( CFG_TUSB_DEVICE_HID_KEYBOARD + CFG_TUSB_DEVICE_HID_MOUSE + CFG_TUSB_DEVICE_HID_GENERIC ) + #define DEVICE_CLASS_HID ( CFG_TUD_HID_KEYBOARD + CFG_TUD_HID_MOUSE + CFG_TUD_HID_GENERIC ) - #ifndef CFG_TUSB_DEVICE_ENDOINT0_SIZE - #define CFG_TUSB_DEVICE_ENDOINT0_SIZE 64 + #ifndef CFG_TUD_ENDOINT0_SIZE + #define CFG_TUD_ENDOINT0_SIZE 64 #endif - #if CFG_TUSB_DEVICE_ENDOINT0_SIZE > 64 + #if CFG_TUD_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 + #ifndef CFG_TUD_ENUM_BUFFER_SIZE + #define CFG_TUD_ENUM_BUFFER_SIZE 256 #endif #endif // MODE_DEVICE_SUPPORTED -- cgit v1.3.1