andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refine ASSERT_DEFINE to allow special error_handler for os task

Browse Source 
add device_addr0 for enumeration task
start to add osal port for freeRTOS
This commit is contained in:
hathach
2013-02-04 00:03:08 +07:00
parent 3ac88f1b4e
commit 5f8839fff8
10 changed files with 149 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tinyusb/host/usbd_host.c
View File

@@ -56,11 +56,6 @@
//--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION
//--------------------------------------------------------------------+
struct {
tusb_speed_t speed;
uint8_t hub_addr;
uint8_t hub_port;
} usbh_device_addr0[TUSB_CFG_HOST_CONTROLLER_NUM];
STATIC_ usbh_device_info_t device_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
@@ -81,39 +76,38 @@ OSAL_TASK_DEF(enum_task, usbh_enumeration_task, 128, OSAL_PRIO_HIGH);
#define ENUM_QUEUE_DEPTH 5
OSAL_DEF_QUEUE(enum_queue, ENUM_QUEUE_DEPTH, uin32_t);
osal_queue_handle_t enum_queue_hdl;
usbh_device_addr0_t device_addr0 TUSB_CFG_ATTR_USBRAM;
void usbh_enumeration_task(void)
{
usbh_enumerate_t enum_item;
tusb_error_t error;
OSAL_TASK_LOOP_BEGIN
osal_queue_receive(enum_queue_hdl, (uint32_t*)&enum_item, OSAL_TIMEOUT_NORMAL, &error);
osal_queue_receive(enum_queue_hdl, (uint32_t*)(&device_addr0.enum_entry), OSAL_TIMEOUT_NORMAL, &error);
TASK_ASSERT_STATUS(error);
if (enum_item.hub_address == 0) // direct connection
if (device_addr0.enum_entry.hub_addr == 0) // direct connection
{
if ( enum_item.connect_status == hcd_port_connect_status(enum_item.core_id) ) // there chances the event is out-dated
{
tusb_std_request_t request_dev_desc =
{
.bmRequestType =
{
.direction = TUSB_DIR_DEV_TO_HOST,
.type = TUSB_REQUEST_TYPE_STANDARD,
.recipient = TUSB_REQUEST_RECIPIENT_DEVICE
},
TASK_ASSERT(device_addr0.enum_entry.connect_status == hcd_port_connect_status(device_addr0.enum_entry.core_id)); // there chances the event is out-dated
.bRequest = TUSB_REQUEST_GET_DESCRIPTOR,
.wValue = (TUSB_DESC_DEVICE << 8),
.wLength = 8
};
tusb_speed_t speed = hcd_port_speed(enum_item.core_id);
pipe_handle_t pipe_addr0 = hcd_pipe_addr0_open(enum_item.core_id, speed, enum_item.hub_address, enum_item.hub_port);
tusb_std_request_t request_dev_desc =
{
.bmRequestType =
{
.direction = TUSB_DIR_DEV_TO_HOST,
.type = TUSB_REQUEST_TYPE_STANDARD,
.recipient = TUSB_REQUEST_RECIPIENT_DEVICE
},
.bRequest = TUSB_REQUEST_GET_DESCRIPTOR,
.wValue = (TUSB_DESC_DEVICE << 8),
.wLength = 8
};
device_addr0.speed = hcd_port_speed(device_addr0.enum_entry.core_id);
// pipe_handle_t pipe_addr0 = hcd_pipe_addr0_open(&device_addr0);
// hcd_pipe_control_xfer(pipe_addr0, &request_dev_desc)
}
}else // device connect via a hub
{
ASSERT_MESSAGE("%s", "Hub is not supported yet");
@@ -122,6 +116,11 @@ void usbh_enumeration_task(void)
OSAL_TASK_LOOP_END
}
//--------------------------------------------------------------------+
// REPORTER TASK & ITS DATA
//--------------------------------------------------------------------+
//--------------------------------------------------------------------+
// CLASS-USBD API (don't require to verify parameters)
//--------------------------------------------------------------------+