refractor move device_addr0 into usbh_device_pool

enum_entry contains speed and enum task will not carry out disconnection clean up

5 files changed, 97 insertions, 96 deletions

diff --git a/tests/test/host/test_enum_task.c b/tests/test/host/test_enum_task.c
index 7bb10466e..1ca02494f 100644
--- a/tests/test/host/test_enum_task.c
+++ b/tests/test/host/test_enum_task.c
@@ -44,36 +44,31 @@
 #include "mock_usbh_hcd.h"
 #include "mock_tusb_callback.h"
 
-extern usbh_device_info_t usbh_device_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
-extern usbh_device_addr0_t device_addr0;
+extern usbh_device_info_t usbh_device_info_pool[TUSB_CFG_HOST_DEVICE_MAX+1];
 extern uint8_t enum_data_buffer[TUSB_CFG_HOST_ENUM_BUFFER_SIZE];
-
 tusb_handle_device_t dev_hdl;
-pipe_handle_t pipe_addr0 = 12;
 
 usbh_enumerate_t const enum_connect = {
-    .core_id        = 0,
-    .hub_addr       = 0,
-    .hub_port       = 0,
-    .connect_status = 1
+    .core_id  = 0,
+    .hub_addr = 0,
+    .hub_port = 0,
+    .speed    = TUSB_SPEED_FULL
 };
 
 void queue_recv_stub (osal_queue_handle_t const queue_hdl, uint32_t *p_data, uint32_t msec, tusb_error_t *p_error, int num_call);
 void semaphore_wait_success_stub(osal_semaphore_handle_t const sem_hdl, uint32_t msec, tusb_error_t *p_error, int num_call);
-tusb_error_t control_xfer_stub(pipe_handle_t pipe_hdl, const tusb_std_request_t * const p_request, uint8_t data[], int num_call);
+tusb_error_t control_xfer_stub(uint8_t dev_addr, const tusb_std_request_t * const p_request, uint8_t data[], int num_call);
 
 void setUp(void)
 {
-  memclr_(usbh_device_info_pool, sizeof(usbh_device_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
+  memclr_(usbh_device_info_pool, sizeof(usbh_device_info_t)*(TUSB_CFG_HOST_DEVICE_MAX+1));
 
   osal_queue_receive_StubWithCallback(queue_recv_stub);
   osal_semaphore_wait_StubWithCallback(semaphore_wait_success_stub);
   hcd_pipe_control_xfer_StubWithCallback(control_xfer_stub);
 
   hcd_port_connect_status_ExpectAndReturn(enum_connect.core_id, true);
-  hcd_port_speed_ExpectAndReturn(enum_connect.core_id, TUSB_SPEED_FULL);
-
-  hcd_addr0_open_IgnoreAndReturn(TUSB_ERROR_NONE);
+  hcd_pipe_control_open_ExpectAndReturn(0, 8, TUSB_ERROR_NONE);
 }
 
 void tearDown(void)
@@ -109,7 +104,7 @@ semaphore_wait_timeout(2)
 semaphore_wait_timeout(3)
 semaphore_wait_timeout(4)
 
-tusb_error_t control_xfer_stub(pipe_handle_t pipe_hdl, const tusb_std_request_t * const p_request, uint8_t data[], int num_call)
+tusb_error_t control_xfer_stub(uint8_t dev_addr, const tusb_std_request_t * const p_request, uint8_t data[], int num_call)
 {
   switch (num_call)
   {
@@ -171,31 +166,34 @@ void test_addr0_failed_set_address(void)
   TEST_ASSERT_EQUAL_MEMORY(&desc_device, enum_data_buffer, 8);
 }
 
-void test_enum_task_connect(void)
+
+
+void test_enum_failed_get_full_dev_desc(void)
 {
-  usbh_enumeration_task();
+  pipe_handle_t a_pipe = 0x1111;
+  osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(2));
 
-  TEST_ASSERT_EQUAL(TUSB_DEVICE_STATUS_ADDRESSED, usbh_device_info_pool[0].status);
-  TEST_ASSERT_EQUAL(TUSB_SPEED_FULL, usbh_device_info_pool[0].speed);
-  TEST_ASSERT_EQUAL(enum_connect.core_id, usbh_device_info_pool[0].core_id);
-  TEST_ASSERT_EQUAL(enum_connect.hub_addr, usbh_device_info_pool[0].hub_addr);
-  TEST_ASSERT_EQUAL(enum_connect.hub_port, usbh_device_info_pool[0].hub_port);
+  hcd_pipe_control_open_ExpectAndReturn(1, desc_device.bMaxPacketSize0, a_pipe);
+  tusbh_device_mount_failed_cb_Expect(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL);
 
-//  hcd_pipe_control_open_ExpectAndReturn(1, desc_device.bMaxPacketSize0, TUSB_ERROR_NONE);
+  usbh_enumeration_task();
 
+  TEST_ASSERT_EQUAL(TUSB_DEVICE_STATUS_ADDRESSED, usbh_device_info_pool[1].status);
+  TEST_ASSERT_EQUAL(TUSB_SPEED_FULL, usbh_device_info_pool[1].speed);
+  TEST_ASSERT_EQUAL(enum_connect.core_id, usbh_device_info_pool[1].core_id);
+  TEST_ASSERT_EQUAL(enum_connect.hub_addr, usbh_device_info_pool[1].hub_addr);
+  TEST_ASSERT_EQUAL(enum_connect.hub_port, usbh_device_info_pool[1].hub_port);
 }
 
-void test_enum_task_disconnect(void)
+void test_enum_update_new_device_info(void)
 {
   TEST_IGNORE();
-}
 
-void test_enum_task_connect_via_hub(void)
-{
-  TEST_IGNORE();
-}
+  osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(2));
+
+  usbh_enumeration_task();
+
+
+//  hcd_pipe_control_open_ExpectAndReturn(1, desc_device.bMaxPacketSize0, TUSB_ERROR_NONE);
 
-void test_enum_task_disconnect_via_hub(void)
-{
-  TEST_IGNORE();
 }
diff --git a/tests/test/host/test_usbh.c b/tests/test/host/test_usbh.c
index e0fc003ee..da435426c 100644
--- a/tests/test/host/test_usbh.c
+++ b/tests/test/host/test_usbh.c
@@ -42,12 +42,12 @@
 #include "mock_hcd.h"
 #include "mock_usbh_hcd.h"
 
-extern usbh_device_info_t usbh_device_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
+extern usbh_device_info_t usbh_device_info_pool[TUSB_CFG_HOST_DEVICE_MAX+1];
 tusb_handle_device_t dev_hdl;
 void setUp(void)
 {
   dev_hdl = 0;
-  memset(usbh_device_info_pool, 0, TUSB_CFG_HOST_DEVICE_MAX*sizeof(usbh_device_info_t));
+  memset(usbh_device_info_pool, 0, (TUSB_CFG_HOST_DEVICE_MAX+1)*sizeof(usbh_device_info_t));
 }
 
 void tearDown(void)
@@ -86,8 +86,8 @@ void test_usbh_init_ok(void)
 {
   uint32_t dummy;
 
-  usbh_device_info_t device_info_zero[TUSB_CFG_HOST_DEVICE_MAX];
-  memclr_(device_info_zero, sizeof(usbh_device_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
+  usbh_device_info_t device_info_zero[TUSB_CFG_HOST_DEVICE_MAX+1];
+  memclr_(device_info_zero, sizeof(usbh_device_info_t)*(TUSB_CFG_HOST_DEVICE_MAX+1));
 
   for(uint32_t i=0; i<TUSB_CFG_HOST_CONTROLLER_NUM; i++)
     hcd_init_ExpectAndReturn(i, TUSB_ERROR_NONE);
@@ -97,14 +97,14 @@ void test_usbh_init_ok(void)
 
   TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, usbh_init());
 
-  TEST_ASSERT_EQUAL_MEMORY(device_info_zero, usbh_device_info_pool, sizeof(usbh_device_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
+  TEST_ASSERT_EQUAL_MEMORY(device_info_zero, usbh_device_info_pool, sizeof(usbh_device_info_t)*(TUSB_CFG_HOST_DEVICE_MAX+1));
 }
 
 void test_usbh_status_get_fail(void)
 {
   usbh_device_info_pool[dev_hdl].status = 0;
 
-  TEST_ASSERT_EQUAL( 0, tusbh_device_status_get(TUSB_CFG_HOST_DEVICE_MAX) );
+  TEST_ASSERT_EQUAL( 0, tusbh_device_status_get(TUSB_CFG_HOST_DEVICE_MAX+1) );
   TEST_ASSERT_EQUAL( TUSB_DEVICE_STATUS_UNPLUG, tusbh_device_status_get(dev_hdl) );
 }
 
diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h
index 079a0c4f3..5eb705c77 100644
--- a/tinyusb/host/hcd.h
+++ b/tinyusb/host/hcd.h
@@ -71,8 +71,8 @@ tusb_error_t hcd_init(uint8_t hostid) ATTR_WARN_UNUSED_RESULT;
 //--------------------------------------------------------------------+
 // PIPE API
 //--------------------------------------------------------------------+
-pipe_handle_t hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size) ATTR_WARN_UNUSED_RESULT;
-tusb_error_t  hcd_pipe_control_xfer(pipe_handle_t pipe_hdl, tusb_std_request_t const * p_request, uint8_t data[]) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t  hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_std_request_t const * p_request, uint8_t data[]) ATTR_WARN_UNUSED_RESULT;
 pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_descriptor_endpoint_t const * endpoint_desc) ATTR_WARN_UNUSED_RESULT;
 
 #if 0
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index fd2f94ce6..17bcc2027 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -58,14 +58,14 @@
 //--------------------------------------------------------------------+
 static inline uint8_t get_new_address(void) ATTR_ALWAYS_INLINE;
 
-STATIC_ usbh_device_info_t usbh_device_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
+STATIC_ usbh_device_info_t usbh_device_info_pool[TUSB_CFG_HOST_DEVICE_MAX+1]; // including zero-address
 
 //--------------------------------------------------------------------+
 // PUBLIC API (Parameter Verification is required)
 //--------------------------------------------------------------------+
 tusbh_device_status_t tusbh_device_status_get (tusb_handle_device_t const device_hdl)
 {
-  ASSERT(device_hdl < TUSB_CFG_HOST_DEVICE_MAX, 0);
+  ASSERT(device_hdl <= TUSB_CFG_HOST_DEVICE_MAX, 0);
   return usbh_device_info_pool[device_hdl].status;
 }
 
@@ -77,65 +77,75 @@ OSAL_TASK_DEF(enum_task, usbh_enumeration_task, 128, OSAL_PRIO_HIGH);
 #define ENUM_QUEUE_DEPTH  5
 OSAL_QUEUE_DEF(enum_queue, ENUM_QUEUE_DEPTH, uin32_t);
 osal_queue_handle_t enum_queue_hdl;
-
-usbh_device_addr0_t device_addr0 TUSB_CFG_ATTR_USBRAM;
 STATIC_ uint8_t enum_data_buffer[TUSB_CFG_HOST_ENUM_BUFFER_SIZE] TUSB_CFG_ATTR_USBRAM;
 
 
 void usbh_enumeration_task(void)
 {
   tusb_error_t error;
+  usbh_enumerate_t enum_entry;
   static uint8_t new_addr;
 
   OSAL_TASK_LOOP_BEGIN
 
-  osal_queue_receive(enum_queue_hdl, (uint32_t*)(&device_addr0.enum_entry), OSAL_TIMEOUT_WAIT_FOREVER, &error);
+  osal_queue_receive(enum_queue_hdl, (uint32_t*)(&enum_entry), OSAL_TIMEOUT_WAIT_FOREVER, &error);
 
-  if (device_addr0.enum_entry.hub_addr == 0) // direct connection
-  {
-    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
+  TASK_ASSERT( hcd_port_connect_status(enum_entry.core_id) ); // device may be unplugged
+  usbh_device_info_pool[0].core_id  = enum_entry.core_id;
+  usbh_device_info_pool[0].hub_addr = enum_entry.hub_addr;
+  usbh_device_info_pool[0].hub_port = enum_entry.hub_port;
+  usbh_device_info_pool[0].speed    = enum_entry.speed;
+
+  TASK_ASSERT_STATUS( hcd_pipe_control_open(0, 8) );
 
-    device_addr0.speed = hcd_port_speed(device_addr0.enum_entry.core_id);
-    TASK_ASSERT_STATUS( hcd_addr0_open(&device_addr0) );
+  { // Get first 8 bytes of device descriptor to get Control Endpoint Size
+    tusb_std_request_t request_8byte_device_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
+    };
 
-    { // Get first 8 bytes of device descriptor to get Control Endpoint Size
-      tusb_std_request_t request_device_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
-      };
+    hcd_pipe_control_xfer(0, &request_8byte_device_desc, enum_data_buffer);
+    osal_semaphore_wait(usbh_device_info_pool[0].sem_hdl, OSAL_TIMEOUT_NORMAL, &error); // careful of local variable without static
+    TASK_ASSERT_STATUS_HANDLER(error, tusbh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL) );
+  }
 
-      hcd_pipe_control_xfer(device_addr0.pipe_hdl, &request_device_desc, enum_data_buffer);
-      osal_semaphore_wait(device_addr0.sem_hdl, OSAL_TIMEOUT_NORMAL, &error); // careful of local variable without static
-      TASK_ASSERT_STATUS_HANDLER(error, tusbh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL) );
-    }
+  new_addr = get_new_address();
+  TASK_ASSERT(new_addr <= TUSB_CFG_HOST_DEVICE_MAX);
 
-    new_addr = get_new_address();
-    TASK_ASSERT(new_addr < TUSB_CFG_HOST_DEVICE_MAX);
+  { // Set new address
+    tusb_std_request_t request_set_address = {
+        .bmRequestType = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
+        .bRequest = TUSB_REQUEST_SET_ADDRESS,
+        .wValue   = new_addr
+    };
 
-    { // Set new address
-      tusb_std_request_t request_set_address = {
-          .bmRequestType = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
-          .bRequest = TUSB_REQUEST_SET_ADDRESS,
-          .wValue   = (new_addr+1)
-      };
+    hcd_pipe_control_xfer(0, &request_set_address, NULL);
+    osal_semaphore_wait(usbh_device_info_pool[0].sem_hdl, OSAL_TIMEOUT_NORMAL, &error); // careful of local variable without static
+    TASK_ASSERT_STATUS_HANDLER(error, tusbh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL) );
+  }
 
-      hcd_pipe_control_xfer(device_addr0.pipe_hdl, &request_set_address, NULL);
-      osal_semaphore_wait(device_addr0.sem_hdl, OSAL_TIMEOUT_NORMAL, &error); // careful of local variable without static
-      TASK_ASSERT_STATUS_HANDLER(error, tusbh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL) );
-    }
+  // update device info & open control pipe for new address
+  usbh_device_info_pool[new_addr].core_id  = enum_entry.core_id;
+  usbh_device_info_pool[new_addr].hub_addr = enum_entry.hub_addr;
+  usbh_device_info_pool[new_addr].hub_port = enum_entry.hub_port;
+  usbh_device_info_pool[new_addr].speed    = enum_entry.speed;
+  usbh_device_info_pool[new_addr].status   = TUSB_DEVICE_STATUS_ADDRESSED;
 
-    // update data for the new device
-    usbh_device_info_pool[new_addr].core_id  = device_addr0.enum_entry.core_id;
-    usbh_device_info_pool[new_addr].hub_addr = device_addr0.enum_entry.hub_addr;
-    usbh_device_info_pool[new_addr].hub_port = device_addr0.enum_entry.hub_port;
-    usbh_device_info_pool[new_addr].speed    = device_addr0.speed;
-    usbh_device_info_pool[new_addr].status   = TUSB_DEVICE_STATUS_ADDRESSED;
+//  usbh_device_info_pool[new_addr].pipe_control = hcd_pipe_control_open(new_addr, ((tusb_descriptor_device_t*) enum_data_buffer)->bMaxPacketSize0 );
 
-  }else // device connect via a hub
-  {
-    ASSERT_MESSAGE("%s", "Hub is not supported yet");
+  { // Get full device descriptor
+    //      tusb_std_request_t request_device_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  = 18
+    //      };
+    //
+    //      hcd_pipe_control_xfer(device_addr0.pipe_hdl, &request_device_desc, enum_data_buffer);
+    //      osal_semaphore_wait(usbh_device_info_pool[0].sem_hdl, OSAL_TIMEOUT_NORMAL, &error); // careful of local variable without static
+    //      TASK_ASSERT_STATUS_HANDLER(error, tusbh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL) );
   }
 
   OSAL_TASK_LOOP_END
@@ -153,7 +163,7 @@ tusb_error_t usbh_init(void)
 {
   uint32_t i;
 
-  memclr_(usbh_device_info_pool, sizeof(usbh_device_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
+  memclr_(usbh_device_info_pool, sizeof(usbh_device_info_t)*(TUSB_CFG_HOST_DEVICE_MAX+1));
 
   for(i=0; i<TUSB_CFG_HOST_CONTROLLER_NUM; i++)
   {
@@ -174,7 +184,7 @@ tusb_error_t usbh_init(void)
 static inline uint8_t get_new_address(void)
 {
   uint8_t new_addr;
-  for (new_addr=0; new_addr<TUSB_CFG_HOST_DEVICE_MAX; new_addr++)
+  for (new_addr=1; new_addr <= TUSB_CFG_HOST_DEVICE_MAX; new_addr++)
   {
     if (usbh_device_info_pool[new_addr].status == TUSB_DEVICE_STATUS_UNPLUG)
       break;
diff --git a/tinyusb/host/usbh_hcd.h b/tinyusb/host/usbh_hcd.h
index 111afeae6..fa9eb6591 100644
--- a/tinyusb/host/usbh_hcd.h
+++ b/tinyusb/host/usbh_hcd.h
@@ -70,23 +70,14 @@ typedef struct ATTR_ALIGNED(4){
   uint8_t core_id;
   uint8_t hub_addr;
   uint8_t hub_port;
-  uint8_t connect_status;
+  uint8_t speed;
 } usbh_enumerate_t;
 
-typedef struct {
-  usbh_enumerate_t enum_entry;
-  tusb_speed_t speed;
-  tusb_std_request_t request_packet; // needed to be on USB RAM
-  pipe_handle_t pipe_hdl;
-  OSAL_SEM_DEF(semaphore);
-  osal_semaphore_handle_t sem_hdl;
-} usbh_device_addr0_t;
-
 typedef struct { // TODO internal structure, re-order members
   uint8_t core_id;
-  tusb_speed_t speed;
   uint8_t hub_addr;
   uint8_t hub_port;
+  uint8_t speed;
 
   uint16_t vendor_id;
   uint16_t product_id;
@@ -94,8 +85,10 @@ typedef struct { // TODO internal structure, re-order members
 
   tusbh_device_status_t status;
 
-  pipe_handle_t pipe_control;
+//  pipe_handle_t pipe_control; NOTE: use device address/handle instead
   tusb_std_request_t request_control;
+  OSAL_SEM_DEF(semaphore);
+  osal_semaphore_handle_t sem_hdl;
 
 #if 0 // TODO allow configure for vendor/product
   struct {
@@ -109,7 +102,7 @@ typedef struct { // TODO internal structure, re-order members
 //--------------------------------------------------------------------+
 // ADDRESS 0 API
 //--------------------------------------------------------------------+
-tusb_error_t hcd_addr0_open(usbh_device_addr0_t *dev_addr0) ATTR_WARN_UNUSED_RESULT;
+//tusb_error_t hcd_addr0_open(usbh_device_addr0_t *dev_addr0) ATTR_WARN_UNUSED_RESULT;
 //NOTE addr0 close is not needed tusb_error_t hcd_addr0_close(usbh_device_addr0_t *dev_addr0) ATTR_WARN_UNUSED_RESULT;
 
 #ifdef __cplusplus