From d4a1bd480003f3e1a0590bc46fbcb24f05652ca7 Mon Sep 17 00:00:00 2001
From: tzh <tanzhtanzh@gmail.com>
Date: Thu, 15 Aug 2024 06:56:47 +0000
Subject: [PATCH] feat(wfit/bt): update aic8800 wifi/bt drive and hal

---
 longan/kernel/linux-4.9/drivers/net/wireless/aic8800/aic8800_fdrv/Makefile |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/longan/kernel/linux-4.9/drivers/net/wireless/aic8800/aic8800_fdrv/Makefile b/longan/kernel/linux-4.9/drivers/net/wireless/aic8800/aic8800_fdrv/Makefile
old mode 100644
new mode 100755
index f2ea878..7afaabd
--- a/longan/kernel/linux-4.9/drivers/net/wireless/aic8800/aic8800_fdrv/Makefile
+++ b/longan/kernel/linux-4.9/drivers/net/wireless/aic8800/aic8800_fdrv/Makefile
@@ -22,8 +22,6 @@
 #
 # DEBUG OPTIONS
 CONFIG_RWNX_UM_HELPER_DFLT ?= "/dini/dini_bin/rwnx_umh.sh"
-CONFIG_AIC_FW_PATH = "/vendor/etc/firmware"
-export CONFIG_AIC_FW_PATH
 
 #
 # FW ARCH:
@@ -34,8 +32,7 @@
 CONFIG_RWNX_OLD_IPC ?= n
 
 # Support of P2P DebugFS for enabling/disabling NoA and OppPS
-CONFIG_RWNX_P2P_DEBUGFS ?= y
-CONFIG_DEBUG_FS ?=y
+CONFIG_RWNX_P2P_DEBUGFS := n
 #
 # } // WAITING FOR KCONFIG
 #
@@ -51,12 +48,15 @@
 
 CONFIG_SDIO_SUPPORT =y
 CONFIG_USB_SUPPORT =n
+CONFIG_PCIE_SUPPORT =n
 CONFIG_RX_REORDER ?=y
 CONFIG_ARP_OFFLOAD =y
 CONFIG_RADAR_OR_IR_DETECT =n
 CONFIG_DOWNLOAD_FW =y
 CONFIG_RFTEST=y
 CONFIG_USB_BT =n
+CONFIG_GKI_OPT_FEATURES ?= y
+CONFIG_WPA3_FOR_OLD_KERNEL ?= n
 
 
 # Support of MU-MIMO transmission (need FW support)
@@ -81,6 +81,7 @@
 
 obj-$(CONFIG_AIC8800_WLAN_SUPPORT) := aic8800_fdrv.o
 aic8800_fdrv-y := \
+	rwnx_wakelock.o        \
 	rwnx_gki.o             \
 	rwnx_msg_tx.o          \
 	rwnx_msg_rx.o          \
@@ -96,7 +97,6 @@
 	rwnx_mod_params.o      \
 	rwnx_mesh.o            \
 	rwnx_platform.o        \
-	rwnx_pci.o             \
 	rwnx_dini.o            \
 	rwnx_v7.o              \
 	ipc_host.o             \
@@ -105,7 +105,6 @@
 
 aic8800_fdrv-$(CONFIG_RWNX_RADAR)       += rwnx_radar.o
 aic8800_fdrv-$(CONFIG_DEBUG_FS)         += rwnx_debugfs.o
-aic8800_fdrv-$(CONFIG_DEBUG_FS)         += rwnx_fw_dump.o
 aic8800_fdrv-$(CONFIG_DEBUG_FS)         += rwnx_fw_trace.o
 aic8800_fdrv-$(CONFIG_NL80211_TESTMODE) += rwnx_testmode.o
 aic8800_fdrv-$(CONFIG_RWNX_BFMER)       += rwnx_bfmer.o
@@ -118,13 +117,20 @@
 aic8800_fdrv-$(CONFIG_USB_SUPPORT)     += aicwf_txrxif.o
 aic8800_fdrv-$(CONFIG_USB_SUPPORT)     += aicwf_usb.o
 
+aic8800_fdrv-$(CONFIG_PCIE_SUPPORT)    += rwnx_pci.o
+
 ccflags-$(CONFIG_DEBUG_FS) += -DCONFIG_RWNX_DEBUGFS
 ccflags-$(CONFIG_DEBUG_FS) += -DCONFIG_RWNX_UM_HELPER_DFLT=\"$(CONFIG_RWNX_UM_HELPER_DFLT)\"
 ccflags-$(CONFIG_RWNX_P2P_DEBUGFS) += -DCONFIG_RWNX_P2P_DEBUGFS
+ccflags-$(CONFIG_GKI_OPT_FEATURES) += -DCONFIG_GKI_OPT_FEATURES
 
 # FW VARS
 ccflags-y += -DNX_VIRT_DEV_MAX=4
+ifeq ($(CONFIG_USB_SUPPORT),y)
+ccflags-y += -DNX_REMOTE_STA_MAX=8
+else
 ccflags-y += -DNX_REMOTE_STA_MAX=10
+endif
 ccflags-y += -DNX_MU_GROUP_MAX=62
 ccflags-y += -DNX_TXDESC_CNT=64
 ccflags-y += -DNX_TX_MAX_RATES=4
@@ -140,11 +146,7 @@
 ccflags-$(CONFIG_START_FROM_BOOTROM) += -DCONFIG_START_FROM_BOOTROM
 ccflags-$(CONFIG_PMIC_SETTING) += -DCONFIG_PMIC_SETTING
 ccflags-$(CONFIG_ROM_PATCH_EN) += -DCONFIG_ROM_PATCH_EN
-LOCAL_CODE_VERSION := $(shell expr $(VERSION) \* 256 + $(PATCHLEVEL))
-# 1038 is LINUX_KERENL_VERSION 4.14
-ifeq ($(shell [ $(LOCAL_CODE_VERSION) -lt 1038 ] && echo y),y)
-ccflags-y += -DCONFIG_HE_FOR_OLD_KERNEL
-endif
+
 ccflags-$(CONFIG_PLATFORM_ALLWINNER) += -DCONFIG_COEX
 ccflags-$(CONFIG_PLATFORM_NANOPI_M4) += -DCONFIG_COEX
 
@@ -163,6 +165,7 @@
 ccflags-$(CONFIG_RWNX_SW_PROFILING) += -DCONFIG_RWNX_SW_PROFILING
 ccflags-$(CONFIG_RWNX_MUMIMO_TX) += -DCONFIG_RWNX_MUMIMO_TX
 ccflags-$(CONFIG_RFTEST) += -DCONFIG_RFTEST
+ccflags-$(CONFIG_WPA3_FOR_OLD_KERNEL) += -DCONFIG_WPA3_FOR_OLD_KERNEL
 
 ifeq ($(CONFIG_SDIO_SUPPORT), y)
 ccflags-y += -DAICWF_SDIO_SUPPORT
@@ -172,6 +175,10 @@
 ccflags-y += -DAICWF_USB_SUPPORT
 endif
 
+ifeq ($(CONFIG_PCIE_SUPPORT), y)
+ccflags-y += -DAICWF_PCIE_SUPPORT
+endif
+
 ifeq ($(CONFIG_RWNX_MUMIMO_TX), y)
 ccflags-y += -DCONFIG_USER_MAX=2
 else

--
Gitblit v1.6.2