Skip to content

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

staging: rtl8192e: Rename rtl8192_phy_SetRFReg 

Use naming schema found in other rtlwifi devices.
Rename rtl8192_phy_SetRFReg to rtl92e_set_rf_reg.
Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 31aebbe2
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 48 deletions
drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
View file @ b0e044fe
...@@ -36,15 +36,15 @@ void rtl92e_set_bandwidth(struct net_device *dev, ...@@ -36,15 +36,15 @@ void rtl92e_set_bandwidth(struct net_device *dev,
case HT_CHANNEL_WIDTH_20: case HT_CHANNEL_WIDTH_20:
if (priv->card_8192_version == VERSION_8190_BD || if (priv->card_8192_version == VERSION_8190_BD ||
priv->card_8192_version == VERSION_8190_BE) { priv->card_8192_version == VERSION_8190_BE) {
rtl8192_phy_SetRFReg(dev, rtl92e_set_rf_reg(dev,
(enum rf90_radio_path)eRFPath, (enum rf90_radio_path)eRFPath,
0x0b, bMask12Bits, 0x100); 0x0b, bMask12Bits, 0x100);
rtl8192_phy_SetRFReg(dev, rtl92e_set_rf_reg(dev,
(enum rf90_radio_path)eRFPath, (enum rf90_radio_path)eRFPath,
0x2c, bMask12Bits, 0x3d7); 0x2c, bMask12Bits, 0x3d7);
rtl8192_phy_SetRFReg(dev, rtl92e_set_rf_reg(dev,
(enum rf90_radio_path)eRFPath, (enum rf90_radio_path)eRFPath,
0x0e, bMask12Bits, 0x021); 0x0e, bMask12Bits, 0x021);
} else { } else {
netdev_warn(dev, "%s(): Unknown HW version.\n", netdev_warn(dev, "%s(): Unknown HW version.\n",
...@@ -55,15 +55,15 @@ void rtl92e_set_bandwidth(struct net_device *dev, ...@@ -55,15 +55,15 @@ void rtl92e_set_bandwidth(struct net_device *dev,
case HT_CHANNEL_WIDTH_20_40: case HT_CHANNEL_WIDTH_20_40:
if (priv->card_8192_version == VERSION_8190_BD || if (priv->card_8192_version == VERSION_8190_BD ||
priv->card_8192_version == VERSION_8190_BE) { priv->card_8192_version == VERSION_8190_BE) {
rtl8192_phy_SetRFReg(dev, rtl92e_set_rf_reg(dev,
(enum rf90_radio_path)eRFPath, (enum rf90_radio_path)eRFPath,
0x0b, bMask12Bits, 0x300); 0x0b, bMask12Bits, 0x300);
rtl8192_phy_SetRFReg(dev, rtl92e_set_rf_reg(dev,
(enum rf90_radio_path)eRFPath, (enum rf90_radio_path)eRFPath,
0x2c, bMask12Bits, 0x3ff); 0x2c, bMask12Bits, 0x3ff);
rtl8192_phy_SetRFReg(dev, rtl92e_set_rf_reg(dev,
(enum rf90_radio_path)eRFPath, (enum rf90_radio_path)eRFPath,
0x0e, bMask12Bits, 0x0e1); 0x0e, bMask12Bits, 0x0e1);
} else { } else {
netdev_warn(dev, "%s(): Unknown HW version.\n", netdev_warn(dev, "%s(): Unknown HW version.\n",
...@@ -124,8 +124,8 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -124,8 +124,8 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
rtl8192_setBBreg(dev, pPhyReg->rfHSSIPara2, rtl8192_setBBreg(dev, pPhyReg->rfHSSIPara2,
b3WireDataLength, 0x0); b3WireDataLength, 0x0);
rtl8192_phy_SetRFReg(dev, (enum rf90_radio_path) eRFPath, 0x0, rtl92e_set_rf_reg(dev, (enum rf90_radio_path)eRFPath, 0x0,
bMask12Bits, 0xbf); bMask12Bits, 0xbf);
rtStatus = rtl92e_check_bb_and_rf(dev, HW90_BLOCK_RF, rtStatus = rtl92e_check_bb_and_rf(dev, HW90_BLOCK_RF,
(enum rf90_radio_path)eRFPath); (enum rf90_radio_path)eRFPath);
......
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
View file @ b0e044fe
...@@ -216,8 +216,8 @@ static void rtl8192_phy_RFSerialWrite(struct net_device *dev, ...@@ -216,8 +216,8 @@ static void rtl8192_phy_RFSerialWrite(struct net_device *dev,
} }
} }
void rtl8192_phy_SetRFReg(struct net_device *dev, enum rf90_radio_path eRFPath, void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,
u32 RegAddr, u32 BitMask, u32 Data) u32 RegAddr, u32 BitMask, u32 Data)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u32 Original_Value, BitShift, New_Value; u32 Original_Value, BitShift, New_Value;
...@@ -521,9 +521,9 @@ bool rtl92e_check_bb_and_rf(struct net_device *dev, enum hw90_block CheckBlock, ...@@ -521,9 +521,9 @@ bool rtl92e_check_bb_and_rf(struct net_device *dev, enum hw90_block CheckBlock,
case HW90_BLOCK_RF: case HW90_BLOCK_RF:
WriteData[i] &= 0xfff; WriteData[i] &= 0xfff;
rtl8192_phy_SetRFReg(dev, eRFPath, rtl92e_set_rf_reg(dev, eRFPath,
WriteAddr[HW90_BLOCK_RF], WriteAddr[HW90_BLOCK_RF],
bMask12Bits, WriteData[i]); bMask12Bits, WriteData[i]);
mdelay(10); mdelay(10);
dwRegRead = rtl92e_get_rf_reg(dev, eRFPath, dwRegRead = rtl92e_get_rf_reg(dev, eRFPath,
WriteAddr[HW90_BLOCK_RF], WriteAddr[HW90_BLOCK_RF],
...@@ -729,10 +729,9 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath) ...@@ -729,10 +729,9 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
msleep(100); msleep(100);
continue; continue;
} }
rtl8192_phy_SetRFReg(dev, eRFPath, rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioA_Array[i],
Rtl819XRadioA_Array[i], bMask12Bits,
bMask12Bits, Rtl819XRadioA_Array[i+1]);
Rtl819XRadioA_Array[i+1]);
} }
break; break;
...@@ -742,10 +741,9 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath) ...@@ -742,10 +741,9 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
msleep(100); msleep(100);
continue; continue;
} }
rtl8192_phy_SetRFReg(dev, eRFPath, rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioB_Array[i],
Rtl819XRadioB_Array[i], bMask12Bits,
bMask12Bits, Rtl819XRadioB_Array[i+1]);
Rtl819XRadioB_Array[i+1]);
} }
break; break;
...@@ -755,10 +753,9 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath) ...@@ -755,10 +753,9 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
msleep(100); msleep(100);
continue; continue;
} }
rtl8192_phy_SetRFReg(dev, eRFPath, rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioC_Array[i],
Rtl819XRadioC_Array[i], bMask12Bits,
bMask12Bits, Rtl819XRadioC_Array[i+1]);
Rtl819XRadioC_Array[i+1]);
} }
break; break;
...@@ -768,9 +765,9 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath) ...@@ -768,9 +765,9 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
msleep(100); msleep(100);
continue; continue;
} }
rtl8192_phy_SetRFReg(dev, eRFPath, rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioD_Array[i],
Rtl819XRadioD_Array[i], bMask12Bits, bMask12Bits,
Rtl819XRadioD_Array[i+1]); Rtl819XRadioD_Array[i+1]);
} }
break; break;
...@@ -953,7 +950,7 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, ...@@ -953,7 +950,7 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel,
case CmdID_RF_WriteReg: case CmdID_RF_WriteReg:
for (eRFPath = 0; eRFPath < for (eRFPath = 0; eRFPath <
priv->NumTotalRFPath; eRFPath++) priv->NumTotalRFPath; eRFPath++)
rtl8192_phy_SetRFReg(dev, rtl92e_set_rf_reg(dev,
(enum rf90_radio_path)eRFPath, (enum rf90_radio_path)eRFPath,
CurrentCmd->Para1, bMask12Bits, CurrentCmd->Para1, bMask12Bits,
CurrentCmd->Para2<<7); CurrentCmd->Para2<<7);
......
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
View file @ b0e044fe
...@@ -72,9 +72,9 @@ extern void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr, ...@@ -72,9 +72,9 @@ 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 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr,
u32 dwBitMask); u32 dwBitMask);
extern void rtl8192_phy_SetRFReg(struct net_device *dev, extern void rtl92e_set_rf_reg(struct net_device *dev,
enum rf90_radio_path eRFPath, enum rf90_radio_path eRFPath, u32 RegAddr,
u32 RegAddr, u32 BitMask, u32 Data); u32 BitMask, u32 Data);
extern u32 rtl92e_get_rf_reg(struct net_device *dev, extern u32 rtl92e_get_rf_reg(struct net_device *dev,
enum rf90_radio_path eRFPath, u32 RegAddr, enum rf90_radio_path eRFPath, u32 RegAddr,
u32 BitMask); u32 BitMask);
......
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
View file @ b0e044fe
...@@ -1038,10 +1038,10 @@ static void dm_CheckTXPowerTracking_ThermalMeter(struct net_device *dev) ...@@ -1038,10 +1038,10 @@ static void dm_CheckTXPowerTracking_ThermalMeter(struct net_device *dev)
if (!TM_Trigger) { if (!TM_Trigger) {
{ {
rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d); rtl92e_set_rf_reg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d);
rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4f); rtl92e_set_rf_reg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4f);
rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d); rtl92e_set_rf_reg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d);
rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4f); rtl92e_set_rf_reg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4f);
} }
TM_Trigger = 1; TM_Trigger = 1;
return; return;
......
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