diff options
| author | hathach <[email protected]> | 2019-06-06 10:39:37 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2019-06-06 10:39:37 +0700 |
| commit | 13e01c7dca1e72097be1723676b086be29d0e622 (patch) | |
| tree | 699e883134aae84d54fe592346b2bb4eb92acb7c /tests | |
| parent | 90fea785c6aa60fdfd398fee262bb06c69a010b7 (diff) | |
add TU_ prefix to compiler ATTR to prevent name conflict with application
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lpc18xx_43xx/test/host/ehci/test_ehci_structure.c | 2 | ||||
| -rw-r--r-- | tests/support/descriptor_test.c | 8 | ||||
| -rw-r--r-- | tests/support/tusb_callback.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_ehci_structure.c b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_structure.c index ce6371054..e63fa850c 100644 --- a/tests/lpc18xx_43xx/test/host/ehci/test_ehci_structure.c +++ b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_structure.c @@ -59,7 +59,7 @@ void tearDown(void) void test_struct_alignment(void) { TEST_ASSERT_EQUAL( 32, __alignof__(ehci_qhd_t) ); -// TEST_ASSERT_EQUAL( 32, __alignof__(ehci_qtd_t) ); ehci_qtd_t is used to declare overlay variable in qhd --> cannot declare with ATTR_ALIGNED(32) +// TEST_ASSERT_EQUAL( 32, __alignof__(ehci_qtd_t) ); ehci_qtd_t is used to declare overlay variable in qhd --> cannot declare with TU_ATTR_ALIGNED(32) TEST_ASSERT_EQUAL( 32, __alignof__(ehci_itd_t) ); TEST_ASSERT_EQUAL( 32, __alignof__(ehci_sitd_t) ); diff --git a/tests/support/descriptor_test.c b/tests/support/descriptor_test.c index b51c81711..0796e5b57 100644 --- a/tests/support/descriptor_test.c +++ b/tests/support/descriptor_test.c @@ -27,7 +27,7 @@ #include "tusb_option.h" #include "descriptor_test.h" -CFG_TUSB_MEM_SECTION ATTR_ALIGNED(4) +CFG_TUSB_MEM_SECTION TU_ATTR_ALIGNED(4) const uint8_t keyboard_report_descriptor[] = { HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ), HID_USAGE ( HID_USAGE_DESKTOP_KEYBOARD ), @@ -69,7 +69,7 @@ const uint8_t keyboard_report_descriptor[] = { HID_COLLECTION_END }; -CFG_TUSB_MEM_SECTION ATTR_ALIGNED(4) +CFG_TUSB_MEM_SECTION TU_ATTR_ALIGNED(4) const uint8_t mouse_report_descriptor[] = { HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ), HID_USAGE ( HID_USAGE_DESKTOP_MOUSE ), @@ -106,7 +106,7 @@ const uint8_t mouse_report_descriptor[] = { }; -CFG_TUSB_MEM_SECTION ATTR_ALIGNED(4) +CFG_TUSB_MEM_SECTION TU_ATTR_ALIGNED(4) tusb_desc_device_t const desc_device = { .bLength = sizeof(tusb_desc_device_t), @@ -130,7 +130,7 @@ tusb_desc_device_t const desc_device = } ; -CFG_TUSB_MEM_SECTION ATTR_ALIGNED(4) +CFG_TUSB_MEM_SECTION TU_ATTR_ALIGNED(4) const app_configuration_desc_t desc_configuration = { .configuration = diff --git a/tests/support/tusb_callback.h b/tests/support/tusb_callback.h index 3e793dd9e..456c5d2b6 100644 --- a/tests/support/tusb_callback.h +++ b/tests/support/tusb_callback.h @@ -48,9 +48,9 @@ #include "usbh.h" //------------- core -------------// -uint8_t tusbh_device_attached_cb (tusb_desc_device_t const *p_desc_device) ATTR_WEAK; -void tusbh_device_mount_succeed_cb (uint8_t dev_addr) ATTR_WEAK; -void tusbh_device_mount_failed_cb(tusb_error_t error, tusb_desc_device_t const *p_desc_device) ATTR_WEAK; +uint8_t tusbh_device_attached_cb (tusb_desc_device_t const *p_desc_device) TU_ATTR_WEAK; +void tusbh_device_mount_succeed_cb (uint8_t dev_addr) TU_ATTR_WEAK; +void tusbh_device_mount_failed_cb(tusb_error_t error, tusb_desc_device_t const *p_desc_device) TU_ATTR_WEAK; #ifdef __cplusplus } |