diff options
| author | hathach <[email protected]> | 2013-09-21 13:17:43 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-09-21 13:17:43 +0700 |
| commit | d15ba08fdc5c75aa061dc7dde10eff54f6dc607f (patch) | |
| tree | 037d09bc2fd3d65c311cb8938d8fedb795debd0c /tinyusb/host | |
| parent | 2db5fcdf0a34142a3712174baba1ba7bf63af3f4 (diff) | |
house keeping
Diffstat (limited to 'tinyusb/host')
| -rw-r--r-- | tinyusb/host/ehci/ehci.c | 10 | ||||
| -rw-r--r-- | tinyusb/host/usbh.c | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/tinyusb/host/ehci/ehci.c b/tinyusb/host/ehci/ehci.c index 4d1a2ebd9..9ec9fc7a8 100644 --- a/tinyusb/host/ehci/ehci.c +++ b/tinyusb/host/ehci/ehci.c @@ -57,22 +57,22 @@ //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ -STATIC_ ehci_data_t ehci_data TUSB_CFG_ATTR_USBRAM; +STATIC_VAR ehci_data_t ehci_data TUSB_CFG_ATTR_USBRAM; #if EHCI_PERIODIC_LIST #if (TUSB_CFG_CONTROLLER0_MODE & TUSB_MODE_HOST) - ATTR_ALIGNED(4096) STATIC_ ehci_link_t period_frame_list0[EHCI_FRAMELIST_SIZE] TUSB_CFG_ATTR_USBRAM; + ATTR_ALIGNED(4096) STATIC_VAR ehci_link_t period_frame_list0[EHCI_FRAMELIST_SIZE] TUSB_CFG_ATTR_USBRAM; - #ifndef __ICCARM__ // IAR cannot able to determine the alignment with dataalignment pragma + #ifndef __ICCARM__ // IAR cannot able to determine the alignment with datalignment pragma STATIC_ASSERT( ALIGN_OF(period_frame_list0) == 4096, "Period Framelist must be 4k alginment"); // validation #endif #endif #if (TUSB_CFG_CONTROLLER1_MODE & TUSB_MODE_HOST) - STATIC_ ehci_link_t period_frame_list1[EHCI_FRAMELIST_SIZE] ATTR_ALIGNED(4096) TUSB_CFG_ATTR_USBRAM; + STATIC_VAR ehci_link_t period_frame_list1[EHCI_FRAMELIST_SIZE] ATTR_ALIGNED(4096) TUSB_CFG_ATTR_USBRAM; - #ifndef __ICCARM__ // IAR cannot able to determine the alignment with dataalignment pragma + #ifndef __ICCARM__ // IAR cannot able to determine the alignment with datalignment pragma STATIC_ASSERT( ALIGN_OF(period_frame_list1) == 4096, "Period Framelist must be 4k alginment"); // validation #endif #endif diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c index 1016ebd0d..dd930845e 100644 --- a/tinyusb/host/usbh.c +++ b/tinyusb/host/usbh.c @@ -110,8 +110,9 @@ usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1] TUSB_CFG_ATTR_USBRAM //------------- Enumeration Task Data -------------// OSAL_TASK_DEF(usbh_enumeration_task, 150, TUSB_CFG_OS_TASK_PRIO); OSAL_QUEUE_DEF(enum_queue_def, ENUM_QUEUE_DEPTH, uint32_t); -osal_queue_handle_t enum_queue_hdl; -STATIC_ uint8_t enum_data_buffer[TUSB_CFG_HOST_ENUM_BUFFER_SIZE] TUSB_CFG_ATTR_USBRAM; + +static osal_queue_handle_t enum_queue_hdl; +STATIC_VAR uint8_t enum_data_buffer[TUSB_CFG_HOST_ENUM_BUFFER_SIZE] TUSB_CFG_ATTR_USBRAM; //------------- Reporter Task Data -------------// |