From 949468f34ca1e5d3de6ecd4286a3b5a2db799986 Mon Sep 17 00:00:00 2001 From: Zhou Yanjie Date: Tue, 5 Feb 2019 15:20:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?lwip-2.1.0:=20sys=5Farch.c:=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=BC=96=E8=AF=91=E8=BF=87=E7=A8=8B=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E8=AD=A6=E5=91=8A/Fix=20compile-time=20warnings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在第519行中,“(rt_uint32_t *)msg”应改为“(rt_ubase_t *)msg”。 在第550行中,“(rt_uint32_t *)msg”应改为“(rt_ubase_t *)msg”。 In line 519, "(rt_uint32_t *)msg" should be changed to "(rt_ubase_t *)msg". In line 550, "(rt_uint32_t *)msg" should be changed to "(rt_ubase_t *)msg". Signed-off-by: Zhou Yanjie --- components/net/lwip-2.1.0/src/arch/sys_arch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 components/net/lwip-2.1.0/src/arch/sys_arch.c diff --git a/components/net/lwip-2.1.0/src/arch/sys_arch.c b/components/net/lwip-2.1.0/src/arch/sys_arch.c old mode 100644 new mode 100755 index ee96249bec..fab418e526 --- a/components/net/lwip-2.1.0/src/arch/sys_arch.c +++ b/components/net/lwip-2.1.0/src/arch/sys_arch.c @@ -516,7 +516,7 @@ u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout) 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) return SYS_ARCH_TIMEOUT; @@ -547,7 +547,7 @@ u32_t sys_arch_mbox_tryfetch(sys_mbox_t *mbox, void **msg) { 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) return SYS_ARCH_TIMEOUT; From 4c585c2d31d0724c7c18b1ce0068194aeed010ef Mon Sep 17 00:00:00 2001 From: Zhou Yanjie Date: Tue, 5 Feb 2019 15:27:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?lwip-2.1.0:=20ethernetif.c:=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=BC=96=E8=AF=91=E8=BF=87=E7=A8=8B=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E8=AD=A6=E5=91=8A/Fix=20compile-time=20warnings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在第334行中,“(rt_uint32_t*)&msg”应改为“(rt_ubase_t *)&msg”。 在第366行中,“(rt_uint32_t*)&msg”应改为“(rt_ubase_t *)&msg”。 In line 334, "(rt_uint32_t*)&msg" should be changed to "(rt_ubase_t *)&msg". In line 366, "(rt_uint32_t*)&msg" should be changed to "(rt_ubase_t *)&msg". Signed-off-by: Zhou Yanjie --- components/net/lwip-2.1.0/src/netif/ethernetif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 components/net/lwip-2.1.0/src/netif/ethernetif.c diff --git a/components/net/lwip-2.1.0/src/netif/ethernetif.c b/components/net/lwip-2.1.0/src/netif/ethernetif.c old mode 100644 new mode 100755 index 910d7c3470..8fe78ee9b0 --- a/components/net/lwip-2.1.0/src/netif/ethernetif.c +++ b/components/net/lwip-2.1.0/src/netif/ethernetif.c @@ -331,7 +331,7 @@ static void eth_tx_thread_entry(void* parameter) while (1) { - if (rt_mb_recv(ð_tx_thread_mb, (rt_uint32_t*)&msg, RT_WAITING_FOREVER) == RT_EOK) + if (rt_mb_recv(ð_tx_thread_mb, (rt_ubase_t *)&msg, RT_WAITING_FOREVER) == RT_EOK) { struct eth_device* enetif; @@ -363,7 +363,7 @@ static void eth_rx_thread_entry(void* parameter) while (1) { - if (rt_mb_recv(ð_rx_thread_mb, (rt_uint32_t*)&device, RT_WAITING_FOREVER) == RT_EOK) + if (rt_mb_recv(ð_rx_thread_mb, (rt_ubase_t *)&device, RT_WAITING_FOREVER) == RT_EOK) { struct pbuf *p;