fix osal_semaphore_wait & osal_queue_receive of osal_none's bug

- not assign error to TUSB_ERROR_NON if succeed

add code up to set device address for enumeration

2 files changed, 28 insertions, 13 deletions

diff --git a/tests/test/host/test_usbh.c b/tests/test/host/test_usbh.c
index 8f4d84be4..02177122e 100644
--- a/tests/test/host/test_usbh.c
+++ b/tests/test/host/test_usbh.c
@@ -126,6 +126,7 @@ usbh_enumerate_t enum_connect =
     .hub_port = 0,
     .connect_status = 1
 };
+extern usbh_device_addr0_t device_addr0;
 
 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)
 {
@@ -134,6 +135,11 @@ void queue_recv_stub (osal_queue_handle_t const queue_hdl, uint32_t *p_data, uin
   (*p_error) = TUSB_ERROR_NONE;
 }
 
+void semaphore_wait_stub(osal_semaphore_handle_t const sem_hdl, uint32_t msec, tusb_error_t *p_error, int num_call)
+{
+  (*p_error) = TUSB_ERROR_NONE;
+}
+
 tusb_error_t pipe_control_stub(pipe_handle_t pipe_hdl, const tusb_std_request_t * const p_request, uint8_t data[], int num_call)
 {
   tusb_descriptor_device_t dev_desc =
@@ -158,18 +164,24 @@ tusb_error_t pipe_control_stub(pipe_handle_t pipe_hdl, const tusb_std_request_t
       .bNumConfigurations = 0x02
   };
 
-  if (p_request->bRequest == TUSB_REQUEST_GET_DESCRIPTOR)
+  switch (p_request->bRequest)
   {
-    switch (p_request->wValue >> 8)
-    {
-      case TUSB_DESC_DEVICE:
-        memcpy(data, &dev_desc, p_request->wLength);
-      break;
+    case TUSB_REQUEST_GET_DESCRIPTOR:
+      switch (p_request->wValue >> 8)
+      {
+        case TUSB_DESC_DEVICE:
+          memcpy(data, &dev_desc, p_request->wLength);
+        break;
 
-      default:
-        TEST_FAIL();
-      break;
-    }
+        default:
+          TEST_FAIL();
+        break;
+      }
+    break;
+
+    case TUSB_REQUEST_SET_ADDRESS:
+      TEST_ASSERT_EQUAL(p_request->wValue, 1);
+    break;
   }
 
   return TUSB_ERROR_NONE;
@@ -185,7 +197,10 @@ void test_enum_task_connect(void)
   hcd_addr0_open_IgnoreAndReturn(TUSB_ERROR_NONE);
 
   hcd_pipe_control_xfer_StubWithCallback(pipe_control_stub);
-//  hcd_pipe_control_open_ExpectAnd(1, );
+  osal_semaphore_wait_StubWithCallback(semaphore_wait_stub);
+
+  hcd_pipe_control_xfer_StubWithCallback(pipe_control_stub);
+  osal_semaphore_wait_StubWithCallback(semaphore_wait_stub);
 
   usbh_enumeration_task();
 }
diff --git a/tests/test/test_osal_freeRTOS.c b/tests/test/test_osal_freeRTOS.c
index ddb6b63f2..437ba130c 100644
--- a/tests/test/test_osal_freeRTOS.c
+++ b/tests/test/test_osal_freeRTOS.c
@@ -57,8 +57,8 @@ osal_queue_handle_t queue_hdl;
 void setUp(void)
 {
   memset(statements, 0, sizeof(statements));
-  sem_hdl = osal_semaphore_create(OSAL_SEM_REF(sem));
-  queue_hdl = osal_queue_create(&queue);
+//  sem_hdl = osal_semaphore_create(OSAL_SEM_REF(sem));
+//  queue_hdl = osal_queue_create(&queue);
 }
 
 void tearDown(void)