Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2345VOR
rt-thread
提交
d7032b9c
R
rt-thread
项目概览
2345VOR
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d7032b9c
编写于
12月 05, 2021
作者:
mysterywolf
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[lwip] solve the conflict between multi BYTE_ORDER(s)
上级
36d51542
变更
12
显示空白变更内容
内联
并排
Showing
12 changed file
with
35 addition
and
48 deletion
+35
-48
components/net/lwip-1.4.1/src/arch/include/arch/cc.h
components/net/lwip-1.4.1/src/arch/include/arch/cc.h
+8
-0
components/net/lwip-1.4.1/src/arch/include/arch/sys_arch.h
components/net/lwip-1.4.1/src/arch/include/arch/sys_arch.h
+1
-8
components/net/lwip-1.4.1/src/lwipopts.h
components/net/lwip-1.4.1/src/lwipopts.h
+0
-4
components/net/lwip-2.0.2/src/arch/include/arch/cc.h
components/net/lwip-2.0.2/src/arch/include/arch/cc.h
+8
-0
components/net/lwip-2.0.2/src/arch/include/arch/sys_arch.h
components/net/lwip-2.0.2/src/arch/include/arch/sys_arch.h
+1
-8
components/net/lwip-2.0.2/src/lwipopts.h
components/net/lwip-2.0.2/src/lwipopts.h
+0
-4
components/net/lwip-2.0.3/src/arch/include/arch/cc.h
components/net/lwip-2.0.3/src/arch/include/arch/cc.h
+7
-0
components/net/lwip-2.0.3/src/arch/include/arch/sys_arch.h
components/net/lwip-2.0.3/src/arch/include/arch/sys_arch.h
+1
-8
components/net/lwip-2.0.3/src/lwipopts.h
components/net/lwip-2.0.3/src/lwipopts.h
+0
-4
components/net/lwip-2.1.2/src/arch/include/arch/cc.h
components/net/lwip-2.1.2/src/arch/include/arch/cc.h
+8
-0
components/net/lwip-2.1.2/src/arch/include/arch/sys_arch.h
components/net/lwip-2.1.2/src/arch/include/arch/sys_arch.h
+1
-8
components/net/lwip-2.1.2/src/lwipopts.h
components/net/lwip-2.1.2/src/lwipopts.h
+0
-4
未找到文件。
components/net/lwip-1.4.1/src/arch/include/arch/cc.h
浏览文件 @
d7032b9c
...
@@ -40,6 +40,14 @@
...
@@ -40,6 +40,14 @@
#include <string.h>
#include <string.h>
#include <stdint.h>
#include <stdint.h>
#ifndef BYTE_ORDER
#ifdef RT_USING_BIG_ENDIAN
#define BYTE_ORDER BIG_ENDIAN
#else
#define BYTE_ORDER LITTLE_ENDIAN
#endif
/* RT_USING_BIG_ENDIAN */
#endif
/* BYTE_ORDER */
typedef
uint8_t
u8_t
;
typedef
uint8_t
u8_t
;
typedef
int8_t
s8_t
;
typedef
int8_t
s8_t
;
typedef
uint16_t
u16_t
;
typedef
uint16_t
u16_t
;
...
...
components/net/lwip-1.4.1/src/arch/include/arch/sys_arch.h
浏览文件 @
d7032b9c
...
@@ -36,19 +36,12 @@
...
@@ -36,19 +36,12 @@
#define __ARCH_SYS_ARCH_H__
#define __ARCH_SYS_ARCH_H__
#include "arch/cc.h"
#include "arch/cc.h"
#include <rtthread.h>
#include <rtthread.h>
#ifdef RT_USING_BIG_ENDIAN
#define BYTE_ORDER BIG_ENDIAN
#else
#define BYTE_ORDER LITTLE_ENDIAN
#endif
#define SYS_MBOX_NULL RT_NULL
#define SYS_MBOX_NULL RT_NULL
#define SYS_SEM_NULL RT_NULL
#define SYS_SEM_NULL RT_NULL
typedef
u
32_t
sys_prot_t
;
typedef
rt_uint
32_t
sys_prot_t
;
#define SYS_MBOX_SIZE 10
#define SYS_MBOX_SIZE 10
#define SYS_LWIP_TIMER_NAME "timer"
#define SYS_LWIP_TIMER_NAME "timer"
...
...
components/net/lwip-1.4.1/src/lwipopts.h
浏览文件 @
d7032b9c
...
@@ -37,10 +37,6 @@
...
@@ -37,10 +37,6 @@
#define LWIP_PLATFORM_BYTESWAP 0
#define LWIP_PLATFORM_BYTESWAP 0
#ifndef BYTE_ORDER
#define BYTE_ORDER LITTLE_ENDIAN
#endif
/* #define RT_LWIP_DEBUG */
/* #define RT_LWIP_DEBUG */
#ifdef RT_LWIP_DEBUG
#ifdef RT_LWIP_DEBUG
...
...
components/net/lwip-2.0.2/src/arch/include/arch/cc.h
浏览文件 @
d7032b9c
...
@@ -39,6 +39,14 @@
...
@@ -39,6 +39,14 @@
#include <rtthread.h>
#include <rtthread.h>
#include <string.h>
#include <string.h>
#ifndef BYTE_ORDER
#ifdef RT_USING_BIG_ENDIAN
#define BYTE_ORDER BIG_ENDIAN
#else
#define BYTE_ORDER LITTLE_ENDIAN
#endif
/* RT_USING_BIG_ENDIAN */
#endif
/* BYTE_ORDER */
#define U16_F "hu"
#define U16_F "hu"
#define S16_F "hd"
#define S16_F "hd"
#define X16_F "hx"
#define X16_F "hx"
...
...
components/net/lwip-2.0.2/src/arch/include/arch/sys_arch.h
浏览文件 @
d7032b9c
...
@@ -36,19 +36,12 @@
...
@@ -36,19 +36,12 @@
#define __ARCH_SYS_ARCH_H__
#define __ARCH_SYS_ARCH_H__
#include "arch/cc.h"
#include "arch/cc.h"
#include <rtthread.h>
#include <rtthread.h>
#ifdef RT_USING_BIG_ENDIAN
#define BYTE_ORDER BIG_ENDIAN
#else
#define BYTE_ORDER LITTLE_ENDIAN
#endif
#define SYS_MBOX_NULL RT_NULL
#define SYS_MBOX_NULL RT_NULL
#define SYS_SEM_NULL RT_NULL
#define SYS_SEM_NULL RT_NULL
typedef
u
32_t
sys_prot_t
;
typedef
rt_uint
32_t
sys_prot_t
;
#define SYS_MBOX_SIZE 10
#define SYS_MBOX_SIZE 10
#define SYS_LWIP_TIMER_NAME "timer"
#define SYS_LWIP_TIMER_NAME "timer"
...
...
components/net/lwip-2.0.2/src/lwipopts.h
浏览文件 @
d7032b9c
...
@@ -45,10 +45,6 @@
...
@@ -45,10 +45,6 @@
#define LWIP_PLATFORM_BYTESWAP 0
#define LWIP_PLATFORM_BYTESWAP 0
#ifndef BYTE_ORDER
#define BYTE_ORDER LITTLE_ENDIAN
#endif
/* #define RT_LWIP_DEBUG */
/* #define RT_LWIP_DEBUG */
#ifdef RT_LWIP_DEBUG
#ifdef RT_LWIP_DEBUG
...
...
components/net/lwip-2.0.3/src/arch/include/arch/cc.h
浏览文件 @
d7032b9c
...
@@ -39,6 +39,13 @@
...
@@ -39,6 +39,13 @@
#include <rtthread.h>
#include <rtthread.h>
#include <string.h>
#include <string.h>
#ifndef BYTE_ORDER
#ifdef RT_USING_BIG_ENDIAN
#define BYTE_ORDER BIG_ENDIAN
#else
#define BYTE_ORDER LITTLE_ENDIAN
#endif
/* RT_USING_BIG_ENDIAN */
#endif
/* BYTE_ORDER */
#define U16_F "hu"
#define U16_F "hu"
#define S16_F "hd"
#define S16_F "hd"
...
...
components/net/lwip-2.0.3/src/arch/include/arch/sys_arch.h
浏览文件 @
d7032b9c
...
@@ -36,19 +36,12 @@
...
@@ -36,19 +36,12 @@
#define __ARCH_SYS_ARCH_H__
#define __ARCH_SYS_ARCH_H__
#include "arch/cc.h"
#include "arch/cc.h"
#include <rtthread.h>
#include <rtthread.h>
#ifdef RT_USING_BIG_ENDIAN
#define BYTE_ORDER BIG_ENDIAN
#else
#define BYTE_ORDER LITTLE_ENDIAN
#endif
#define SYS_MBOX_NULL RT_NULL
#define SYS_MBOX_NULL RT_NULL
#define SYS_SEM_NULL RT_NULL
#define SYS_SEM_NULL RT_NULL
typedef
u
32_t
sys_prot_t
;
typedef
rt_uint
32_t
sys_prot_t
;
#define SYS_MBOX_SIZE 10
#define SYS_MBOX_SIZE 10
#define SYS_LWIP_TIMER_NAME "timer"
#define SYS_LWIP_TIMER_NAME "timer"
...
...
components/net/lwip-2.0.3/src/lwipopts.h
浏览文件 @
d7032b9c
...
@@ -45,10 +45,6 @@
...
@@ -45,10 +45,6 @@
#define LWIP_PLATFORM_BYTESWAP 0
#define LWIP_PLATFORM_BYTESWAP 0
#ifndef BYTE_ORDER
#define BYTE_ORDER LITTLE_ENDIAN
#endif
/* #define RT_LWIP_DEBUG */
/* #define RT_LWIP_DEBUG */
#ifdef RT_LWIP_DEBUG
#ifdef RT_LWIP_DEBUG
...
...
components/net/lwip-2.1.2/src/arch/include/arch/cc.h
浏览文件 @
d7032b9c
...
@@ -39,6 +39,14 @@
...
@@ -39,6 +39,14 @@
#include <rtthread.h>
#include <rtthread.h>
#include <string.h>
#include <string.h>
#ifndef BYTE_ORDER
#ifdef RT_USING_BIG_ENDIAN
#define BYTE_ORDER BIG_ENDIAN
#else
#define BYTE_ORDER LITTLE_ENDIAN
#endif
/* RT_USING_BIG_ENDIAN */
#endif
/* BYTE_ORDER */
#define U16_F "hu"
#define U16_F "hu"
#define S16_F "hd"
#define S16_F "hd"
#define X16_F "hx"
#define X16_F "hx"
...
...
components/net/lwip-2.1.2/src/arch/include/arch/sys_arch.h
浏览文件 @
d7032b9c
...
@@ -36,19 +36,12 @@
...
@@ -36,19 +36,12 @@
#define __ARCH_SYS_ARCH_H__
#define __ARCH_SYS_ARCH_H__
#include "arch/cc.h"
#include "arch/cc.h"
#include <rtthread.h>
#include <rtthread.h>
#ifdef RT_USING_BIG_ENDIAN
#define BYTE_ORDER BIG_ENDIAN
#else
#define BYTE_ORDER LITTLE_ENDIAN
#endif
#define SYS_MBOX_NULL RT_NULL
#define SYS_MBOX_NULL RT_NULL
#define SYS_SEM_NULL RT_NULL
#define SYS_SEM_NULL RT_NULL
typedef
u
32_t
sys_prot_t
;
typedef
rt_uint
32_t
sys_prot_t
;
#define SYS_MBOX_SIZE 10
#define SYS_MBOX_SIZE 10
#define SYS_LWIP_TIMER_NAME "timer"
#define SYS_LWIP_TIMER_NAME "timer"
...
...
components/net/lwip-2.1.2/src/lwipopts.h
浏览文件 @
d7032b9c
...
@@ -47,10 +47,6 @@
...
@@ -47,10 +47,6 @@
#define LWIP_PLATFORM_BYTESWAP 0
#define LWIP_PLATFORM_BYTESWAP 0
#ifndef BYTE_ORDER
#define BYTE_ORDER LITTLE_ENDIAN
#endif
/* #define RT_LWIP_DEBUG */
/* #define RT_LWIP_DEBUG */
#ifdef RT_LWIP_DEBUG
#ifdef RT_LWIP_DEBUG
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录