summaryrefslogtreecommitdiff
path: root/components/net
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2018-12-27 12:04:48 +0800
committerBernard Xiong <[email protected]>2018-12-27 12:04:48 +0800
commit61b6fca3dd543fe6e1765adc4dd4e1120e092b59 (patch)
tree1a71a601c4287b6e0d527e677262c1f079cc2215 /components/net
parent96e6deac294667c2637415c8ddd0fed9cee35ede (diff)
[bsp] Update tm4c19x and fix the mb_recv warning in lwip-1.4.1
Diffstat (limited to 'components/net')
-rw-r--r--components/net/lwip-1.4.1/src/arch/include/arch/cc.h15
-rw-r--r--components/net/lwip-1.4.1/src/arch/sys_arch.c10
-rw-r--r--components/net/lwip-1.4.1/src/netif/ethernetif.c4
3 files changed, 16 insertions, 13 deletions
diff --git a/components/net/lwip-1.4.1/src/arch/include/arch/cc.h b/components/net/lwip-1.4.1/src/arch/include/arch/cc.h
index 3889ec9577..e0ad8cf588 100644
--- a/components/net/lwip-1.4.1/src/arch/include/arch/cc.h
+++ b/components/net/lwip-1.4.1/src/arch/include/arch/cc.h
@@ -38,13 +38,14 @@
#include <rthw.h>
#include <rtthread.h>
-typedef rt_uint8_t u8_t;
-typedef rt_int8_t s8_t;
-typedef rt_uint16_t u16_t;
-typedef rt_int16_t s16_t;
-typedef rt_uint32_t u32_t;
-typedef rt_int32_t s32_t;
-typedef rt_uint32_t mem_ptr_t;
+#include <stdint.h>
+typedef uint8_t u8_t;
+typedef int8_t s8_t;
+typedef uint16_t u16_t;
+typedef int16_t s16_t;
+typedef uint32_t u32_t;
+typedef int32_t s32_t;
+typedef uintptr_t mem_ptr_t;
#define U16_F "hu"
#define S16_F "hd"
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
index 45c09e6137..b8085e69d1 100644
--- a/components/net/lwip-1.4.1/src/arch/sys_arch.c
+++ b/components/net/lwip-1.4.1/src/arch/sys_arch.c
@@ -497,10 +497,11 @@ 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;
+ }
else
{
LWIP_ASSERT("rt_mb_recv returned with error!", ret == RT_EOK);
@@ -528,10 +529,11 @@ 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;
+ }
else
{
if (ret == RT_EOK)
diff --git a/components/net/lwip-1.4.1/src/netif/ethernetif.c b/components/net/lwip-1.4.1/src/netif/ethernetif.c
index 943d95f9ed..449b29ffbc 100644
--- a/components/net/lwip-1.4.1/src/netif/ethernetif.c
+++ b/components/net/lwip-1.4.1/src/netif/ethernetif.c
@@ -307,7 +307,7 @@ static void eth_tx_thread_entry(void* parameter)
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;
@@ -339,7 +339,7 @@ static void eth_rx_thread_entry(void* parameter)
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;