diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test/host/ehci/test_ehci_init.c | 10 | ||||
| -rw-r--r-- | tests/test/host/ehci/test_ehci_structure.c | 2 | ||||
| -rw-r--r-- | tests/test/support/tusb_config.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/test/host/ehci/test_ehci_init.c b/tests/test/host/ehci/test_ehci_init.c index ab4e8d219..9e698322a 100644 --- a/tests/test/host/ehci/test_ehci_init.c +++ b/tests/test/host/ehci/test_ehci_init.c @@ -83,7 +83,7 @@ void test_hcd_init_usbint(void) for(uint32_t i=0; i<CONTROLLER_HOST_NUMBER; i++) { - ehci_registers_t* const regs = get_operational_register(i+TUSB_CFG_HOST_CONTROLLER_START_INDEX); + ehci_registers_t* const regs = get_operational_register(i+CONTROLLER_HOST_START_INDEX); //------------- USB INT Enable-------------// TEST_ASSERT(regs->usb_int_enable_bit.usb_error); @@ -107,7 +107,7 @@ void test_hcd_init_async_list(void) for(uint32_t i=0; i<CONTROLLER_HOST_NUMBER; i++) { - uint8_t hostid = i+TUSB_CFG_HOST_CONTROLLER_START_INDEX; + uint8_t hostid = i+CONTROLLER_HOST_START_INDEX; ehci_registers_t * const regs = get_operational_register(hostid); ehci_qhd_t * const async_head = get_async_head(hostid); @@ -132,7 +132,7 @@ void test_hcd_init_period_list(void) for(uint32_t i=0; i<CONTROLLER_HOST_NUMBER; i++) { - uint8_t const hostid = i+TUSB_CFG_HOST_CONTROLLER_START_INDEX; + uint8_t const hostid = i+CONTROLLER_HOST_START_INDEX; ehci_registers_t* const regs = get_operational_register(hostid); ehci_qhd_t * const period_head = get_period_head(hostid); ehci_link_t * const framelist = get_period_frame_list(hostid); @@ -160,7 +160,7 @@ void test_hcd_init_tt_control(void) for(uint32_t i=0; i<CONTROLLER_HOST_NUMBER; i++) { - uint8_t const hostid = i+TUSB_CFG_HOST_CONTROLLER_START_INDEX; + uint8_t const hostid = i+CONTROLLER_HOST_START_INDEX; ehci_registers_t* const regs = get_operational_register(hostid); TEST_ASSERT_EQUAL(0, regs->tt_control); @@ -173,7 +173,7 @@ void test_hcd_init_usbcmd(void) for(uint32_t i=0; i<CONTROLLER_HOST_NUMBER; i++) { - uint8_t const hostid = i+TUSB_CFG_HOST_CONTROLLER_START_INDEX; + uint8_t const hostid = i+CONTROLLER_HOST_START_INDEX; ehci_registers_t* const regs = get_operational_register(hostid); TEST_ASSERT(regs->usb_cmd_bit.async_enable); diff --git a/tests/test/host/ehci/test_ehci_structure.c b/tests/test/host/ehci/test_ehci_structure.c index 7a5ff85d5..1dc5caf7b 100644 --- a/tests/test/host/ehci/test_ehci_structure.c +++ b/tests/test/host/ehci/test_ehci_structure.c @@ -305,7 +305,7 @@ void test_ehci_data(void) { for(uint32_t i=0; i<CONTROLLER_HOST_NUMBER; i++) { - uint8_t hostid = i+TUSB_CFG_HOST_CONTROLLER_START_INDEX; + uint8_t hostid = i+CONTROLLER_HOST_START_INDEX; TEST_ASSERT_BITS_LOW(4096-1, (uint32_t)get_period_frame_list(hostid) ); } diff --git a/tests/test/support/tusb_config.h b/tests/test/support/tusb_config.h index 430f7e031..70652209d 100644 --- a/tests/test/support/tusb_config.h +++ b/tests/test/support/tusb_config.h @@ -65,8 +65,6 @@ // HOST CONFIGURATION //--------------------------------------------------------------------+ //------------- CORE -------------// -#define TUSB_CFG_HOST_CONTROLLER_START_INDEX 0 - #define TUSB_CFG_HOST_DEVICE_MAX 2 #define TUSB_CFG_CONFIGURATION_MAX 2 @@ -79,6 +77,8 @@ #define HOST_HCD_XFER_BULK #define HOST_HCD_XFER_ISOCHRONOUS +// Test support +#define CONTROLLER_HOST_START_INDEX ( ((CONTROLLER_HOST_NUMBER == 1) && (TUSB_CFG_CONTROLLER1_MODE & TUSB_MODE_HOST)) ? 1 : 0) //--------------------------------------------------------------------+ // DEVICE CONFIGURATION //--------------------------------------------------------------------+ |