rename common func to avoid conflict

8 files changed, 34 insertions, 34 deletions

diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_ehci_init.c b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_init.c
index f31944338..69b7c1dd9 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_ehci_init.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_init.c
@@ -107,7 +107,7 @@ void test_hcd_init_async_list(void)
 
   TEST_ASSERT_EQUAL_HEX(async_head, regs->async_list_base);
 
-  TEST_ASSERT_EQUAL_HEX(async_head, align32( (uint32_t) async_head) );
+  TEST_ASSERT_EQUAL_HEX(async_head, tu_align32( (uint32_t) async_head) );
   TEST_ASSERT_EQUAL(EHCI_QUEUE_ELEMENT_QHD, async_head->next.type);
   TEST_ASSERT_FALSE(async_head->next.terminate);
 
@@ -118,7 +118,7 @@ void test_hcd_init_async_list(void)
 void check_qhd_endpoint_link(ehci_link_t *p_prev, ehci_qhd_t *p_qhd)
 {
   //------------- period list check -------------//
-  TEST_ASSERT_EQUAL_HEX((uint32_t) p_qhd, align32(p_prev->address));
+  TEST_ASSERT_EQUAL_HEX((uint32_t) p_qhd, tu_align32(p_prev->address));
   TEST_ASSERT_FALSE(p_prev->terminate);
   TEST_ASSERT_EQUAL(EHCI_QUEUE_ELEMENT_QHD, p_prev->type);
 }
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_open.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_open.c
index c2d52ce4c..a26b990d3 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_open.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_open.c
@@ -143,7 +143,7 @@ void verify_bulk_open_qhd(ehci_qhd_t *p_qhd, tusb_desc_endpoint_t const * desc_e
 
   TEST_ASSERT_EQUAL(class_code, p_qhd->class_code);
   //------------- async list check -------------//
-  TEST_ASSERT_EQUAL_HEX((uint32_t) p_qhd, align32(async_head->next.address));
+  TEST_ASSERT_EQUAL_HEX((uint32_t) p_qhd, tu_align32(async_head->next.address));
   TEST_ASSERT_FALSE(async_head->next.terminate);
   TEST_ASSERT_EQUAL(EHCI_QUEUE_ELEMENT_QHD, async_head->next.type);
 }
@@ -164,7 +164,7 @@ void test_open_bulk_qhd_data(void)
   verify_bulk_open_qhd(p_qhd, desc_endpoint, TUSB_CLASS_MSC);
 
   //------------- async list check -------------//
-  TEST_ASSERT_EQUAL_HEX((uint32_t) p_qhd, align32(async_head->next.address));
+  TEST_ASSERT_EQUAL_HEX((uint32_t) p_qhd, tu_align32(async_head->next.address));
   TEST_ASSERT_FALSE(async_head->next.terminate);
   TEST_ASSERT_EQUAL(EHCI_QUEUE_ELEMENT_QHD, async_head->next.type);
 }
@@ -194,7 +194,7 @@ void test_bulk_close(void)
   hcd_pipe_close(pipe_hdl);
 
   TEST_ASSERT(p_qhd->is_removing);
-  TEST_ASSERT( align32(async_head->next.address) != (uint32_t) p_qhd );
-  TEST_ASSERT_EQUAL_HEX( (uint32_t) async_head, align32(p_qhd->next.address) );
+  TEST_ASSERT( tu_align32(async_head->next.address) != (uint32_t) p_qhd );
+  TEST_ASSERT_EQUAL_HEX( (uint32_t) async_head, tu_align32(p_qhd->next.address) );
   TEST_ASSERT_EQUAL(EHCI_QUEUE_ELEMENT_QHD, p_qhd->next.type);
 }
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_xfer.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_xfer.c
index e3d78f668..a52c721fe 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_xfer.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_xfer.c
@@ -140,7 +140,7 @@ void verify_qtd(ehci_qtd_t *p_qtd, uint8_t p_data[], uint16_t length)
   TEST_ASSERT_EQUAL_HEX( p_data, p_qtd->buffer[0] );
   for(uint8_t i=1; i<5; i++)
   {
-    TEST_ASSERT_EQUAL_HEX( align4k((uint32_t) (p_data+4096*i)), align4k(p_qtd->buffer[i]) );
+    TEST_ASSERT_EQUAL_HEX( tu_align4k((uint32_t) (p_data+4096*i)), tu_align4k(p_qtd->buffer[i]) );
   }
 }
 
@@ -193,7 +193,7 @@ void test_bulk_xfer_double(void)
   //------------- list tail -------------//
   TEST_ASSERT_NOT_NULL(p_tail);
   verify_qtd(p_tail, data2, sizeof(data2));
-  TEST_ASSERT_EQUAL_HEX( align32(p_head->next.address), p_tail);
+  TEST_ASSERT_EQUAL_HEX( tu_align32(p_head->next.address), p_tail);
   TEST_ASSERT_EQUAL(EHCI_PID_IN, p_tail->pid);
   TEST_ASSERT_TRUE(p_tail->next.terminate);
   TEST_ASSERT_TRUE(p_tail->int_on_complete);
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_open.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_open.c
index 1143b9faa..22cbf7569 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_open.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_open.c
@@ -142,7 +142,7 @@ void test_control_open_qhd_data(void)
   TEST_ASSERT_FALSE(p_control_qhd->head_list_flag);
 
   //------------- async list check -------------//
-  TEST_ASSERT_EQUAL_HEX((uint32_t) p_control_qhd, align32(async_head->next.address));
+  TEST_ASSERT_EQUAL_HEX((uint32_t) p_control_qhd, tu_align32(async_head->next.address));
   TEST_ASSERT_FALSE(async_head->next.terminate);
   TEST_ASSERT_EQUAL(EHCI_QUEUE_ELEMENT_QHD, async_head->next.type);
 }
@@ -191,6 +191,6 @@ void test_control_close(void)
   TEST_ASSERT(p_control_qhd->is_removing);
   TEST_ASSERT(p_control_qhd->used);
 
-  TEST_ASSERT( align32(get_async_head(hostid)->next.address) != (uint32_t) p_control_qhd );
-  TEST_ASSERT_EQUAL( get_async_head(hostid), align32(p_control_qhd->next.address));
+  TEST_ASSERT( tu_align32(get_async_head(hostid)->next.address) != (uint32_t) p_control_qhd );
+  TEST_ASSERT_EQUAL( get_async_head(hostid), tu_align32(p_control_qhd->next.address));
 }
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_open.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_open.c
index 1f8fc9a12..f39021ef2 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_open.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_open.c
@@ -136,7 +136,7 @@ void verify_int_qhd(ehci_qhd_t *p_qhd, tusb_desc_endpoint_t const * desc_endpoin
 void check_int_endpoint_link(ehci_qhd_t *p_prev, ehci_qhd_t *p_qhd)
 {
   //------------- period list check -------------//
-  TEST_ASSERT_EQUAL_HEX((uint32_t) p_qhd, align32(p_prev->next.address));
+  TEST_ASSERT_EQUAL_HEX((uint32_t) p_qhd, tu_align32(p_prev->next.address));
   TEST_ASSERT_FALSE(p_prev->next.terminate);
   TEST_ASSERT_EQUAL(EHCI_QUEUE_ELEMENT_QHD, p_prev->next.type);
 }
@@ -181,7 +181,7 @@ void test_open_interrupt_hs_interval_2(void)
   p_int_qhd = &ehci_data.device[ pipe_hdl.dev_addr-1].qhd[ pipe_hdl.index ];
 
   TEST_ASSERT_EQUAL(0 , p_int_qhd->interval_ms);
-  TEST_ASSERT_EQUAL(4 , cardinality_of(p_int_qhd->interrupt_smask)); // either 10101010 or 01010101
+  TEST_ASSERT_EQUAL(4 , tu_cardof(p_int_qhd->interrupt_smask)); // either 10101010 or 01010101
   check_int_endpoint_link(period_head_arr, p_int_qhd);
 }
 
@@ -195,7 +195,7 @@ void test_open_interrupt_hs_interval_3(void)
   p_int_qhd = &ehci_data.device[ pipe_hdl.dev_addr-1].qhd[ pipe_hdl.index ];
 
   TEST_ASSERT_EQUAL(0, p_int_qhd->interval_ms);
-  TEST_ASSERT_EQUAL(2, cardinality_of(p_int_qhd->interrupt_smask) );
+  TEST_ASSERT_EQUAL(2, tu_cardof(p_int_qhd->interrupt_smask) );
   check_int_endpoint_link(period_head_arr, p_int_qhd);
 }
 
@@ -209,7 +209,7 @@ void test_open_interrupt_hs_interval_4(void)
   p_int_qhd = &ehci_data.device[ pipe_hdl.dev_addr-1].qhd[ pipe_hdl.index ];
 
   TEST_ASSERT_EQUAL(1, p_int_qhd->interval_ms);
-  TEST_ASSERT_EQUAL(1, cardinality_of(p_int_qhd->interrupt_smask) );
+  TEST_ASSERT_EQUAL(1, tu_cardof(p_int_qhd->interrupt_smask) );
   check_int_endpoint_link(period_head_arr, p_int_qhd);
 }
 
@@ -223,7 +223,7 @@ void test_open_interrupt_hs_interval_5(void)
   p_int_qhd = &ehci_data.device[ pipe_hdl.dev_addr-1].qhd[ pipe_hdl.index ];
 
   TEST_ASSERT_EQUAL(2, p_int_qhd->interval_ms);
-  TEST_ASSERT_EQUAL(1, cardinality_of(p_int_qhd->interrupt_smask) );
+  TEST_ASSERT_EQUAL(1, tu_cardof(p_int_qhd->interrupt_smask) );
   check_int_endpoint_link( get_period_head(hostid, 2), p_int_qhd );
 }
 
@@ -237,7 +237,7 @@ void test_open_interrupt_hs_interval_6(void)
   p_int_qhd = &ehci_data.device[ pipe_hdl.dev_addr-1].qhd[ pipe_hdl.index ];
 
   TEST_ASSERT_EQUAL(4, p_int_qhd->interval_ms);
-  TEST_ASSERT_EQUAL(1, cardinality_of(p_int_qhd->interrupt_smask) );
+  TEST_ASSERT_EQUAL(1, tu_cardof(p_int_qhd->interrupt_smask) );
   check_int_endpoint_link( get_period_head(hostid, 4), p_int_qhd);
 }
 
@@ -251,7 +251,7 @@ void test_open_interrupt_hs_interval_7(void)
   p_int_qhd = &ehci_data.device[ pipe_hdl.dev_addr-1].qhd[ pipe_hdl.index ];
 
   TEST_ASSERT_EQUAL(8, p_int_qhd->interval_ms);
-  TEST_ASSERT_EQUAL(1, cardinality_of(p_int_qhd->interrupt_smask) );
+  TEST_ASSERT_EQUAL(1, tu_cardof(p_int_qhd->interrupt_smask) );
   check_int_endpoint_link( get_period_head(hostid, 8), p_int_qhd);
 }
 
@@ -265,7 +265,7 @@ void test_open_interrupt_hs_interval_8(void)
   p_int_qhd = &ehci_data.device[ pipe_hdl.dev_addr-1].qhd[ pipe_hdl.index ];
 
   TEST_ASSERT_EQUAL(255, p_int_qhd->interval_ms);
-  TEST_ASSERT_EQUAL(1, cardinality_of(p_int_qhd->interrupt_smask) );
+  TEST_ASSERT_EQUAL(1, tu_cardof(p_int_qhd->interrupt_smask) );
   check_int_endpoint_link( get_period_head(hostid, 255), p_int_qhd);
   check_int_endpoint_link( get_period_head(hostid, 8) , p_int_qhd);
 }
@@ -318,8 +318,8 @@ void test_interrupt_close(void)
                     hcd_pipe_close(pipe_hdl) );
 
   TEST_ASSERT(p_int_qhd->is_removing);
-  TEST_ASSERT( align32(period_head_arr->next.address) != (uint32_t) p_int_qhd );
-  TEST_ASSERT_EQUAL_HEX( (uint32_t) period_head_arr, align32(p_int_qhd->next.address ) );
+  TEST_ASSERT( tu_align32(period_head_arr->next.address) != (uint32_t) p_int_qhd );
+  TEST_ASSERT_EQUAL_HEX( (uint32_t) period_head_arr, tu_align32(p_int_qhd->next.address ) );
   TEST_ASSERT_EQUAL(EHCI_QUEUE_ELEMENT_QHD, p_int_qhd->next.type);
 }
 
@@ -336,7 +336,7 @@ void test_interrupt_256ms_close(void)
                     hcd_pipe_close(pipe_hdl) );
 
   TEST_ASSERT(p_int_qhd->is_removing);
-  TEST_ASSERT( align32(get_period_head(hostid, 8)->address) != (uint32_t) p_int_qhd );
-  TEST_ASSERT_EQUAL_HEX( (uint32_t) get_period_head(hostid, 8), align32(p_int_qhd->next.address ) );
+  TEST_ASSERT( tu_align32(get_period_head(hostid, 8)->address) != (uint32_t) p_int_qhd );
+  TEST_ASSERT_EQUAL_HEX( (uint32_t) get_period_head(hostid, 8), tu_align32(p_int_qhd->next.address ) );
   TEST_ASSERT_EQUAL(EHCI_QUEUE_ELEMENT_QHD, p_int_qhd->next.type);
 }
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_xfer.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_xfer.c
index cacc1e98c..aeb094932 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_xfer.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_xfer.c
@@ -142,7 +142,7 @@ void verify_qtd(ehci_qtd_t *p_qtd, uint8_t p_data[], uint16_t length)
   TEST_ASSERT_EQUAL_HEX( p_data, p_qtd->buffer[0] );
   for(uint8_t i=1; i<5; i++)
   {
-    TEST_ASSERT_EQUAL_HEX( align4k((uint32_t) (p_data+4096*i)), align4k(p_qtd->buffer[i]) );
+    TEST_ASSERT_EQUAL_HEX( tu_align4k((uint32_t) (p_data+4096*i)), tu_align4k(p_qtd->buffer[i]) );
   }
 }
 
@@ -182,7 +182,7 @@ void test_interrupt_xfer_double(void)
   //------------- list tail -------------//
   TEST_ASSERT_NOT_NULL(p_tail);
   verify_qtd(p_tail, data2, sizeof(data2));
-  TEST_ASSERT_EQUAL_HEX( align32(p_head->next.address), p_tail);
+  TEST_ASSERT_EQUAL_HEX( tu_align32(p_head->next.address), p_tail);
   TEST_ASSERT_EQUAL(EHCI_PID_IN, p_tail->pid);
   TEST_ASSERT_TRUE(p_tail->next.terminate);
   TEST_ASSERT_TRUE(p_tail->int_on_complete);
diff --git a/tests/support/ehci_controller_fake.c b/tests/support/ehci_controller_fake.c
index 04d55172c..041e1dbb5 100644
--- a/tests/support/ehci_controller_fake.c
+++ b/tests/support/ehci_controller_fake.c
@@ -95,7 +95,7 @@ void complete_qtd_in_qhd(ehci_qhd_t *p_qhd)
   {
     while(!p_qhd->qtd_overlay.next.terminate)
     {
-      ehci_qtd_t* p_qtd = (ehci_qtd_t*) align32(p_qhd->qtd_overlay.next.address);
+      ehci_qtd_t* p_qtd = (ehci_qtd_t*) tu_align32(p_qhd->qtd_overlay.next.address);
       p_qtd->active = 0;
       p_qtd->total_bytes = 0;
       p_qhd->qtd_overlay = *p_qtd;
@@ -110,7 +110,7 @@ bool complete_all_qtd_in_async(ehci_qhd_t *head)
   do
   {
     complete_qtd_in_qhd(p_qhd);
-    p_qhd = (ehci_qhd_t*) align32(p_qhd->next.address);
+    p_qhd = (ehci_qhd_t*) tu_align32(p_qhd->next.address);
   }while(p_qhd != head); // stop if loop around
 
   return true;
@@ -121,7 +121,7 @@ bool complete_all_qtd_in_period(ehci_link_t *head)
   while(!head->terminate)
   {
     uint32_t queue_type = head->type;
-    head = (ehci_link_t*) align32(head->address);
+    head = (ehci_link_t*) tu_align32(head->address);
 
     if ( queue_type == EHCI_QUEUE_ELEMENT_QHD)
     {
@@ -153,7 +153,7 @@ void complete_1st_qtd_with_error(ehci_qhd_t* p_qhd, bool halted, bool xact_err)
   {
     if(!p_qhd->qtd_overlay.next.terminate) // TODO add active check
     {
-      ehci_qtd_t* p_qtd = (ehci_qtd_t*) align32(p_qhd->qtd_overlay.next.address);
+      ehci_qtd_t* p_qtd = (ehci_qtd_t*) tu_align32(p_qhd->qtd_overlay.next.address);
       p_qtd->active   = 0;
       p_qtd->halted   = halted ? 1 : 0;
       p_qtd->xact_err = xact_err ? 1 : 0;
@@ -172,7 +172,7 @@ void complete_list_with_error(uint8_t hostid, bool halted, bool xact_err)
   do
   {
     complete_1st_qtd_with_error(p_qhd, halted, xact_err);
-    p_qhd = (ehci_qhd_t*) align32(p_qhd->next.address);
+    p_qhd = (ehci_qhd_t*) tu_align32(p_qhd->next.address);
   }while(p_qhd != get_async_head(hostid)); // stop if loop around
 
   //------------- Period List -------------//
@@ -183,7 +183,7 @@ void complete_list_with_error(uint8_t hostid, bool halted, bool xact_err)
     while(!head->terminate)
     {
       uint32_t queue_type = head->type;
-      head = (ehci_link_t*) align32(head->address);
+      head = (ehci_link_t*) tu_align32(head->address);
 
       if ( queue_type == EHCI_QUEUE_ELEMENT_QHD)
       {
diff --git a/tests/support/type_helper.h b/tests/support/type_helper.h
index d0712e4f0..3e27cef2e 100644
--- a/tests/support/type_helper.h
+++ b/tests/support/type_helper.h
@@ -70,7 +70,7 @@
 #define TEST_ASSERT_STATUS( actual )\
   TEST_ASSERT_EQUAL( TUSB_ERROR_NONE, (actual) )
 
-// log2_of a value is equivalent to its highest set bit's position
+// tu_log2 a value is equivalent to its highest set bit's position
 #define BITFIELD_OFFSET_OF_MEMBER(struct_type, member, bitfield_member) \
   ({\
     uint32_t value=0;\
@@ -78,7 +78,7 @@
     memclr_((void*)&str, sizeof(struct_type));\
     str.member.bitfield_member = 1;\
     memcpy(&value, (void*)&str.member, sizeof(str.member));\
-    log2_of( value );\
+    tu_log2( value );\
   })
 
 #define BITFIELD_OFFSET_OF_UINT32(struct_type, offset, bitfield_member) \
@@ -86,7 +86,7 @@
     struct_type str;\
     memclr_(&str, sizeof(struct_type));\
     str.bitfield_member = 1;\
-    log2_of( ((uint32_t*) &str)[offset] );\
+    tu_log2( ((uint32_t*) &str)[offset] );\
   })
 
 #ifdef __cplusplus