Skip to content
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.

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

Fix compilation errors in ubuntu 20.04 fresh image #9

Merged
merged 1 commit into from
Apr 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -378,23 +378,23 @@ else

ifeq ($(OSABL),YES)
cp -f os/linux/Makefile.6.util $(RT28xx_DIR)/os/linux/Makefile
$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
$(MAKE) -C $(LINUX_SRC) M=$(RT28xx_DIR)/os/linux
endif

cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile
ifeq ($(PLATFORM),DM6446)
$(MAKE) ARCH=arm CROSS_COMPILE=arm_v5t_le- -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
$(MAKE) ARCH=arm CROSS_COMPILE=arm_v5t_le- -C $(LINUX_SRC) M=$(RT28xx_DIR)/os/linux
else
ifeq ($(PLATFORM),FREESCALE8377)
$(MAKE) ARCH=powerpc CROSS_COMPILE=$(CROSS_COMPILE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
$(MAKE) ARCH=powerpc CROSS_COMPILE=$(CROSS_COMPILE) -C $(LINUX_SRC) M=$(RT28xx_DIR)/os/linux
else
$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
$(MAKE) -C $(LINUX_SRC) M=$(RT28xx_DIR)/os/linux
endif
endif

ifeq ($(OSABL),YES)
cp -f os/linux/Makefile.6.netif $(RT28xx_DIR)/os/linux/Makefile
$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
$(MAKE) -C $(LINUX_SRC) M=$(RT28xx_DIR)/os/linux
endif

ifeq ($(RT28xx_MODE),AP)
Expand Down Expand Up @@ -483,9 +483,9 @@ ifneq (,$(findstring 2.4,$(LINUX_SRC)))
cp -f os/linux/Makefile.libwapi.4 $(RT28xx_DIR)/os/linux/Makefile
$(MAKE) -C $(RT28xx_DIR)/os/linux/
else
cp -f os/linux/Makefile.libwapi.6 $(RT28xx_DIR)/os/linux/Makefile
$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
endif
cp -f os/linux/Makefile.libwapi.6 $(RT28xx_DIR)/os/linux/Makefile
$(MAKE) -C $(LINUX_SRC) M=$(RT28xx_DIR)/os/linux
endif

osutil:
ifeq ($(OSABL),YES)
Expand All @@ -494,7 +494,7 @@ ifneq (,$(findstring 2.4,$(LINUX_SRC)))
$(MAKE) -C $(RT28xx_DIR)/os/linux/
else
cp -f os/linux/Makefile.6.util $(RT28xx_DIR)/os/linux/Makefile
$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
$(MAKE) -C $(LINUX_SRC) M=$(RT28xx_DIR)/os/linux
endif
endif

Expand All @@ -505,7 +505,7 @@ ifneq (,$(findstring 2.4,$(LINUX_SRC)))
$(MAKE) -C $(RT28xx_DIR)/os/linux/
else
cp -f os/linux/Makefile.6.netif $(RT28xx_DIR)/os/linux/Makefile
$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
$(MAKE) -C $(LINUX_SRC) M=$(RT28xx_DIR)/os/linux
endif
endif

Expand All @@ -515,7 +515,7 @@ ifneq (,$(findstring 2.4,$(LINUX_SRC)))
$(MAKE) -C $(RT28xx_DIR)/os/linux/
else
cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile
$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
$(MAKE) -C $(LINUX_SRC) M=$(RT28xx_DIR)/os/linux
endif

# Declare the contents of the .PHONY variable as phony. We keep that information in a variable
Expand Down
2 changes: 0 additions & 2 deletions include/os/rt_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ typedef VOID pregs;
/***********************************************************************************
* Compiler related definitions
***********************************************************************************/
#undef __inline
#define __inline static inline
#define IN
#define OUT
#define INOUT
Expand Down
2 changes: 0 additions & 2 deletions include/os/rt_linux.h
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,6 @@ extern const struct iw_handler_def rt28xx_ap_iw_handler_def;
/***********************************************************************************
* Compiler related definitions
***********************************************************************************/
#undef __inline
#define __inline static inline
#define IN
#define OUT
#define INOUT
Expand Down
4 changes: 2 additions & 2 deletions include/rt_os_net.h
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ PNET_DEV RtmpPhyNetDevMainCreate(
int rt28xx_close(VOID *dev);
int rt28xx_open(VOID *dev);

__inline INT VIRTUAL_IF_UP(VOID *pAd)
static inline INT VIRTUAL_IF_UP(VOID *pAd)
{
RT_CMD_INF_UP_DOWN InfConf = { rt28xx_open, rt28xx_close };
if (RTMP_COM_IoctlHandle(pAd, NULL, CMD_RTPRIV_IOCTL_VIRTUAL_INF_UP,
Expand All @@ -298,7 +298,7 @@ __inline INT VIRTUAL_IF_UP(VOID *pAd)
return 0;
}

__inline VOID VIRTUAL_IF_DOWN(VOID *pAd)
static inline VOID VIRTUAL_IF_DOWN(VOID *pAd)
{
RT_CMD_INF_UP_DOWN InfConf = { rt28xx_open, rt28xx_close };
RTMP_COM_IoctlHandle(pAd, NULL, CMD_RTPRIV_IOCTL_VIRTUAL_INF_DOWN,
Expand Down