From 4023d07df0ef5db09b88b0326371bb92301ebd2e Mon Sep 17 00:00:00 2001
From: hathach <thachha@live.com>
Date: Wed, 27 Feb 2013 01:57:40 +0700
Subject: [PATCH] add parsing configuration desc & invoke driver install
subtask
---
tests/test/host/test_enum_task.c | 4 ++-
tinyusb/class/hid_host.h | 2 +-
tinyusb/host/usbh.c | 52 ++++++++++++++++++++++++++++----
tinyusb/host/usbh.h | 2 +-
tinyusb/host/usbh_hcd.h | 7 ++++-
5 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/tests/test/host/test_enum_task.c b/tests/test/host/test_enum_task.c
index 308be8806..9cd1e39a3 100644
--- a/tests/test/host/test_enum_task.c
+++ b/tests/test/host/test_enum_task.c
@@ -221,7 +221,9 @@ void test_enum_parse_config_desc(void)
hcd_pipe_control_open_ExpectAndReturn(1, desc_device.bMaxPacketSize0, TUSB_ERROR_NONE);
tusbh_device_attached_cb_ExpectAndReturn((tusb_descriptor_device_t*) enum_data_buffer, 1);
- hidh_install_ExpectAndReturn(1, &desc_configuration.keyboard_interface, TUSB_ERROR_NONE);
+ hidh_install_subtask_IgnoreAndReturn(TUSB_ERROR_NONE);
usbh_enumeration_task();
+
+ TEST_ASSERT_EQUAL(desc_configuration.configuration.bNumInterfaces, usbh_device_info_pool[1].interface_count);
}
diff --git a/tinyusb/class/hid_host.h b/tinyusb/class/hid_host.h
index 1a6130d62..af2805681 100644
--- a/tinyusb/class/hid_host.h
+++ b/tinyusb/class/hid_host.h
@@ -96,7 +96,7 @@ static inline void hidh_init(void)
void hidh_init(void);
#endif
-tusb_error_t hidh_install(uint8_t dev_addr, tusb_descriptor_interface_t const *descriptor) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t hidh_install_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *descriptor, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;
#endif
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index 116540caf..ce677c3a1 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -132,6 +132,7 @@ OSAL_TASK_DECLARE(usbh_enumeration_task)
// for OSAL_NONE local variable won't retain value after blocking service sem_wait/queue_recv
static uint8_t new_addr;
static uint8_t configure_selected = 1;
+ static uint8_t *p_desc = NULL;
OSAL_TASK_LOOP_BEGIN
@@ -177,7 +178,7 @@ OSAL_TASK_DECLARE(usbh_enumeration_task)
)
);
- //------------- update device info & open control pipe for new address -------------//
+ //------------- update port info & open control pipe for new address -------------//
usbh_device_info_pool[new_addr].core_id = usbh_device_info_pool[0].core_id;
usbh_device_info_pool[new_addr].hub_addr = usbh_device_info_pool[0].hub_addr;
usbh_device_info_pool[new_addr].hub_port = usbh_device_info_pool[0].hub_port;
@@ -200,14 +201,16 @@ OSAL_TASK_DECLARE(usbh_enumeration_task)
)
);
+ // update device info
usbh_device_info_pool[new_addr].vendor_id = ((tusb_descriptor_device_t*) enum_data_buffer)->idVendor;
usbh_device_info_pool[new_addr].product_id = ((tusb_descriptor_device_t*) enum_data_buffer)->idProduct;
usbh_device_info_pool[new_addr].configure_count = ((tusb_descriptor_device_t*) enum_data_buffer)->bNumConfigurations;
- //------------- update device info and invoke callback to ask user which configuration to select -------------//
+ //------------- invoke callback to ask user which configuration to select -------------//
if (tusbh_device_attached_cb)
{
- configure_selected = min8_of(1, tusbh_device_attached_cb( (tusb_descriptor_device_t*) enum_data_buffer) );
+ configure_selected = min8_of(1,
+ tusbh_device_attached_cb( (tusb_descriptor_device_t*) enum_data_buffer) );
}else
{
configure_selected = 1;
@@ -228,7 +231,7 @@ OSAL_TASK_DECLARE(usbh_enumeration_task)
)
);
TASK_ASSERT_WITH_HANDLER( TUSB_CFG_HOST_ENUM_BUFFER_SIZE > ((tusb_descriptor_configuration_t*)enum_data_buffer)->wTotalLength,
- tusbh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_CONFIG_DESC_TOO_LONG, NULL) );
+ tusbh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_CONFIG_DESC_TOO_LONG, NULL) );
//------------- Get full configuration descriptor -------------//
OSAL_SUBTASK_INVOKED_AND_WAIT(
@@ -239,13 +242,50 @@ OSAL_TASK_DECLARE(usbh_enumeration_task)
.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_CONFIGURATION << 8) | (configure_selected - 1),
- .wLength = ((tusb_descriptor_configuration_t*)enum_data_buffer)->wTotalLength
+ .wLength = ((tusb_descriptor_configuration_t*) enum_data_buffer)->wTotalLength
},
enum_data_buffer
)
);
- // TODO Configuration Parser & driver install
+ // update configuration info
+ usbh_device_info_pool[new_addr].interface_count = ((tusb_descriptor_configuration_t*) enum_data_buffer)->bNumInterfaces;
+
+ //------------- parse configuration -------------//
+ p_desc = enum_data_buffer + sizeof(tusb_descriptor_configuration_t);
+
+ // parse each interfaces
+ while( p_desc < enum_data_buffer + ((tusb_descriptor_configuration_t*)enum_data_buffer)->wTotalLength )
+ {
+ tusb_descriptor_interface_t *p_interface_desc = (tusb_descriptor_interface_t*) p_desc;
+
+ TASK_ASSERT( TUSB_DESC_INTERFACE == p_interface_desc->bDescriptorType ); // TODO should we skip this descriptor and advance
+
+ // NOTE: cannot use switch (conflicted with OSAL_NONE task)
+ if (TUSB_CLASS_UNSPECIFIED == p_interface_desc->bInterfaceClass)
+ {
+ TASK_ASSERT( false ); // corrupted data
+ }
+#if HOST_CLASS_HID
+ else if ( TUSB_CLASS_HID == p_interface_desc->bInterfaceClass)
+ {
+ uint16_t length;
+ OSAL_SUBTASK_INVOKED_AND_WAIT (
+ hidh_install_subtask(new_addr, p_interface_desc, &length)
+ );
+ p_desc += length;
+ }
+#endif
+ // unsupported class
+ else
+ {
+ do
+ {
+ p_desc += (*p_desc);
+ } while ( (p_desc < enum_data_buffer + ((tusb_descriptor_configuration_t*)enum_data_buffer)->wTotalLength)
+ && TUSB_DESC_INTERFACE != p_desc[1] );
+ }
+ }
//------------- Set Configure -------------//
// (void) hcd_pipe_control_xfer(
diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h
index d0f8423ef..ea3a1d7e9 100644
--- a/tinyusb/host/usbh.h
+++ b/tinyusb/host/usbh.h
@@ -100,7 +100,7 @@ enum {
};
/// Device Status
-enum {
+enum tusbh_device_status_{
TUSB_DEVICE_STATUS_UNPLUG = 0,
TUSB_DEVICE_STATUS_ADDRESSED,
diff --git a/tinyusb/host/usbh_hcd.h b/tinyusb/host/usbh_hcd.h
index fa9eb6591..0fc831cb9 100644
--- a/tinyusb/host/usbh_hcd.h
+++ b/tinyusb/host/usbh_hcd.h
@@ -74,14 +74,19 @@ typedef struct ATTR_ALIGNED(4){
} usbh_enumerate_t;
typedef struct { // TODO internal structure, re-order members
+ //------------- port info -------------//
uint8_t core_id;
uint8_t hub_addr;
uint8_t hub_port;
uint8_t speed;
+ //------------- device descriptor info -------------//
uint16_t vendor_id;
uint16_t product_id;
- uint8_t configure_count;
+ uint8_t configure_count; // bNumConfigurations alias
+
+ //------------- configuration descriptor info -------------//
+ uint8_t interface_count; // bNumInterfaces alias
tusbh_device_status_t status;