mirror of
https://github.com/aircrack-ng/rtl8812au.git
synced 2024-11-26 07:04:12 +00:00
Some Makefile updates + other minor fixes
This commit is contained in:
parent
44596ced01
commit
bc95c21031
@ -230,7 +230,7 @@ ZerBea - https://github.com/ZerBea
|
|||||||
lwfinger - https://github.com/lwfinger
|
lwfinger - https://github.com/lwfinger
|
||||||
Ulli-Kroll - https://github.com/Ulli-Kroll
|
Ulli-Kroll - https://github.com/Ulli-Kroll
|
||||||
|
|
||||||
Aldo, thanks to Realtek and Alfa Networks for all they're help & support.
|
Also, thanks to Realtek and Alfa Networks for all they're help & support.
|
||||||
|
|
||||||
All the others interested and participating. Appreciate it!
|
All the others interested and participating. Appreciate it!
|
||||||
|
|
||||||
|
0
core/rtw_mlme_ext.c
Executable file → Normal file
0
core/rtw_mlme_ext.c
Executable file → Normal file
0
core/rtw_recv.c
Executable file → Normal file
0
core/rtw_recv.c
Executable file → Normal file
@ -1,5 +1,5 @@
|
|||||||
PACKAGE_NAME="realtek-rtl88xxau"
|
PACKAGE_NAME="realtek-rtl88xxau"
|
||||||
PACKAGE_VERSION="5.6.4.2~20191030"
|
PACKAGE_VERSION="5.6.4.2~20191031"
|
||||||
CLEAN="'make' clean"
|
CLEAN="'make' clean"
|
||||||
BUILT_MODULE_NAME[0]=88XXau
|
BUILT_MODULE_NAME[0]=88XXau
|
||||||
PROCS_NUM=`nproc`
|
PROCS_NUM=`nproc`
|
||||||
|
133
hal/hal_mp.c
133
hal/hal_mp.c
@ -30,7 +30,7 @@
|
|||||||
#ifdef CONFIG_RTL8192E
|
#ifdef CONFIG_RTL8192E
|
||||||
#include <rtl8192e_hal.h>
|
#include <rtl8192e_hal.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_RTL8814A
|
#if defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8812A)
|
||||||
#include <rtl8814a_hal.h>
|
#include <rtl8814a_hal.h>
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A)
|
#if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A)
|
||||||
@ -862,7 +862,7 @@ VOID mpt_SetRFPath_8814A(PADAPTER pAdapter)
|
|||||||
mpt_ToggleIG_8814A(pAdapter);
|
mpt_ToggleIG_8814A(pAdapter);
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_RTL8814A */
|
#endif /* CONFIG_RTL8814A */
|
||||||
#if defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8822B) || defined(CONFIG_RTL8821C)
|
#if defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8822B) || defined(CONFIG_RTL8821C) || defined(CONFIG_RTL8812A)
|
||||||
VOID
|
VOID
|
||||||
mpt_SetSingleTone_8814A(
|
mpt_SetSingleTone_8814A(
|
||||||
IN PADAPTER pAdapter,
|
IN PADAPTER pAdapter,
|
||||||
@ -966,126 +966,6 @@ mpt_SetSingleTone_8814A(
|
|||||||
phy_set_bb_reg(pAdapter, rD_TxScale_Jaguar2, bMaskDWord, regIG3); /* 0x1A1C[31:21]*/
|
phy_set_bb_reg(pAdapter, rD_TxScale_Jaguar2, bMaskDWord, regIG3); /* 0x1A1C[31:21]*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A)
|
|
||||||
void mpt_SetRFPath_8812A(PADAPTER pAdapter)
|
|
||||||
{
|
|
||||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
|
|
||||||
PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.mpt_ctx;
|
|
||||||
struct mp_priv *pmp = &pAdapter->mppriv;
|
|
||||||
u8 channel = pmp->channel;
|
|
||||||
u8 bandwidth = pmp->bandwidth;
|
|
||||||
u8 eLNA_2g = pHalData->ExternalLNA_2G;
|
|
||||||
u32 ulAntennaTx, ulAntennaRx;
|
|
||||||
|
|
||||||
ulAntennaTx = pHalData->antenna_tx_path;
|
|
||||||
ulAntennaRx = pHalData->AntennaRxPath;
|
|
||||||
|
|
||||||
switch (ulAntennaTx) {
|
|
||||||
case ANTENNA_A:
|
|
||||||
pMptCtx->mpt_rf_path = RF_PATH_A;
|
|
||||||
phy_set_bb_reg(pAdapter, rTxPath_Jaguar, bMaskLWord, 0x1111);
|
|
||||||
if (pHalData->rfe_type == 3 && IS_HARDWARE_TYPE_8812(pAdapter))
|
|
||||||
phy_set_bb_reg(pAdapter, r_ANTSEL_SW_Jaguar, bMask_AntselPathFollow_Jaguar, 0x0);
|
|
||||||
break;
|
|
||||||
case ANTENNA_B:
|
|
||||||
pMptCtx->mpt_rf_path = RF_PATH_B;
|
|
||||||
phy_set_bb_reg(pAdapter, rTxPath_Jaguar, bMaskLWord, 0x2222);
|
|
||||||
if (pHalData->rfe_type == 3 && IS_HARDWARE_TYPE_8812(pAdapter))
|
|
||||||
phy_set_bb_reg(pAdapter, r_ANTSEL_SW_Jaguar, bMask_AntselPathFollow_Jaguar, 0x1);
|
|
||||||
break;
|
|
||||||
case ANTENNA_AB:
|
|
||||||
pMptCtx->mpt_rf_path = RF_PATH_AB;
|
|
||||||
phy_set_bb_reg(pAdapter, rTxPath_Jaguar, bMaskLWord, 0x3333);
|
|
||||||
if (pHalData->rfe_type == 3 && IS_HARDWARE_TYPE_8812(pAdapter))
|
|
||||||
phy_set_bb_reg(pAdapter, r_ANTSEL_SW_Jaguar, bMask_AntselPathFollow_Jaguar, 0x0);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
pMptCtx->mpt_rf_path = RF_PATH_AB;
|
|
||||||
RTW_INFO("Unknown Tx antenna.\n");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (ulAntennaRx) {
|
|
||||||
u32 reg0xC50 = 0;
|
|
||||||
case ANTENNA_A:
|
|
||||||
phy_set_bb_reg(pAdapter, rRxPath_Jaguar, bMaskByte0, 0x11);
|
|
||||||
phy_set_rf_reg(pAdapter, RF_PATH_B, RF_AC_Jaguar, 0xF0000, 0x1); /*/ RF_B_0x0[19:16] = 1, Standby mode*/
|
|
||||||
phy_set_bb_reg(pAdapter, rCCK_RX_Jaguar, bCCK_RX_Jaguar, 0x0);
|
|
||||||
phy_set_rf_reg(pAdapter, RF_PATH_A, RF_AC_Jaguar, BIT19 | BIT18 | BIT17 | BIT16, 0x3);
|
|
||||||
|
|
||||||
/*/ <20121101, Kordan> To prevent gain table from not switched, asked by Ynlin.*/
|
|
||||||
reg0xC50 = phy_query_bb_reg(pAdapter, rA_IGI_Jaguar, bMaskByte0);
|
|
||||||
phy_set_bb_reg(pAdapter, rA_IGI_Jaguar, bMaskByte0, reg0xC50 + 2);
|
|
||||||
phy_set_bb_reg(pAdapter, rA_IGI_Jaguar, bMaskByte0, reg0xC50);
|
|
||||||
|
|
||||||
/* set PWED_TH for BB Yn user guide R29 */
|
|
||||||
if (IS_HARDWARE_TYPE_8812(pAdapter)) {
|
|
||||||
if (channel <= 14) { /* 2.4G */
|
|
||||||
if (bandwidth == CHANNEL_WIDTH_20
|
|
||||||
&& eLNA_2g == 0) {
|
|
||||||
/* 0x830[3:1]=3'b010 */
|
|
||||||
phy_set_bb_reg(pAdapter, rPwed_TH_Jaguar, BIT1 | BIT2 | BIT3, 0x02);
|
|
||||||
} else
|
|
||||||
/* 0x830[3:1]=3'b100 */
|
|
||||||
phy_set_bb_reg(pAdapter, rPwed_TH_Jaguar, BIT1 | BIT2 | BIT3, 0x04);
|
|
||||||
} else
|
|
||||||
/* 0x830[3:1]=3'b100 for 5G */
|
|
||||||
phy_set_bb_reg(pAdapter, rPwed_TH_Jaguar, BIT1 | BIT2 | BIT3, 0x04);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ANTENNA_B:
|
|
||||||
phy_set_bb_reg(pAdapter, rRxPath_Jaguar, bMaskByte0, 0x22);
|
|
||||||
phy_set_rf_reg(pAdapter, RF_PATH_A, RF_AC_Jaguar, 0xF0000, 0x1);/*/ RF_A_0x0[19:16] = 1, Standby mode */
|
|
||||||
phy_set_bb_reg(pAdapter, rCCK_RX_Jaguar, bCCK_RX_Jaguar, 0x1);
|
|
||||||
phy_set_rf_reg(pAdapter, RF_PATH_B, RF_AC_Jaguar, BIT19 | BIT18 | BIT17 | BIT16, 0x3);
|
|
||||||
|
|
||||||
/*/ <20121101, Kordan> To prevent gain table from not switched, asked by Ynlin.*/
|
|
||||||
reg0xC50 = phy_query_bb_reg(pAdapter, rB_IGI_Jaguar, bMaskByte0);
|
|
||||||
phy_set_bb_reg(pAdapter, rB_IGI_Jaguar, bMaskByte0, reg0xC50 + 2);
|
|
||||||
phy_set_bb_reg(pAdapter, rB_IGI_Jaguar, bMaskByte0, reg0xC50);
|
|
||||||
|
|
||||||
/* set PWED_TH for BB Yn user guide R29 */
|
|
||||||
if (IS_HARDWARE_TYPE_8812(pAdapter)) {
|
|
||||||
if (channel <= 14) {
|
|
||||||
if (bandwidth == CHANNEL_WIDTH_20
|
|
||||||
&& eLNA_2g == 0) {
|
|
||||||
/* 0x830[3:1]=3'b010 */
|
|
||||||
phy_set_bb_reg(pAdapter, rPwed_TH_Jaguar, BIT1 | BIT2 | BIT3, 0x02);
|
|
||||||
} else
|
|
||||||
/* 0x830[3:1]=3'b100 */
|
|
||||||
phy_set_bb_reg(pAdapter, rPwed_TH_Jaguar, BIT1 | BIT2 | BIT3, 0x04);
|
|
||||||
} else
|
|
||||||
/* 0x830[3:1]=3'b100 for 5G */
|
|
||||||
phy_set_bb_reg(pAdapter, rPwed_TH_Jaguar, BIT1 | BIT2 | BIT3, 0x04);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ANTENNA_AB:
|
|
||||||
phy_set_bb_reg(pAdapter, rRxPath_Jaguar, bMaskByte0, 0x33);
|
|
||||||
phy_set_rf_reg(pAdapter, RF_PATH_B, RF_AC_Jaguar, 0xF0000, 0x3); /*/ RF_B_0x0[19:16] = 3, Rx mode*/
|
|
||||||
phy_set_bb_reg(pAdapter, rCCK_RX_Jaguar, bCCK_RX_Jaguar, 0x0);
|
|
||||||
/* set PWED_TH for BB Yn user guide R29 */
|
|
||||||
phy_set_bb_reg(pAdapter, rPwed_TH_Jaguar, BIT1 | BIT2 | BIT3, 0x04);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
RTW_INFO("Unknown Rx antenna.\n");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pHalData->rfe_type == 5 || pHalData->rfe_type == 1) {
|
|
||||||
if (ulAntennaTx == ANTENNA_A || ulAntennaTx == ANTENNA_AB) {
|
|
||||||
/* WiFi */
|
|
||||||
phy_set_bb_reg(pAdapter, r_ANTSEL_SW_Jaguar, BIT(1) | BIT(0), 0x2);
|
|
||||||
phy_set_bb_reg(pAdapter, r_ANTSEL_SW_Jaguar, BIT(9) | BIT(8), 0x3);
|
|
||||||
} else {
|
|
||||||
/* BT */
|
|
||||||
phy_set_bb_reg(pAdapter, r_ANTSEL_SW_Jaguar, BIT(1) | BIT(0), 0x1);
|
|
||||||
phy_set_bb_reg(pAdapter, r_ANTSEL_SW_Jaguar, BIT(9) | BIT(8), 0x3);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_RTL8723B
|
#ifdef CONFIG_RTL8723B
|
||||||
@ -1526,12 +1406,6 @@ void hal_mpt_SetAntenna(PADAPTER pAdapter)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A)
|
|
||||||
if (IS_HARDWARE_TYPE_JAGUAR(pAdapter)) {
|
|
||||||
mpt_SetRFPath_8812A(pAdapter);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_RTL8723B
|
#ifdef CONFIG_RTL8723B
|
||||||
if (IS_HARDWARE_TYPE_8723B(pAdapter)) {
|
if (IS_HARDWARE_TYPE_8723B(pAdapter)) {
|
||||||
mpt_SetRFPath_8723B(pAdapter);
|
mpt_SetRFPath_8723B(pAdapter);
|
||||||
@ -2148,8 +2022,7 @@ static VOID mpt_StartOfdmContTx(
|
|||||||
pMptCtx->bOfdmContTx = TRUE;
|
pMptCtx->bOfdmContTx = TRUE;
|
||||||
} /* mpt_StartOfdmContTx */
|
} /* mpt_StartOfdmContTx */
|
||||||
|
|
||||||
|
#if defined(CONFIG_MP_VHT_HW_TX_MODE)
|
||||||
#if defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8821B) || defined(CONFIG_RTL8822B) || defined(CONFIG_RTL8821C)
|
|
||||||
/* for HW TX mode */
|
/* for HW TX mode */
|
||||||
void mpt_ProSetPMacTx(PADAPTER Adapter)
|
void mpt_ProSetPMacTx(PADAPTER Adapter)
|
||||||
{
|
{
|
||||||
|
@ -22,8 +22,9 @@
|
|||||||
*/
|
*/
|
||||||
#define AUTOCONF_INCLUDED
|
#define AUTOCONF_INCLUDED
|
||||||
#define RTL871X_MODULE_NAME "8812AU"
|
#define RTL871X_MODULE_NAME "8812AU"
|
||||||
|
#ifndef DRV_NAME
|
||||||
#define DRV_NAME "rtl8812au"
|
#define DRV_NAME "rtl8812au"
|
||||||
|
#endif
|
||||||
|
|
||||||
#define CONFIG_USB_HCI
|
#define CONFIG_USB_HCI
|
||||||
|
|
||||||
|
0
include/drv_conf.h
Executable file → Normal file
0
include/drv_conf.h
Executable file → Normal file
0
include/hal_data.h
Executable file → Normal file
0
include/hal_data.h
Executable file → Normal file
0
include/rtl8723b_hal.h
Executable file → Normal file
0
include/rtl8723b_hal.h
Executable file → Normal file
0
include/rtl8723b_led.h
Executable file → Normal file
0
include/rtl8723b_led.h
Executable file → Normal file
0
include/rtl8723b_recv.h
Executable file → Normal file
0
include/rtl8723b_recv.h
Executable file → Normal file
0
include/rtl8723b_spec.h
Executable file → Normal file
0
include/rtl8723b_spec.h
Executable file → Normal file
0
include/rtl8723b_xmit.h
Executable file → Normal file
0
include/rtl8723b_xmit.h
Executable file → Normal file
0
include/rtl8814a_cmd.h
Executable file → Normal file
0
include/rtl8814a_cmd.h
Executable file → Normal file
0
include/rtl8814a_hal.h
Executable file → Normal file
0
include/rtl8814a_hal.h
Executable file → Normal file
0
include/rtl8814a_recv.h
Executable file → Normal file
0
include/rtl8814a_recv.h
Executable file → Normal file
0
include/rtl8814a_spec.h
Executable file → Normal file
0
include/rtl8814a_spec.h
Executable file → Normal file
0
include/rtl8814a_xmit.h
Executable file → Normal file
0
include/rtl8814a_xmit.h
Executable file → Normal file
0
include/rtl8821ce_hal.h
Executable file → Normal file
0
include/rtl8821ce_hal.h
Executable file → Normal file
0
include/rtl8822be_hal.h
Executable file → Normal file
0
include/rtl8822be_hal.h
Executable file → Normal file
0
os_dep/linux/ioctl_cfg80211.c
Executable file → Normal file
0
os_dep/linux/ioctl_cfg80211.c
Executable file → Normal file
@ -2069,7 +2069,7 @@ int rtw_mp_hwtx(struct net_device *dev,
|
|||||||
struct mp_priv *pmp_priv = &padapter->mppriv;
|
struct mp_priv *pmp_priv = &padapter->mppriv;
|
||||||
PMPT_CONTEXT pMptCtx = &(padapter->mppriv.mpt_ctx);
|
PMPT_CONTEXT pMptCtx = &(padapter->mppriv.mpt_ctx);
|
||||||
|
|
||||||
#if defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8821B) || defined(CONFIG_RTL8822B) || defined(CONFIG_RTL8821C)
|
#if defined(CONFIG_MP_VHT_HW_TX_MODE)
|
||||||
u8 input[wrqu->data.length];
|
u8 input[wrqu->data.length];
|
||||||
|
|
||||||
if (copy_from_user(input, wrqu->data.pointer, wrqu->data.length))
|
if (copy_from_user(input, wrqu->data.pointer, wrqu->data.length))
|
||||||
|
Loading…
Reference in New Issue
Block a user