summaryrefslogtreecommitdiff
path: root/tests/test
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test')
-rw-r--r--tests/test/host/ehci/test_ehci_usbh_hcd_integration.c6
-rw-r--r--tests/test/host/ehci/test_pipe_interrupt_open.c24
-rw-r--r--tests/test/host/test_enum_task.c2
-rw-r--r--tests/test/host/test_hid_host_keyboard.c20
-rw-r--r--tests/test/host/test_usbh.c14
5 files changed, 44 insertions, 22 deletions
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 fbfdea6fd..b123fb351 100644
--- a/tests/test/host/ehci/test_ehci_usbh_hcd_integration.c
+++ b/tests/test/host/ehci/test_ehci_usbh_hcd_integration.c
@@ -78,7 +78,7 @@ void setUp(void)
usbh_device_info_pool[i].hub_addr = hub_addr;
usbh_device_info_pool[i].hub_port = hub_port;
usbh_device_info_pool[i].speed = TUSB_SPEED_HIGH;
- usbh_device_info_pool[i].status = TUSB_DEVICE_STATUS_READY;
+ usbh_device_info_pool[i].state = TUSB_DEVICE_STATE_READY;
}
regs = get_operational_register(hostid);
@@ -184,10 +184,10 @@ void test_device_unplugged_status(void)
{
ehci_controller_device_unplug(hostid);
hcd_isr(hostid);
- TEST_ASSERT_EQUAL(TUSB_DEVICE_STATUS_REMOVING, usbh_device_info_pool[dev_addr].status);
+ TEST_ASSERT_EQUAL(TUSB_DEVICE_STATE_REMOVING, usbh_device_info_pool[dev_addr].state);
regs->usb_sts_bit.async_advance = 1;
hcd_isr(hostid); // async advance
- TEST_ASSERT_EQUAL(TUSB_DEVICE_STATUS_UNPLUG, usbh_device_info_pool[dev_addr].status);
+ TEST_ASSERT_EQUAL(TUSB_DEVICE_STATE_UNPLUG, usbh_device_info_pool[dev_addr].state);
}
diff --git a/tests/test/host/ehci/test_pipe_interrupt_open.c b/tests/test/host/ehci/test_pipe_interrupt_open.c
index 0ae65b2ab..b04e68192 100644
--- a/tests/test/host/ehci/test_pipe_interrupt_open.c
+++ b/tests/test/host/ehci/test_pipe_interrupt_open.c
@@ -108,7 +108,7 @@ void verify_open_qhd(ehci_qhd_t *p_qhd, uint8_t endpoint_addr, uint16_t max_pack
}
//--------------------------------------------------------------------+
-// INTERRUPT PIPE
+// PIPE OPEN
//--------------------------------------------------------------------+
tusb_descriptor_endpoint_t const desc_ept_interrupt_out =
{
@@ -176,3 +176,25 @@ void test_open_interrupt_qhd_non_hs(void)
TEST_ASSERT_EQUAL(1, p_qhd->interrupt_smask);
TEST_ASSERT_EQUAL(0x1c, p_qhd->non_hs_interrupt_cmask);
}
+
+//--------------------------------------------------------------------+
+// PIPE CLOSE
+//--------------------------------------------------------------------+
+void test_interrupt_close(void)
+{
+ ehci_qhd_t *p_qhd;
+ pipe_handle_t pipe_hdl;
+
+ pipe_hdl = hcd_pipe_open(dev_addr, &desc_ept_interrupt_out, TUSB_CLASS_HID);
+ p_qhd = qhd_get_from_pipe_handle(pipe_hdl);
+
+ //------------- Code Under TEST -------------//
+ hcd_pipe_close(pipe_hdl);
+
+ TEST_IGNORE(); // check operation removing interrupt head
+
+// TEST_ASSERT(p_qhd->is_removing);
+// TEST_ASSERT( align32(period_head) != (uint32_t) p_qhd );
+// TEST_ASSERT_EQUAL_HEX( (uint32_t) get_async_head(hostid), align32(p_qhd->next.address ) );
+
+}
diff --git a/tests/test/host/test_enum_task.c b/tests/test/host/test_enum_task.c
index 00df47833..9800e6f8e 100644
--- a/tests/test/host/test_enum_task.c
+++ b/tests/test/host/test_enum_task.c
@@ -194,7 +194,7 @@ void test_enum_failed_get_full_dev_desc(void)
usbh_enumeration_task();
- TEST_ASSERT_EQUAL(TUSB_DEVICE_STATUS_ADDRESSED, usbh_device_info_pool[1].status);
+ TEST_ASSERT_EQUAL(TUSB_DEVICE_STATE_ADDRESSED, usbh_device_info_pool[1].state);
TEST_ASSERT_EQUAL(TUSB_SPEED_FULL, usbh_device_info_pool[1].speed);
TEST_ASSERT_EQUAL(enum_connect.core_id, usbh_device_info_pool[1].core_id);
TEST_ASSERT_EQUAL(enum_connect.hub_addr, usbh_device_info_pool[1].hub_addr);
diff --git a/tests/test/host/test_hid_host_keyboard.c b/tests/test/host/test_hid_host_keyboard.c
index ccecf3501..41882d407 100644
--- a/tests/test/host/test_hid_host_keyboard.c
+++ b/tests/test/host/test_hid_host_keyboard.c
@@ -100,11 +100,11 @@ void test_keyboard_no_instances_invalid_para(void)
void test_keyboard_install_ok(void)
{
- tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATUS_READY);
+ tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATE_READY);
TEST_ASSERT_EQUAL(0, tusbh_hid_keyboard_no_instances(device_hdl));
TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, hidh_keyboard_install(device_hdl, (uint8_t*) &kbd_descriptor));
- tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATUS_READY);
+ tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATE_READY);
TEST_ASSERT_EQUAL(1, tusbh_hid_keyboard_no_instances(device_hdl));
}
@@ -150,7 +150,7 @@ pipe_status_t pipe_status_get_stub(pipe_handle_t pipe_hdl, int num_call)
void test_keyboard_get_invalid_para()
{
- tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATUS_READY);
+ tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATE_READY);
TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_hid_keyboard_get(0, 0, NULL));
tusbh_device_status_get_IgnoreAndReturn(0);
@@ -162,18 +162,18 @@ void test_keyboard_get_invalid_para()
void test_keyboard_get_class_not_supported()
{
- tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATUS_READY);
+ tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATE_READY);
keyboard_info_pool[device_hdl].instance[0].pipe_in = (pipe_handle_t) { 0 };
TEST_ASSERT_EQUAL(TUSB_ERROR_CLASS_DEVICE_DONT_SUPPORT, tusbh_hid_keyboard_get(device_hdl, instance_num, &report));
}
void test_keyboard_get_report_not_available()
{
- tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATUS_READY);
+ tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATE_READY);
usbh_pipe_status_get_IgnoreAndReturn(PIPE_STATUS_BUSY);
TEST_ASSERT_EQUAL(TUSB_ERROR_CLASS_DATA_NOT_AVAILABLE, tusbh_hid_keyboard_get(device_hdl, instance_num, &report));
- tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATUS_READY);
+ tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATE_READY);
usbh_pipe_status_get_IgnoreAndReturn(PIPE_STATUS_AVAILABLE);
TEST_ASSERT_EQUAL(TUSB_ERROR_CLASS_DATA_NOT_AVAILABLE, tusbh_hid_keyboard_get(device_hdl, instance_num, &report));
}
@@ -182,16 +182,16 @@ void test_keyboard_get_ok()
{
usbh_pipe_status_get_StubWithCallback(pipe_status_get_stub);
- tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATUS_READY);
+ tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATE_READY);
TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, tusbh_hid_keyboard_get(device_hdl, instance_num, &report));
TEST_ASSERT_EQUAL_MEMORY(&sample_key[0], &report, sizeof(tusb_keyboard_report_t));
- tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATUS_READY);
+ tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATE_READY);
TEST_ASSERT_EQUAL(TUSB_ERROR_CLASS_DATA_NOT_AVAILABLE, tusbh_hid_keyboard_get(device_hdl, instance_num, &report));
- tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATUS_READY);
+ tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATE_READY);
TEST_ASSERT_EQUAL(TUSB_ERROR_CLASS_DATA_NOT_AVAILABLE, tusbh_hid_keyboard_get(device_hdl, instance_num, &report));
- tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATUS_READY);
+ tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATE_READY);
TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, tusbh_hid_keyboard_get(device_hdl, instance_num, &report));
TEST_ASSERT_EQUAL_MEMORY(&sample_key[1], &report, sizeof(tusb_keyboard_report_t));
}
diff --git a/tests/test/host/test_usbh.c b/tests/test/host/test_usbh.c
index f9f1c5ac8..a7d44814d 100644
--- a/tests/test/host/test_usbh.c
+++ b/tests/test/host/test_usbh.c
@@ -63,16 +63,16 @@ void tearDown(void)
//--------------------------------------------------------------------+
void test_usbh_status_get_fail(void)
{
- usbh_device_info_pool[dev_hdl].status = 0;
+ usbh_device_info_pool[dev_hdl].state = 0;
TEST_ASSERT_EQUAL( 0, tusbh_device_status_get(TUSB_CFG_HOST_DEVICE_MAX+1) );
- TEST_ASSERT_EQUAL( TUSB_DEVICE_STATUS_UNPLUG, tusbh_device_status_get(dev_hdl) );
+ TEST_ASSERT_EQUAL( TUSB_DEVICE_STATE_UNPLUG, tusbh_device_status_get(dev_hdl) );
}
void test_usbh_status_get_succeed(void)
{
- usbh_device_info_pool[dev_hdl].status = TUSB_DEVICE_STATUS_READY;
- TEST_ASSERT_EQUAL( TUSB_DEVICE_STATUS_READY, tusbh_device_status_get(dev_hdl) );
+ usbh_device_info_pool[dev_hdl].state = TUSB_DEVICE_STATE_READY;
+ TEST_ASSERT_EQUAL( TUSB_DEVICE_STATE_READY, tusbh_device_status_get(dev_hdl) );
}
//--------------------------------------------------------------------+
@@ -167,7 +167,7 @@ void test_usbh_device_unplugged_isr_device_not_previously_mounted(void)
{
uint8_t dev_addr = 1;
- usbh_device_info_pool[dev_addr].status = TUSB_DEVICE_STATUS_UNPLUG;
+ usbh_device_info_pool[dev_addr].state = TUSB_DEVICE_STATE_UNPLUG;
usbh_device_info_pool[dev_addr].core_id = 0;
usbh_device_info_pool[dev_addr].hub_addr = 0;
usbh_device_info_pool[dev_addr].hub_port = 0;
@@ -179,7 +179,7 @@ void test_usbh_device_unplugged_isr(void)
{
uint8_t dev_addr = 1;
- usbh_device_info_pool[dev_addr].status = TUSB_DEVICE_STATUS_READY;
+ usbh_device_info_pool[dev_addr].state = TUSB_DEVICE_STATE_READY;
usbh_device_info_pool[dev_addr].core_id = 0;
usbh_device_info_pool[dev_addr].hub_addr = 0;
usbh_device_info_pool[dev_addr].hub_port = 0;
@@ -190,5 +190,5 @@ void test_usbh_device_unplugged_isr(void)
//------------- Code Under Test -------------//
usbh_device_unplugged_isr(0);
- TEST_ASSERT_EQUAL(TUSB_DEVICE_STATUS_REMOVING, usbh_device_info_pool[dev_addr].status);
+ TEST_ASSERT_EQUAL(TUSB_DEVICE_STATE_REMOVING, usbh_device_info_pool[dev_addr].state);
}
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-18 07:11:57 +0000