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

refine OSAL_TASK_LOOP_BEGIN & OSAL_TASK_LOOP_END

Browse Source 
- add TASK_ASSERT & TASK_ASSERT_STATUS
add more code for enumerate task
add control requests & its type def
add API for HCD
- hcd_pipe_addr0_open
- hcd_pipe_control_open
- hcd_pipe_control_xfer
- hcd_pipe_open
- hcd_port_speed
This commit is contained in:
hathach
2013-02-02 15:36:20 +07:00
parent a25da9d3ee
commit 3ac88f1b4e
12 changed files with 254 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tinyusb/host/hcd.h
View File

@@ -56,7 +56,6 @@
#endif
#include "common/common.h"
#include "core/tusb_types.h"
typedef uint32_t pipe_handle_t;
@@ -66,7 +65,11 @@ tusb_error_t hcd_init(uint8_t hostid) ATTR_WARN_UNUSED_RESULT;
//--------------------------------------------------------------------+
// PIPE API
//--------------------------------------------------------------------+
//pipe_handle_t hcd_pipe_control_open(core_id, speed, hub_addr, hub_port, dev_addr, max_packet_size);
pipe_handle_t hcd_pipe_addr0_open(uint8_t core_id, tusb_speed_t speed, uint8_t hub_addr, uint8_t hub_port);
pipe_handle_t hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size);
tusb_error_t hcd_pipe_control_xfer(pipe_handle_t pipe_hdl, const tusb_std_request_t * const p_request, uint8_t data[]);
pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_descriptor_endpoint_t* endpoint_desc);
#if 0
//tusb_error_t hcd_pipe_open(
@@ -83,7 +86,7 @@ tusb_error_t hcd_pipe_cancel()ATTR_WARN_UNUSED_RESULT;
//--------------------------------------------------------------------+
/// return the current connect status of roothub port
bool hcd_port_connect_status(uint8_t core_id) ATTR_WARN_UNUSED_RESULT;
tusb_speed_t hcd_port_speed_get(uint8_t core_id) ATTR_WARN_UNUSED_RESULT;
tusb_speed_t hcd_port_speed(uint8_t core_id) ATTR_WARN_UNUSED_RESULT;
#ifdef __cplusplus
}

52
tinyusb/host/usbd_host.c
View File

@@ -56,6 +56,12 @@
//--------------------------------------------------------------------+
// 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,31 +87,39 @@ void usbh_enumeration_task(void)
usbh_enumerate_t enum_item;
tusb_error_t error;
OSAL_TASK_LOOP
OSAL_TASK_LOOP_BEGIN
osal_queue_receive(enum_queue_hdl, (uint32_t*)&enum_item, OSAL_TIMEOUT_NORMAL, &error);
TASK_ASSERT_STATUS(error);
if (enum_item.hub_address == 0) // direct connection
{
OSAL_TASK_LOOP_BEGIN
osal_queue_receive(enum_queue_hdl, (uint32_t*)&enum_item, OSAL_TIMEOUT_NORMAL, &error);
if (error != TUSB_ERROR_NONE)
if ( enum_item.connect_status == hcd_port_connect_status(enum_item.core_id) ) // there chances the event is out-dated
{
ASSERT_STATEMENT("%s", TUSB_ErrorStr[error]);
}
else
{
if (enum_item.hub_address == 0) // direct connection
tusb_std_request_t request_dev_desc =
{
if ( enum_item.connect_status == hcd_port_connect_status(enum_item.core_id) ) // there chances the event is out-dated
{
.bmRequestType =
{
.direction = TUSB_DIR_DEV_TO_HOST,
.type = TUSB_REQUEST_TYPE_STANDARD,
.recipient = TUSB_REQUEST_RECIPIENT_DEVICE
},
}
}else // device connect via a hub
{
ASSERT_STATEMENT("%s", "Hub is not supported yet");
}
.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);
// hcd_pipe_control_xfer(pipe_addr0, &request_dev_desc)
}
OSAL_TASK_LOOP_END
}else // device connect via a hub
{
ASSERT_MESSAGE("%s", "Hub is not supported yet");
}
OSAL_TASK_LOOP_END
}
//--------------------------------------------------------------------+

15
tinyusb/host/usbd_host.h
View File

@@ -110,16 +110,21 @@ enum {
typedef uint8_t tusbh_device_status_t;
typedef uint32_t tusbh_flag_class_t;
typedef struct { // TODO internal structure
typedef struct { // TODO internal structure, re-order members
uint8_t core_id;
tusbh_device_status_t status;
pipe_handle_t pipe_control;
tusb_speed_t speed;
uint8_t hub_addr;
uint8_t hub_port;
#if 0 // TODO allow configure for vendor/product
uint16_t vendor_id;
uint16_t product_id;
uint8_t configure_count;
tusbh_device_status_t status;
pipe_handle_t pipe_control;
tusb_std_request_t request_control;
#if 0 // TODO allow configure for vendor/product
struct {
uint8_t interface_count;
uint8_t attributes;