From e401372c051e2ce3761daaf18deb4df39797fff4 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 9 May 2013 13:05:48 +0700 Subject: rename ehci_controller to ehci_controller_fake --- tests/test/host/ehci/test_ehci_init.c | 2 +- tests/test/host/ehci/test_ehci_isr.c | 2 +- tests/test/host/ehci/test_ehci_structure.c | 2 +- .../host/ehci/test_ehci_usbh_hcd_integration.c | 2 +- tests/test/host/ehci/test_pipe_bulk_open.c | 2 +- tests/test/host/ehci/test_pipe_bulk_xfer.c | 2 +- tests/test/host/ehci/test_pipe_control_open.c | 2 +- tests/test/host/ehci/test_pipe_control_xfer.c | 2 +- tests/test/host/ehci/test_pipe_interrupt_open.c | 2 +- tests/test/host/ehci/test_pipe_interrupt_xfer.c | 2 +- tests/test/host/ehci/test_pipe_isochronous_open.c | 2 +- .../integration/test_hidh_keyboard_integrate.c | 2 +- tests/test/support/ehci_controller.c | 195 --------------------- tests/test/support/ehci_controller.h | 81 --------- tests/test/support/ehci_controller_fake.c | 195 +++++++++++++++++++++ tests/test/support/ehci_controller_fake.h | 81 +++++++++ 16 files changed, 288 insertions(+), 288 deletions(-) delete mode 100644 tests/test/support/ehci_controller.c delete mode 100644 tests/test/support/ehci_controller.h create mode 100644 tests/test/support/ehci_controller_fake.c create mode 100644 tests/test/support/ehci_controller_fake.h diff --git a/tests/test/host/ehci/test_ehci_init.c b/tests/test/host/ehci/test_ehci_init.c index f7fc5ca8a..0026b1479 100644 --- a/tests/test/host/ehci/test_ehci_init.c +++ b/tests/test/host/ehci/test_ehci_init.c @@ -47,7 +47,7 @@ #include "hcd.h" #include "mock_usbh_hcd.h" #include "ehci.h" -#include "ehci_controller.h" +#include "ehci_controller_fake.h" usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; diff --git a/tests/test/host/ehci/test_ehci_isr.c b/tests/test/host/ehci/test_ehci_isr.c index 07bf477d3..0d781dbe5 100644 --- a/tests/test/host/ehci/test_ehci_isr.c +++ b/tests/test/host/ehci/test_ehci_isr.c @@ -46,7 +46,7 @@ #include "hcd.h" #include "mock_usbh_hcd.h" #include "ehci.h" -#include "ehci_controller.h" +#include "ehci_controller_fake.h" usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; diff --git a/tests/test/host/ehci/test_ehci_structure.c b/tests/test/host/ehci/test_ehci_structure.c index d35884291..43baa1704 100644 --- a/tests/test/host/ehci/test_ehci_structure.c +++ b/tests/test/host/ehci/test_ehci_structure.c @@ -46,7 +46,7 @@ #include "hcd.h" #include "mock_usbh_hcd.h" #include "ehci.h" -#include "ehci_controller.h" +#include "ehci_controller_fake.h" usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; diff --git a/tests/test/host/ehci/test_ehci_usbh_hcd_integration.c b/tests/test/host/ehci/test_ehci_usbh_hcd_integration.c index 74cbc16a8..75c3ca5f8 100644 --- a/tests/test/host/ehci/test_ehci_usbh_hcd_integration.c +++ b/tests/test/host/ehci/test_ehci_usbh_hcd_integration.c @@ -49,7 +49,7 @@ #include "usbh_hcd.h" #include "usbh.h" #include "ehci.h" -#include "ehci_controller.h" +#include "ehci_controller_fake.h" #define _TINY_USB_SOURCE_FILE_ usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; diff --git a/tests/test/host/ehci/test_pipe_bulk_open.c b/tests/test/host/ehci/test_pipe_bulk_open.c index 4081f08d9..70d8d74ae 100644 --- a/tests/test/host/ehci/test_pipe_bulk_open.c +++ b/tests/test/host/ehci/test_pipe_bulk_open.c @@ -46,7 +46,7 @@ #include "hcd.h" #include "mock_usbh_hcd.h" #include "ehci.h" -#include "ehci_controller.h" +#include "ehci_controller_fake.h" usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; diff --git a/tests/test/host/ehci/test_pipe_bulk_xfer.c b/tests/test/host/ehci/test_pipe_bulk_xfer.c index e82e82e51..e1476549e 100644 --- a/tests/test/host/ehci/test_pipe_bulk_xfer.c +++ b/tests/test/host/ehci/test_pipe_bulk_xfer.c @@ -46,7 +46,7 @@ #include "hcd.h" #include "mock_usbh_hcd.h" #include "ehci.h" -#include "ehci_controller.h" +#include "ehci_controller_fake.h" usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; diff --git a/tests/test/host/ehci/test_pipe_control_open.c b/tests/test/host/ehci/test_pipe_control_open.c index 013ecb6e5..28f2c9911 100644 --- a/tests/test/host/ehci/test_pipe_control_open.c +++ b/tests/test/host/ehci/test_pipe_control_open.c @@ -46,7 +46,7 @@ #include "hcd.h" #include "mock_usbh_hcd.h" #include "ehci.h" -#include "ehci_controller.h" +#include "ehci_controller_fake.h" usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; diff --git a/tests/test/host/ehci/test_pipe_control_xfer.c b/tests/test/host/ehci/test_pipe_control_xfer.c index 47319b581..3052b0cd6 100644 --- a/tests/test/host/ehci/test_pipe_control_xfer.c +++ b/tests/test/host/ehci/test_pipe_control_xfer.c @@ -46,7 +46,7 @@ #include "hcd.h" #include "mock_usbh_hcd.h" #include "ehci.h" -#include "ehci_controller.h" +#include "ehci_controller_fake.h" usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; diff --git a/tests/test/host/ehci/test_pipe_interrupt_open.c b/tests/test/host/ehci/test_pipe_interrupt_open.c index b51772501..af499f739 100644 --- a/tests/test/host/ehci/test_pipe_interrupt_open.c +++ b/tests/test/host/ehci/test_pipe_interrupt_open.c @@ -46,7 +46,7 @@ #include "hcd.h" #include "mock_usbh_hcd.h" #include "ehci.h" -#include "ehci_controller.h" +#include "ehci_controller_fake.h" usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; diff --git a/tests/test/host/ehci/test_pipe_interrupt_xfer.c b/tests/test/host/ehci/test_pipe_interrupt_xfer.c index 842d921e2..108378e94 100644 --- a/tests/test/host/ehci/test_pipe_interrupt_xfer.c +++ b/tests/test/host/ehci/test_pipe_interrupt_xfer.c @@ -46,7 +46,7 @@ #include "hcd.h" #include "mock_usbh_hcd.h" #include "ehci.h" -#include "ehci_controller.h" +#include "ehci_controller_fake.h" usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; diff --git a/tests/test/host/ehci/test_pipe_isochronous_open.c b/tests/test/host/ehci/test_pipe_isochronous_open.c index 643a4919e..9b45fbe45 100644 --- a/tests/test/host/ehci/test_pipe_isochronous_open.c +++ b/tests/test/host/ehci/test_pipe_isochronous_open.c @@ -46,7 +46,7 @@ #include "hcd.h" #include "mock_usbh_hcd.h" #include "ehci.h" -#include "ehci_controller.h" +#include "ehci_controller_fake.h" usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; diff --git a/tests/test/host/integration/test_hidh_keyboard_integrate.c b/tests/test/host/integration/test_hidh_keyboard_integrate.c index e21a7f9ef..a9fec44a1 100644 --- a/tests/test/host/integration/test_hidh_keyboard_integrate.c +++ b/tests/test/host/integration/test_hidh_keyboard_integrate.c @@ -47,7 +47,7 @@ //#include "usbh.h" //#include "tusb.h" //#include "hid_host.h" -////#include "ehci_controller.h" +////#include "ehci_controller_fake.h" // //#include "descriptor_test.h" // diff --git a/tests/test/support/ehci_controller.c b/tests/test/support/ehci_controller.c deleted file mode 100644 index a29f4d6be..000000000 --- a/tests/test/support/ehci_controller.c +++ /dev/null @@ -1,195 +0,0 @@ -/**************************************************************************/ -/*! - @file ehci_controller.c - @author hathach (tinyusb.org) - - @section LICENSE - - Software License Agreement (BSD License) - - Copyright (c) 2013, 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. Neither the name of the copyright holders nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''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 COPYRIGHT HOLDER 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 tinyusb stack. -*/ -/**************************************************************************/ - -//--------------------------------------------------------------------+ -// INCLUDE -//--------------------------------------------------------------------+ -#include "unity.h" -#include "common/common.h" -#include "hal.h" -#include "usbh_hcd.h" -#include "ehci.h" - - -//--------------------------------------------------------------------+ -// MACRO CONSTANT TYPEDEF -//--------------------------------------------------------------------+ -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_init(void) -{ - memclr_(&lpc_usb0, sizeof(LPC_USB0_Type)); - memclr_(&lpc_usb1, sizeof(LPC_USB1_Type)); -} - -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 ); -} - -void complete_qtd_in_qhd(ehci_qhd_t *p_qhd) -{ - if ( !p_qhd->qtd_overlay.halted ) - { - while(!p_qhd->qtd_overlay.next.terminate) - { - ehci_qtd_t* p_qtd = (ehci_qtd_t*) align32(p_qhd->qtd_overlay.next.address); - p_qtd->active = 0; - p_qhd->qtd_overlay = *p_qtd; - } - } -} - -bool complete_all_qtd_in_async(ehci_qhd_t *head) -{ - ehci_qhd_t *p_qhd = head; - - do - { - complete_qtd_in_qhd(p_qhd); - p_qhd = (ehci_qhd_t*) align32(p_qhd->next.address); - }while(p_qhd != head); // stop if loop around - - return true; -} - -bool complete_all_qtd_in_period(ehci_link_t *head) -{ - while(!head->terminate) - { - uint32_t queue_type = head->type; - head = (ehci_link_t*) align32(head->address); - - if ( queue_type == EHCI_QUEUE_ELEMENT_QHD) - { - complete_qtd_in_qhd( (ehci_qhd_t*) head ); - } - } - return true; -} - -void ehci_controller_run(uint8_t hostid) -{ - //------------- Async List -------------// - ehci_registers_t* const regs = get_operational_register(hostid); - complete_all_qtd_in_async((ehci_qhd_t*) regs->async_list_base); - - //------------- Period List -------------// - for(uint8_t i=1; i <= EHCI_FRAMELIST_SIZE; i *= 2) - { - complete_all_qtd_in_period( get_period_head(hostid, i) ); - } - regs->usb_sts = EHCI_INT_MASK_NXP_ASYNC | EHCI_INT_MASK_NXP_PERIODIC; - - hcd_isr(hostid); -} - -void ehci_controller_run_error(uint8_t hostid) -{ - //------------- Async List -------------// - ehci_registers_t* const regs = get_operational_register(hostid); - - ehci_qhd_t *p_qhd = (ehci_qhd_t*) regs->async_list_base; - do - { - if ( !p_qhd->qtd_overlay.halted ) - { - if(!p_qhd->qtd_overlay.next.terminate) - { - ehci_qtd_t* p_qtd = (ehci_qtd_t*) align32(p_qhd->qtd_overlay.next.address); - p_qtd->active = 0; - p_qtd->babble_err = p_qtd->buffer_err = p_qtd->xact_err = 1; - p_qhd->qtd_overlay = *p_qtd; - } - } - p_qhd = (ehci_qhd_t*) align32(p_qhd->next.address); - }while(p_qhd != get_async_head(hostid)); // stop if loop around - //------------- Period List -------------// - - regs->usb_sts = EHCI_INT_MASK_ERROR; - - hcd_isr(hostid); -} - -void ehci_controller_device_plug(uint8_t hostid, tusb_speed_t speed) -{ - ehci_registers_t* const regs = get_operational_register(hostid); - - regs->usb_sts_bit.port_change_detect = 1; - 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) -{ - ehci_registers_t* const regs = get_operational_register(hostid); - - regs->usb_sts_bit.port_change_detect = 1; - regs->portsc_bit.connect_status_change = 1; - regs->portsc_bit.current_connect_status = 0; - - hcd_isr(hostid); -} diff --git a/tests/test/support/ehci_controller.h b/tests/test/support/ehci_controller.h deleted file mode 100644 index e33abfb1f..000000000 --- a/tests/test/support/ehci_controller.h +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************/ -/*! - @file ehci_controller.h - @author hathach (tinyusb.org) - - @section LICENSE - - Software License Agreement (BSD License) - - Copyright (c) 2013, 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. Neither the name of the copyright holders nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''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 COPYRIGHT HOLDER 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 tinyusb stack. -*/ -/**************************************************************************/ - -/** \file - * \brief TBD - * - * \note TBD - */ - -/** \ingroup TBD - * \defgroup TBD - * \brief TBD - * - * @{ - */ - -#ifndef _TUSB_EHCI_CONTROLLER_H_ -#define _TUSB_EHCI_CONTROLLER_H_ - -#ifdef __cplusplus - extern "C" { -#endif - -extern ehci_data_t ehci_data; - -void ehci_controller_init(void); -void ehci_controller_run(uint8_t hostid); -void ehci_controller_control_xfer_proceed(uint8_t dev_addr, uint8_t p_data[]); -void ehci_controller_device_plug(uint8_t hostid, tusb_speed_t speed); -void ehci_controller_device_unplug(uint8_t hostid); - -ehci_registers_t* get_operational_register(uint8_t hostid); -ehci_link_t* get_period_frame_list(uint8_t hostid); -ehci_qhd_t* get_async_head(uint8_t hostid); -ehci_link_t* get_period_head(uint8_t hostid, uint8_t interval_ms); -ehci_qhd_t* get_control_qhd(uint8_t dev_addr); -ehci_qtd_t* get_control_qtds(uint8_t dev_addr); -ehci_qhd_t* qhd_get_from_pipe_handle(pipe_handle_t pipe_hdl); - -#ifdef __cplusplus - } -#endif - -#endif /* _TUSB_EHCI_CONTROLLER_H_ */ - -/** @} */ diff --git a/tests/test/support/ehci_controller_fake.c b/tests/test/support/ehci_controller_fake.c new file mode 100644 index 000000000..d3659e834 --- /dev/null +++ b/tests/test/support/ehci_controller_fake.c @@ -0,0 +1,195 @@ +/**************************************************************************/ +/*! + @file ehci_controller_fake.c + @author hathach (tinyusb.org) + + @section LICENSE + + Software License Agreement (BSD License) + + Copyright (c) 2013, 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. Neither the name of the copyright holders nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''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 COPYRIGHT HOLDER 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 tinyusb stack. +*/ +/**************************************************************************/ + +//--------------------------------------------------------------------+ +// INCLUDE +//--------------------------------------------------------------------+ +#include "unity.h" +#include "common/common.h" +#include "hal.h" +#include "usbh_hcd.h" +#include "ehci.h" + + +//--------------------------------------------------------------------+ +// MACRO CONSTANT TYPEDEF +//--------------------------------------------------------------------+ +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_init(void) +{ + memclr_(&lpc_usb0, sizeof(LPC_USB0_Type)); + memclr_(&lpc_usb1, sizeof(LPC_USB1_Type)); +} + +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 ); +} + +void complete_qtd_in_qhd(ehci_qhd_t *p_qhd) +{ + if ( !p_qhd->qtd_overlay.halted ) + { + while(!p_qhd->qtd_overlay.next.terminate) + { + ehci_qtd_t* p_qtd = (ehci_qtd_t*) align32(p_qhd->qtd_overlay.next.address); + p_qtd->active = 0; + p_qhd->qtd_overlay = *p_qtd; + } + } +} + +bool complete_all_qtd_in_async(ehci_qhd_t *head) +{ + ehci_qhd_t *p_qhd = head; + + do + { + complete_qtd_in_qhd(p_qhd); + p_qhd = (ehci_qhd_t*) align32(p_qhd->next.address); + }while(p_qhd != head); // stop if loop around + + return true; +} + +bool complete_all_qtd_in_period(ehci_link_t *head) +{ + while(!head->terminate) + { + uint32_t queue_type = head->type; + head = (ehci_link_t*) align32(head->address); + + if ( queue_type == EHCI_QUEUE_ELEMENT_QHD) + { + complete_qtd_in_qhd( (ehci_qhd_t*) head ); + } + } + return true; +} + +void ehci_controller_run(uint8_t hostid) +{ + //------------- Async List -------------// + ehci_registers_t* const regs = get_operational_register(hostid); + complete_all_qtd_in_async((ehci_qhd_t*) regs->async_list_base); + + //------------- Period List -------------// + for(uint8_t i=1; i <= EHCI_FRAMELIST_SIZE; i *= 2) + { + complete_all_qtd_in_period( get_period_head(hostid, i) ); + } + regs->usb_sts = EHCI_INT_MASK_NXP_ASYNC | EHCI_INT_MASK_NXP_PERIODIC; + + hcd_isr(hostid); +} + +void ehci_controller_run_error(uint8_t hostid) +{ + //------------- Async List -------------// + ehci_registers_t* const regs = get_operational_register(hostid); + + ehci_qhd_t *p_qhd = (ehci_qhd_t*) regs->async_list_base; + do + { + if ( !p_qhd->qtd_overlay.halted ) + { + if(!p_qhd->qtd_overlay.next.terminate) + { + ehci_qtd_t* p_qtd = (ehci_qtd_t*) align32(p_qhd->qtd_overlay.next.address); + p_qtd->active = 0; + p_qtd->babble_err = p_qtd->buffer_err = p_qtd->xact_err = 1; + p_qhd->qtd_overlay = *p_qtd; + } + } + p_qhd = (ehci_qhd_t*) align32(p_qhd->next.address); + }while(p_qhd != get_async_head(hostid)); // stop if loop around + //------------- Period List -------------// + + regs->usb_sts = EHCI_INT_MASK_ERROR; + + hcd_isr(hostid); +} + +void ehci_controller_device_plug(uint8_t hostid, tusb_speed_t speed) +{ + ehci_registers_t* const regs = get_operational_register(hostid); + + regs->usb_sts_bit.port_change_detect = 1; + 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) +{ + ehci_registers_t* const regs = get_operational_register(hostid); + + regs->usb_sts_bit.port_change_detect = 1; + regs->portsc_bit.connect_status_change = 1; + regs->portsc_bit.current_connect_status = 0; + + hcd_isr(hostid); +} diff --git a/tests/test/support/ehci_controller_fake.h b/tests/test/support/ehci_controller_fake.h new file mode 100644 index 000000000..7c8b0c27d --- /dev/null +++ b/tests/test/support/ehci_controller_fake.h @@ -0,0 +1,81 @@ +/**************************************************************************/ +/*! + @file ehci_controller_fake + @author hathach (tinyusb.org) + + @section LICENSE + + Software License Agreement (BSD License) + + Copyright (c) 2013, 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. Neither the name of the copyright holders nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''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 COPYRIGHT HOLDER 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 tinyusb stack. +*/ +/**************************************************************************/ + +/** \file + * \brief TBD + * + * \note TBD + */ + +/** \ingroup TBD + * \defgroup TBD + * \brief TBD + * + * @{ + */ + +#ifndef _TUSB_EHCI_CONTROLLER_H_ +#define _TUSB_EHCI_CONTROLLER_H_ + +#ifdef __cplusplus + extern "C" { +#endif + +extern ehci_data_t ehci_data; + +void ehci_controller_init(void); +void ehci_controller_run(uint8_t hostid); +void ehci_controller_control_xfer_proceed(uint8_t dev_addr, uint8_t p_data[]); +void ehci_controller_device_plug(uint8_t hostid, tusb_speed_t speed); +void ehci_controller_device_unplug(uint8_t hostid); + +ehci_registers_t* get_operational_register(uint8_t hostid); +ehci_link_t* get_period_frame_list(uint8_t hostid); +ehci_qhd_t* get_async_head(uint8_t hostid); +ehci_link_t* get_period_head(uint8_t hostid, uint8_t interval_ms); +ehci_qhd_t* get_control_qhd(uint8_t dev_addr); +ehci_qtd_t* get_control_qtds(uint8_t dev_addr); +ehci_qhd_t* qhd_get_from_pipe_handle(pipe_handle_t pipe_hdl); + +#ifdef __cplusplus + } +#endif + +#endif /* _TUSB_EHCI_CONTROLLER_H_ */ + +/** @} */ -- cgit v1.3.1