From 77623e8119e9b4634fc26443af4623856b25804c Mon Sep 17 00:00:00 2001 From: armink Date: Sat, 29 Dec 2018 12:04:28 +0800 Subject: [PATCH] [bsp] Update tm4c19x and fix the warning in lwip-1.4.1 --- bsp/tm4c129x/.config | 2 +- bsp/tm4c129x/rtconfig.h | 2 +- .../net/lwip-1.4.1/src/arch/include/arch/cc.h | 15 ++++++++------- include/rtdef.h | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/bsp/tm4c129x/.config b/bsp/tm4c129x/.config index 65b5b0574..ec901ddbe 100644 --- a/bsp/tm4c129x/.config +++ b/bsp/tm4c129x/.config @@ -98,7 +98,7 @@ CONFIG_RT_USING_SERIAL=y # # POSIX layer and C standard library # -# CONFIG_RT_USING_LIBC is not set +CONFIG_RT_USING_LIBC=y # CONFIG_RT_USING_PTHREADS is not set # diff --git a/bsp/tm4c129x/rtconfig.h b/bsp/tm4c129x/rtconfig.h index d9e6e561c..ec559845e 100644 --- a/bsp/tm4c129x/rtconfig.h +++ b/bsp/tm4c129x/rtconfig.h @@ -89,7 +89,7 @@ /* POSIX layer and C standard library */ -/* RT_USING_LIBC is not set */ +#define RT_USING_LIBC /* RT_USING_PTHREADS is not set */ /* Network stack */ 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 3889ec957..e0ad8cf58 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 #include -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 +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/include/rtdef.h b/include/rtdef.h index 0ff233063..5cb3687ce 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -441,7 +441,7 @@ struct rt_timer }; typedef struct rt_timer *rt_timer_t; -/*@}*/ +/**@}*/ /** * @addtogroup Signal -- GitLab