From 3c2467196070eeedd4171e183db04fb815677246 Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 10 Apr 2018 14:31:11 +0700 Subject: mass rename TUSB_CFG to CFG_TUSB --- tinyusb/device/usbd.c | 18 +++++++++--------- tinyusb/device/usbd.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'tinyusb/device') diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c index d18cb258a..23bf971d3 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]; -TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT uint8_t usbd_enum_buffer[TUSB_CFG_DEVICE_ENUM_BUFFER_SIZE]; +CFG_TUSB_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT uint8_t usbd_enum_buffer[CFG_TUSB_DEVICE_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 TUSB_CFG_DEVICE_MSC + #if CFG_TUSB_DEVICE_MSC [TUSB_CLASS_MSC] = { .init = mscd_init, @@ -106,7 +106,7 @@ static usbd_class_driver_t const usbd_class_drivers[] = }, #endif - #if TUSB_CFG_DEVICE_CDC + #if CFG_TUSB_DEVICE_CDC [TUSB_CLASS_CDC] = { .init = cdcd_init, @@ -184,8 +184,8 @@ VERIFY_STATIC(sizeof(usbd_task_event_t) <= 12, "size is not correct"); #define TUC_DEVICE_STACKSIZE 150 #endif -#ifndef TUSB_CFG_OS_TASK_PRIO -#define TUSB_CFG_OS_TASK_PRIO 0 +#ifndef CFG_TUSB_OS_TASK_PRIO +#define CFG_TUSB_OS_TASK_PRIO 0 #endif @@ -200,11 +200,11 @@ static tusb_error_t usbd_main_st(void); tusb_error_t usbd_init (void) { - #if (TUSB_CFG_CONTROLLER_0_MODE & TUSB_MODE_DEVICE) + #if (CFG_TUSB_CONTROLLER_0_MODE & TUSB_MODE_DEVICE) dcd_init(0); #endif - #if (TUSB_CFG_CONTROLLER_1_MODE & TUSB_MODE_DEVICE) + #if (CFG_TUSB_CONTROLLER_1_MODE & TUSB_MODE_DEVICE) dcd_init(1); #endif @@ -215,7 +215,7 @@ tusb_error_t usbd_init (void) _usbd_ctrl_sem = osal_semaphore_create(1, 0); VERIFY(_usbd_q, TUSB_ERROR_OSAL_SEMAPHORE_FAILED); - osal_task_create(usbd_task, "usbd", TUC_DEVICE_STACKSIZE, NULL, TUSB_CFG_OS_TASK_PRIO); + osal_task_create(usbd_task, "usbd", TUC_DEVICE_STACKSIZE, NULL, CFG_TUSB_OS_TASK_PRIO); //------------- Descriptor Check -------------// TU_ASSERT(tusbd_descriptor_pointers.p_device != NULL && tusbd_descriptor_pointers.p_configuration != NULL, TUSB_ERROR_DESCRIPTOR_CORRUPTED); @@ -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 <= TUSB_CFG_DEVICE_ENUM_BUFFER_SIZE, 0); + TU_ASSERT( len <= CFG_TUSB_DEVICE_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 a2559d880..3f8fc1be9 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 TUSB_CFG_DEVICE_HID_KEYBOARD is enabled - uint8_t const * p_hid_mouse_report; ///< pointer to HID report descriptor of Mouse interface. Only needed if TUSB_CFG_DEVICE_HID_MOUSE is enabled + 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 }tusbd_descriptor_pointer_t; // define by application -- cgit v1.3.1