add std=gnu99 for test build

add hcd_init to usbh_init and update test code
add TUSB_CFG_OS_TICK_PER_SECOND define for TUSB_OS_NONE
change osal_semaphore_wait and osal_queue_receive API to have timeout effectively

4 files changed, 53 insertions, 29 deletions

diff --git a/tests/project.yml b/tests/project.yml
index 039d04579..feedb7b65 100644
--- a/tests/project.yml
+++ b/tests/project.yml
@@ -44,14 +44,14 @@
   :commmon: &common_defines []
   :test:
     - *common_defines
-    - _TEST_
+    - _TEST_ -std=gnu99
     - MCU=MCU_LPC43XX
     - CORE_M4
     - __CODE_RED
     - _TINY_USB_SOURCE_FILE_
   :test_preprocess:
     - *common_defines
-    - _TEST_
+    - _TEST_ -std=gnu99
     - MCU=MCU_LPC43XX
     - CORE_M4
     - __CODE_RED
diff --git a/tests/test/host/test_usbd_host.c b/tests/test/host/test_usbd_host.c
index 255ef3dad..7dceff7db 100644
--- a/tests/test/host/test_usbd_host.c
+++ b/tests/test/host/test_usbd_host.c
@@ -39,6 +39,7 @@
 #include "errors.h"
 #include "usbd_host.h"
 #include "mock_osal.h"
+#include "mock_hcd.h"
 
 extern usbh_device_info_t device_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
 tusb_handle_device_t dev_hdl;
@@ -55,26 +56,42 @@ void tearDown(void)
 //--------------------------------------------------------------------+
 // init, get_status
 //--------------------------------------------------------------------+
+void test_usbh_init_hcd_failed(void)
+{
+  hcd_init_IgnoreAndReturn(TUSB_ERROR_HCD_FAILED);
+  TEST_ASSERT_EQUAL(TUSB_ERROR_HCD_FAILED, usbh_init());
+}
+
 void test_usbh_init_task_create_failed(void)
 {
+  for(uint32_t i=0; i<TUSB_CFG_HOST_CONTROLLER_NUM; i++)
+    hcd_init_ExpectAndReturn(i, TUSB_ERROR_NONE);
+
   osal_task_create_IgnoreAndReturn(TUSB_ERROR_OSAL_TASK_FAILED);
   TEST_ASSERT_EQUAL(TUSB_ERROR_OSAL_TASK_FAILED, usbh_init());
 }
 
 void test_usbh_init_queue_create_failed(void)
 {
+  for(uint32_t i=0; i<TUSB_CFG_HOST_CONTROLLER_NUM; i++)
+    hcd_init_ExpectAndReturn(i, TUSB_ERROR_NONE);
+
   osal_task_create_IgnoreAndReturn(TUSB_ERROR_NONE);
   osal_queue_create_IgnoreAndReturn(NULL);
   TEST_ASSERT_EQUAL(TUSB_ERROR_OSAL_QUEUE_FAILED, usbh_init());
 }
 
-void test_usbh_init_checkmem(void)
+
+void test_usbh_init_ok(void)
 {
   uint32_t dummy;
 
   usbh_device_info_t device_info_zero[TUSB_CFG_HOST_DEVICE_MAX];
   memset(device_info_zero, 0, sizeof(usbh_device_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
 
+  for(uint32_t i=0; i<TUSB_CFG_HOST_CONTROLLER_NUM; i++)
+    hcd_init_ExpectAndReturn(i, TUSB_ERROR_NONE);
+
   osal_task_create_IgnoreAndReturn(TUSB_ERROR_NONE);
   osal_queue_create_IgnoreAndReturn((osal_queue_handle_t)(&dummy));
 
@@ -100,40 +117,41 @@ void test_usbh_status_get_succeed(void)
 //--------------------------------------------------------------------+
 // enum task
 //--------------------------------------------------------------------+
-void test_enum_task(void)
+extern osal_queue_handle_t enumeration_queue_hdl;
+usbh_enumerate_t enum_connect =
 {
-//  osal_queue_
-  TEST_IGNORE();
-  usbh_enumerate_task();
-}
+    .core_id = 0,
+    .hub_address = 0,
+    .hub_port = 0,
+    .connect_status = 1
+};
 
+void queue_recv_stub (osal_queue_handle_t const queue_hdl, uint32_t *p_data, osal_timeout_t msec, tusb_error_t *p_error, int num_call)
+{
+  TEST_ASSERT_EQUAL_PTR(enumeration_queue_hdl, queue_hdl);
+  memcpy(p_data, &enum_connect, 4);
+  (*p_error) = TUSB_ERROR_NONE;
+}
 
-#if 0
-void test_keyboard_open_invalid_para()
+void test_enum_task_connect(void)
 {
-  tusb_handle_keyboard_t keyboard_handle;
+  osal_queue_receive_StubWithCallback(queue_recv_stub);
+  hcd_port_connect_status_ExpectAndReturn(enum_connect.core_id, true);
 
-  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_keyboard_open(TUSB_CFG_HOST_DEVICE_MAX, 1, &keyboard_handle) );
-  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_keyboard_open(0, 0, &keyboard_handle) );
-  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_keyboard_open(0, TUSB_CFG_CONFIGURATION_MAX+1, &keyboard_handle) );
-  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_keyboard_open(0, 1, NULL) );
+  usbh_enumerate_task();
 }
 
-void test_keyboard_open_succeed()
+void test_enum_task_disconnect(void)
 {
-  tusb_handle_keyboard_t keyboard_handle = 0;
+  TEST_IGNORE();
+}
 
-  TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, tusbh_keyboard_open(0, 1, &keyboard_handle));
-  TEST_ASSERT_TRUE( 0 != keyboard_handle);
+void test_enum_task_connect_via_hub(void)
+{
+  TEST_IGNORE();
 }
 
-void test_keyboard_callback__()
+void test_enum_task_disconnect_via_hub(void)
 {
   TEST_IGNORE();
-  tusb_handle_device_t device_handle = __LINE__;
-  tusb_handle_configure_t configure_handle = __LINE__;
-  tusb_handle_interface_t interface_handle = __LINE__;
-  uint32_t configure_flags = BIT_(TUSB_CLASS_HID);
-  tusbh_usbd_device_mounted_cb_ExpectWithArray(TUSB_ERROR_NONE, device_handle, &configure_flags, 1, 1);
 }
-#endif
diff --git a/tests/test/support/tusb_config.h b/tests/test/support/tusb_config.h
index c02f12d66..87b09a9dd 100644
--- a/tests/test/support/tusb_config.h
+++ b/tests/test/support/tusb_config.h
@@ -88,6 +88,7 @@
 #define TUSB_CFG_DEBUG 3
 
 #define TUSB_CFG_OS TUSB_OS_NONE
+#define TUSB_CFG_OS_TICK_PER_SECOND 1000 // 1 ms tick
 
 #ifdef __CODE_RED // make use of code red's support for ram region macros
   #if (MCU == MCU_LPC11UXX) || (MCU == MCU_LPC13UXX)
diff --git a/tests/test/test_osal_none.c b/tests/test/test_osal_none.c
index 8ae0bfd51..122dc48e2 100644
--- a/tests/test/test_osal_none.c
+++ b/tests/test/test_osal_none.c
@@ -107,19 +107,20 @@ void test_queue_send(void)
 //--------------------------------------------------------------------+
 void sample_task_semaphore(void)
 {
+  tusb_error_t error = TUSB_ERROR_NONE;
   OSAL_TASK_LOOP
   {
     OSAL_TASK_LOOP_BEGIN
 
     statements[0]++;
 
-    osal_semaphore_wait(sem_hdl, OSAL_TIMEOUT_WAIT_FOREVER);
+    osal_semaphore_wait(sem_hdl, OSAL_TIMEOUT_WAIT_FOREVER, &error);
     statements[1]++;
 
-    osal_semaphore_wait(sem_hdl, OSAL_TIMEOUT_WAIT_FOREVER);
+    osal_semaphore_wait(sem_hdl, OSAL_TIMEOUT_WAIT_FOREVER, &error);
     statements[2]++;
 
-    osal_semaphore_wait(sem_hdl, OSAL_TIMEOUT_WAIT_FOREVER);
+    osal_semaphore_wait(sem_hdl, OSAL_TIMEOUT_WAIT_FOREVER, &error);
     statements[3]++;
 
     OSAL_TASK_LOOP_END
@@ -139,12 +140,16 @@ void test_task_with_semaphore(void)
   sample_task_semaphore();
   TEST_ASSERT_EQUAL(1, statements[1]);
 
+  // post 2 consecutive times
   osal_semaphore_post(sem_hdl);
   osal_semaphore_post(sem_hdl);
   sample_task_semaphore();
   TEST_ASSERT_EQUAL(1, statements[2]);
   TEST_ASSERT_EQUAL(1, statements[3]);
 
+  // timeout
+
+
   // reach end of task loop, back to beginning
   sample_task_semaphore();
   TEST_ASSERT_EQUAL(2, statements[0]);