libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2070 from RT-Thread/fix_32bit_64bit 

Fix the value width issue under 32/64 bit arch.
This commit is contained in:
Bernard Xiong 2018-12-13 16:47:19 +08:00 committed by GitHub
parent dcf7bce2cc 1f37de29c4
commit b75a809d19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/dfs/src/dfs_file.c
View File

@ -171,7 +171,7 @@ int dfs_file_ioctl(struct dfs_fd *fd, int cmd, void *args)
return fd->flags; /* return flags */ return fd->flags; /* return flags */
case F_SETFL: case F_SETFL:
{ {
int flags = (int)args; int flags = (int)(rt_base_t)args;
int mask = O_NONBLOCK | O_APPEND; int mask = O_NONBLOCK | O_APPEND;
flags &= mask; flags &= mask;

2
components/dfs/src/poll.c
View File

@ -40,7 +40,7 @@ static int __wqueue_pollwake(struct rt_wqueue_node *wait, void *key)
{ {
struct rt_poll_node *pn; struct rt_poll_node *pn;
if (key && !((rt_uint32_t)key & wait->key)) if (key && !((rt_ubase_t)key & wait->key))
return -1; return -1;
pn = rt_container_of(wait, struct rt_poll_node, wqn); pn = rt_container_of(wait, struct rt_poll_node, wqn);

4
components/drivers/sdio/mmcsd_core.c
View File

@ -595,7 +595,7 @@ static void mmcsd_power_off(struct rt_mmcsd_host *host)
int mmcsd_wait_cd_changed(rt_int32_t timeout) int mmcsd_wait_cd_changed(rt_int32_t timeout)
{ {
struct rt_mmcsd_host *host; struct rt_mmcsd_host *host;
if (rt_mb_recv(&mmcsd_hotpluge_mb, (rt_uint32_t*)&host, timeout) == RT_EOK) if (rt_mb_recv(&mmcsd_hotpluge_mb, (rt_ubase_t *)&host, timeout) == RT_EOK)
{ {
if(host->card == RT_NULL) if(host->card == RT_NULL)
{ {
@ -623,7 +623,7 @@ void mmcsd_detect(void *param)
while (1) while (1)
{ {
if (rt_mb_recv(&mmcsd_detect_mb, (rt_uint32_t*)&host, RT_WAITING_FOREVER) == RT_EOK) if (rt_mb_recv(&mmcsd_detect_mb, (rt_ubase_t *)&host, RT_WAITING_FOREVER) == RT_EOK)
{ {
if (host->card == RT_NULL) if (host->card == RT_NULL)
{ {

4
components/net/lwip-2.0.2/src/arch/sys_arch.c
View File

@ -508,7 +508,7 @@ u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout)
t = timeout / (1000/RT_TICK_PER_SECOND); t = timeout / (1000/RT_TICK_PER_SECOND);
} }
ret = rt_mb_recv(*mbox, (rt_uint32_t *)msg, t); ret = rt_mb_recv(*mbox, (rt_ubase_t *)msg, t);
if(ret == -RT_ETIMEOUT) if(ret == -RT_ETIMEOUT)
return SYS_ARCH_TIMEOUT; return SYS_ARCH_TIMEOUT;
@ -539,7 +539,7 @@ u32_t sys_arch_mbox_tryfetch(sys_mbox_t *mbox, void **msg)
{ {
int ret; int ret;
ret = rt_mb_recv(*mbox, (rt_uint32_t *)msg, 0); ret = rt_mb_recv(*mbox, (rt_ubase_t *)msg, 0);
if(ret == -RT_ETIMEOUT) if(ret == -RT_ETIMEOUT)
return SYS_ARCH_TIMEOUT; return SYS_ARCH_TIMEOUT;

4
components/net/lwip-2.0.2/src/netif/ethernetif.c
View File

@ -329,7 +329,7 @@ static void eth_tx_thread_entry(void* parameter)
while (1) while (1)
{ {
if (rt_mb_recv(&eth_tx_thread_mb, (rt_uint32_t*)&msg, RT_WAITING_FOREVER) == RT_EOK) if (rt_mb_recv(&eth_tx_thread_mb, (rt_ubase_t *)&msg, RT_WAITING_FOREVER) == RT_EOK)
{ {
struct eth_device* enetif; struct eth_device* enetif;
@ -361,7 +361,7 @@ static void eth_rx_thread_entry(void* parameter)
while (1) while (1)
{ {
if (rt_mb_recv(&eth_rx_thread_mb, (rt_uint32_t*)&device, RT_WAITING_FOREVER) == RT_EOK) if (rt_mb_recv(&eth_rx_thread_mb, (rt_ubase_t *)&device, RT_WAITING_FOREVER) == RT_EOK)
{ {
struct pbuf *p; struct pbuf *p;

2
src/memheap.c
View File

@ -34,7 +34,7 @@
#define RT_MEMHEAP_MINIALLOC 12 #define RT_MEMHEAP_MINIALLOC 12
#define RT_MEMHEAP_SIZE RT_ALIGN(sizeof(struct rt_memheap_item), RT_ALIGN_SIZE) #define RT_MEMHEAP_SIZE RT_ALIGN(sizeof(struct rt_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: * The initialized memory pool will be: