fix 32bit & 64bit value to pointer interconvert.

geniusgogo · BernardXiong · commit 658b2c10277d · 2022-01-28T11:35:10.000+08:00
diff --git a/components/cplusplus/cxx_mail.h b/components/cplusplus/cxx_mail.h
@@ -51,7 +51,7 @@ class Mail {
         else
             tick = rt_tick_from_millisecond(millisec);
 
-        return rt_mb_send_wait(&mID, (rt_uint32_t)mptr, tick) == RT_EOK;
+        return rt_mb_send_wait(&mID, (rt_ubase_t)mptr, tick) == RT_EOK;
     }
 
     /** Get a mail from a queue.
diff --git a/components/lwp/lwp_mem.c b/components/lwp/lwp_mem.c
@@ -17,7 +17,7 @@
 
 // todo: remove repleat code
 #define RT_MEMHEAP_SIZE         RT_ALIGN(sizeof(struct rt_lwp_memheap_item), RT_ALIGN_SIZE)
-#define MEMITEM_SIZE(item)      ((rt_uint32_t)item->next - (rt_uint32_t)item - RT_MEMHEAP_SIZE)
+#define MEMITEM_SIZE(item)      ((rt_ubase_t)item->next - (rt_ubase_t)item - RT_MEMHEAP_SIZE)
 
 #ifndef LWP_MEM_PAGE_SIZE
     #define LWP_MEM_PAGE_SIZE       (4 * 1024)
diff --git a/components/lwp/lwp_memheap.c b/components/lwp/lwp_memheap.c
@@ -29,7 +29,7 @@
 #define RT_MEMHEAP_MINIALLOC    12
 
 #define RT_MEMHEAP_SIZE         RT_ALIGN(sizeof(struct rt_lwp_memheap_item), RT_ALIGN_SIZE)
-#define MEMITEM_SIZE(item)      ((rt_uint32_t)item->next - (rt_uint32_t)item - RT_MEMHEAP_SIZE)
+#define MEMITEM_SIZE(item)      ((rt_ubase_t)item->next - (rt_ubase_t)item - RT_MEMHEAP_SIZE)
 
 /*
  * The initialized memory pool will be:
diff --git a/components/net/lwip-1.4.1/src/arch/sys_arch.c b/components/net/lwip-1.4.1/src/arch/sys_arch.c
@@ -450,7 +450,7 @@ void sys_mbox_post(sys_mbox_t *mbox, void *msg)
 {
     RT_DEBUG_NOT_IN_INTERRUPT;
 
-    rt_mb_send_wait(*mbox, (rt_uint32_t)msg, RT_WAITING_FOREVER);
+    rt_mb_send_wait(*mbox, (rt_ubase_t)msg, RT_WAITING_FOREVER);
 
     return;
 }
@@ -462,7 +462,7 @@ void sys_mbox_post(sys_mbox_t *mbox, void *msg)
  */
 err_t sys_mbox_trypost(sys_mbox_t *mbox, void *msg)
 {
-    if (rt_mb_send(*mbox, (rt_uint32_t)msg) == RT_EOK)
+    if (rt_mb_send(*mbox, (rt_ubase_t)msg) == RT_EOK)
         return ERR_OK;
 
     return ERR_MEM;
diff --git a/components/net/lwip-1.4.1/src/netif/ethernetif.c b/components/net/lwip-1.4.1/src/netif/ethernetif.c
@@ -374,7 +374,7 @@ static err_t ethernetif_linkoutput(struct netif *netif, struct pbuf *p)
     /* send a message to eth tx thread */
     msg.netif = netif;
     msg.buf   = p;
-    if (rt_mb_send(&eth_tx_thread_mb, (rt_uint32_t) &msg) == RT_EOK)
+    if (rt_mb_send(&eth_tx_thread_mb, (rt_ubase_t) &msg) == RT_EOK)
     {
         /* waiting for ack */
         rt_sem_take(&(enetif->tx_ack), RT_WAITING_FOREVER);
@@ -556,7 +556,7 @@ rt_err_t eth_device_ready(struct eth_device* dev)
         if(dev->rx_notice == RT_FALSE)
         {
             dev->rx_notice = RT_TRUE;
-            return rt_mb_send(&eth_rx_thread_mb, (rt_uint32_t)dev);
+            return rt_mb_send(&eth_rx_thread_mb, (rt_ubase_t)dev);
         }
         else
             return RT_EOK;
@@ -581,7 +581,7 @@ rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up)
     rt_hw_interrupt_enable(level);
 
     /* post message to ethernet thread */
-    return rt_mb_send(&eth_rx_thread_mb, (rt_uint32_t)dev);
+    return rt_mb_send(&eth_rx_thread_mb, (rt_ubase_t)dev);
 }
 #else
 /* NOTE: please not use it in interrupt when no RxThread exist */
diff --git a/components/net/lwip-2.0.3/src/netif/ethernetif.c b/components/net/lwip-2.0.3/src/netif/ethernetif.c
@@ -605,7 +605,7 @@ rt_err_t eth_device_ready(struct eth_device* dev)
         if(dev->rx_notice == RT_FALSE)
         {
             dev->rx_notice = RT_TRUE;
-            return rt_mb_send(&eth_rx_thread_mb, (rt_uint32_t)dev);
+            return rt_mb_send(&eth_rx_thread_mb, (rt_ubase_t)dev);
         }
         else
             return RT_EOK;
diff --git a/components/net/lwip-2.1.2/src/arch/sys_arch.c b/components/net/lwip-2.1.2/src/arch/sys_arch.c
@@ -469,7 +469,7 @@ void sys_mbox_post(sys_mbox_t *mbox, void *msg)
 {
     RT_DEBUG_NOT_IN_INTERRUPT;
 
-    rt_mb_send_wait(*mbox, (rt_uint32_t)msg, RT_WAITING_FOREVER);
+    rt_mb_send_wait(*mbox, (rt_ubase_t)msg, RT_WAITING_FOREVER);
 
     return;
 }
@@ -481,7 +481,7 @@ void sys_mbox_post(sys_mbox_t *mbox, void *msg)
  */
 err_t sys_mbox_trypost(sys_mbox_t *mbox, void *msg)
 {
-    if (rt_mb_send(*mbox, (rt_uint32_t)msg) == RT_EOK)
+    if (rt_mb_send(*mbox, (rt_ubase_t)msg) == RT_EOK)
         return ERR_OK;
 
     return ERR_MEM;
diff --git a/components/net/lwip-2.1.2/src/netif/ethernetif.c b/components/net/lwip-2.1.2/src/netif/ethernetif.c
@@ -405,7 +405,7 @@ static err_t ethernetif_linkoutput(struct netif *netif, struct pbuf *p)
     msg.netif = netif;
     msg.buf   = p;
     rt_completion_init(&msg.ack);
-    if (rt_mb_send(&eth_tx_thread_mb, (rt_uint32_t) &msg) == RT_EOK)
+    if (rt_mb_send(&eth_tx_thread_mb, (rt_ubase_t) &msg) == RT_EOK)
     {
         /* waiting for ack */
         rt_completion_wait(&msg.ack, RT_WAITING_FOREVER);
@@ -615,7 +615,7 @@ rt_err_t eth_device_ready(struct eth_device* dev)
         if(dev->rx_notice == RT_FALSE)
         {
             dev->rx_notice = RT_TRUE;
-            return rt_mb_send(&eth_rx_thread_mb, (rt_uint32_t)dev);
+            return rt_mb_send(&eth_rx_thread_mb, (rt_ubase_t)dev);
         }
         else
             return RT_EOK;
@@ -640,7 +640,7 @@ rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up)
     rt_hw_interrupt_enable(level);
 
     /* post message to ethernet thread */
-    return rt_mb_send(&eth_rx_thread_mb, (rt_uint32_t)dev);
+    return rt_mb_send(&eth_rx_thread_mb, (rt_ubase_t)dev);
 }
 #else
 /* NOTE: please not use it in interrupt when no RxThread exist */
diff --git a/examples/utest/testcases/kernel/memheap_tc.c b/examples/utest/testcases/kernel/memheap_tc.c
@@ -22,12 +22,12 @@
 static void memheap_test(void)
 {
     struct rt_memheap heap1;
-    rt_uint32_t ptr_start;
+    rt_ubase_t ptr_start;
     void *ptr[SLICE_NUM];
     int i, cnt = 0;
 
     /* init heap */
-    ptr_start = (rt_uint32_t)rt_malloc_align(HEAP_SIZE, HEAP_ALIGN);
+    ptr_start = (rt_ubase_t)rt_malloc_align(HEAP_SIZE, HEAP_ALIGN);
     if (ptr_start == RT_NULL)
     {
         rt_kprintf("totle size too big,can not malloc memory!");

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class Mail {`
`51`	`51`	`else`
`52`	`52`	`tick = rt_tick_from_millisecond(millisec);`
`53`	`53`
`54`		`- return rt_mb_send_wait(&mID, (rt_uint32_t)mptr, tick) == RT_EOK;`
	`54`	`+ return rt_mb_send_wait(&mID, (rt_ubase_t)mptr, tick) == RT_EOK;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/** Get a mail from a queue.`
Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@ void sys_mbox_post(sys_mbox_t mbox, void msg)`
`450`	`450`	`{`
`451`	`451`	`RT_DEBUG_NOT_IN_INTERRUPT;`
`452`	`452`
`453`		`- rt_mb_send_wait(*mbox, (rt_uint32_t)msg, RT_WAITING_FOREVER);`
	`453`	`+ rt_mb_send_wait(*mbox, (rt_ubase_t)msg, RT_WAITING_FOREVER);`
`454`	`454`
`455`	`455`	`return;`
`456`	`456`	`}`
`@@ -462,7 +462,7 @@ void sys_mbox_post(sys_mbox_t mbox, void msg)`
`462`	`462`	`*/`
`463`	`463`	`err_t sys_mbox_trypost(sys_mbox_t mbox, void msg)`
`464`	`464`	`{`
`465`		`- if (rt_mb_send(*mbox, (rt_uint32_t)msg) == RT_EOK)`
	`465`	`+ if (rt_mb_send(*mbox, (rt_ubase_t)msg) == RT_EOK)`
`466`	`466`	`return ERR_OK;`
`467`	`467`
`468`	`468`	`return ERR_MEM;`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ static err_t ethernetif_linkoutput(struct netif netif, struct pbuf p)`
`374`	`374`	`/* send a message to eth tx thread */`
`375`	`375`	`msg.netif = netif;`
`376`	`376`	`msg.buf = p;`
`377`		`- if (rt_mb_send(&eth_tx_thread_mb, (rt_uint32_t) &msg) == RT_EOK)`
	`377`	`+ if (rt_mb_send(&eth_tx_thread_mb, (rt_ubase_t) &msg) == RT_EOK)`
`378`	`378`	`{`
`379`	`379`	`/* waiting for ack */`
`380`	`380`	`rt_sem_take(&(enetif->tx_ack), RT_WAITING_FOREVER);`
`@@ -556,7 +556,7 @@ rt_err_t eth_device_ready(struct eth_device* dev)`
`556`	`556`	`if(dev->rx_notice == RT_FALSE)`
`557`	`557`	`{`
`558`	`558`	`dev->rx_notice = RT_TRUE;`
`559`		`- return rt_mb_send(&eth_rx_thread_mb, (rt_uint32_t)dev);`
	`559`	`+ return rt_mb_send(&eth_rx_thread_mb, (rt_ubase_t)dev);`
`560`	`560`	`}`
`561`	`561`	`else`
`562`	`562`	`return RT_EOK;`
`@@ -581,7 +581,7 @@ rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up)`
`581`	`581`	`rt_hw_interrupt_enable(level);`
`582`	`582`
`583`	`583`	`/* post message to ethernet thread */`
`584`		`- return rt_mb_send(&eth_rx_thread_mb, (rt_uint32_t)dev);`
	`584`	`+ return rt_mb_send(&eth_rx_thread_mb, (rt_ubase_t)dev);`
`585`	`585`	`}`
`586`	`586`	`#else`
`587`	`587`	`/* NOTE: please not use it in interrupt when no RxThread exist */`
Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,7 @@ rt_err_t eth_device_ready(struct eth_device* dev)`
`605`	`605`	`if(dev->rx_notice == RT_FALSE)`
`606`	`606`	`{`
`607`	`607`	`dev->rx_notice = RT_TRUE;`
`608`		`- return rt_mb_send(&eth_rx_thread_mb, (rt_uint32_t)dev);`
	`608`	`+ return rt_mb_send(&eth_rx_thread_mb, (rt_ubase_t)dev);`
`609`	`609`	`}`
`610`	`610`	`else`
`611`	`611`	`return RT_EOK;`
Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ void sys_mbox_post(sys_mbox_t mbox, void msg)`
`469`	`469`	`{`
`470`	`470`	`RT_DEBUG_NOT_IN_INTERRUPT;`
`471`	`471`
`472`		`- rt_mb_send_wait(*mbox, (rt_uint32_t)msg, RT_WAITING_FOREVER);`
	`472`	`+ rt_mb_send_wait(*mbox, (rt_ubase_t)msg, RT_WAITING_FOREVER);`
`473`	`473`
`474`	`474`	`return;`
`475`	`475`	`}`
`@@ -481,7 +481,7 @@ void sys_mbox_post(sys_mbox_t mbox, void msg)`
`481`	`481`	`*/`
`482`	`482`	`err_t sys_mbox_trypost(sys_mbox_t mbox, void msg)`
`483`	`483`	`{`
`484`		`- if (rt_mb_send(*mbox, (rt_uint32_t)msg) == RT_EOK)`
	`484`	`+ if (rt_mb_send(*mbox, (rt_ubase_t)msg) == RT_EOK)`
`485`	`485`	`return ERR_OK;`
`486`	`486`
`487`	`487`	`return ERR_MEM;`
Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ static err_t ethernetif_linkoutput(struct netif netif, struct pbuf p)`
`405`	`405`	`msg.netif = netif;`
`406`	`406`	`msg.buf = p;`
`407`	`407`	`rt_completion_init(&msg.ack);`
`408`		`- if (rt_mb_send(&eth_tx_thread_mb, (rt_uint32_t) &msg) == RT_EOK)`
	`408`	`+ if (rt_mb_send(&eth_tx_thread_mb, (rt_ubase_t) &msg) == RT_EOK)`
`409`	`409`	`{`
`410`	`410`	`/* waiting for ack */`
`411`	`411`	`rt_completion_wait(&msg.ack, RT_WAITING_FOREVER);`
`@@ -615,7 +615,7 @@ rt_err_t eth_device_ready(struct eth_device* dev)`
`615`	`615`	`if(dev->rx_notice == RT_FALSE)`
`616`	`616`	`{`
`617`	`617`	`dev->rx_notice = RT_TRUE;`
`618`		`- return rt_mb_send(&eth_rx_thread_mb, (rt_uint32_t)dev);`
	`618`	`+ return rt_mb_send(&eth_rx_thread_mb, (rt_ubase_t)dev);`
`619`	`619`	`}`
`620`	`620`	`else`
`621`	`621`	`return RT_EOK;`
`@@ -640,7 +640,7 @@ rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up)`
`640`	`640`	`rt_hw_interrupt_enable(level);`
`641`	`641`
`642`	`642`	`/* post message to ethernet thread */`
`643`		`- return rt_mb_send(&eth_rx_thread_mb, (rt_uint32_t)dev);`
	`643`	`+ return rt_mb_send(&eth_rx_thread_mb, (rt_ubase_t)dev);`
`644`	`644`	`}`
`645`	`645`	`#else`
`646`	`646`	`/* NOTE: please not use it in interrupt when no RxThread exist */`
Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@`
`22`	`22`	`static void memheap_test(void)`
`23`	`23`	`{`
`24`	`24`	`struct rt_memheap heap1;`
`25`		`- rt_uint32_t ptr_start;`
	`25`	`+ rt_ubase_t ptr_start;`
`26`	`26`	`void *ptr[SLICE_NUM];`
`27`	`27`	`int i, cnt = 0;`
`28`	`28`
`29`	`29`	`/* init heap */`
`30`		`- ptr_start = (rt_uint32_t)rt_malloc_align(HEAP_SIZE, HEAP_ALIGN);`
	`30`	`+ ptr_start = (rt_ubase_t)rt_malloc_align(HEAP_SIZE, HEAP_ALIGN);`
`31`	`31`	`if (ptr_start == RT_NULL)`
`32`	`32`	`{`
`33`	`33`	`rt_kprintf("totle size too big,can not malloc memory!");`