From bc9a97a1be86b5f57eaa46cdf79fdeb110847105 Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 5 Apr 2013 14:05:05 +0700 Subject: [PATCH] refractor test --- tests/test/host/ehci/test_ehci_isr.c | 3 +-- tests/test/support/ehci_controller.c | 12 +++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/test/host/ehci/test_ehci_isr.c b/tests/test/host/ehci/test_ehci_isr.c index b2afa6c9c..40613b53a 100644 --- a/tests/test/host/ehci/test_ehci_isr.c +++ b/tests/test/host/ehci/test_ehci_isr.c @@ -93,11 +93,10 @@ void test_isr_device_connect_slowspeed(void) void test_isr_device_disconnect(void) { - ehci_controller_device_unplug(hostid); usbh_device_unplugged_isr_Expect(hostid); //------------- Code Under Test -------------// - hcd_isr(hostid); + ehci_controller_device_unplug(hostid); TEST_ASSERT(regs->usb_cmd_bit.advacne_async); } diff --git a/tests/test/support/ehci_controller.c b/tests/test/support/ehci_controller.c index 760ea9a29..317aba8b5 100644 --- a/tests/test/support/ehci_controller.c +++ b/tests/test/support/ehci_controller.c @@ -155,10 +155,10 @@ 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->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; + regs->portsc_bit.nxp_port_speed = speed; hcd_isr(hostid); } @@ -167,7 +167,9 @@ 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->usb_sts_bit.port_change_detect = 1; + regs->portsc_bit.connect_status_change = 1; regs->portsc_bit.current_connect_status = 0; + + hcd_isr(hostid); }