diff options
| author | hathach <[email protected]> | 2013-03-04 16:21:41 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-03-04 16:21:41 +0700 |
| commit | 94c004724ccbe2b74af74fc1753184f6b3ccb9cf (patch) | |
| tree | b526a427c2bf16e46d7a20d1a5a54324922d9947 /tinyusb/host | |
| parent | 656da2992ded914c70da849f9f7a1571dd2b91f4 (diff) | |
allow configure host/device by controller basic
- make changes to adapt
add mcu_capacity.h
Diffstat (limited to 'tinyusb/host')
| -rw-r--r-- | tinyusb/host/ehci/ehci.c | 8 | ||||
| -rw-r--r-- | tinyusb/host/ehci/ehci.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tinyusb/host/ehci/ehci.c b/tinyusb/host/ehci/ehci.c index 961dc6517..4c55065cc 100644 --- a/tinyusb/host/ehci/ehci.c +++ b/tinyusb/host/ehci/ehci.c @@ -55,13 +55,13 @@ //--------------------------------------------------------------------+ STATIC_ ehci_data_t ehci_data TUSB_CFG_ATTR_USBRAM; STATIC_ ehci_link_t period_frame_list0[EHCI_FRAMELIST_SIZE] ATTR_ALIGNED(4096) TUSB_CFG_ATTR_USBRAM; -#if TUSB_CFG_HOST_CONTROLLER_NUM > 1 +#if CONTROLLER_HOST_NUMBER > 1 STATIC_ ehci_link_t period_frame_list1[EHCI_FRAMELIST_SIZE] ATTR_ALIGNED(4096) TUSB_CFG_ATTR_USBRAM; #endif //------------- Validation -------------// STATIC_ASSERT( ALIGN_OF(period_frame_list0) == 4096, "Period Framelist must be 4k alginment"); -#if TUSB_CFG_HOST_CONTROLLER_NUM > 1 +#if CONTROLLER_HOST_NUMBER > 1 STATIC_ASSERT( ALIGN_OF(period_frame_list1) == 4096, "Period Framelist must be 4k alginment"); #endif @@ -77,7 +77,7 @@ STATIC_ INLINE_ ehci_registers_t* const get_operational_register(uint8_t hostid) STATIC_ INLINE_ ehci_link_t* const get_period_frame_list(uint8_t list_idx) ATTR_PURE ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; STATIC_ INLINE_ ehci_link_t* const get_period_frame_list(uint8_t list_idx) { -#if TUSB_CFG_HOST_CONTROLLER_NUM > 1 +#if CONTROLLER_HOST_NUMBER > 1 return list_idx ? period_frame_list1 : period_frame_list0; // TODO more than 2 controller #else return period_frame_list0; @@ -108,7 +108,7 @@ tusb_error_t hcd_init(void) //------------- Data Structure init -------------// memclr_(&ehci_data, sizeof(ehci_data_t)); - for(i=0; i<TUSB_CFG_HOST_CONTROLLER_NUM; i++) + for(i=0; i<CONTROLLER_HOST_NUMBER; i++) { ASSERT_STATUS (hcd_controller_init(TUSB_CFG_HOST_CONTROLLER_START_INDEX + i)); } diff --git a/tinyusb/host/ehci/ehci.h b/tinyusb/host/ehci/ehci.h index 7f528eb06..880a0e477 100644 --- a/tinyusb/host/ehci/ehci.h +++ b/tinyusb/host/ehci/ehci.h @@ -435,8 +435,8 @@ typedef struct { // ehci_itd_t itd[EHCI_MAX_ITD] ; ///< Iso Transfer Pool struct { - ehci_qhd_t async_head[TUSB_CFG_HOST_CONTROLLER_NUM]; /// head qhd of async list, also is used as control endpoint for address 0 - ehci_qhd_t period_head[TUSB_CFG_HOST_CONTROLLER_NUM]; + ehci_qhd_t async_head[CONTROLLER_HOST_NUMBER]; /// head qhd of async list, also is used as control endpoint for address 0 + ehci_qhd_t period_head[CONTROLLER_HOST_NUMBER]; ehci_qtd_t addr0_qtd[3]; }controller; ///< Static Interrupt Queue Head |