From 4adfc6a6d8a77ca9526ec04e62c83ea88ffdddd7 Mon Sep 17 00:00:00 2001 From: hathach Date: Sat, 23 Mar 2013 15:00:56 +0700 Subject: change signature usbh_isr to add tusb_bus_event_t parameter change singature of call_isr as well --- tests/test/host/ehci/test_pipe_bulk_xfer.c | 4 ++-- tests/test/host/ehci/test_pipe_control_xfer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/test/host/ehci/test_pipe_bulk_xfer.c b/tests/test/host/ehci/test_pipe_bulk_xfer.c index 71a833b46..6d3d0c4a7 100644 --- a/tests/test/host/ehci/test_pipe_bulk_xfer.c +++ b/tests/test/host/ehci/test_pipe_bulk_xfer.c @@ -202,7 +202,7 @@ void test_bulk_xfer_double(void) TEST_ASSERT_TRUE(p_tail->int_on_complete); } -void test_bulk_xfer_isr(void) +void test_bulk_xfer_complete_isr(void) { hcd_pipe_xfer(pipe_hdl_bulk, xfer_data, sizeof(xfer_data), false); hcd_pipe_xfer(pipe_hdl_bulk, data2, sizeof(data2), true); @@ -212,7 +212,7 @@ void test_bulk_xfer_isr(void) ehci_controller_run(hostid); - usbh_isr_Expect(pipe_hdl_bulk, TUSB_CLASS_MSC); + usbh_isr_Expect(pipe_hdl_bulk, TUSB_CLASS_MSC, BUS_EVENT_XFER_COMPLETE); //------------- Code Under Test -------------// hcd_isr(hostid); diff --git a/tests/test/host/ehci/test_pipe_control_xfer.c b/tests/test/host/ehci/test_pipe_control_xfer.c index 19d2b7e21..432f5956e 100644 --- a/tests/test/host/ehci/test_pipe_control_xfer.c +++ b/tests/test/host/ehci/test_pipe_control_xfer.c @@ -235,7 +235,7 @@ void test_control_xfer_complete_isr(void) TEST_ASSERT_EQUAL_HEX(async_head, get_operational_register(hostid)->async_list_base); TEST_ASSERT_EQUAL_HEX((uint32_t) p_control_qhd, align32(async_head->next.address)); - usbh_isr_Expect(((pipe_handle_t){.dev_addr = dev_addr}), 0); + usbh_isr_Expect(((pipe_handle_t){.dev_addr = dev_addr}), 0, BUS_EVENT_XFER_COMPLETE); //------------- Code Under TEST -------------// hcd_isr(hostid); -- cgit v1.3.1