From a00101e97a263789324116f1479fe41d2515a86a Mon Sep 17 00:00:00 2001 From: kimocoder Date: Sat, 17 Aug 2019 18:47:31 +0200 Subject: [PATCH] Cleaned up Makefile --- Makefile | 740 +------------------------- WiFi_Direct_User_Interface/install.sh | 3 +- os_dep/linux/usb_intf.c | 4 - platform/custom_country_chplan.h | 22 - 4 files changed, 16 insertions(+), 753 deletions(-) delete mode 100644 platform/custom_country_chplan.h diff --git a/Makefile b/Makefile index b45e2c2..a26b777 100755 --- a/Makefile +++ b/Makefile @@ -1,48 +1,29 @@ EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) EXTRA_CFLAGS += -O1 #EXTRA_CFLAGS += -O3 -EXTRA_CFLAGS += -Wall +EXTRA_CFLAGS += -Wall -Wno-switch -Wno-date-time -Wno-unused-value -Wno-unused-label +EXTRA_CFLAGS += -Wno-cast-function-type -Wno-unused-variable -Wno-unused -Wno-unused-parameter +EXTRA_CFLAGS += -Wno-unused-function -Wno-cast-function-type -Wno-misleading-indentation +EXTRA_CFLAGS += -Wno-uninitialized -Wno-missing-field-initializers -Wno-vla -g #EXTRA_CFLAGS += -Wextra #EXTRA_CFLAGS += -Werror #EXTRA_CFLAGS += -pedantic #EXTRA_CFLAGS += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes - #EXTRA_CFLAGS += -Wno-tautological-compare #EXTRA_CFLAGS += -Wno-incompatible-pointer-types -EXTRA_CFLAGS += -Wno-switch -EXTRA_CFLAGS += -Wno-cast-function-type -EXTRA_CFLAGS += -Wno-unused-variable -EXTRA_CFLAGS += -Wno-unused-value -EXTRA_CFLAGS += -Wno-unused-label -EXTRA_CFLAGS += -Wno-unused-parameter -EXTRA_CFLAGS += -Wno-unused-function -EXTRA_CFLAGS += -Wno-unused -EXTRA_CFLAGS += -Wno-cast-function-type -EXTRA_CFLAGS += -Wno-date-time #EXTRA_CFLAGS += -Wsign-conversion -EXTRA_CFLAGS += -Wno-misleading-indentation -EXTRA_CFLAGS += -Wno-uninitialized # Relax some warnings from '-Wextra' so we won't get flooded with warnings #EXTRA_CFLAGS += -Wno-sign-compare -Wno-sign-conversion -EXTRA_CFLAGS += -Wno-missing-field-initializers #EXTRA_CFLAGS += -Wno-type-limits -#EXTRA_CFLAGS += -Wconversion -Wformat-overflow -Wswitch -Wswitch-bool -#EXTRA_CFLAGS += -Wno-tautological-compare -Wno-ignored-qualifiers -#EXTRA_CFLAGS += -Wstringop-truncation -fstrict-overflow -Wstrict-overflow -Wformat-truncation + +EXTRA_CFLAGS += -I$(src)/include +#EXTRA_LDFLAGS += --strip-debug GCC_VER_49 := $(shell echo `$(CC) -dumpversion | cut -f1-2 -d.` \>= 4.9 | bc ) ifeq ($(GCC_VER_49),1) EXTRA_CFLAGS += -Wno-date-time # Fix compile error && warning on gcc 4.9 and later endif -EXTRA_CFLAGS += -Wno-vla -g - -EXTRA_CFLAGS += -I$(src)/include - -#EXTRA_LDFLAGS += --strip-debug - -CONFIG_AUTOCFG_CP = n - ########################## WIFI IC ############################ CONFIG_RTL8812A = y CONFIG_RTL8821A = y @@ -73,11 +54,10 @@ CONFIG_80211W = n CONFIG_REDUCE_TX_CPU_LOADING = n CONFIG_BR_EXT = y CONFIG_TDLS = n +CONFIG_AP_MODE = n CONFIG_WIFI_MONITOR = y # If you are setting up AP (e.g. by hostapd) in 802.11ac mode, you may have to choose 'y' below. # Otherwise some channels may be flagged 'NO-IR' (i.e. Passive scanning) by the driver. -# Please check your country's regulatory domain first, -# to see whether active scanning is permitted by law/regulations on the desired channels. CONFIG_DISABLE_REGD_C=y CONFIG_MCC_MODE = n CONFIG_APPEND_VENDOR_IE_ENABLE = n @@ -181,11 +161,10 @@ CONFIG_PLATFORM_NV_TK1_UBUNTU = n CONFIG_PLATFORM_RTL8197D = n CONFIG_PLATFORM_AML_S905 = n CONFIG_PLATFORM_ZTE_ZX296716 = n + ########### CUSTOMER ################################ CONFIG_CUSTOMER_HUAWEI_GENERAL = n - CONFIG_DRVEXT_MODULE = n - export TopDIR ?= $(shell pwd) ########### COMMON ################################# @@ -193,51 +172,21 @@ ifeq ($(CONFIG_DISABLE_REGD_C), y) EXTRA_CFLAGS += -DCONFIG_DISABLE_REGD_C endif -ifeq ($(CONFIG_GSPI_HCI), y) -HCI_NAME = gspi -endif - -ifeq ($(CONFIG_SDIO_HCI), y) -HCI_NAME = sdio -endif - ifeq ($(CONFIG_USB_HCI), y) HCI_NAME = usb endif -ifeq ($(CONFIG_PCI_HCI), y) -HCI_NAME = pci -endif - ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y) EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau\" ifeq ($(CONFIG_USB_HCI), y) USER_MODULE_NAME = 88XXau endif -ifeq ($(CONFIG_PCI_HCI), y) -USER_MODULE_NAME = 88XXae -endif -ifeq ($(CONFIG_SDIO_HCI), y) -USER_MODULE_NAME = 88XXas -endif else EXTRA_CFLAGS += -DDRV_NAME=\"rtl8812au\" endif -#ifeq ($(RTL8814), 1) -#CONFIG_RTL8812A = n -#CONFIG_RTL8821A = n -#CONFIG_RTL8814A = y -#endif - -#ifeq ($(RTL8821), 1) -#CONFIG_RTL8812A = y -#CONFIG_RTL8821A = y -#CONFIG_RTL8814A = n -#endif - _OS_INTFS_FILES := os_dep/osdep_service.o \ os_dep/linux/os_intfs.o \ os_dep/linux/$(HCI_NAME)_intf.o \ @@ -256,17 +205,6 @@ ifeq ($(CONFIG_MP_INCLUDED), y) _OS_INTFS_FILES += os_dep/linux/ioctl_mp.o endif -ifeq ($(CONFIG_SDIO_HCI), y) -_OS_INTFS_FILES += os_dep/linux/custom_gpio_linux.o -_OS_INTFS_FILES += os_dep/linux/$(HCI_NAME)_ops_linux.o -endif - -ifeq ($(CONFIG_GSPI_HCI), y) -_OS_INTFS_FILES += os_dep/linux/custom_gpio_linux.o -_OS_INTFS_FILES += os_dep/linux/$(HCI_NAME)_ops_linux.o -endif - - _HAL_INTFS_FILES := hal/hal_intf.o \ hal/hal_com.o \ hal/hal_com_phycfg.o \ @@ -281,146 +219,16 @@ _HAL_INTFS_FILES := hal/hal_intf.o \ hal/led/hal_led.o \ hal/led/hal_$(HCI_NAME)_led.o - EXTRA_CFLAGS += -I$(src)/platform - EXTRA_CFLAGS += -I$(src)/hal/btc -########### HAL_RTL8188E ################################# -ifeq ($(CONFIG_RTL8188E), y) - -RTL871X = rtl8188e -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8189es -endif - -ifeq ($(CONFIG_GSPI_HCI), y) -MODULE_NAME = 8189es -endif - -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8188eu -endif - -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8188ee -endif -EXTRA_CFLAGS += -DCONFIG_RTL8188E - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8188EPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_xmit.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)/$(RTL871X)_dm.o \ - hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)/$(RTL871X)_cmd.o \ - hal/$(RTL871X)/hal8188e_s_fw.o \ - hal/$(RTL871X)/hal8188e_t_fw.o \ - hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_led.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_xmit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_recv.o - -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -else -ifeq ($(CONFIG_GSPI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -else -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -endif -endif - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188E_USB.o -endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188E_PCIE.o -endif -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188E_SDIO.o -endif - -endif - -########### HAL_RTL8192E ################################# -ifeq ($(CONFIG_RTL8192E), y) - -RTL871X = rtl8192e -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8192es -endif - -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8192eu -endif - -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8192ee -endif -EXTRA_CFLAGS += -DCONFIG_RTL8192E -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8192EPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_xmit.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)/$(RTL871X)_dm.o \ - hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)/$(RTL871X)_cmd.o \ - hal/$(RTL871X)/hal8192e_fw.o \ - hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_led.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_xmit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_recv.o - -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -else -ifeq ($(CONFIG_GSPI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -else -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -endif -endif - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8192E_USB.o -endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8192E_PCIE.o -endif -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8192E_SDIO.o -endif - -ifeq ($(CONFIG_BT_COEXIST), y) -_BTC_FILES += hal/btc/halbtc8192e1ant.o \ - hal/btc/halbtc8192e2ant.o -endif - -endif - ########### HAL_RTL8812A_RTL8821A ################################# - ifneq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A), n_n) RTL871X = rtl8812a ifeq ($(CONFIG_USB_HCI), y) MODULE_NAME = 8812au endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8812ae -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8812as -endif _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ hal/$(RTL871X)/Hal8812PwrSeq.o \ @@ -439,34 +247,20 @@ _HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_xmit.o \ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_recv.o -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -else -ifeq ($(CONFIG_GSPI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -else + +ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o endif -endif ifeq ($(CONFIG_RTL8812A), y) ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8812A_USB.o endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8812A_PCIE.o -endif endif ifeq ($(CONFIG_RTL8821A), y) ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8821A_USB.o endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8821A_PCIE.o -endif -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8821A_SDIO.o -endif endif ifeq ($(CONFIG_RTL8812A), y) @@ -475,7 +269,6 @@ _HAL_INTFS_FILES += hal/rtl8812a/hal8812a_fw.o endif ifeq ($(CONFIG_RTL8821A), y) - ifeq ($(CONFIG_RTL8812A), n) RTL871X = rtl8821a @@ -486,19 +279,11 @@ else MODULE_NAME := 8811au endif endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME := 8821ae -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME := 8821as -endif - endif EXTRA_CFLAGS += -DCONFIG_RTL8821A _HAL_INTFS_FILES += hal/rtl8812a/hal8821a_fw.o - endif ifeq ($(CONFIG_BT_COEXIST), y) @@ -511,65 +296,6 @@ _BTC_FILES += hal/btc/halbtc8821a1ant.o \ hal/btc/halbtc8821a2ant.o endif endif - -endif - -########### HAL_RTL8723B ################################# -ifeq ($(CONFIG_RTL8723B), y) - -RTL871X = rtl8723b -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8723bu -endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8723be -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8723bs -endif - -EXTRA_CFLAGS += -DCONFIG_RTL8723B - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8723BPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)/$(RTL871X)_dm.o \ - hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)/$(RTL871X)_cmd.o \ - hal/$(RTL871X)/hal8723b_fw.o - -_HAL_INTFS_FILES += \ - hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_led.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_xmit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_recv.o - -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -else -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -endif - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723B_USB.o -endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723B_PCIE.o -endif -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723B_SDIO.o -endif - -_BTC_FILES += hal/btc/halbtc8723bwifionly.o -ifeq ($(CONFIG_BT_COEXIST), y) -_BTC_FILES += hal/btc/halbtc8723b1ant.o \ - hal/btc/halbtc8723b2ant.o -endif - endif ########### HAL_RTL8814A ################################# @@ -582,15 +308,8 @@ RTL871X = rtl8814a ifeq ($(CONFIG_USB_HCI), y) MODULE_NAME = 8814au endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8814ae -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8814as -endif EXTRA_CFLAGS += -DCONFIG_RTL8814A - _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ hal/$(RTL871X)/Hal8814PwrSeq.o \ hal/$(RTL871X)/$(RTL871X)_xmit.o\ @@ -604,387 +323,19 @@ _HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ hal/$(RTL871X)/$(RTL871X)_cmd.o \ hal/$(RTL871X)/hal8814a_fw.o - _HAL_INTFS_FILES += \ hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_led.o \ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_xmit.o \ hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_recv.o -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -else -ifeq ($(CONFIG_GSPI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -else +ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o endif -endif ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8814A_USB.o endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8814A_PCIE.o -endif - -endif - -########### HAL_RTL8723C ################################# -ifeq ($(CONFIG_RTL8723C), y) - -RTL871X = rtl8703b -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8723cu -MODULE_SUB_NAME = 8703bu -endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8723ce -MODULE_SUB_NAME = 8703be -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8723cs -MODULE_SUB_NAME = 8703bs -endif - -EXTRA_CFLAGS += -DCONFIG_RTL8703B - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8703BPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)/$(RTL871X)_dm.o \ - hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)/$(RTL871X)_cmd.o \ - hal/$(RTL871X)/hal8703b_fw.o - -_HAL_INTFS_FILES += \ - hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_led.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_xmit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_recv.o - -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -else -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -endif - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8703B_USB.o -endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8703B_PCIE.o -endif - -ifeq ($(CONFIG_BT_COEXIST), y) -_BTC_FILES += hal/btc/halbtc8703b1ant.o -endif - -endif - -########### HAL_RTL8723D ################################# -ifeq ($(CONFIG_RTL8723D), y) - -RTL871X = rtl8723d -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8723du -MODULE_SUB_NAME = 8723du -endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8723de -MODULE_SUB_NAME = 8723de -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8723ds -MODULE_SUB_NAME = 8723ds -endif - -EXTRA_CFLAGS += -DCONFIG_RTL8723D - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8723DPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)/$(RTL871X)_dm.o \ - hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)/$(RTL871X)_cmd.o \ - hal/$(RTL871X)/hal8723d_fw.o \ - hal/$(RTL871X)/$(RTL871X)_lps_poff.o - - -_HAL_INTFS_FILES += \ - hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_led.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_xmit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_recv.o - -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -else -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -endif - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723D_USB.o -endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723D_PCIE.o -endif - -ifeq ($(CONFIG_BT_COEXIST), y) -_BTC_FILES += hal/btc/halbtc8723d1ant.o \ - hal/btc/halbtc8723d2ant.o -endif - -endif - -########### HAL_RTL8188F ################################# -ifeq ($(CONFIG_RTL8188F), y) - -RTL871X = rtl8188f -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8188fu -endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8188fe -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8189fs -endif - -EXTRA_CFLAGS += -DCONFIG_RTL8188F - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8188FPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)/$(RTL871X)_dm.o \ - hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)/$(RTL871X)_cmd.o \ - hal/$(RTL871X)/hal8188f_fw.o - -_HAL_INTFS_FILES += \ - hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_led.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_xmit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_recv.o - -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -else -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -endif - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188F_USB.o -endif - -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188F_SDIO.o -endif - -endif - -########### HAL_RTL8188GTV ################################# -ifeq ($(CONFIG_RTL8188GTV), y) - -RTL871X = rtl8188gtv -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8188gtvu -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8189gtvs -endif - -EXTRA_CFLAGS += -DCONFIG_RTL8188GTV - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8188GTVPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)/$(RTL871X)_dm.o \ - hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)/$(RTL871X)_cmd.o \ - hal/$(RTL871X)/hal8188gtv_fw.o - -_HAL_INTFS_FILES += \ - hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_led.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_xmit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_recv.o - -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -else -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -endif - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188GTV_USB.o -endif - -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188GTV_SDIO.o -endif - -endif - -########### HAL_RTL8822B ################################# -ifeq ($(CONFIG_RTL8822B), y) -RTL871X := rtl8822b -ifeq ($(CONFIG_USB_HCI), y) -ifeq ($(CONFIG_BT_COEXIST), n) -MODULE_NAME = 8812bu -else -MODULE_NAME = 88x2bu -endif -endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 88x2be -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 88x2bs -endif - -endif -########### HAL_RTL8821C ################################# -ifeq ($(CONFIG_RTL8821C), y) -RTL871X := rtl8821c -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8821cu -endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8821ce -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8821cs -endif - -endif - -########### HAL_RTL8710B ################################# -ifeq ($(CONFIG_RTL8710B), y) - -RTL871X = rtl8710b -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8710bu -MODULE_SUB_NAME = 8710bu -endif - -EXTRA_CFLAGS += -DCONFIG_RTL8710B - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8710BPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)/$(RTL871X)_dm.o \ - hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)/$(RTL871X)_cmd.o \ - hal/$(RTL871X)/hal8710b_fw.o \ - hal/$(RTL871X)/$(RTL871X)_lps_poff.o - - -_HAL_INTFS_FILES += \ - hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_led.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_xmit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_recv.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8710B_USB.o -endif - -endif - -########### HAL_RTL8192F ################################# -ifeq ($(CONFIG_RTL8192F), y) - -RTL871X = rtl8192f -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8192fu -MODULE_SUB_NAME = 8192fu -endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8192fe -MODULE_SUB_NAME = 8192fe -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8192fs -MODULE_SUB_NAME = 8192fs -endif - -EXTRA_CFLAGS += -DCONFIG_RTL8192F - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8192FPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)/$(RTL871X)_dm.o \ - hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)/$(RTL871X)_cmd.o \ - hal/$(RTL871X)/hal8192f_fw.o \ - hal/$(RTL871X)/$(RTL871X)_lps_poff.o - - -_HAL_INTFS_FILES += \ - hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_led.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_xmit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_recv.o - -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -else -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -endif - -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES += hal/efuse/$(RTL871X)/HalEfuseMask8192F_SDIO.o -endif - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES += hal/efuse/$(RTL871X)/HalEfuseMask8192F_USB.o -endif - -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/efuse/$(RTL871X)/HalEfuseMask8192F_PCIE.o -endif - -endif -########### AUTO_CFG ################################# - -ifeq ($(CONFIG_AUTOCFG_CP), y) - -ifeq ($(CONFIG_RTL8188E)$(CONFIG_SDIO_HCI),yy) -$(shell cp $(TopDIR)/autoconf_rtl8189e_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h) -else ifeq ($(CONFIG_RTL8188F)$(CONFIG_SDIO_HCI),yy) -$(shell cp $(TopDIR)/autoconf_rtl8189f_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h) -else ifeq ($(CONFIG_RTL8723C),y) -$(shell cp $(TopDIR)/autoconf_rtl8723c_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h) -else -$(shell cp $(TopDIR)/autoconf_$(RTL871X)_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h) -endif endif ########### END OF PATH ################################# @@ -1020,7 +371,6 @@ ifeq ($(CONFIG_WAPI_SUPPORT), y) EXTRA_CFLAGS += -DCONFIG_WAPI_SUPPORT endif - ifeq ($(CONFIG_EFUSE_CONFIG_FILE), y) EXTRA_CFLAGS += -DCONFIG_EFUSE_CONFIG_FILE @@ -1043,7 +393,6 @@ EXTRA_CFLAGS += -DWIFIMAC_PATH=\"$(USER_WIFIMAC_PATH)\" else EXTRA_CFLAGS += -DWIFIMAC_PATH=\"/data/wifimac.txt\" endif - endif ifeq ($(CONFIG_EXT_CLK), y) @@ -1181,7 +530,6 @@ EXTRA_CFLAGS += -DCONFIG_BR_EXT EXTRA_CFLAGS += '-DCONFIG_BR_EXT_BRNAME="'$(BR_NAME)'"' endif - ifeq ($(CONFIG_TDLS), y) EXTRA_CFLAGS += -DCONFIG_TDLS endif @@ -1271,7 +619,6 @@ ifeq ($(CONFIG_RTW_DEBUG), y) EXTRA_CFLAGS += -DCONFIG_RTW_DEBUG EXTRA_CFLAGS += -DRTW_LOG_LEVEL=$(CONFIG_RTW_LOG_LEVEL) endif - EXTRA_CFLAGS += -DDM_ODM_SUPPORT_TYPE=0x04 ifeq ($(CONFIG_PLATFORM_I386_PC), y) @@ -1298,7 +645,6 @@ EXTRA_CFLAGS += -DCONFIG_RADIO_WORK EXTRA_CFLAGS += -DRTW_VENDOR_EXT_SUPPORT EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC ARCH ?= arm - CROSS_COMPILE := /mnt/newdisk/android_sdk/nvidia_tk1/android_L/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8/bin/arm-eabi- KSRC :=/mnt/newdisk/android_sdk/nvidia_tk1/android_L/out/target/product/shieldtablet/obj/KERNEL/ MODULE_NAME = wlan @@ -1308,9 +654,7 @@ ifeq ($(CONFIG_PLATFORM_NV_TK1_UBUNTU), y) EXTRA_CFLAGS += -DCONFIG_PLATFORM_NV_TK1 EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT - ARCH ?= arm - CROSS_COMPILE ?= KVER := $(shell uname -r) KSRC := /lib/modules/$(KVER)/build @@ -1330,7 +674,6 @@ KSRC := $(KERNEL_BUILD_PATH) MODULE_NAME :=wlan endif - ifeq ($(CONFIG_PLATFORM_ACTIONS_ATM705X), y) EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN #EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC @@ -1730,7 +1073,6 @@ EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION - EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ifeq ($(CONFIG_USB_HCI), y) EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX @@ -1813,10 +1155,8 @@ EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT # default setting for Android 4.1, 4.2 EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT - # Enable this for Android 5.0 EXTRA_CFLAGS += -DCONFIG_RADIO_WORK - EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ifeq ($(CONFIG_USB_HCI), y) EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX @@ -1919,14 +1259,6 @@ ifndef KSRC KSRC := /HiSTBAndroidV600R003C00SPC021_git_0512/device/hisilicon/bigfish/sdk/source/kernel/linux-3.18.y KSRC += O=/HiSTBAndroidV600R003C00SPC021_git_0512/out/target/product/Hi3798MV200/obj/KERNEL_OBJ endif - -ifeq ($(CONFIG_RTL8822B), y) -ifeq ($(CONFIG_SDIO_HCI), y) -CONFIG_RTL8822BS ?= m -USER_MODULE_NAME := rtl8822bs -endif -endif - endif # Platform setting @@ -2014,7 +1346,6 @@ ifeq ($(CONFIG_SDIO_HCI), y) endif ARCH := arm - # ==== Cross compile setting for Android 4.4 SDK ===== #CROSS_COMPILE := arm-linux-gnueabihf- KVER := 3.10.24 @@ -2022,7 +1353,6 @@ KVER := 3.10.24 CROSS_COMPILE := /home/realtek/software_phoenix/phoenix/toolchain/usr/local/arm-2013.11/bin/arm-linux-gnueabihf- KSRC := /home/realtek/software_phoenix/linux-kernel MODULE_NAME := 8192eu - endif ifeq ($(CONFIG_PLATFORM_RTK119X_AM), y) @@ -2032,13 +1362,11 @@ EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE -DCONFIG_FULL_CH_IN_P2P_HANDSHAKE EXTRA_CFLAGS += -DCONFIG_IFACE_NUMBER=3 EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT - ifeq ($(CONFIG_USB_HCI), y) EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX endif ARCH := arm - #CROSS_COMPILE := arm-linux-gnueabihf- KVER := 3.10.24 #KSRC := @@ -2071,7 +1399,6 @@ EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX endif ARCH := arm64 - # ==== Cross compile setting for Android 4.4 SDK ===== #CROSS_COMPILE := arm-linux-gnueabihf- #KVER := 4.1.10 @@ -2091,10 +1418,8 @@ EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX endif ARCH:=rlx - CROSS_COMPILE:=mips-linux- KSRC:= /home/realtek/share/Develop/IPCAM_SDK/RealSil/rts3901_sdk_v1.2_vanilla/linux-3.10 - endif ifeq ($(CONFIG_PLATFORM_NOVATEK_NT72668), y) @@ -2139,7 +1464,6 @@ EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 EXTRA_CFLAGS += -DRTW_USE_CFG80211_STA_EVENT # default setting for Android 5.x and later EXTRA_CFLAGS += -DCONFIG_RADIO_WORK - ifeq ($(CONFIG_SDIO_HCI), y) EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS endif @@ -2158,7 +1482,6 @@ CONFIG_RTL8822BS ?= m USER_MODULE_NAME := 8822bs endif endif - endif ifeq ($(CONFIG_PLATFORM_ZTE_ZX296716), y) @@ -2181,14 +1504,6 @@ endif ARCH ?= arm64 CROSS_COMPILE ?= KSRC ?= - -ifeq ($(CONFIG_RTL8822B), y) -ifeq ($(CONFIG_SDIO_HCI), y) -CONFIG_RTL8822BS ?= m -USER_MODULE_NAME := 8822bs -endif -endif - endif ########### CUSTOMER ################################ @@ -2210,16 +1525,6 @@ ifneq ($(KERNELRELEASE),) ########### this part for *.mk ############################ include $(src)/hal/phydm/phydm.mk -########### HAL_RTL8822B ################################# -ifeq ($(CONFIG_RTL8822B), y) -include $(src)/rtl8822b.mk -endif - -########### HAL_RTL8821C ################################# -ifeq ($(CONFIG_RTL8821C), y) -include $(src)/rtl8821c.mk -endif - rtk_core := core/rtw_cmd.o \ core/rtw_security.o \ core/rtw_debug.o \ @@ -2256,14 +1561,8 @@ rtk_core := core/rtw_cmd.o \ core/rtw_rm_fsm.o \ core/efuse/rtw_efuse.o -ifeq ($(CONFIG_SDIO_HCI), y) -rtk_core += core/rtw_sdio.o -endif - $(MODULE_NAME)-y += $(rtk_core) - $(MODULE_NAME)-$(CONFIG_INTEL_WIDI) += core/rtw_intel_widi.o - $(MODULE_NAME)-$(CONFIG_WAPI_SUPPORT) += core/rtw_wapi.o \ core/rtw_wapi_sms4.o @@ -2271,17 +1570,10 @@ $(MODULE_NAME)-y += $(_OS_INTFS_FILES) $(MODULE_NAME)-y += $(_HAL_INTFS_FILES) $(MODULE_NAME)-y += $(_PHYDM_FILES) $(MODULE_NAME)-y += $(_BTC_FILES) - $(MODULE_NAME)-$(CONFIG_MP_INCLUDED) += core/rtw_mp.o -ifeq ($(CONFIG_RTL8723B), y) -$(MODULE_NAME)-$(CONFIG_MP_INCLUDED)+= core/rtw_bt_mp.o -endif - obj-$(CONFIG_RTL8812AU) := $(MODULE_NAME).o - else - export CONFIG_RTL8812AU = m all: modules @@ -2300,8 +1592,8 @@ uninstall: rm -f $(MODDESTDIR)$(MODULE_NAME).ko /sbin/depmod -a ${KVER} -backup_rtlwifi: - @echo "Making backup rtlwifi drivers" +backup: + @echo "Making backup of drivers" ifneq (,$(wildcard $(STAGINGMODDIR)/rtl*)) @tar cPf $(wildcard $(STAGINGMODDIR))/backup_rtlwifi_driver.tar $(wildcard $(STAGINGMODDIR)/rtl*) @rm -rf $(wildcard $(STAGINGMODDIR)/rtl*) @@ -2317,7 +1609,7 @@ endif @/sbin/depmod -a ${KVER} @echo "Please reboot your system" -restore_rtlwifi: +restore: @echo "Restoring backups" ifneq (,$(wildcard $(STAGINGMODDIR)/backup_rtlwifi_driver.tar)) @tar xPf $(STAGINGMODDIR)/backup_rtlwifi_driver.tar @@ -2338,7 +1630,6 @@ config_r: @echo "make config" /bin/bash script/Configure script/config.in - .PHONY: modules clean clean: @@ -2356,4 +1647,3 @@ clean: rm -fr *.mod.c *.mod *.o .*.cmd *.ko *~ rm -fr .tmp_versions endif - diff --git a/WiFi_Direct_User_Interface/install.sh b/WiFi_Direct_User_Interface/install.sh index f4f5394..519b8fc 100644 --- a/WiFi_Direct_User_Interface/install.sh +++ b/WiFi_Direct_User_Interface/install.sh @@ -4,7 +4,7 @@ echo $wpa_supplicant_hostapd if [ -e $wpa_supplicant_hostapd ]; then - echo "Checking wpa_supplicant_hostatpd" + echo "Checking wpa_supplicant_hostatpd" else echo "wpa_supplicant_hostapd doesn'tt exist in corresponding folder" exit @@ -98,4 +98,3 @@ fi echo "##################################################" echo "WiFi_Direct_User_Interface install complete!!!!!!!" echo "##################################################" - diff --git a/os_dep/linux/usb_intf.c b/os_dep/linux/usb_intf.c index c4842b9..b8581e2 100644 --- a/os_dep/linux/usb_intf.c +++ b/os_dep/linux/usb_intf.c @@ -21,10 +21,6 @@ #error "CONFIG_USB_HCI shall be on!\n" #endif -#if defined(PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) -#error "Shall be Linux or Windows, but not both!\n" -#endif - #ifdef CONFIG_80211N_HT extern int rtw_ht_enable; extern int rtw_bw_mode; diff --git a/platform/custom_country_chplan.h b/platform/custom_country_chplan.h deleted file mode 100644 index f8cc13b..0000000 --- a/platform/custom_country_chplan.h +++ /dev/null @@ -1,22 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2013 - 2017 Realtek Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - *****************************************************************************/ - -#error "You have defined CONFIG_CUSTOMIZED_COUNTRY_CHPLAN_MAP to use a customized map of your own instead of the default one" -#error "Before removing these error notifications, please make sure regulatory certification requirements of your target markets" - -static const struct country_chplan CUSTOMIZED_country_chplan_map[] = { - COUNTRY_CHPLAN_ENT("TW", 0x76, 1, 0x3FF), /* Taiwan */ -}; -