refractor move device_addr0 into usbh_device_pool

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

1 files changed, 29 insertions, 31 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();
 }