From 4da3b03430f136e82c5c6188b8974907e8827a99 Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 1 Oct 2013 12:12:35 +0700 Subject: [PATCH] refractor hub --- demos/host/host_os_none/host_os_none.uvopt | 56 +++++++++++++++++----- tinyusb/host/hub.c | 45 ++++++----------- tinyusb/host/usbh.c | 20 ++++---- 3 files changed, 72 insertions(+), 49 deletions(-) diff --git a/demos/host/host_os_none/host_os_none.uvopt b/demos/host/host_os_none/host_os_none.uvopt index 7a5bf1d1f..2cf7205a8 100644 --- a/demos/host/host_os_none/host_os_none.uvopt +++ b/demos/host/host_os_none/host_os_none.uvopt @@ -158,7 +158,24 @@ -O975 -S0 -C0 -FO7 -FD10000000 -FC800 -FN2 -FF0LPC18xx43xx_512_BA -FS01A000000 -FL080000 -FF1LPC18xx43xx_512_BB -FS11B000000 -FL180000) - + + + 0 + 0 + 375 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + C:\Users\hathach\Dropbox\tinyusb\workspace\tinyusb\tinyusb\host\usbh.c + + + + 0 @@ -370,7 +387,24 @@ -O975 -S0 -C0 -FO7 -FD10000000 -FC800 -FN2 -FF0LPC18xx43xx_512_BA -FS01A000000 -FL080000 -FF1LPC18xx43xx_512_BB -FS11B000000 -FL180000) - + + + 0 + 0 + 375 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + C:\Users\hathach\Dropbox\tinyusb\workspace\tinyusb\tinyusb\host\usbh.c + + + + 0 @@ -440,10 +474,10 @@ 1 0 0 - 0 + 17 0 126 - 149 + 129 0 ..\src\cdc_serial_app.c cdc_serial_app.c @@ -760,10 +794,10 @@ 1 0 0 - 0 + 24 0 1 - 12 + 11 0 ..\..\..\tinyusb\host\hub.c hub.c @@ -792,10 +826,10 @@ 1 0 0 - 0 + 56 0 - 411 - 419 + 562 + 578 0 ..\..\..\tinyusb\host\ehci\ehci.c ehci.c @@ -1080,10 +1114,10 @@ 2 0 0 - 11 + 0 0 145 - 154 + 151 0 ..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s startup_LPC43xx.s diff --git a/tinyusb/host/hub.c b/tinyusb/host/hub.c index 5413320f6..b4f1baf09 100644 --- a/tinyusb/host/hub.c +++ b/tinyusb/host/hub.c @@ -67,7 +67,7 @@ uint8_t hub_enum_buffer[sizeof(descriptor_hub_desc_t)] TUSB_CFG_ATTR_USBRAM; //--------------------------------------------------------------------+ // HUB //--------------------------------------------------------------------+ -tusb_error_t hub_port_clear_feature_subtask(uint8_t feature) +tusb_error_t hub_port_clear_feature_subtask(uint8_t hub_addr, uint8_t hub_port, uint8_t feature) { tusb_error_t error; @@ -78,8 +78,8 @@ tusb_error_t hub_port_clear_feature_subtask(uint8_t feature) //------------- Clear Port Feature request -------------// OSAL_SUBTASK_INVOKED_AND_WAIT( - usbh_control_xfer_subtask( usbh_devices[0].hub_addr, bm_request_type(TUSB_DIR_HOST_TO_DEV, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER), - HUB_REQUEST_CLEAR_FEATURE, feature, usbh_devices[0].hub_port, + usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_HOST_TO_DEV, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER), + HUB_REQUEST_CLEAR_FEATURE, feature, hub_port, 0, NULL ), error ); @@ -87,8 +87,8 @@ tusb_error_t hub_port_clear_feature_subtask(uint8_t feature) //------------- Get Port Status to check if feature is cleared -------------// OSAL_SUBTASK_INVOKED_AND_WAIT( - usbh_control_xfer_subtask( usbh_devices[0].hub_addr, bm_request_type(TUSB_DIR_DEV_TO_HOST, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER), - HUB_REQUEST_GET_STATUS, 0, usbh_devices[0].hub_port, + usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_DEV_TO_HOST, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER), + HUB_REQUEST_GET_STATUS, 0, hub_port, 4, hub_enum_buffer ), error ); @@ -101,7 +101,7 @@ tusb_error_t hub_port_clear_feature_subtask(uint8_t feature) OSAL_SUBTASK_END } -tusb_error_t hub_port_reset_subtask() +tusb_error_t hub_port_reset_subtask(uint8_t hub_addr, uint8_t hub_port) { tusb_error_t error; @@ -109,8 +109,8 @@ tusb_error_t hub_port_reset_subtask() //------------- Set Port Reset -------------// OSAL_SUBTASK_INVOKED_AND_WAIT( - usbh_control_xfer_subtask( usbh_devices[0].hub_addr, bm_request_type(TUSB_DIR_HOST_TO_DEV, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER), - HUB_REQUEST_SET_FEATURE, HUB_FEATURE_PORT_RESET, usbh_devices[0].hub_port, + usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_HOST_TO_DEV, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER), + HUB_REQUEST_SET_FEATURE, HUB_FEATURE_PORT_RESET, hub_port, 0, NULL ), error ); @@ -120,8 +120,8 @@ tusb_error_t hub_port_reset_subtask() //------------- Get Port Status to check if port is enabled, powered and reset_change -------------// OSAL_SUBTASK_INVOKED_AND_WAIT( - usbh_control_xfer_subtask( usbh_devices[0].hub_addr, bm_request_type(TUSB_DIR_DEV_TO_HOST, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER), - HUB_REQUEST_GET_STATUS, 0, usbh_devices[0].hub_port, + usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_DEV_TO_HOST, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER), + HUB_REQUEST_GET_STATUS, 0, hub_port, 4, hub_enum_buffer ), error ); @@ -134,27 +134,12 @@ tusb_error_t hub_port_reset_subtask() OSAL_SUBTASK_END } -tusb_error_t hub_enumerate_subtask(void) +// can only get the speed RIGHT AFTER hub_port_reset_subtask call +tusb_speed_t hub_port_get_speed(void) { - tusb_error_t error; - hub_port_status_response_t * p_port_status; - - OSAL_SUBTASK_BEGIN - - //------------- Port Reset & Get Port Speed -------------// - OSAL_SUBTASK_INVOKED_AND_WAIT ( hub_port_reset_subtask(), error ); - SUBTASK_ASSERT_STATUS( error ); - - // TODO get port speed - p_port_status = (hub_port_status_response_t *) hub_enum_buffer; - usbh_devices[0].speed = (p_port_status->status_current.high_speed_device_attached) ? TUSB_SPEED_HIGH : - (p_port_status->status_current.low_speed_device_attached ) ? TUSB_SPEED_LOW : TUSB_SPEED_FULL; - - // Acknowledge Port Reset Change - OSAL_SUBTASK_INVOKED_AND_WAIT( hub_port_clear_feature_subtask(HUB_FEATURE_PORT_RESET_CHANGE), error ); - SUBTASK_ASSERT_STATUS( error ); - - OSAL_SUBTASK_END + hub_port_status_response_t * p_port_status = (hub_port_status_response_t *) hub_enum_buffer; + return (p_port_status->status_current.high_speed_device_attached) ? TUSB_SPEED_HIGH : + (p_port_status->status_current.low_speed_device_attached ) ? TUSB_SPEED_LOW : TUSB_SPEED_FULL; } //--------------------------------------------------------------------+ diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c index b623584da..f0710e186 100644 --- a/tinyusb/host/usbh.c +++ b/tinyusb/host/usbh.c @@ -370,11 +370,10 @@ tusb_error_t enumeration_body_subtask(void) ); SUBTASK_ASSERT_STATUS( error ); - if ( ! ((hub_port_status_response_t *) enum_data_buffer)->status_change.connect_status ) SUBTASK_EXIT(TUSB_ERROR_NONE); // only handle connection change - // Acknowledge Port Connection Change - OSAL_SUBTASK_INVOKED_AND_WAIT( hub_port_clear_feature_subtask(HUB_FEATURE_PORT_CONNECTION_CHANGE), error ); - SUBTASK_ASSERT_STATUS( error ); + OSAL_SUBTASK_INVOKED_AND_WAIT( hub_port_clear_feature_subtask(usbh_devices[0].hub_addr, usbh_devices[0].hub_port, HUB_FEATURE_PORT_CONNECTION_CHANGE), error ); + + if ( ! ((hub_port_status_response_t *) enum_data_buffer)->status_change.connect_status ) SUBTASK_EXIT(TUSB_ERROR_NONE); // only handle connection change if ( ! ((hub_port_status_response_t *) enum_data_buffer)->status_current.connect_status ) { // Device is disconnected via Hub @@ -388,8 +387,13 @@ tusb_error_t enumeration_body_subtask(void) } else { // Device is connected via Hub - OSAL_SUBTASK_INVOKED_AND_WAIT( hub_enumerate_subtask(), error ); + OSAL_SUBTASK_INVOKED_AND_WAIT ( hub_port_reset_subtask(usbh_devices[0].hub_addr, usbh_devices[0].hub_port), error ); SUBTASK_ASSERT_STATUS( error ); + + usbh_devices[0].speed = hub_port_get_speed(); + + // Acknowledge Port Reset Change + OSAL_SUBTASK_INVOKED_AND_WAIT( hub_port_clear_feature_subtask(usbh_devices[0].hub_addr, usbh_devices[0].hub_port, HUB_FEATURE_PORT_RESET_CHANGE), error ); } } else @@ -413,18 +417,18 @@ tusb_error_t enumeration_body_subtask(void) ); SUBTASK_ASSERT_STATUS(error); // TODO some slow device is observed to fail the very fist controller xfer, can try more times + //------------- Reset device again before Set Address -------------// if (usbh_devices[0].hub_addr == 0) { // mount direct to root hub hcd_port_reset( usbh_devices[0].core_id ); // reset port after 8 byte descriptor // osal_task_delay(50); // TODO reset is recommended to last 50 ms (NXP EHCI passes this) }else { - OSAL_SUBTASK_INVOKED_AND_WAIT ( hub_port_reset_subtask(), error ); + OSAL_SUBTASK_INVOKED_AND_WAIT ( hub_port_reset_subtask(usbh_devices[0].hub_addr, usbh_devices[0].hub_port), error ); SUBTASK_ASSERT_STATUS( error ); // Acknowledge Port Reset Change - OSAL_SUBTASK_INVOKED_AND_WAIT( hub_port_clear_feature_subtask(HUB_FEATURE_PORT_RESET_CHANGE), error ); - SUBTASK_ASSERT_STATUS( error ); + OSAL_SUBTASK_INVOKED_AND_WAIT( hub_port_clear_feature_subtask(usbh_devices[0].hub_addr, usbh_devices[0].hub_port, HUB_FEATURE_PORT_RESET_CHANGE), error ); (void) hub_status_pipe_queue( usbh_devices[0].hub_addr ); // done with hub, waiting for next data on status pipe }