From 86d3be356a7996a8eb5b54560625cbfe4fcc7990 Mon Sep 17 00:00:00 2001 From: kimocoder Date: Tue, 1 Jan 2019 12:20:36 +0100 Subject: [PATCH] Some more cleanup --- Makefile | 4 - dkms.conf | 2 +- include/rtl8821c_dm.h | 23 ----- include/rtl8821c_hal.h | 83 ----------------- include/rtl8821c_spec.h | 191 ---------------------------------------- include/rtl8821ce_hal.h | 23 ----- include/rtl8821cs_hal.h | 23 ----- include/rtl8821cu_hal.h | 24 ----- 8 files changed, 1 insertion(+), 372 deletions(-) delete mode 100644 include/rtl8821c_dm.h delete mode 100644 include/rtl8821c_hal.h delete mode 100644 include/rtl8821c_spec.h delete mode 100644 include/rtl8821ce_hal.h delete mode 100644 include/rtl8821cs_hal.h delete mode 100644 include/rtl8821cu_hal.h diff --git a/Makefile b/Makefile index 985b35d..bb2e341 100755 --- a/Makefile +++ b/Makefile @@ -218,7 +218,6 @@ else EXTRA_CFLAGS += -DDRV_NAME=\"rtl8812au\" endif - ifeq ($(CONFIG_USB2_EXTERNAL_POWER), y) EXTRA_CFLAGS += -DCONFIG_USE_EXTERNAL_POWER endif @@ -612,7 +611,6 @@ EXTRA_CFLAGS += -DCONFIG_BR_EXT EXTRA_CFLAGS += '-DCONFIG_BR_EXT_BRNAME="'$(BR_NAME)'"' endif - ifeq ($(CONFIG_TDLS), y) EXTRA_CFLAGS += -DCONFIG_TDLS endif @@ -770,7 +768,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 @@ -1503,7 +1500,6 @@ ifeq ($(CONFIG_PCI_HCI), y) MODULE_NAME := rtw_pci endif - endif USER_MODULE_NAME ?= diff --git a/dkms.conf b/dkms.conf index 4f6e9c9..62c36b6 100644 --- a/dkms.conf +++ b/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="realtek-rtl88xxau" -PACKAGE_VERSION="5.2.20.2~20181229" +PACKAGE_VERSION="5.2.20.2~20190101" CLEAN="'make' clean" BUILT_MODULE_NAME[0]=88XXau PROCS_NUM=`nproc` diff --git a/include/rtl8821c_dm.h b/include/rtl8821c_dm.h deleted file mode 100644 index b1e4fe6..0000000 --- a/include/rtl8821c_dm.h +++ /dev/null @@ -1,23 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2016 - 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. - * - *****************************************************************************/ -#ifndef __RTL8812C_DM_H__ -#define __RTL8812C_DM_H__ - -void rtl8821c_phy_init_dm_priv(PADAPTER); -void rtl8821c_phy_deinit_dm_priv(PADAPTER); -void rtl8821c_phy_init_haldm(PADAPTER); -void rtl8821c_phy_haldm_watchdog(PADAPTER); - -#endif diff --git a/include/rtl8821c_hal.h b/include/rtl8821c_hal.h deleted file mode 100644 index 75d8750..0000000 --- a/include/rtl8821c_hal.h +++ /dev/null @@ -1,83 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2016 - 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. - * - *****************************************************************************/ -#ifndef _RTL8821C_HAL_H_ -#define _RTL8821C_HAL_H_ - -#include /* BIT(x) */ -#include "../hal/halmac/halmac_api.h" /* MAC REG definition */ -#include "hal_data.h" -#include "rtl8821c_spec.h" -#include "../hal/rtl8821c/hal8821c_fw.h" - -#ifdef CONFIG_USB_HCI -#include -#endif -#ifdef CONFIG_SDIO_HCI -#include -#endif -#ifdef CONFIG_PCI_HCI -#include -#endif - -#ifdef CONFIG_SUPPORT_TRX_SHARED -#define FIFO_BLOCK_SIZE 32768 /*@Block size = 32K*/ -#define RX_FIFO_EXPANDING (1 * FIFO_BLOCK_SIZE) -#else -#define RX_FIFO_EXPANDING 0 -#endif - - -#if defined(CONFIG_USB_HCI) - - #ifndef MAX_RECVBUF_SZ - #ifndef CONFIG_MINIMAL_MEMORY_USAGE - /* 8821C - RX FIFO :16K ,for RX agg DMA mode = 16K, Rx agg USB mode could large than 16k*/ - /* #define MAX_RECVBUF_SZ (16384 + RX_FIFO_EXPANDING)*/ - /* For Max throughput issue , need to use USB AGG mode to replace DMA AGG mode*/ - #define MAX_RECVBUF_SZ (32768) - - /*#define MAX_RECVBUF_SZ_8821C (24576)*/ /* 24k*/ - /*#define MAX_RECVBUF_SZ_8821C (20480)*/ /*20K*/ - /*#define MAX_RECVBUF_SZ_8821C (10240) */ /*10K*/ - /*#define MAX_RECVBUF_SZ_8821C (15360)*/ /*15k < 16k*/ - /*#define MAX_RECVBUF_SZ_8821C (8192+1024)*/ /* 8K+1k*/ - #else - #define MAX_RECVBUF_SZ (4096 + RX_FIFO_EXPANDING) /* about 4K */ - #endif - #endif/* !MAX_RECVBUF_SZ*/ - -#elif defined(CONFIG_PCI_HCI) - /*#ifndef CONFIG_MINIMAL_MEMORY_USAGE - #define MAX_RECVBUF_SZ (9100) - #else*/ - #define MAX_RECVBUF_SZ (4096 + RX_FIFO_EXPANDING) /* about 4K */ - /*#endif*/ - -#elif defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) - #define MAX_RECVBUF_SZ (16384 + RX_FIFO_EXPANDING) -#endif - -void init_hal_spec_rtl8821c(PADAPTER); -/* MP Functions */ -#ifdef CONFIG_MP_INCLUDED -void rtl8821c_prepare_mp_txdesc(PADAPTER, struct mp_priv *); /* rtw_mp.c */ -void rtl8821c_mp_config_rfpath(PADAPTER); /* hal_mp.c */ -#endif - -#ifdef CONFIG_PCI_HCI -u16 get_txbd_rw_reg(u16 q_idx); -#endif - -#endif /* _RTL8821C_HAL_H_ */ diff --git a/include/rtl8821c_spec.h b/include/rtl8821c_spec.h deleted file mode 100644 index 6184332..0000000 --- a/include/rtl8821c_spec.h +++ /dev/null @@ -1,191 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2016 - 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. - * - *****************************************************************************/ -#ifndef __RTL8821C_SPEC_H__ -#define __RTL8821C_SPEC_H__ - -#define EFUSE_MAP_SIZE HALMAC_EFUSE_SIZE_8821C - -/* - * MAC Register definition - */ -#define REG_AFE_XTAL_CTRL REG_AFE_CTRL1_8821C /* hal_com.c & phydm */ -#define REG_AFE_PLL_CTRL REG_AFE_CTRL2_8821C /* hal_com.c & phydm */ -#define REG_MAC_PHY_CTRL REG_AFE_CTRL3_8821C /* phydm only */ -#define REG_LEDCFG0 REG_LED_CFG_8821C /* rtw_mp.c */ -#define MSR (REG_CR_8821C + 2) /* rtw_mp.c */ -#define MSR1 REG_CR_EXT_8821C /* rtw_mp.c & hal_com.c */ -#define REG_C2HEVT_MSG_NORMAL 0x1A0 /* hal_com.c */ -#define REG_C2HEVT_CLEAR 0x1AF /* hal_com.c */ -#define REG_BCN_CTRL_1 REG_BCN_CTRL_CLINT0_8821C/* hal_com.c */ -#define REG_TSFTR1 REG_FREERUN_CNT_8821C /* hal_com.c */ -#define REG_WOWLAN_WAKE_REASON 0x01C7 -#define REG_GPIO_PIN_CTRL_2 REG_GPIO_EXT_CTRL_8821C - -/* RXERR_RPT, for rtw_mp.c */ -#define RXERR_TYPE_OFDM_PPDU 0 -#define RXERR_TYPE_OFDM_FALSE_ALARM 2 -#define RXERR_TYPE_OFDM_MPDU_OK 0 -#define RXERR_TYPE_OFDM_MPDU_FAIL 1 -#define RXERR_TYPE_CCK_PPDU 3 -#define RXERR_TYPE_CCK_FALSE_ALARM 5 -#define RXERR_TYPE_CCK_MPDU_OK 3 -#define RXERR_TYPE_CCK_MPDU_FAIL 4 -#define RXERR_TYPE_HT_PPDU 8 -#define RXERR_TYPE_HT_FALSE_ALARM 9 -#define RXERR_TYPE_HT_MPDU_TOTAL 6 -#define RXERR_TYPE_HT_MPDU_OK 6 -#define RXERR_TYPE_HT_MPDU_FAIL 7 -#define RXERR_TYPE_RX_FULL_DROP 10 - -#define RXERR_COUNTER_MASK BIT_MASK_RPT_COUNTER_8821C -#define RXERR_RPT_RST BIT_RXERR_RPT_RST_8821C -#define _RXERR_RPT_SEL(type) (BIT_RXERR_RPT_SEL_V1_3_0_8821C(type) \ - | ((type & 0x10) ? BIT_RXERR_RPT_SEL_V1_4_8821C : 0)) - -/* - * BB Register definition - */ -#define rPMAC_Reset 0x100 /* hal_mp.c */ - -#define rFPGA0_RFMOD 0x800 -#define rFPGA0_TxInfo 0x804 -#define rOFDMCCKEN_Jaguar 0x808 /* hal_mp.c */ -#define rFPGA0_TxGainStage 0x80C /* phydm only */ -#define rFPGA0_XA_HSSIParameter1 0x820 /* hal_mp.c */ -#define rFPGA0_XA_HSSIParameter2 0x824 /* hal_mp.c */ -#define rFPGA0_XB_HSSIParameter1 0x828 /* hal_mp.c */ -#define rFPGA0_XB_HSSIParameter2 0x82C /* hal_mp.c */ -#define rTxAGC_B_Rate18_06 0x830 -#define rTxAGC_B_Rate54_24 0x834 -#define rTxAGC_B_CCK1_55_Mcs32 0x838 -#define rCCAonSec_Jaguar 0x838 /* hal_mp.c */ -#define rTxAGC_B_Mcs03_Mcs00 0x83C -#define rTxAGC_B_Mcs07_Mcs04 0x848 -#define rTxAGC_B_Mcs11_Mcs08 0x84C -#define rFPGA0_XA_RFInterfaceOE 0x860 -#define rFPGA0_XB_RFInterfaceOE 0x864 -#define rTxAGC_B_Mcs15_Mcs12 0x868 -#define rTxAGC_B_CCK11_A_CCK2_11 0x86C -#define rFPGA0_XAB_RFInterfaceSW 0x870 -#define rFPGA0_XAB_RFParameter 0x878 -#define rFPGA0_AnalogParameter4 0x88C /* hal_mp.c & phydm */ -#define rFPGA0_XB_LSSIReadBack 0x8A4 /* phydm */ -#define rHSSIRead_Jaguar 0x8B0 /* RF read addr (rtl8821c_phy.c) */ - -#define rC_TxScale_Jaguar2 0x181C /* Pah_C TX scaling factor (hal_mp.c) */ -#define rC_IGI_Jaguar2 0x1850 /* Initial Gain for path-C (hal_mp.c) */ - -#define rFPGA1_TxInfo 0x90C /* hal_mp.c */ -#define rSingleTone_ContTx_Jaguar 0x914 /* hal_mp.c */ - -#define rCCK0_System 0xA00 -#define rCCK0_AFESetting 0xA04 - -#define rCCK0_DSPParameter2 0xA1C -#define rCCK0_TxFilter1 0xA20 -#define rCCK0_TxFilter2 0xA24 -#define rCCK0_DebugPort 0xA28 -#define rCCK0_FalseAlarmReport 0xA2C - -#define rD_TxScale_Jaguar2 0x1A1C /* Path_D TX scaling factor (hal_mp.c) */ -#define rD_IGI_Jaguar2 0x1A50 /* Initial Gain for path-D (hal_mp.c) */ - -#define rOFDM0_TRxPathEnable 0xC04 -#define rOFDM0_TRMuxPar 0xC08 -#define rA_TxScale_Jaguar 0xC1C /* Pah_A TX scaling factor (hal_mp.c) */ -#define rOFDM0_RxDetector1 0xC30 /* rtw_mp.c */ -#define rOFDM0_ECCAThreshold 0xC4C /* phydm only */ -#define rOFDM0_XAAGCCore1 0xC50 /* phydm only */ -#define rA_IGI_Jaguar 0xC50 /* Initial Gain for path-A (hal_mp.c) */ -#define rOFDM0_XBAGCCore1 0xC58 /* phydm only */ -#define rOFDM0_XATxIQImbalance 0xC80 /* phydm only */ -#define rA_LSSIWrite_Jaguar 0xC90 /* RF write addr, LSSI Parameter (rtl8821c_phy.c) */ -#define rA_RFE_Pinmux_Jaguar 0xCB0 /* hal_mp.c */ - -#define rOFDM1_LSTF 0xD00 -#define rOFDM1_TRxPathEnable 0xD04 /* hal_mp.c */ -#define rA_PIRead_Jaguar 0xD04 /* RF readback with PI (rtl8821c_phy.c) */ -#define rA_SIRead_Jaguar 0xD08 /* RF readback with SI (rtl8821c_phy.c) */ -#define rB_PIRead_Jaguar 0xD44 /* RF readback with PI (rtl8821c_phy.c) */ -#define rB_SIRead_Jaguar 0xD48 /* RF readback with SI (rtl8821c_phy.c) */ - -#define rTxAGC_A_Rate18_06 0xE00 -#define rTxAGC_A_Rate54_24 0xE04 -#define rTxAGC_A_CCK1_Mcs32 0xE08 -#define rTxAGC_A_Mcs03_Mcs00 0xE10 -#define rTxAGC_A_Mcs07_Mcs04 0xE14 -#define rTxAGC_A_Mcs11_Mcs08 0xE18 -#define rTxAGC_A_Mcs15_Mcs12 0xE1C -#define rB_TxScale_Jaguar 0xE1C /* Path_B TX scaling factor (hal_mp.c) */ -#define rB_IGI_Jaguar 0xE50 /* Initial Gain for path-B (hal_mp.c) */ -#define rB_LSSIWrite_Jaguar 0xE90 /* RF write addr, LSSI Parameter (rtl8821c_phy.c) */ -#define rB_RFE_Pinmux_Jaguar 0xEB0 /* hal_mp.c */ - -/* Page1(0x100) */ -#define bBBResetB 0x100 - -/* Page8(0x800) */ -#define bCCKEn 0x1000000 -#define bOFDMEn 0x2000000 -/* Reg 0x80C rFPGA0_TxGainStage */ -#define bXBTxAGC 0xF00 -#define bXCTxAGC 0xF000 -#define bXDTxAGC 0xF0000 - -/* PageA(0xA00) */ -#define bCCKBBMode 0x3 - -#define bCCKScramble 0x8 -#define bCCKTxRate 0x3000 - -/* General */ -#define bMaskByte0 0xFF /* mp, rtw_odm.c & phydm */ -#define bMaskByte1 0xFF00 /* hal_mp.c & phydm */ -#define bMaskByte2 0xFF0000 /* hal_mp.c & phydm */ -#define bMaskByte3 0xFF000000 /* hal_mp.c & phydm */ -#define bMaskHWord 0xFFFF0000 /* hal_com.c, rtw_mp.c */ -#define bMaskLWord 0x0000FFFF /* mp, hal_com.c & phydm */ -#define bMaskDWord 0xFFFFFFFF /* mp, hal, rtw_odm.c & phydm */ - -#define bEnable 0x1 /* hal_mp.c, rtw_mp.c */ -#define bDisable 0x0 /* rtw_mp.c */ - -#define MAX_STALL_TIME 50 /* unit: us, hal_com_phycfg.c */ - -#define Rx_Smooth_Factor 20 /* phydm only */ - -/* - * RF Register definition - */ -#define RF_AC 0x00 -#define RF_AC_Jaguar 0x00 /* hal_mp.c */ -#define RF_CHNLBW 0x18 /* rtl8821c_phy.c */ -#define RF_0x52 0x52 - -struct hw_port_reg { - u32 net_type; /*reg_offset*/ - u8 net_type_shift; - u32 macaddr; /*reg_offset*/ - u32 bssid; /*reg_offset*/ - u32 bcn_ctl; /*reg_offset*/ - u32 tsf_rst; /*reg_offset*/ - u8 tsf_rst_bit; - u32 bcn_space; /*reg_offset*/ - u8 bcn_space_shift; - u16 bcn_space_mask; - u32 ps_aid; /*reg_offset*/ -}; - -#endif /* __RTL8192E_SPEC_H__ */ diff --git a/include/rtl8821ce_hal.h b/include/rtl8821ce_hal.h deleted file mode 100644 index 426002a..0000000 --- a/include/rtl8821ce_hal.h +++ /dev/null @@ -1,23 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2016 - 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. - * - *****************************************************************************/ -#ifndef _RTL8821CE_HAL_H_ -#define _RTL8821CE_HAL_H_ - -#include /* PADAPTER */ - -/* rtl8821ce_ops.c */ -void rtl8821ce_set_hal_ops(PADAPTER); - -#endif /* _RTL8821CE_HAL_H_ */ diff --git a/include/rtl8821cs_hal.h b/include/rtl8821cs_hal.h deleted file mode 100644 index ceecc15..0000000 --- a/include/rtl8821cs_hal.h +++ /dev/null @@ -1,23 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2016 - 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. - * - *****************************************************************************/ -#ifndef _RTL8821CS_HAL_H_ -#define _RTL8821CS_HAL_H_ - -#include /* PADAPTER */ - -/* rtl8821cs_ops.c */ -u8 rtl8821cs_set_hal_ops(PADAPTER); - -#endif /* _RTL8821CS_HAL_H_ */ diff --git a/include/rtl8821cu_hal.h b/include/rtl8821cu_hal.h deleted file mode 100644 index aec4372..0000000 --- a/include/rtl8821cu_hal.h +++ /dev/null @@ -1,24 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2016 - 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. - * - *****************************************************************************/ -#ifndef _RTL8821CU_HAL_H_ -#define _RTL8821CU_HAL_H_ - -#include /* PADAPTER */ - -/* rtl8821cu_ops.c */ -u8 rtl8821cu_set_hal_ops(PADAPTER); -void rtl8821cu_set_hw_type(struct dvobj_priv *pdvobj); - -#endif /* _RTL8821CU_HAL_H_ */