Embedded/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-01-31 05:52:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

refractor hub

Browse Source
This commit is contained in:
hathach 2013-09-30 17:14:44 +07:00
parent 0f05d27ac9
commit 5eebec61f1
2 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tinyusb/host/hub.c
View File

@ -161,12 +161,11 @@ tusb_error_t hub_enumerate_subtask(void)
OSAL_SUBTASK_INVOKED_AND_WAIT( hub_port_clear_feature_subtask(HUB_FEATURE_PORT_CONNECTION_CHANGE), error ); OSAL_SUBTASK_INVOKED_AND_WAIT( hub_port_clear_feature_subtask(HUB_FEATURE_PORT_CONNECTION_CHANGE), error );
SUBTASK_ASSERT_STATUS( error ); SUBTASK_ASSERT_STATUS( error );
//--------------------------------------------------------------------+ //------------- Port Reset & Get Port Speed -------------//
// PORT RESET & WAIT FOR STATUS ENDPOINT & GET STATUS & CLEAR RESET CHANGE
//--------------------------------------------------------------------+
OSAL_SUBTASK_INVOKED_AND_WAIT ( hub_port_reset_subtask(), error ); OSAL_SUBTASK_INVOKED_AND_WAIT ( hub_port_reset_subtask(), error );
SUBTASK_ASSERT_STATUS( error ); SUBTASK_ASSERT_STATUS( error );
// TODO get port speed
p_port_status = (hub_port_status_response_t *) hub_enum_buffer; 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 : 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; (p_port_status->status_current.low_speed_device_attached ) ? TUSB_SPEED_LOW : TUSB_SPEED_FULL;

36
tinyusb/host/usbh.c
View File

@ -384,41 +384,11 @@ tusb_error_t enumeration_body_subtask(void)
// osal_task_delay(50); // TODO reset is recommended to last 50 ms (NXP EHCI passes this) // osal_task_delay(50); // TODO reset is recommended to last 50 ms (NXP EHCI passes this)
}else }else
{ {
hub_port_status_response_t * p_port_status; OSAL_SUBTASK_INVOKED_AND_WAIT ( hub_port_reset_subtask(), error );
//--------------------------------------------------------------------+
// PORT RESET & WAIT FOR STATUS ENDPOINT & GET STATUS & CLEAR RESET CHANGE
//--------------------------------------------------------------------+
//------------- 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,
0, NULL ),
error
);
SUBTASK_ASSERT_STATUS( error ); SUBTASK_ASSERT_STATUS( error );
osal_task_delay(200); // TODO Hub wait for Status Endpoint on Reset Change // Acknowledge Port Reset Change
OSAL_SUBTASK_INVOKED_AND_WAIT( hub_port_clear_feature_subtask(HUB_FEATURE_PORT_RESET_CHANGE), error );
//------------- 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,
4, enum_data_buffer ),
error
);
SUBTASK_ASSERT_STATUS( error );
p_port_status = (hub_port_status_response_t *) enum_data_buffer;
SUBTASK_ASSERT ( p_port_status->status_change.reset && p_port_status->status_current.connect_status &&
p_port_status->status_current.port_power && p_port_status->status_current.port_enable);
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, HUB_FEATURE_PORT_RESET_CHANGE, usbh_devices[0].hub_port,
0, NULL ),
error
);
SUBTASK_ASSERT_STATUS( error ); SUBTASK_ASSERT_STATUS( error );
} }