Skip to content

[lwip] solve the conflict between multi BYTE_ORDER(s) #5333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 5, 2021
Merged

[lwip] solve the conflict between multi BYTE_ORDER(s) #5333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions components/net/lwip-1.4.1/src/arch/include/arch/cc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@
#include <string.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 int8_t s8_t;
typedef uint16_t u16_t;
Expand Down
9 changes: 1 addition & 8 deletions components/net/lwip-1.4.1/src/arch/include/arch/sys_arch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,12 @@
#define __ARCH_SYS_ARCH_H__

#include "arch/cc.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_SEM_NULL RT_NULL

typedef u32_t sys_prot_t;
typedef rt_uint32_t sys_prot_t;

#define SYS_MBOX_SIZE 10
#define SYS_LWIP_TIMER_NAME "timer"
Expand Down
4 changes: 0 additions & 4 deletions components/net/lwip-1.4.1/src/lwipopts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@

#define LWIP_PLATFORM_BYTESWAP 0

#ifndef BYTE_ORDER
#define BYTE_ORDER LITTLE_ENDIAN
#endif

/* #define RT_LWIP_DEBUG */

#ifdef RT_LWIP_DEBUG
Expand Down
8 changes: 8 additions & 0 deletions components/net/lwip-2.0.2/src/arch/include/arch/cc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@
#include <rtthread.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 S16_F "hd"
#define X16_F "hx"
Expand Down
9 changes: 1 addition & 8 deletions components/net/lwip-2.0.2/src/arch/include/arch/sys_arch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,12 @@
#define __ARCH_SYS_ARCH_H__

#include "arch/cc.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_SEM_NULL RT_NULL

typedef u32_t sys_prot_t;
typedef rt_uint32_t sys_prot_t;

#define SYS_MBOX_SIZE 10
#define SYS_LWIP_TIMER_NAME "timer"
Expand Down
4 changes: 0 additions & 4 deletions components/net/lwip-2.0.2/src/lwipopts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@

#define LWIP_PLATFORM_BYTESWAP 0

#ifndef BYTE_ORDER
#define BYTE_ORDER LITTLE_ENDIAN
#endif

/* #define RT_LWIP_DEBUG */

#ifdef RT_LWIP_DEBUG
Expand Down
7 changes: 7 additions & 0 deletions components/net/lwip-2.0.3/src/arch/include/arch/cc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@
#include <rtthread.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 S16_F "hd"
Expand Down
9 changes: 1 addition & 8 deletions components/net/lwip-2.0.3/src/arch/include/arch/sys_arch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,12 @@
#define __ARCH_SYS_ARCH_H__

#include "arch/cc.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_SEM_NULL RT_NULL

typedef u32_t sys_prot_t;
typedef rt_uint32_t sys_prot_t;

#define SYS_MBOX_SIZE 10
#define SYS_LWIP_TIMER_NAME "timer"
Expand Down
4 changes: 0 additions & 4 deletions components/net/lwip-2.0.3/src/lwipopts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@

#define LWIP_PLATFORM_BYTESWAP 0

#ifndef BYTE_ORDER
#define BYTE_ORDER LITTLE_ENDIAN
#endif

/* #define RT_LWIP_DEBUG */

#ifdef RT_LWIP_DEBUG
Expand Down
8 changes: 8 additions & 0 deletions components/net/lwip-2.1.2/src/arch/include/arch/cc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@
#include <rtthread.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 S16_F "hd"
#define X16_F "hx"
Expand Down
9 changes: 1 addition & 8 deletions components/net/lwip-2.1.2/src/arch/include/arch/sys_arch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,12 @@
#define __ARCH_SYS_ARCH_H__

#include "arch/cc.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_SEM_NULL RT_NULL

typedef u32_t sys_prot_t;
typedef rt_uint32_t sys_prot_t;

#define SYS_MBOX_SIZE 10
#define SYS_LWIP_TIMER_NAME "timer"
Expand Down
4 changes: 0 additions & 4 deletions components/net/lwip-2.1.2/src/lwipopts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@

#define LWIP_PLATFORM_BYTESWAP 0

#ifndef BYTE_ORDER
#define BYTE_ORDER LITTLE_ENDIAN
#endif

/* #define RT_LWIP_DEBUG */

#ifdef RT_LWIP_DEBUG
Expand Down