andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refractor

Browse Source 
- remove TUSB_CFG_HOST_CONTROLLER_START_INDEX
This commit is contained in:
hathach
2013-03-04 18:01:05 +07:00
parent e1033b9b3c
commit a259be6edf
6 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test/host/ehci/test_ehci_init.c
View File

@@ -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);

2
tests/test/host/ehci/test_ehci_structure.c
View File

@@ -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) );
}

4
tests/test/support/tusb_config.h
View File

@@ -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
//--------------------------------------------------------------------+