summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-03-06 15:08:09 +0700
committerhathach <[email protected]>2013-03-06 15:08:09 +0700
commit685fb970860868053a7cccf194c77053c7ddf575 (patch)
tree2caafbcf48a649d35aebc00737db9b58553eff57 /tests
parent959311532ed69376a6a5845ca5a2066264b9a4e7 (diff)
rename fields in ehci_qtd_t
Diffstat (limited to 'tests')
-rw-r--r--tests/test/host/ehci/test_ehci_pipe_xfer.c40
-rw-r--r--tests/test/host/ehci/test_ehci_structure.c4
2 files changed, 23 insertions, 21 deletions
diff --git a/tests/test/host/ehci/test_ehci_pipe_xfer.c b/tests/test/host/ehci/test_ehci_pipe_xfer.c
index d84d08f1a..2996b1b89 100644
--- a/tests/test/host/ehci/test_ehci_pipe_xfer.c
+++ b/tests/test/host/ehci/test_ehci_pipe_xfer.c
@@ -153,25 +153,27 @@ void test_control_xfer_get(void)
TEST_ASSERT_EQUAL_HEX( p_status , p_data->next.address );
TEST_ASSERT_TRUE( p_status->next.terminate );
-// ehci_qtd_t *p_qtd = p_setup;
-// TEST_ASSERT_TRUE(p_qtd->alternate.terminate); // not used, always invalid
-// TEST_ASSERT_FALSE(p_qtd->pingstate_err);
-// TEST_ASSERT_FALSE(p_qtd->split_state);
-// TEST_ASSERT_FALSE(p_qtd->missed_uframe);
-// TEST_ASSERT_FALSE(p_qtd->xact_err);
-// TEST_ASSERT_FALSE(p_qtd->babble_err);
-// TEST_ASSERT_FALSE(p_qtd->buffer_err);
-// TEST_ASSERT_FALSE(p_qtd->halted);
-// TEST_ASSERT_TRUE(p_qtd->active);
-// // error count
-// TEST_ASSERT_EQUAL(0, p_qtd->current_page);
-// TEST_ASSERT_FALSE(p_qtd->int_on_complete);
-// TEST_ASSERT_EQUAL(8, p_qtd->total_bytes);
-// TEST_ASSERT_FALSE(p_qtd->data_toggle);
-//
-//// TEST_ASSERT_EQUAL_HEX(request)
-//
-// TEST_ASSERT_EQUAL(EHCI_PID_SETUP, p_qtd->pid);
+ ehci_qtd_t *p_qtd = p_setup;
+ TEST_ASSERT_TRUE(p_qtd->alternate.terminate); // not used, always invalid
+
+ TEST_ASSERT_FALSE(p_qtd->pingstate_err);
+ TEST_ASSERT_FALSE(p_qtd->non_hs_split_state);
+ TEST_ASSERT_FALSE(p_qtd->non_hs_period_missed_uframe);
+ TEST_ASSERT_FALSE(p_qtd->xact_err);
+ TEST_ASSERT_FALSE(p_qtd->babble_err);
+ TEST_ASSERT_FALSE(p_qtd->buffer_err);
+ TEST_ASSERT_FALSE(p_qtd->halted);
+ TEST_ASSERT_TRUE(p_qtd->active);
+
+ TEST_ASSERT_EQUAL(3, p_qtd->cerr);
+ TEST_ASSERT_EQUAL(0, p_qtd->current_page);
+ TEST_ASSERT_FALSE(p_qtd->int_on_complete);
+ TEST_ASSERT_EQUAL(8, p_qtd->total_bytes);
+ TEST_ASSERT_FALSE(p_qtd->data_toggle);
+
+// TEST_ASSERT_EQUAL_HEX(request)
+
+ TEST_ASSERT_EQUAL(EHCI_PID_SETUP, p_qtd->pid);
}
void test_control_xfer_set(void)
diff --git a/tests/test/host/ehci/test_ehci_structure.c b/tests/test/host/ehci/test_ehci_structure.c
index 811a042b4..abbde1389 100644
--- a/tests/test/host/ehci/test_ehci_structure.c
+++ b/tests/test/host/ehci/test_ehci_structure.c
@@ -119,8 +119,8 @@ void test_qtd_structure(void)
//------------- Word 2 -------------//
TEST_ASSERT_EQUAL( 0, BITFIELD_OFFSET_OF_UINT32(ehci_qtd_t, 2, pingstate_err) );
- TEST_ASSERT_EQUAL( 1, BITFIELD_OFFSET_OF_UINT32(ehci_qtd_t, 2, split_state) );
- TEST_ASSERT_EQUAL( 2, BITFIELD_OFFSET_OF_UINT32(ehci_qtd_t, 2, missed_uframe));
+ TEST_ASSERT_EQUAL( 1, BITFIELD_OFFSET_OF_UINT32(ehci_qtd_t, 2, non_hs_split_state) );
+ TEST_ASSERT_EQUAL( 2, BITFIELD_OFFSET_OF_UINT32(ehci_qtd_t, 2, non_hs_period_missed_uframe));
TEST_ASSERT_EQUAL( 3, BITFIELD_OFFSET_OF_UINT32(ehci_qtd_t, 2, xact_err) );
TEST_ASSERT_EQUAL( 4, BITFIELD_OFFSET_OF_UINT32(ehci_qtd_t, 2, babble_err) );
TEST_ASSERT_EQUAL( 5, BITFIELD_OFFSET_OF_UINT32(ehci_qtd_t, 2, buffer_err) );