diff options
| author | hathach <[email protected]> | 2013-07-04 09:45:20 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-07-04 09:45:20 +0700 |
| commit | c5afb9d50f3aea59dfdf016a1ae33ab511249de7 (patch) | |
| tree | 7d6e61d3c023dddc7450a1b29eaa04f933aefad5 /tests | |
| parent | 544b48183abea8c9cec94c93bc7080bd0e4cee8e (diff) | |
change class (hid/cdc) _mounted_isr to _mounted_cb
Diffstat (limited to 'tests')
5 files changed, 9 insertions, 9 deletions
diff --git a/tests/lpc18xx_43xx/test/host/cdc/cdc_callback.h b/tests/lpc18xx_43xx/test/host/cdc/cdc_callback.h index 0919627a1..c5004ee88 100644 --- a/tests/lpc18xx_43xx/test/host/cdc/cdc_callback.h +++ b/tests/lpc18xx_43xx/test/host/cdc/cdc_callback.h @@ -53,7 +53,7 @@ extern "C" { #endif -void tusbh_cdc_mounted_isr(uint8_t dev_addr); +void tusbh_cdc_mounted_cb(uint8_t dev_addr); void tusbh_cdc_unmounted_isr(uint8_t dev_addr); void tusbh_cdc_isr(uint8_t dev_addr, tusb_event_t event); void tusbh_cdc_xfer_isr(uint8_t dev_addr, tusb_event_t event, cdc_pipeid_t pipe_id, uint32_t xferred_bytes); diff --git a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c index 92534e9f9..e803137d4 100644 --- a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c +++ b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c @@ -128,7 +128,7 @@ void test_cdch_open_length_check(void) pipe_handle_t dummy_hld = { .dev_addr = 1 }; hcd_pipe_open_IgnoreAndReturn(dummy_hld); - tusbh_cdc_mounted_isr_Expect(dev_addr); + tusbh_cdc_mounted_cb_Expect(dev_addr); //------------- CUT -------------// TEST_ASSERT_EQUAL( TUSB_ERROR_NONE, cdch_open_subtask(dev_addr, p_comm_interface, &length) ); @@ -140,7 +140,7 @@ void test_cdch_open_interface_number_check(void) { pipe_handle_t dummy_hld = { .dev_addr = 1 }; hcd_pipe_open_IgnoreAndReturn(dummy_hld); - tusbh_cdc_mounted_isr_Expect(dev_addr); + tusbh_cdc_mounted_cb_Expect(dev_addr); //------------- CUT -------------// TEST_ASSERT_EQUAL( TUSB_ERROR_NONE, cdch_open_subtask(dev_addr, p_comm_interface, &length) ); @@ -153,7 +153,7 @@ void test_cdch_open_acm_capacity_check(void) { pipe_handle_t dummy_hld = { .dev_addr = 1 }; hcd_pipe_open_IgnoreAndReturn(dummy_hld); - tusbh_cdc_mounted_isr_Expect(dev_addr); + tusbh_cdc_mounted_cb_Expect(dev_addr); //------------- CUT -------------// TEST_ASSERT_EQUAL( TUSB_ERROR_NONE, cdch_open_subtask(dev_addr, p_comm_interface, &length) ); @@ -173,7 +173,7 @@ void test_cdch_close_device(void) hcd_pipe_open_ExpectAndReturn(dev_addr, p_endpoint_notification, TUSB_CLASS_CDC, pipe_notification); hcd_pipe_open_ExpectAndReturn(dev_addr, p_endpoint_out, TUSB_CLASS_CDC, pipe_out); hcd_pipe_open_ExpectAndReturn(dev_addr, p_endpoint_in, TUSB_CLASS_CDC, pipe_int); - tusbh_cdc_mounted_isr_Expect(dev_addr); + tusbh_cdc_mounted_cb_Expect(dev_addr); TEST_ASSERT_EQUAL( TUSB_ERROR_NONE, cdch_open_subtask(dev_addr, p_comm_interface, &length) ); diff --git a/tests/lpc18xx_43xx/test/host/hid/hidh_callback.h b/tests/lpc18xx_43xx/test/host/hid/hidh_callback.h index 9ac72bb8d..44b8c0ff7 100644 --- a/tests/lpc18xx_43xx/test/host/hid/hidh_callback.h +++ b/tests/lpc18xx_43xx/test/host/hid/hidh_callback.h @@ -60,11 +60,11 @@ //------------- hidh -------------// void tusbh_hid_keyboard_isr(uint8_t dev_addr, tusb_event_t event) ATTR_WEAK; -void tusbh_hid_keyboard_mounted_isr(uint8_t dev_addr) ATTR_WEAK; +void tusbh_hid_keyboard_mounted_cb(uint8_t dev_addr) ATTR_WEAK; void tusbh_hid_keyboard_unmounted_isr(uint8_t dev_addr) ATTR_WEAK; void tusbh_hid_mouse_isr(uint8_t dev_addr, tusb_event_t event) ATTR_WEAK; -void tusbh_hid_mouse_mounted_isr(uint8_t dev_addr) ATTR_WEAK; +void tusbh_hid_mouse_mounted_cb(uint8_t dev_addr) ATTR_WEAK; void tusbh_hid_mouse_unmounted_isr(uint8_t dev_addr) ATTR_WEAK; #ifdef __cplusplus diff --git a/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c b/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c index 4d80671f6..c46bd8844 100644 --- a/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c +++ b/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c @@ -145,7 +145,7 @@ void test_keyboard_open_ok(void) usbh_control_xfer_subtask_StubWithCallback(stub_set_idle_request); hcd_pipe_open_ExpectAndReturn(dev_addr, p_kdb_endpoint_desc, TUSB_CLASS_HID, pipe_hdl); - tusbh_hid_keyboard_mounted_isr_Expect(dev_addr); + tusbh_hid_keyboard_mounted_cb_Expect(dev_addr); //------------- Code Under TEST -------------// TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, hidh_open_subtask(dev_addr, p_kbd_interface_desc, &length)); diff --git a/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c b/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c index d64d70460..2e9a291f4 100644 --- a/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c +++ b/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c @@ -134,7 +134,7 @@ void test_mouse_open_ok(void) usbh_control_xfer_subtask_StubWithCallback(stub_set_idle_request); hcd_pipe_open_ExpectAndReturn(dev_addr, p_mouse_endpoint_desc, TUSB_CLASS_HID, pipe_hdl); - tusbh_hid_mouse_mounted_isr_Expect(dev_addr); + tusbh_hid_mouse_mounted_cb_Expect(dev_addr); //------------- Code Under TEST -------------// TEST_ASSERT_STATUS( hidh_open_subtask(dev_addr, p_mouse_interface_desc, &length)); |
