diff --git a/tests/test/host/ehci/test_ehci_isr.c b/tests/test/host/ehci/test_ehci_isr.c index ebf6f594..b2afa6c9 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 00000000..d66b8104 --- /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/usbh/test_enum_task.c similarity index 100% rename from tests/test/host/test_enum_task.c rename to tests/test/host/usbh/test_enum_task.c diff --git a/tests/test/host/test_usbh.c b/tests/test/host/usbh/test_usbh.c similarity index 100% rename from tests/test/host/test_usbh.c rename to tests/test/host/usbh/test_usbh.c diff --git a/tests/test/support/ehci_controller.c b/tests/test/support/ehci_controller.c index 31605cec..760ea9a2 100644 --- a/tests/test/support/ehci_controller.c +++ b/tests/test/support/ehci_controller.c @@ -44,6 +44,8 @@ #include "binary.h" #include "hal.h" #include "ehci.h" +#include "usbh_hcd.h" + //--------------------------------------------------------------------+ // MACRO CONSTANT TYPEDEF @@ -52,9 +54,35 @@ ehci_data_t ehci_data; LPC_USB0_Type lpc_usb0; LPC_USB1_Type lpc_usb1; +extern usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; + //--------------------------------------------------------------------+ // IMPLEMENTATION //--------------------------------------------------------------------+ +void ehci_controller_control_xfer_proceed(uint8_t dev_addr, uint8_t p_data[]) +{ + ehci_registers_t* const regs = get_operational_register( usbh_devices[dev_addr].core_id ); + ehci_qhd_t * p_qhd = get_control_qhd(dev_addr); + ehci_qtd_t * p_qtd_setup = get_control_qtds(dev_addr); + ehci_qtd_t * p_qtd_data = p_qtd_setup + 1; + ehci_qtd_t * p_qtd_status = p_qtd_setup + 2; + + tusb_std_request_t const *p_request = (tusb_std_request_t *) p_qtd_setup->buffer[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 00000000..9aea51a9 --- /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;