From 6fd852e202056312b549ec390c86c48f0c06996f Mon Sep 17 00:00:00 2001 From: fariouche Date: Sun, 5 Aug 2018 14:18:19 +0200 Subject: [PATCH] Renamed interface and driver to 88XX if both 8812 8821 and 8814 are enabled --- Makefile | 24 +++++++++++++++++++++++- include/autoconf.h | 2 +- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5910267..9fbefc2 100755 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ CONFIG_RTL8812A = y CONFIG_RTL8821A = y CONFIG_RTL8192E = n CONFIG_RTL8723B = n -CONFIG_RTL8814A = n +CONFIG_RTL8814A = y CONFIG_RTL8723C = n CONFIG_RTL8188F = n CONFIG_RTL8822B = n @@ -196,6 +196,25 @@ 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 @@ -1009,6 +1028,9 @@ endif ifeq ($(CONFIG_LED_CONTROL), y) EXTRA_CFLAGS += -DCONFIG_LED_CONTROL +ifeq ($(RTL8814), 1) +EXTRA_CFLAGS += -DCONFIG_SW_LED -DCONFIG_RTW_SW_LED +endif ifeq ($(CONFIG_LED_ENABLE), y) EXTRA_CFLAGS += -DCONFIG_LED_ENABLE endif diff --git a/include/autoconf.h b/include/autoconf.h index af0b95d..bc57c41 100644 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -22,7 +22,7 @@ */ #define AUTOCONF_INCLUDED #define RTL871X_MODULE_NAME "8812AU" -#define DRV_NAME "rtl8812au" +//#define DRV_NAME "rtl8812au" #define CONFIG_USB_HCI