diff options
| author | hathach <[email protected]> | 2013-02-26 17:28:05 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-02-26 17:28:05 +0700 |
| commit | 49da21086004bd666564c5bd1bd2a0bb7938205d (patch) | |
| tree | cb57d60704f8cb41b7450108ea12b3ec7cabcd7a /tests | |
| parent | ac744b0401b93bade7d71e38db9f911c9d213fde (diff) | |
add osal subtask support
add usbh_control_xfer_subtask as xfer and wait
fix potential error when update device info & open control pipe for new address
fix build error with hal_****.c
add STATIC_ASSSERT to perform compile time checking with sizeof later
update osal_queue_receive and osal_semaphore_wait for osal_none to support subtask
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test/host/test_enum_task.c | 3 | ||||
| -rw-r--r-- | tests/test/host/test_usbh.c | 1 | ||||
| -rw-r--r-- | tests/test/support/tusb_callback.h | 1 | ||||
| -rw-r--r-- | tests/test/test_osal_none.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/tests/test/host/test_enum_task.c b/tests/test/host/test_enum_task.c index 9fcb2fed0..308be8806 100644 --- a/tests/test/host/test_enum_task.c +++ b/tests/test/host/test_enum_task.c @@ -43,6 +43,7 @@ #include "mock_hcd.h" #include "mock_usbh_hcd.h" #include "mock_tusb_callback.h" +#include "mock_hid_host.h" 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]; @@ -220,7 +221,7 @@ 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); -// hid_install + hidh_install_ExpectAndReturn(1, &desc_configuration.keyboard_interface, TUSB_ERROR_NONE); usbh_enumeration_task(); } diff --git a/tests/test/host/test_usbh.c b/tests/test/host/test_usbh.c index dfd72f186..beb1b1559 100644 --- a/tests/test/host/test_usbh.c +++ b/tests/test/host/test_usbh.c @@ -42,6 +42,7 @@ #include "mock_hcd.h" #include "mock_usbh_hcd.h" #include "mock_tusb_callback.h" +#include "mock_hid_host.h" extern usbh_device_info_t usbh_device_info_pool[TUSB_CFG_HOST_DEVICE_MAX+1]; tusb_handle_device_t dev_hdl; diff --git a/tests/test/support/tusb_callback.h b/tests/test/support/tusb_callback.h index c99baa6bd..5a6e11eb5 100644 --- a/tests/test/support/tusb_callback.h +++ b/tests/test/support/tusb_callback.h @@ -61,7 +61,6 @@ uint8_t tusbh_device_attached_cb (tusb_descriptor_device_t const *p_desc_device) ATTR_WEAK ATTR_WARN_UNUSED_RESULT; void tusbh_device_mounted_cb (tusb_handle_device_t device_hdl) ATTR_WEAK; void tusbh_device_mount_failed_cb(tusb_error_t error, tusb_descriptor_device_t const *p_desc_device) ATTR_WEAK; -void hidh_init(void); #ifdef __cplusplus } diff --git a/tests/test/test_osal_none.c b/tests/test/test_osal_none.c index 1d4b72a16..683e6d4cc 100644 --- a/tests/test/test_osal_none.c +++ b/tests/test/test_osal_none.c @@ -254,7 +254,7 @@ void sample_task_flow_control(void) statements[2]++; osal_semaphore_wait(sem_hdl, OSAL_TIMEOUT_NORMAL, &error); - TASK_ASSERT_STATUS_HANDLER(error, flow_control_error_handler()); + TASK_ASSERT_STATUS_WITH_HANDLER(error, flow_control_error_handler()); statements[3]++; OSAL_TASK_LOOP_END |