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/host/ehci/ehci.c | 32 ++++++++++++++++---------------- tinyusb/host/ehci/ehci.h | 2 +- tinyusb/host/hcd.h | 4 ++-- tinyusb/host/hub.c | 8 ++++---- tinyusb/host/ohci/ohci.c | 8 ++++---- tinyusb/host/ohci/ohci.h | 4 ++-- tinyusb/host/usbh.c | 38 +++++++++++++++++++------------------- tinyusb/host/usbh_hcd.h | 2 +- 8 files changed, 49 insertions(+), 49 deletions(-) (limited to 'tinyusb/host') diff --git a/tinyusb/host/ehci/ehci.c b/tinyusb/host/ehci/ehci.c index 0686748f4..f1b2c7f92 100644 --- a/tinyusb/host/ehci/ehci.c +++ b/tinyusb/host/ehci/ehci.c @@ -38,7 +38,7 @@ #include "common/tusb_common.h" -#if MODE_HOST_SUPPORTED && (TUSB_CFG_MCU == MCU_LPC43XX || TUSB_CFG_MCU == MCU_LPC18XX) +#if MODE_HOST_SUPPORTED && (CFG_TUSB_MCU == MCU_LPC43XX || CFG_TUSB_MCU == MCU_LPC18XX) //--------------------------------------------------------------------+ // INCLUDE //--------------------------------------------------------------------+ @@ -57,20 +57,20 @@ //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ -TUSB_CFG_ATTR_USBRAM STATIC_VAR ehci_data_t ehci_data; +CFG_TUSB_ATTR_USBRAM STATIC_VAR ehci_data_t ehci_data; #if EHCI_PERIODIC_LIST - #if (TUSB_CFG_CONTROLLER_0_MODE & TUSB_MODE_HOST) - TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4096) STATIC_VAR ehci_link_t period_frame_list0[EHCI_FRAMELIST_SIZE]; + #if (CFG_TUSB_CONTROLLER_0_MODE & TUSB_MODE_HOST) + CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(4096) STATIC_VAR ehci_link_t period_frame_list0[EHCI_FRAMELIST_SIZE]; #ifndef __ICCARM__ // IAR cannot able to determine the alignment with datalignment pragma VERIFY_STATIC( ALIGN_OF(period_frame_list0) == 4096, "Period Framelist must be 4k alginment"); // validation #endif #endif - #if (TUSB_CFG_CONTROLLER_1_MODE & TUSB_MODE_HOST) - TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4096) STATIC_VAR ehci_link_t period_frame_list1[EHCI_FRAMELIST_SIZE]; + #if (CFG_TUSB_CONTROLLER_1_MODE & TUSB_MODE_HOST) + CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(4096) STATIC_VAR ehci_link_t period_frame_list1[EHCI_FRAMELIST_SIZE]; #ifndef __ICCARM__ // IAR cannot able to determine the alignment with datalignment pragma VERIFY_STATIC( ALIGN_OF(period_frame_list1) == 4096, "Period Framelist must be 4k alginment"); // validation @@ -133,11 +133,11 @@ tusb_error_t hcd_init(void) //------------- Data Structure init -------------// memclr_(&ehci_data, sizeof(ehci_data_t)); - #if (TUSB_CFG_CONTROLLER_0_MODE & TUSB_MODE_HOST) + #if (CFG_TUSB_CONTROLLER_0_MODE & TUSB_MODE_HOST) ASSERT_ERR (hcd_controller_init(0)); #endif - #if (TUSB_CFG_CONTROLLER_1_MODE & TUSB_MODE_HOST) + #if (CFG_TUSB_CONTROLLER_1_MODE & TUSB_MODE_HOST) ASSERT_ERR (hcd_controller_init(1)); #endif @@ -511,7 +511,7 @@ static void async_advance_isr(ehci_qhd_t * const async_head) usbh_devices[0].state = TUSB_DEVICE_STATE_UNPLUG; } - for(uint8_t relative_dev_addr=0; relative_dev_addr < TUSB_CFG_HOST_DEVICE_MAX; relative_dev_addr++) + for(uint8_t relative_dev_addr=0; relative_dev_addr < CFG_TUSB_HOST_DEVICE_MAX; relative_dev_addr++) { // check if control endpoint is removing ehci_qhd_t *p_control_qhd = &ehci_data.device[relative_dev_addr].control.qhd; @@ -592,7 +592,7 @@ static void async_list_xfer_complete_isr(ehci_qhd_t * const async_head) } p_qhd = qhd_next(p_qhd); max_loop++; - }while(p_qhd != async_head && max_loop < HCD_MAX_ENDPOINT*TUSB_CFG_HOST_DEVICE_MAX); // async list traversal, stop if loop around + }while(p_qhd != async_head && max_loop < HCD_MAX_ENDPOINT*CFG_TUSB_HOST_DEVICE_MAX); // async list traversal, stop if loop around // TODO abstract max loop guard for async } @@ -606,7 +606,7 @@ static void period_list_xfer_complete_isr(uint8_t hostid, uint8_t interval_ms) // TODO abstract max loop guard for period while( !next_item.terminate && !(interval_ms > 1 && period_1ms_addr == align32(next_item.address)) && - max_loop < (HCD_MAX_ENDPOINT + EHCI_MAX_ITD + EHCI_MAX_SITD)*TUSB_CFG_HOST_DEVICE_MAX) + max_loop < (HCD_MAX_ENDPOINT + EHCI_MAX_ITD + EHCI_MAX_SITD)*CFG_TUSB_HOST_DEVICE_MAX) { switch ( next_item.type ) { @@ -691,7 +691,7 @@ static void xfer_error_isr(uint8_t hostid) qhd_xfer_error_isr( p_qhd ); p_qhd = qhd_next(p_qhd); max_loop++; - }while(p_qhd != async_head && max_loop < HCD_MAX_ENDPOINT*TUSB_CFG_HOST_DEVICE_MAX); // async list traversal, stop if loop around + }while(p_qhd != async_head && max_loop < HCD_MAX_ENDPOINT*CFG_TUSB_HOST_DEVICE_MAX); // async list traversal, stop if loop around #if EHCI_PERIODIC_LIST //------------- TODO refractor period list -------------// @@ -704,7 +704,7 @@ static void xfer_error_isr(uint8_t hostid) // TODO abstract max loop guard for period while( !next_item.terminate && !(interval_ms > 1 && period_1ms_addr == align32(next_item.address)) && - period_max_loop < (HCD_MAX_ENDPOINT + EHCI_MAX_ITD + EHCI_MAX_SITD)*TUSB_CFG_HOST_DEVICE_MAX) + period_max_loop < (HCD_MAX_ENDPOINT + EHCI_MAX_ITD + EHCI_MAX_SITD)*CFG_TUSB_HOST_DEVICE_MAX) { switch ( next_item.type ) { @@ -794,12 +794,12 @@ static inline ehci_link_t* get_period_frame_list(uint8_t hostid) { switch(hostid) { -#if (TUSB_CFG_CONTROLLER_0_MODE & TUSB_MODE_HOST) +#if (CFG_TUSB_CONTROLLER_0_MODE & TUSB_MODE_HOST) case 0: return period_frame_list0; #endif -#if (TUSB_CFG_CONTROLLER_1_MODE & TUSB_MODE_HOST) +#if (CFG_TUSB_CONTROLLER_1_MODE & TUSB_MODE_HOST) case 1: return period_frame_list1; #endif @@ -811,7 +811,7 @@ static inline ehci_link_t* get_period_frame_list(uint8_t hostid) static inline uint8_t hostid_to_data_idx(uint8_t hostid) { - #if (CONTROLLER_HOST_NUMBER == 1) && (TUSB_CFG_CONTROLLER_1_MODE & TUSB_MODE_HOST) + #if (CONTROLLER_HOST_NUMBER == 1) && (CFG_TUSB_CONTROLLER_1_MODE & TUSB_MODE_HOST) (void) hostid; return 0; #else diff --git a/tinyusb/host/ehci/ehci.h b/tinyusb/host/ehci/ehci.h index 5b1cc7987..250023ee5 100644 --- a/tinyusb/host/ehci/ehci.h +++ b/tinyusb/host/ehci/ehci.h @@ -471,7 +471,7 @@ typedef struct { ehci_qtd_t qtd[HCD_MAX_XFER] ATTR_ALIGNED(32) ; ///< Queue Element Transfer Pool // ehci_itd_t itd[EHCI_MAX_ITD] ; ///< Iso Transfer Pool // ehci_sitd_t sitd[EHCI_MAX_SITD] ; ///< Split (FS) Isochronous Transfer Pool - }device[TUSB_CFG_HOST_DEVICE_MAX]; + }device[CFG_TUSB_HOST_DEVICE_MAX]; }ehci_data_t; #ifdef __cplusplus diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h index a7f412cbf..b9f6a1ff7 100644 --- a/tinyusb/host/hcd.h +++ b/tinyusb/host/hcd.h @@ -52,8 +52,8 @@ #if MODE_HOST_SUPPORTED // Max number of endpoints per device enum { - HCD_MAX_ENDPOINT = TUSB_CFG_HOST_HUB + TUSB_CFG_HOST_HID_KEYBOARD + TUSB_CFG_HOST_HID_MOUSE + TUSB_CFG_HOST_HID_GENERIC + - TUSB_CFG_HOST_MSC*2 + TUSB_CFG_HOST_CDC*3, + HCD_MAX_ENDPOINT = CFG_TUSB_HOST_HUB + CFG_TUSB_HOST_HID_KEYBOARD + CFG_TUSB_HOST_HID_MOUSE + CFG_TUSB_HOST_HID_GENERIC + + CFG_TUSB_HOST_MSC*2 + CFG_TUSB_HOST_CDC*3, HCD_MAX_XFER = HCD_MAX_ENDPOINT*2, }; diff --git a/tinyusb/host/hub.c b/tinyusb/host/hub.c index 9b4f03634..063cef61a 100644 --- a/tinyusb/host/hub.c +++ b/tinyusb/host/hub.c @@ -38,7 +38,7 @@ #include "tusb_option.h" -#if (MODE_HOST_SUPPORTED && TUSB_CFG_HOST_HUB) +#if (MODE_HOST_SUPPORTED && CFG_TUSB_HOST_HUB) #define _TINY_USB_SOURCE_FILE_ @@ -58,8 +58,8 @@ typedef struct { uint8_t status_change; // data from status change interrupt endpoint }usbh_hub_t; -TUSB_CFG_ATTR_USBRAM STATIC_VAR usbh_hub_t hub_data[TUSB_CFG_HOST_DEVICE_MAX]; -ATTR_ALIGNED(4) TUSB_CFG_ATTR_USBRAM STATIC_VAR uint8_t hub_enum_buffer[sizeof(descriptor_hub_desc_t)]; +CFG_TUSB_ATTR_USBRAM STATIC_VAR usbh_hub_t hub_data[CFG_TUSB_HOST_DEVICE_MAX]; +ATTR_ALIGNED(4) CFG_TUSB_ATTR_USBRAM STATIC_VAR uint8_t hub_enum_buffer[sizeof(descriptor_hub_desc_t)]; //OSAL_SEM_DEF(hub_enum_semaphore); //static osal_semaphore_handle_t hub_enum_sem_hdl; @@ -152,7 +152,7 @@ tusb_speed_t hub_port_get_speed(void) //--------------------------------------------------------------------+ void hub_init(void) { - memclr_(hub_data, TUSB_CFG_HOST_DEVICE_MAX*sizeof(usbh_hub_t)); + memclr_(hub_data, CFG_TUSB_HOST_DEVICE_MAX*sizeof(usbh_hub_t)); // hub_enum_sem_hdl = osal_semaphore_create( OSAL_SEM_REF(hub_enum_semaphore) ); } diff --git a/tinyusb/host/ohci/ohci.c b/tinyusb/host/ohci/ohci.c index 435d2d8ff..2d1b70666 100644 --- a/tinyusb/host/ohci/ohci.c +++ b/tinyusb/host/ohci/ohci.c @@ -38,7 +38,7 @@ #include -#if MODE_HOST_SUPPORTED && (TUSB_CFG_MCU == MCU_LPC175X_6X) +#if MODE_HOST_SUPPORTED && (CFG_TUSB_MCU == MCU_LPC175X_6X) //--------------------------------------------------------------------+ // INCLUDE //--------------------------------------------------------------------+ @@ -143,7 +143,7 @@ enum { //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ -TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(256) STATIC_VAR ohci_data_t ohci_data; +CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(256) STATIC_VAR ohci_data_t ohci_data; static ohci_ed_t * const p_ed_head[] = { @@ -384,7 +384,7 @@ static inline ohci_ed_t * ed_find_free(uint8_t dev_addr) static ohci_ed_t * ed_list_find_previous(ohci_ed_t const * p_head, ohci_ed_t const * p_ed) { - uint32_t max_loop = HCD_MAX_ENDPOINT*TUSB_CFG_HOST_DEVICE_MAX; + uint32_t max_loop = HCD_MAX_ENDPOINT*CFG_TUSB_HOST_DEVICE_MAX; ohci_ed_t const * p_prev = p_head; @@ -608,7 +608,7 @@ static inline uint32_t gtd_xfer_byte_left(uint32_t buffer_end, uint32_t current_ static void done_queue_isr(uint8_t hostid) { - uint8_t max_loop = (TUSB_CFG_HOST_DEVICE_MAX+1)*(HCD_MAX_XFER+OHCI_MAX_ITD); + uint8_t max_loop = (CFG_TUSB_HOST_DEVICE_MAX+1)*(HCD_MAX_XFER+OHCI_MAX_ITD); // done head is written in reversed order of completion --> need to reverse the done queue first ohci_td_item_t* td_head = list_reverse ( (ohci_td_item_t*) align16(ohci_data.hcca.done_head) ); diff --git a/tinyusb/host/ohci/ohci.h b/tinyusb/host/ohci/ohci.h index 96ee6f90c..f49d85261 100644 --- a/tinyusb/host/ohci/ohci.h +++ b/tinyusb/host/ohci/ohci.h @@ -191,13 +191,13 @@ typedef struct ATTR_ALIGNED(256) { struct { ohci_ed_t ed; ohci_gtd_t gtd[3]; // setup, data, status - }control[TUSB_CFG_HOST_DEVICE_MAX+1]; + }control[CFG_TUSB_HOST_DEVICE_MAX+1]; struct { // ochi_itd_t itd[OHCI_MAX_ITD]; // itd requires alignment of 32 ohci_ed_t ed[HCD_MAX_ENDPOINT]; ohci_gtd_t gtd[HCD_MAX_XFER]; - }device[TUSB_CFG_HOST_DEVICE_MAX]; + }device[CFG_TUSB_HOST_DEVICE_MAX]; } ohci_data_t; diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c index bb7300596..6e94ccd4e 100644 --- a/tinyusb/host/usbh.c +++ b/tinyusb/host/usbh.c @@ -42,8 +42,8 @@ #define _TINY_USB_SOURCE_FILE_ -#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 //--------------------------------------------------------------------+ @@ -67,7 +67,7 @@ static host_class_driver_t const usbh_class_drivers[] = }, #endif - #if TUSB_CFG_HOST_CDC + #if CFG_TUSB_HOST_CDC [TUSB_CLASS_CDC] = { .init = cdch_init, .open_subtask = cdch_open_subtask, @@ -76,7 +76,7 @@ static host_class_driver_t const usbh_class_drivers[] = }, #endif - #if TUSB_CFG_HOST_MSC + #if CFG_TUSB_HOST_MSC [TUSB_CLASS_MSC] = { .init = msch_init, .open_subtask = msch_open_subtask, @@ -85,7 +85,7 @@ static host_class_driver_t const usbh_class_drivers[] = }, #endif - #if TUSB_CFG_HOST_HUB + #if CFG_TUSB_HOST_HUB [TUSB_CLASS_HUB] = { .init = hub_init, .open_subtask = hub_open_subtask, @@ -94,7 +94,7 @@ static host_class_driver_t const usbh_class_drivers[] = }, #endif - #if TUSB_CFG_HOST_CUSTOM_CLASS + #if CFG_TUSB_HOST_CUSTOM_CLASS [TUSB_CLASS_MAPPED_INDEX_END-1] = { .init = cush_init, .open_subtask = cush_open_subtask, @@ -109,13 +109,13 @@ enum { USBH_CLASS_DRIVER_COUNT = sizeof(usbh_class_drivers) / sizeof(host_class_ //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ -TUSB_CFG_ATTR_USBRAM usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; // including zero-address +CFG_TUSB_ATTR_USBRAM usbh_device_info_t usbh_devices[CFG_TUSB_HOST_DEVICE_MAX+1]; // including zero-address //------------- Enumeration Task Data -------------/ enum { ENUM_QUEUE_DEPTH = 16 }; STATIC_VAR osal_queue_t enum_queue_hdl; -TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) STATIC_VAR uint8_t enum_data_buffer[TUSB_CFG_HOST_ENUM_BUFFER_SIZE]; +CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(4) STATIC_VAR uint8_t enum_data_buffer[CFG_TUSB_HOST_ENUM_BUFFER_SIZE]; //------------- Reporter Task Data -------------// @@ -128,7 +128,7 @@ static inline uint8_t get_configure_number_for_device(tusb_desc_device_t* dev_de //--------------------------------------------------------------------+ tusb_device_state_t tuh_device_get_state (uint8_t const dev_addr) { - TU_ASSERT( dev_addr <= TUSB_CFG_HOST_DEVICE_MAX, TUSB_DEVICE_STATE_INVALID_PARAMETER); + TU_ASSERT( dev_addr <= CFG_TUSB_HOST_DEVICE_MAX, TUSB_DEVICE_STATE_INVALID_PARAMETER); return (tusb_device_state_t) usbh_devices[dev_addr].state; } @@ -142,7 +142,7 @@ uint32_t tuh_device_get_mounted_class_flag(uint8_t dev_addr) //--------------------------------------------------------------------+ tusb_error_t usbh_init(void) { - memclr_(usbh_devices, sizeof(usbh_device_info_t)*(TUSB_CFG_HOST_DEVICE_MAX+1)); + memclr_(usbh_devices, sizeof(usbh_device_info_t)*(CFG_TUSB_HOST_DEVICE_MAX+1)); ASSERT_ERR( hcd_init() ); @@ -150,10 +150,10 @@ tusb_error_t usbh_init(void) enum_queue_hdl = osal_queue_create( ENUM_QUEUE_DEPTH, sizeof(uint32_t) ); TU_ASSERT(enum_queue_hdl, TUSB_ERROR_OSAL_QUEUE_FAILED); - osal_task_create(usbh_enumeration_task, "usbh", 200, NULL, TUSB_CFG_OS_TASK_PRIO); + osal_task_create(usbh_enumeration_task, "usbh", 200, NULL, CFG_TUSB_OS_TASK_PRIO); //------------- Semaphore, Mutex for Control Pipe -------------// - for(uint8_t i=0; i= ((tusb_desc_configuration_t*)enum_data_buffer)->wTotalLength, + STASK_ASSERT_HDLR( CFG_TUSB_HOST_ENUM_BUFFER_SIZE >= ((tusb_desc_configuration_t*)enum_data_buffer)->wTotalLength, tuh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_CONFIG_DESC_TOO_LONG, NULL) ); //------------- Get full configuration descriptor -------------// STASK_INVOKE( usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE), TUSB_REQ_GET_DESCRIPTOR, (TUSB_DESC_CONFIGURATION << 8) | (configure_selected - 1), 0, - TUSB_CFG_HOST_ENUM_BUFFER_SIZE, enum_data_buffer ), + CFG_TUSB_HOST_ENUM_BUFFER_SIZE, enum_data_buffer ), error ); STASK_ASSERT_ERR(error); @@ -618,7 +618,7 @@ tusb_error_t enumeration_body_subtask(void) static inline uint8_t get_new_address(void) { uint8_t addr; - for (addr=1; addr <= TUSB_CFG_HOST_DEVICE_MAX; addr++) + for (addr=1; addr <= CFG_TUSB_HOST_DEVICE_MAX; addr++) { if (usbh_devices[addr].state == TUSB_DEVICE_STATE_UNPLUG) break; diff --git a/tinyusb/host/usbh_hcd.h b/tinyusb/host/usbh_hcd.h index ac967332e..1c2c4ad0b 100644 --- a/tinyusb/host/usbh_hcd.h +++ b/tinyusb/host/usbh_hcd.h @@ -96,7 +96,7 @@ typedef struct { } control; } usbh_device_info_t; -extern usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; // including zero-address +extern usbh_device_info_t usbh_devices[CFG_TUSB_HOST_DEVICE_MAX+1]; // including zero-address //--------------------------------------------------------------------+ // callback from HCD ISR -- cgit v1.3.1