Skip to content

L
linux
Commit 3c351fec authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman
Browse files
Options

staging: rtl8192e: Rename rtl8192_QueryBBReg 

Use naming schema found in other rtlwifi devices.
Rename rtl8192_QueryBBReg to rtl92e_get_bb_reg.
Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 68a5143c
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 34 deletions
drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
View file @ 3c351fec
...@@ -105,12 +105,12 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -105,12 +105,12 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
switch (eRFPath) { switch (eRFPath) {
case RF90_PATH_A: case RF90_PATH_A:
case RF90_PATH_C: case RF90_PATH_C:
u4RegValue = rtl8192_QueryBBReg(dev, pPhyReg->rfintfs, u4RegValue = rtl92e_get_bb_reg(dev, pPhyReg->rfintfs,
bRFSI_RFENV); bRFSI_RFENV);
break; break;
case RF90_PATH_B: case RF90_PATH_B:
case RF90_PATH_D: case RF90_PATH_D:
u4RegValue = rtl8192_QueryBBReg(dev, pPhyReg->rfintfs, u4RegValue = rtl92e_get_bb_reg(dev, pPhyReg->rfintfs,
bRFSI_RFENV<<16); bRFSI_RFENV<<16);
break; break;
} }
......
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
View file @ 3c351fec
...@@ -910,10 +910,10 @@ bool rtl92e_start_adapter(struct net_device *dev) ...@@ -910,10 +910,10 @@ bool rtl92e_start_adapter(struct net_device *dev)
dm_initialize_txpower_tracking(dev); dm_initialize_txpower_tracking(dev);
if (priv->IC_Cut >= IC_VersionCut_D) { if (priv->IC_Cut >= IC_VersionCut_D) {
tmpRegA = rtl8192_QueryBBReg(dev, tmpRegA = rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance,
rOFDM0_XATxIQImbalance, bMaskDWord); bMaskDWord);
tmpRegC = rtl8192_QueryBBReg(dev, tmpRegC = rtl92e_get_bb_reg(dev, rOFDM0_XCTxIQImbalance,
rOFDM0_XCTxIQImbalance, bMaskDWord); bMaskDWord);
for (i = 0; i < TxBBGainTableLength; i++) { for (i = 0; i < TxBBGainTableLength; i++) {
if (tmpRegA == dm_tx_bb_gain[i]) { if (tmpRegA == dm_tx_bb_gain[i]) {
priv->rfa_txpowertrackingindex = (u8)i; priv->rfa_txpowertrackingindex = (u8)i;
...@@ -925,8 +925,8 @@ bool rtl92e_start_adapter(struct net_device *dev) ...@@ -925,8 +925,8 @@ bool rtl92e_start_adapter(struct net_device *dev)
} }
} }
TempCCk = rtl8192_QueryBBReg(dev, TempCCk = rtl92e_get_bb_reg(dev, rCCK0_TxFilter1,
rCCK0_TxFilter1, bMaskByte2); bMaskByte2);
for (i = 0; i < CCKTxBBGainTableLength; i++) { for (i = 0; i < CCKTxBBGainTableLength; i++) {
if (TempCCk == dm_cck_tx_bb_gain[i][0]) { if (TempCCk == dm_cck_tx_bb_gain[i][0]) {
...@@ -1516,8 +1516,9 @@ static void rtl8192_query_rxphystatus( ...@@ -1516,8 +1516,9 @@ static void rtl8192_query_rxphystatus(
pstats->bPacketBeacon = precord_stats->bPacketBeacon = bPacketBeacon; pstats->bPacketBeacon = precord_stats->bPacketBeacon = bPacketBeacon;
pstats->bToSelfBA = precord_stats->bToSelfBA = bToSelfBA; pstats->bToSelfBA = precord_stats->bToSelfBA = bToSelfBA;
if (check_reg824 == 0) { if (check_reg824 == 0) {
reg824_bit9 = rtl8192_QueryBBReg(priv->rtllib->dev, reg824_bit9 = rtl92e_get_bb_reg(priv->rtllib->dev,
rFPGA0_XA_HSSIParameter2, 0x200); rFPGA0_XA_HSSIParameter2,
0x200);
check_reg824 = 1; check_reg824 = 1;
} }
......
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
View file @ 3c351fec
...@@ -96,7 +96,7 @@ void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask, ...@@ -96,7 +96,7 @@ void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask,
write_nic_dword(dev, dwRegAddr, dwData); write_nic_dword(dev, dwRegAddr, dwData);
} }
u32 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask) u32 rtl92e_get_bb_reg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask)
{ {
u32 Ret = 0, OriginalValue, BitShift; u32 Ret = 0, OriginalValue, BitShift;
...@@ -146,7 +146,7 @@ static u32 rtl8192_phy_RFSerialRead(struct net_device *dev, ...@@ -146,7 +146,7 @@ static u32 rtl8192_phy_RFSerialRead(struct net_device *dev,
mdelay(1); mdelay(1);
ret = rtl8192_QueryBBReg(dev, pPhyReg->rfLSSIReadBack, ret = rtl92e_get_bb_reg(dev, pPhyReg->rfLSSIReadBack,
bLSSIReadBackData); bLSSIReadBackData);
if (priv->rf_chip == RF_8256) { if (priv->rf_chip == RF_8256) {
...@@ -1309,19 +1309,19 @@ void rtl92e_init_gain(struct net_device *dev, u8 Operation) ...@@ -1309,19 +1309,19 @@ void rtl92e_init_gain(struct net_device *dev, u8 Operation)
DIG_ALGO_BY_FALSE_ALARM) DIG_ALGO_BY_FALSE_ALARM)
rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x8); rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x8);
priv->initgain_backup.xaagccore1 = priv->initgain_backup.xaagccore1 =
(u8)rtl8192_QueryBBReg(dev, rOFDM0_XAAGCCore1, (u8)rtl92e_get_bb_reg(dev, rOFDM0_XAAGCCore1,
BitMask); BitMask);
priv->initgain_backup.xbagccore1 = priv->initgain_backup.xbagccore1 =
(u8)rtl8192_QueryBBReg(dev, rOFDM0_XBAGCCore1, (u8)rtl92e_get_bb_reg(dev, rOFDM0_XBAGCCore1,
BitMask); BitMask);
priv->initgain_backup.xcagccore1 = priv->initgain_backup.xcagccore1 =
(u8)rtl8192_QueryBBReg(dev, rOFDM0_XCAGCCore1, (u8)rtl92e_get_bb_reg(dev, rOFDM0_XCAGCCore1,
BitMask); BitMask);
priv->initgain_backup.xdagccore1 = priv->initgain_backup.xdagccore1 =
(u8)rtl8192_QueryBBReg(dev, rOFDM0_XDAGCCore1, (u8)rtl92e_get_bb_reg(dev, rOFDM0_XDAGCCore1,
BitMask); BitMask);
BitMask = bMaskByte2; BitMask = bMaskByte2;
priv->initgain_backup.cca = (u8)rtl8192_QueryBBReg(dev, priv->initgain_backup.cca = (u8)rtl92e_get_bb_reg(dev,
rCCK0_CCA, BitMask); rCCK0_CCA, BitMask);
RT_TRACE(COMP_SCAN, RT_TRACE(COMP_SCAN,
......
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
View file @ 3c351fec
...@@ -70,7 +70,7 @@ enum rf90_radio_path { ...@@ -70,7 +70,7 @@ enum rf90_radio_path {
extern u8 rtl92e_is_legal_rf_path(struct net_device *dev, u32 eRFPath); extern u8 rtl92e_is_legal_rf_path(struct net_device *dev, u32 eRFPath);
extern void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr, extern void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr,
u32 dwBitMask, u32 dwData); u32 dwBitMask, u32 dwData);
extern u32 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr, extern u32 rtl92e_get_bb_reg(struct net_device *dev, u32 dwRegAddr,
u32 dwBitMask); u32 dwBitMask);
extern void rtl92e_set_rf_reg(struct net_device *dev, extern void rtl92e_set_rf_reg(struct net_device *dev,
enum rf90_radio_path eRFPath, u32 RegAddr, enum rf90_radio_path eRFPath, u32 RegAddr,
......
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
View file @ 3c351fec
...@@ -856,7 +856,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev) ...@@ -856,7 +856,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
int i = 0, CCKSwingNeedUpdate = 0; int i = 0, CCKSwingNeedUpdate = 0;
if (!priv->btxpower_trackingInit) { if (!priv->btxpower_trackingInit) {
tmpRegA = rtl8192_QueryBBReg(dev, rOFDM0_XATxIQImbalance, tmpRegA = rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance,
bMaskDWord); bMaskDWord);
for (i = 0; i < OFDM_Table_Length; i++) { for (i = 0; i < OFDM_Table_Length; i++) {
if (tmpRegA == OFDMSwingTable[i]) { if (tmpRegA == OFDMSwingTable[i]) {
...@@ -868,7 +868,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev) ...@@ -868,7 +868,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
} }
} }
TempCCk = rtl8192_QueryBBReg(dev, rCCK0_TxFilter1, bMaskByte2); TempCCk = rtl92e_get_bb_reg(dev, rCCK0_TxFilter1, bMaskByte2);
for (i = 0; i < CCK_Table_length; i++) { for (i = 0; i < CCK_Table_length; i++) {
if (TempCCk == (u32)CCKSwingTable_Ch1_Ch13[i][0]) { if (TempCCk == (u32)CCKSwingTable_Ch1_Ch13[i][0]) {
priv->CCK_index = (u8) i; priv->CCK_index = (u8) i;
...@@ -1279,12 +1279,12 @@ static void dm_bb_initialgain_backup(struct net_device *dev) ...@@ -1279,12 +1279,12 @@ static void dm_bb_initialgain_backup(struct net_device *dev)
return; return;
rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x8); rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x8);
priv->initgain_backup.xaagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XAAGCCore1, bit_mask); priv->initgain_backup.xaagccore1 = (u8)rtl92e_get_bb_reg(dev, rOFDM0_XAAGCCore1, bit_mask);
priv->initgain_backup.xbagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XBAGCCore1, bit_mask); priv->initgain_backup.xbagccore1 = (u8)rtl92e_get_bb_reg(dev, rOFDM0_XBAGCCore1, bit_mask);
priv->initgain_backup.xcagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XCAGCCore1, bit_mask); priv->initgain_backup.xcagccore1 = (u8)rtl92e_get_bb_reg(dev, rOFDM0_XCAGCCore1, bit_mask);
priv->initgain_backup.xdagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XDAGCCore1, bit_mask); priv->initgain_backup.xdagccore1 = (u8)rtl92e_get_bb_reg(dev, rOFDM0_XDAGCCore1, bit_mask);
bit_mask = bMaskByte2; bit_mask = bMaskByte2;
priv->initgain_backup.cca = (u8)rtl8192_QueryBBReg(dev, rCCK0_CCA, bit_mask); priv->initgain_backup.cca = (u8)rtl92e_get_bb_reg(dev, rCCK0_CCA, bit_mask);
RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc50 is %x\n", RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc50 is %x\n",
priv->initgain_backup.xaagccore1); priv->initgain_backup.xaagccore1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7