From 68dddefe7b87583cf2eaac68f2d77e2a5efd3d69 Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 5 Apr 2013 14:00:37 +0700 Subject: add control xfer for ehci controller fake: ehci_controller_control_xfer_proceed refractor test code --- tests/test/host/ehci/test_ehci_isr.c | 12 +- tests/test/host/integration/test_hidh_keyboard.c | 73 ++++++ tests/test/host/test_enum_task.c | 276 ----------------------- tests/test/host/test_usbh.c | 193 ---------------- tests/test/host/usbh/test_enum_task.c | 276 +++++++++++++++++++++++ tests/test/host/usbh/test_usbh.c | 193 ++++++++++++++++ tests/test/support/ehci_controller.c | 32 ++- tests/test/support/type_helper.h | 74 ++++++ tinyusb/core/std_request.h | 2 +- tinyusb/host/ehci/ehci.c | 3 - 10 files changed, 651 insertions(+), 483 deletions(-) create mode 100644 tests/test/host/integration/test_hidh_keyboard.c delete mode 100644 tests/test/host/test_enum_task.c delete mode 100644 tests/test/host/test_usbh.c create mode 100644 tests/test/host/usbh/test_enum_task.c create mode 100644 tests/test/host/usbh/test_usbh.c create mode 100644 tests/test/support/type_helper.h diff --git a/tests/test/host/ehci/test_ehci_isr.c b/tests/test/host/ehci/test_ehci_isr.c index ebf6f5942..b2afa6c9c 100644 --- a/tests/test/host/ehci/test_ehci_isr.c +++ b/tests/test/host/ehci/test_ehci_isr.c @@ -69,32 +69,26 @@ void tearDown(void) void test_isr_device_connect_highspeed(void) { - ehci_controller_device_plug(hostid, TUSB_SPEED_HIGH); - usbh_device_plugged_isr_Expect(hostid, TUSB_SPEED_HIGH); //------------- Code Under Test -------------// - hcd_isr(hostid); + ehci_controller_device_plug(hostid, TUSB_SPEED_HIGH); } void test_isr_device_connect_fullspeed(void) { - ehci_controller_device_plug(hostid, TUSB_SPEED_FULL); - usbh_device_plugged_isr_Expect(hostid, TUSB_SPEED_FULL); //------------- Code Under Test -------------// - hcd_isr(hostid); + ehci_controller_device_plug(hostid, TUSB_SPEED_FULL); } void test_isr_device_connect_slowspeed(void) { - ehci_controller_device_plug(hostid, TUSB_SPEED_LOW); - usbh_device_plugged_isr_Expect(hostid, TUSB_SPEED_LOW); //------------- Code Under Test -------------// - hcd_isr(hostid); + ehci_controller_device_plug(hostid, TUSB_SPEED_LOW); } void test_isr_device_disconnect(void) diff --git a/tests/test/host/integration/test_hidh_keyboard.c b/tests/test/host/integration/test_hidh_keyboard.c new file mode 100644 index 000000000..d66b81040 --- /dev/null +++ b/tests/test/host/integration/test_hidh_keyboard.c @@ -0,0 +1,73 @@ +/* + * test_hidh_keyboard.c + * + * Created on: Apr 5, 2013 + * Author: hathach + */ + +/* + * Software License Agreement (BSD License) + * Copyright (c) 2012, hathach (tinyusb.org) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + * + * This file is part of the tiny usb stack. + */ +#define _TINY_USB_SOURCE_FILE_ + +#include "stdlib.h" +#include "unity.h" +#include "type_helper.h" +#include "tusb_option.h" +#include "errors.h" + +#include "osal_none.h" +#include "hcd.h" +#include "usbh.h" +#include "tusb.h" +#include "hid_host.h" + +#include "descriptor_test.h" + +uint8_t dev_addr; +uint8_t hostid; + +void setUp(void) +{ + dev_addr = RANDOM(TUSB_CFG_HOST_DEVICE_MAX)+1; + hostid = RANDOM(CONTROLLER_HOST_NUMBER) + TEST_CONTROLLER_HOST_START_INDEX; + + tusb_init(); +} + +void tearDown(void) +{ +} + +void test_(void) +{ + ehci_controller_device_plug(hostid, TUSB_SPEED_HIGH); + + +} diff --git a/tests/test/host/test_enum_task.c b/tests/test/host/test_enum_task.c deleted file mode 100644 index 28a6a3c9e..000000000 --- a/tests/test/host/test_enum_task.c +++ /dev/null @@ -1,276 +0,0 @@ -/* - * test_enum_task.c - * - * Created on: Feb 5, 2013 - * Author: hathach - */ - -/* - * Software License Agreement (BSD License) - * Copyright (c) 2012, hathach (tinyusb.org) - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - * - * This file is part of the tiny usb stack. - */ - -#include "unity.h" -#include "errors.h" -#include "descriptor_test.h" - -#include "mock_osal.h" -#include "usbh.h" -#include "mock_hcd.h" -#include "usbh_hcd.h" - -#include "mock_tusb_callback.h" -#include "mock_hid_host.h" - -extern usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; -extern uint8_t enum_data_buffer[TUSB_CFG_HOST_ENUM_BUFFER_SIZE]; -uint8_t dev_addr; - -usbh_enumerate_t const enum_connect = { - .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(uint8_t dev_addr, const tusb_std_request_t * const p_request, uint8_t data[], int num_call); - -void setUp(void) -{ - memclr_(usbh_devices, 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); - osal_semaphore_reset_Expect( usbh_devices[0].control.sem_hdl ); - hcd_pipe_control_open_ExpectAndReturn(0, 8, TUSB_ERROR_NONE); -} - -void tearDown(void) -{ -} - -//--------------------------------------------------------------------+ -// STUB & HELPER -//--------------------------------------------------------------------+ -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) -{ - (*p_data) = ( *((uint32_t*) &enum_connect) ); - (*p_error) = TUSB_ERROR_NONE; -} - -void semaphore_wait_success_stub(osal_semaphore_handle_t const sem_hdl, uint32_t msec, tusb_error_t *p_error, int num_call) -{ - (*p_error) = TUSB_ERROR_NONE; -} - -#define semaphore_wait_timeout_stub(n) semaphore_wait_timeout_##n -#define semaphore_wait_timeout(n) \ - void semaphore_wait_timeout_##n(osal_semaphore_handle_t const sem_hdl, uint32_t msec, tusb_error_t *p_error, int num_call) {\ - if (num_call >= n)\ - (*p_error) = TUSB_ERROR_OSAL_TIMEOUT;\ - else \ - (*p_error) = TUSB_ERROR_NONE;\ - } - -semaphore_wait_timeout(0) -semaphore_wait_timeout(1) -semaphore_wait_timeout(2) -semaphore_wait_timeout(3) -semaphore_wait_timeout(4) -semaphore_wait_timeout(5) -semaphore_wait_timeout(6) -semaphore_wait_timeout(7) -semaphore_wait_timeout(8) - -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) - { - case 0: // get 8 bytes of device descriptor - TEST_ASSERT_EQUAL(TUSB_REQUEST_GET_DESCRIPTOR, p_request->bRequest); - TEST_ASSERT_EQUAL(TUSB_DESC_DEVICE, p_request->wValue >> 8); - TEST_ASSERT_EQUAL(8, p_request->wLength); - memcpy(data, &desc_device, p_request->wLength); - break; - - case 1: // set device address - TEST_ASSERT_EQUAL(TUSB_REQUEST_SET_ADDRESS, p_request->bRequest); - TEST_ASSERT_EQUAL(p_request->wValue, 1); - break; - - case 2: // get full device decriptor for new address - TEST_ASSERT_EQUAL(TUSB_REQUEST_GET_DESCRIPTOR, p_request->bRequest); - TEST_ASSERT_EQUAL(TUSB_DESC_DEVICE, p_request->wValue >> 8); - TEST_ASSERT_EQUAL(18, p_request->wLength); - memcpy(data, &desc_device, p_request->wLength); - break; - - case 3: // get 9 bytes of configuration descriptor - TEST_ASSERT_EQUAL(TUSB_REQUEST_GET_DESCRIPTOR, p_request->bRequest); - TEST_ASSERT_EQUAL(TUSB_DESC_CONFIGURATION, p_request->wValue >> 8); - TEST_ASSERT_EQUAL(9, p_request->wLength); - memcpy(data, &desc_configuration, p_request->wLength); - break; - - case 4: // get full-length configuration descriptor - TEST_ASSERT_EQUAL(TUSB_REQUEST_GET_DESCRIPTOR, p_request->bRequest); - TEST_ASSERT_EQUAL(TUSB_DESC_CONFIGURATION, p_request->wValue >> 8); - TEST_ASSERT_EQUAL(desc_configuration.configuration.wTotalLength, p_request->wLength); - memcpy(data, &desc_configuration, p_request->wLength); - break; - - default: - return TUSB_ERROR_OSAL_TIMEOUT; - } - - return TUSB_ERROR_NONE; -} - -tusb_error_t hidh_install_stub(uint8_t dev_addr, tusb_descriptor_interface_t const *descriptor, uint16_t *p_length, int num_call) -{ - *p_length = sizeof(tusb_descriptor_interface_t) + sizeof(tusb_hid_descriptor_hid_t) + sizeof(tusb_descriptor_endpoint_t); - return TUSB_ERROR_NONE; -} - -//--------------------------------------------------------------------+ -// enumeration -//--------------------------------------------------------------------+ -void test_addr0_failed_dev_desc(void) -{ - osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(0)); - tusbh_device_mount_failed_cb_Expect(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL); - - usbh_enumeration_task(); - - TEST_ASSERT_EQUAL(TUSB_DEVICE_STATE_ADDRESSED, usbh_devices[0].state); - -} - -void test_addr0_failed_set_address(void) -{ - osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(1)); - hcd_port_reset_Expect( usbh_devices[0].core_id ); - tusbh_device_mount_failed_cb_Expect(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL); - - usbh_enumeration_task(); - - TEST_ASSERT_EQUAL(TUSB_DEVICE_STATE_ADDRESSED, usbh_devices[0].state); - TEST_ASSERT_EQUAL_MEMORY(&desc_device, enum_data_buffer, 8); -} - -void test_enum_failed_get_full_dev_desc(void) -{ - osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(2)); - hcd_port_reset_Expect( usbh_devices[0].core_id ); - hcd_pipe_control_close_ExpectAndReturn(0, TUSB_ERROR_NONE); - - osal_semaphore_reset_Expect( usbh_devices[0].control.sem_hdl ); - hcd_pipe_control_open_ExpectAndReturn(1, desc_device.bMaxPacketSize0, TUSB_ERROR_NONE); - tusbh_device_mount_failed_cb_Expect(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL); - - usbh_enumeration_task(); - - TEST_ASSERT_EQUAL(TUSB_DEVICE_STATE_ADDRESSED, usbh_devices[1].state); - TEST_ASSERT_EQUAL(TUSB_SPEED_FULL, usbh_devices[1].speed); - TEST_ASSERT_EQUAL(enum_connect.core_id, usbh_devices[1].core_id); - TEST_ASSERT_EQUAL(enum_connect.hub_addr, usbh_devices[1].hub_addr); - TEST_ASSERT_EQUAL(enum_connect.hub_port, usbh_devices[1].hub_port); -} - -void test_enum_failed_get_9byte_config_desc(void) -{ - osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(3)); - hcd_port_reset_Expect( usbh_devices[0].core_id ); - hcd_pipe_control_close_ExpectAndReturn(0, TUSB_ERROR_NONE); - osal_semaphore_reset_Expect( usbh_devices[0].control.sem_hdl ); - 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); - tusbh_device_mount_failed_cb_Expect(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL); - - usbh_enumeration_task(); - - TEST_ASSERT_EQUAL(desc_device.idVendor, usbh_devices[1].vendor_id); - TEST_ASSERT_EQUAL(desc_device.idProduct, usbh_devices[1].product_id); - TEST_ASSERT_EQUAL(desc_device.bNumConfigurations, usbh_devices[1].configure_count); -} - -void test_enum_failed_get_full_config_desc(void) -{ - osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(4)); - hcd_port_reset_Expect( usbh_devices[0].core_id ); - hcd_pipe_control_close_ExpectAndReturn(0, TUSB_ERROR_NONE); - osal_semaphore_reset_Expect( usbh_devices[0].control.sem_hdl ); - 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); - tusbh_device_mount_failed_cb_Expect(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL); - - usbh_enumeration_task(); -} - -void class_install_expect(void) -{ - hidh_open_subtask_StubWithCallback(hidh_install_stub); -} - -void test_enum_parse_config_desc(void) -{ - osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(5)); - hcd_port_reset_Expect( usbh_devices[0].core_id ); - hcd_pipe_control_close_ExpectAndReturn(0, TUSB_ERROR_NONE); - osal_semaphore_reset_Expect( usbh_devices[0].control.sem_hdl ); - 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); - - tusbh_device_mount_failed_cb_Expect(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL); // fail to set configure - - usbh_enumeration_task(); - - TEST_ASSERT_EQUAL(desc_configuration.configuration.bNumInterfaces, usbh_devices[1].interface_count); -} - -void test_enum_set_configure(void) -{ - osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(6)); - hcd_port_reset_Expect( usbh_devices[0].core_id ); - hcd_pipe_control_close_ExpectAndReturn(0, TUSB_ERROR_NONE); - osal_semaphore_reset_Expect( usbh_devices[0].control.sem_hdl ); - 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); - class_install_expect(); - - tusbh_device_mount_succeed_cb_Expect(1); - - usbh_enumeration_task(); - - TEST_ASSERT_EQUAL(TUSB_CLASS_FLAG_HID, usbh_devices[1].flag_supported_class); // TODO change later -} diff --git a/tests/test/host/test_usbh.c b/tests/test/host/test_usbh.c deleted file mode 100644 index 1058e54d6..000000000 --- a/tests/test/host/test_usbh.c +++ /dev/null @@ -1,193 +0,0 @@ -/* - * test_usbd_host.c - * - * Created on: Jan 21, 2013 - * Author: hathach - */ - -/* - * Software License Agreement (BSD License) - * Copyright (c) 2012, hathach (tinyusb.org) - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - * - * This file is part of the tiny usb stack. - */ - -#include "unity.h" -#include "errors.h" - -#include "mock_osal.h" -#include "usbh.h" -#include "mock_hcd.h" -#include "usbh_hcd.h" - -#include "mock_tusb_callback.h" -#include "mock_hid_host.h" - -extern usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; -uint8_t dev_addr; -void setUp(void) -{ - dev_addr = RANDOM(TUSB_CFG_HOST_DEVICE_MAX)+1; - memset(usbh_devices, 0, (TUSB_CFG_HOST_DEVICE_MAX+1)*sizeof(usbh_device_info_t)); -} - -void tearDown(void) -{ -} - -//--------------------------------------------------------------------+ -// get_status -//--------------------------------------------------------------------+ -void test_usbh_status_get_fail(void) -{ - usbh_devices[dev_addr].state = 0; - - TEST_ASSERT_EQUAL( TUSB_DEVICE_STATE_INVALID_PARAMETER, tusbh_device_get_state(TUSB_CFG_HOST_DEVICE_MAX+1) ); - TEST_ASSERT_EQUAL( TUSB_DEVICE_STATE_UNPLUG, tusbh_device_get_state(dev_addr) ); -} - -void test_usbh_status_get_succeed(void) -{ - usbh_devices[dev_addr].state = TUSB_DEVICE_STATE_CONFIGURED; - TEST_ASSERT_EQUAL( TUSB_DEVICE_STATE_CONFIGURED, tusbh_device_get_state(dev_addr) ); -} - -//--------------------------------------------------------------------+ -// Init -//--------------------------------------------------------------------+ -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_enum_task_create_failed(void) -{ - hcd_init_ExpectAndReturn(TUSB_ERROR_NONE); - for (uint8_t i=0; i= n)\ + (*p_error) = TUSB_ERROR_OSAL_TIMEOUT;\ + else \ + (*p_error) = TUSB_ERROR_NONE;\ + } + +semaphore_wait_timeout(0) +semaphore_wait_timeout(1) +semaphore_wait_timeout(2) +semaphore_wait_timeout(3) +semaphore_wait_timeout(4) +semaphore_wait_timeout(5) +semaphore_wait_timeout(6) +semaphore_wait_timeout(7) +semaphore_wait_timeout(8) + +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) + { + case 0: // get 8 bytes of device descriptor + TEST_ASSERT_EQUAL(TUSB_REQUEST_GET_DESCRIPTOR, p_request->bRequest); + TEST_ASSERT_EQUAL(TUSB_DESC_DEVICE, p_request->wValue >> 8); + TEST_ASSERT_EQUAL(8, p_request->wLength); + memcpy(data, &desc_device, p_request->wLength); + break; + + case 1: // set device address + TEST_ASSERT_EQUAL(TUSB_REQUEST_SET_ADDRESS, p_request->bRequest); + TEST_ASSERT_EQUAL(p_request->wValue, 1); + break; + + case 2: // get full device decriptor for new address + TEST_ASSERT_EQUAL(TUSB_REQUEST_GET_DESCRIPTOR, p_request->bRequest); + TEST_ASSERT_EQUAL(TUSB_DESC_DEVICE, p_request->wValue >> 8); + TEST_ASSERT_EQUAL(18, p_request->wLength); + memcpy(data, &desc_device, p_request->wLength); + break; + + case 3: // get 9 bytes of configuration descriptor + TEST_ASSERT_EQUAL(TUSB_REQUEST_GET_DESCRIPTOR, p_request->bRequest); + TEST_ASSERT_EQUAL(TUSB_DESC_CONFIGURATION, p_request->wValue >> 8); + TEST_ASSERT_EQUAL(9, p_request->wLength); + memcpy(data, &desc_configuration, p_request->wLength); + break; + + case 4: // get full-length configuration descriptor + TEST_ASSERT_EQUAL(TUSB_REQUEST_GET_DESCRIPTOR, p_request->bRequest); + TEST_ASSERT_EQUAL(TUSB_DESC_CONFIGURATION, p_request->wValue >> 8); + TEST_ASSERT_EQUAL(desc_configuration.configuration.wTotalLength, p_request->wLength); + memcpy(data, &desc_configuration, p_request->wLength); + break; + + default: + return TUSB_ERROR_OSAL_TIMEOUT; + } + + return TUSB_ERROR_NONE; +} + +tusb_error_t hidh_install_stub(uint8_t dev_addr, tusb_descriptor_interface_t const *descriptor, uint16_t *p_length, int num_call) +{ + *p_length = sizeof(tusb_descriptor_interface_t) + sizeof(tusb_hid_descriptor_hid_t) + sizeof(tusb_descriptor_endpoint_t); + return TUSB_ERROR_NONE; +} + +//--------------------------------------------------------------------+ +// enumeration +//--------------------------------------------------------------------+ +void test_addr0_failed_dev_desc(void) +{ + osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(0)); + tusbh_device_mount_failed_cb_Expect(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL); + + usbh_enumeration_task(); + + TEST_ASSERT_EQUAL(TUSB_DEVICE_STATE_ADDRESSED, usbh_devices[0].state); + +} + +void test_addr0_failed_set_address(void) +{ + osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(1)); + hcd_port_reset_Expect( usbh_devices[0].core_id ); + tusbh_device_mount_failed_cb_Expect(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL); + + usbh_enumeration_task(); + + TEST_ASSERT_EQUAL(TUSB_DEVICE_STATE_ADDRESSED, usbh_devices[0].state); + TEST_ASSERT_EQUAL_MEMORY(&desc_device, enum_data_buffer, 8); +} + +void test_enum_failed_get_full_dev_desc(void) +{ + osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(2)); + hcd_port_reset_Expect( usbh_devices[0].core_id ); + hcd_pipe_control_close_ExpectAndReturn(0, TUSB_ERROR_NONE); + + osal_semaphore_reset_Expect( usbh_devices[0].control.sem_hdl ); + hcd_pipe_control_open_ExpectAndReturn(1, desc_device.bMaxPacketSize0, TUSB_ERROR_NONE); + tusbh_device_mount_failed_cb_Expect(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL); + + usbh_enumeration_task(); + + TEST_ASSERT_EQUAL(TUSB_DEVICE_STATE_ADDRESSED, usbh_devices[1].state); + TEST_ASSERT_EQUAL(TUSB_SPEED_FULL, usbh_devices[1].speed); + TEST_ASSERT_EQUAL(enum_connect.core_id, usbh_devices[1].core_id); + TEST_ASSERT_EQUAL(enum_connect.hub_addr, usbh_devices[1].hub_addr); + TEST_ASSERT_EQUAL(enum_connect.hub_port, usbh_devices[1].hub_port); +} + +void test_enum_failed_get_9byte_config_desc(void) +{ + osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(3)); + hcd_port_reset_Expect( usbh_devices[0].core_id ); + hcd_pipe_control_close_ExpectAndReturn(0, TUSB_ERROR_NONE); + osal_semaphore_reset_Expect( usbh_devices[0].control.sem_hdl ); + 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); + tusbh_device_mount_failed_cb_Expect(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL); + + usbh_enumeration_task(); + + TEST_ASSERT_EQUAL(desc_device.idVendor, usbh_devices[1].vendor_id); + TEST_ASSERT_EQUAL(desc_device.idProduct, usbh_devices[1].product_id); + TEST_ASSERT_EQUAL(desc_device.bNumConfigurations, usbh_devices[1].configure_count); +} + +void test_enum_failed_get_full_config_desc(void) +{ + osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(4)); + hcd_port_reset_Expect( usbh_devices[0].core_id ); + hcd_pipe_control_close_ExpectAndReturn(0, TUSB_ERROR_NONE); + osal_semaphore_reset_Expect( usbh_devices[0].control.sem_hdl ); + 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); + tusbh_device_mount_failed_cb_Expect(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL); + + usbh_enumeration_task(); +} + +void class_install_expect(void) +{ + hidh_open_subtask_StubWithCallback(hidh_install_stub); +} + +void test_enum_parse_config_desc(void) +{ + osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(5)); + hcd_port_reset_Expect( usbh_devices[0].core_id ); + hcd_pipe_control_close_ExpectAndReturn(0, TUSB_ERROR_NONE); + osal_semaphore_reset_Expect( usbh_devices[0].control.sem_hdl ); + 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); + + tusbh_device_mount_failed_cb_Expect(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL); // fail to set configure + + usbh_enumeration_task(); + + TEST_ASSERT_EQUAL(desc_configuration.configuration.bNumInterfaces, usbh_devices[1].interface_count); +} + +void test_enum_set_configure(void) +{ + osal_semaphore_wait_StubWithCallback(semaphore_wait_timeout_stub(6)); + hcd_port_reset_Expect( usbh_devices[0].core_id ); + hcd_pipe_control_close_ExpectAndReturn(0, TUSB_ERROR_NONE); + osal_semaphore_reset_Expect( usbh_devices[0].control.sem_hdl ); + 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); + class_install_expect(); + + tusbh_device_mount_succeed_cb_Expect(1); + + usbh_enumeration_task(); + + TEST_ASSERT_EQUAL(TUSB_CLASS_FLAG_HID, usbh_devices[1].flag_supported_class); // TODO change later +} diff --git a/tests/test/host/usbh/test_usbh.c b/tests/test/host/usbh/test_usbh.c new file mode 100644 index 000000000..1058e54d6 --- /dev/null +++ b/tests/test/host/usbh/test_usbh.c @@ -0,0 +1,193 @@ +/* + * test_usbd_host.c + * + * Created on: Jan 21, 2013 + * Author: hathach + */ + +/* + * Software License Agreement (BSD License) + * Copyright (c) 2012, hathach (tinyusb.org) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + * + * This file is part of the tiny usb stack. + */ + +#include "unity.h" +#include "errors.h" + +#include "mock_osal.h" +#include "usbh.h" +#include "mock_hcd.h" +#include "usbh_hcd.h" + +#include "mock_tusb_callback.h" +#include "mock_hid_host.h" + +extern usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; +uint8_t dev_addr; +void setUp(void) +{ + dev_addr = RANDOM(TUSB_CFG_HOST_DEVICE_MAX)+1; + memset(usbh_devices, 0, (TUSB_CFG_HOST_DEVICE_MAX+1)*sizeof(usbh_device_info_t)); +} + +void tearDown(void) +{ +} + +//--------------------------------------------------------------------+ +// get_status +//--------------------------------------------------------------------+ +void test_usbh_status_get_fail(void) +{ + usbh_devices[dev_addr].state = 0; + + TEST_ASSERT_EQUAL( TUSB_DEVICE_STATE_INVALID_PARAMETER, tusbh_device_get_state(TUSB_CFG_HOST_DEVICE_MAX+1) ); + TEST_ASSERT_EQUAL( TUSB_DEVICE_STATE_UNPLUG, tusbh_device_get_state(dev_addr) ); +} + +void test_usbh_status_get_succeed(void) +{ + usbh_devices[dev_addr].state = TUSB_DEVICE_STATE_CONFIGURED; + TEST_ASSERT_EQUAL( TUSB_DEVICE_STATE_CONFIGURED, tusbh_device_get_state(dev_addr) ); +} + +//--------------------------------------------------------------------+ +// Init +//--------------------------------------------------------------------+ +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_enum_task_create_failed(void) +{ + hcd_init_ExpectAndReturn(TUSB_ERROR_NONE); + for (uint8_t i=0; ibuffer[0]; + + if (p_request->wLength > 0 && p_request->bmRequestType.direction == TUSB_DIR_DEV_TO_HOST) + { + memcpy(p_qtd_data, p_data, p_request->wLength); + } + + //------------- retire all QTDs -------------// + p_qtd_setup->active = p_qtd_data->active = p_qtd_status->active = 0; + p_qhd->qtd_overlay = *p_qtd_status; + + regs->usb_sts = EHCI_INT_MASK_NXP_ASYNC | EHCI_INT_MASK_NXP_PERIODIC; + + hcd_isr( usbh_devices[dev_addr].core_id ); +} + bool complete_all_qtd_in_list(ehci_qhd_t *head) { ehci_qhd_t *p_qhd = head; @@ -90,7 +118,7 @@ void ehci_controller_run(uint8_t hostid) complete_all_qtd_in_list((ehci_qhd_t*) regs->async_list_base); //------------- Period List -------------// - complete_all_qtd_in_list( get_period_head(hostid) ); + complete_all_qtd_in_list( get_period_head(hostid) ); regs->usb_sts = EHCI_INT_MASK_NXP_ASYNC | EHCI_INT_MASK_NXP_PERIODIC; hcd_isr(hostid); @@ -131,6 +159,8 @@ void ehci_controller_device_plug(uint8_t hostid, tusb_speed_t speed) regs->portsc_bit.connect_status_change = 1; regs->portsc_bit.current_connect_status = 1; regs->portsc_bit.nxp_port_speed = speed; + + hcd_isr(hostid); } void ehci_controller_device_unplug(uint8_t hostid) diff --git a/tests/test/support/type_helper.h b/tests/test/support/type_helper.h new file mode 100644 index 000000000..9aea51a9b --- /dev/null +++ b/tests/test/support/type_helper.h @@ -0,0 +1,74 @@ +/* + * type_helper.h + * + * Created on: Mar 25, 2013 + * Author: hathach + */ + +/* + * Software License Agreement (BSD License) + * Copyright (c) 2012, hathach (tinyusb.net) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + * + * This file is part of the tiny usb stack. + */ + +/** \file + * \brief TBD + * + * \note TBD + */ + +/** \ingroup TBD + * \defgroup TBD + * \brief TBD + * + * @{ + */ + +#ifndef _TUSB_TYPE_HELPER_H_ +#define _TUSB_TYPE_HELPER_H_ + +#ifdef __cplusplus + extern "C" { +#endif + +#define TEST_ASSERT_PIPE_HANDLE(expected, actual)\ + TEST_ASSERT_EQUAL(expected.dev_addr, actual.dev_addr);\ + TEST_ASSERT_EQUAL(expected.xfer_type, actual.xfer_type);\ + TEST_ASSERT_EQUAL(expected.index, actual.index);\ + +#define TEST_ASSERT_MEM_ZERO(buffer, size)\ + do{\ + for (uint32_t i=0; itotal_bytes = total_bytes; p_qtd->buffer[0] = data_ptr; - for(uint8_t i=1; i<5; i++) { p_qtd->buffer[i] |= align4k( p_qtd->buffer[i-1] ) + 4096; -- cgit v1.3.1