Renamed interface and driver to 88XX if both 8812 8821 and 8814 are enabled

This commit is contained in:
fariouche 2018-08-05 14:18:19 +02:00
parent 9b811a5614
commit aa56550adf
2 changed files with 33 additions and 6 deletions

View File

@ -39,7 +39,7 @@ CONFIG_RTL8812A = y
CONFIG_RTL8821A = y CONFIG_RTL8821A = y
CONFIG_RTL8192E = n CONFIG_RTL8192E = n
CONFIG_RTL8723B = n CONFIG_RTL8723B = n
CONFIG_RTL8814A = n CONFIG_RTL8814A = y
CONFIG_RTL8723C = n CONFIG_RTL8723C = n
CONFIG_RTL8188F = n CONFIG_RTL8188F = n
CONFIG_RTL8822B = n CONFIG_RTL8822B = n
@ -196,11 +196,35 @@ ifeq ($(CONFIG_PCI_HCI), y)
HCI_NAME = pci HCI_NAME = pci
endif endif
ifeq ($(RTL8814), 1) ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y)
CONFIG_RTL8812A = y
CONFIG_RTL8821A = y EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau\"
CONFIG_RTL8814A = y ifeq ($(CONFIG_USB_HCI), y)
USER_MODULE_NAME = 88XXau
endif 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
ifeq ($(CONFIG_USB2_EXTERNAL_POWER), y) ifeq ($(CONFIG_USB2_EXTERNAL_POWER), y)
EXTRA_CFLAGS += -DCONFIG_USE_EXTERNAL_POWER EXTRA_CFLAGS += -DCONFIG_USE_EXTERNAL_POWER
@ -1003,6 +1027,9 @@ endif
ifeq ($(CONFIG_LED_CONTROL), y) ifeq ($(CONFIG_LED_CONTROL), y)
EXTRA_CFLAGS += -DCONFIG_LED_CONTROL EXTRA_CFLAGS += -DCONFIG_LED_CONTROL
ifeq ($(RTL8814), 1)
EXTRA_CFLAGS += -DCONFIG_SW_LED -DCONFIG_RTW_SW_LED
endif
ifeq ($(CONFIG_LED_ENABLE), y) ifeq ($(CONFIG_LED_ENABLE), y)
EXTRA_CFLAGS += -DCONFIG_LED_ENABLE EXTRA_CFLAGS += -DCONFIG_LED_ENABLE
endif endif

View File

@ -22,7 +22,7 @@
*/ */
#define AUTOCONF_INCLUDED #define AUTOCONF_INCLUDED
#define RTL871X_MODULE_NAME "8812AU" #define RTL871X_MODULE_NAME "8812AU"
#define DRV_NAME "rtl8812au" //#define DRV_NAME "rtl8812au"
#define CONFIG_USB_HCI #define CONFIG_USB_HCI