Skip to content

L
linux
Commit fb37edcf authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman
Browse files
Options

staging:rtl8192u: Rename RF90_RADIO_PATH_E - Style 

Rename the enumerated type RF90_RADIO_PATH_E to rf90_radio_path_e.
Whilst it is not flagged as an issue by checkpatch, types are meant
to be named in lowercase.

This change is purely a coding style change which should have no
impact on runtime code execution.
Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b714c8c0
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 47 deletions
drivers/staging/rtl8192u/r8190_rtl8256.c
View file @ fb37edcf
...@@ -41,16 +41,16 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, enum ht_channel_width Bandwi ...@@ -41,16 +41,16 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, enum ht_channel_width Bandwi
|| priv->card_8192_version || priv->card_8192_version
== VERSION_819xU_B) { /* 8256 D-cut, E-cut, xiong: consider it later! */ == VERSION_819xU_B) { /* 8256 D-cut, E-cut, xiong: consider it later! */
rtl8192_phy_SetRFReg(dev, rtl8192_phy_SetRFReg(dev,
(enum RF90_RADIO_PATH_E)eRFPath, (enum rf90_radio_path_e)eRFPath,
0x0b, bMask12Bits, 0x100); /* phy para:1ba */ 0x0b, bMask12Bits, 0x100); /* phy para:1ba */
rtl8192_phy_SetRFReg(dev, rtl8192_phy_SetRFReg(dev,
(enum RF90_RADIO_PATH_E)eRFPath, (enum rf90_radio_path_e)eRFPath,
0x2c, bMask12Bits, 0x3d7); 0x2c, bMask12Bits, 0x3d7);
rtl8192_phy_SetRFReg(dev, rtl8192_phy_SetRFReg(dev,
(enum RF90_RADIO_PATH_E)eRFPath, (enum rf90_radio_path_e)eRFPath,
0x0e, bMask12Bits, 0x021); 0x0e, bMask12Bits, 0x021);
rtl8192_phy_SetRFReg(dev, rtl8192_phy_SetRFReg(dev,
(enum RF90_RADIO_PATH_E)eRFPath, (enum rf90_radio_path_e)eRFPath,
0x14, bMask12Bits, 0x5ab); 0x14, bMask12Bits, 0x5ab);
} else { } else {
RT_TRACE(COMP_ERR, "PHY_SetRF8256Bandwidth(): unknown hardware version\n"); RT_TRACE(COMP_ERR, "PHY_SetRF8256Bandwidth(): unknown hardware version\n");
...@@ -58,15 +58,15 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, enum ht_channel_width Bandwi ...@@ -58,15 +58,15 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, enum ht_channel_width Bandwi
break; break;
case HT_CHANNEL_WIDTH_20_40: case HT_CHANNEL_WIDTH_20_40:
if (priv->card_8192_version == VERSION_819xU_A || priv->card_8192_version == VERSION_819xU_B) { /* 8256 D-cut, E-cut, xiong: consider it later! */ if (priv->card_8192_version == VERSION_819xU_A || priv->card_8192_version == VERSION_819xU_B) { /* 8256 D-cut, E-cut, xiong: consider it later! */
rtl8192_phy_SetRFReg(dev, (enum RF90_RADIO_PATH_E)eRFPath, 0x0b, bMask12Bits, 0x300); /* phy para:3ba */ rtl8192_phy_SetRFReg(dev, (enum rf90_radio_path_e)eRFPath, 0x0b, bMask12Bits, 0x300); /* phy para:3ba */
rtl8192_phy_SetRFReg(dev, (enum RF90_RADIO_PATH_E)eRFPath, 0x2c, bMask12Bits, 0x3df); rtl8192_phy_SetRFReg(dev, (enum rf90_radio_path_e)eRFPath, 0x2c, bMask12Bits, 0x3df);
rtl8192_phy_SetRFReg(dev, (enum RF90_RADIO_PATH_E)eRFPath, 0x0e, bMask12Bits, 0x0a1); rtl8192_phy_SetRFReg(dev, (enum rf90_radio_path_e)eRFPath, 0x0e, bMask12Bits, 0x0a1);
if (priv->chan == 3 || priv->chan == 9) if (priv->chan == 3 || priv->chan == 9)
/* I need to set priv->chan whenever current channel changes */ /* I need to set priv->chan whenever current channel changes */
rtl8192_phy_SetRFReg(dev, (enum RF90_RADIO_PATH_E)eRFPath, 0x14, bMask12Bits, 0x59b); rtl8192_phy_SetRFReg(dev, (enum rf90_radio_path_e)eRFPath, 0x14, bMask12Bits, 0x59b);
else else
rtl8192_phy_SetRFReg(dev, (enum RF90_RADIO_PATH_E)eRFPath, 0x14, bMask12Bits, 0x5ab); rtl8192_phy_SetRFReg(dev, (enum rf90_radio_path_e)eRFPath, 0x14, bMask12Bits, 0x5ab);
} else { } else {
RT_TRACE(COMP_ERR, "PHY_SetRF8256Bandwidth(): unknown hardware version\n"); RT_TRACE(COMP_ERR, "PHY_SetRF8256Bandwidth(): unknown hardware version\n");
} }
...@@ -115,14 +115,14 @@ void phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -115,14 +115,14 @@ void phy_RF8256_Config_ParaFile(struct net_device *dev)
u8 ConstRetryTimes = 5, RetryTimes = 5; u8 ConstRetryTimes = 5, RetryTimes = 5;
u8 ret = 0; u8 ret = 0;
/* Initialize RF */ /* Initialize RF */
for (eRFPath = (enum RF90_RADIO_PATH_E)RF90_PATH_A; eRFPath < priv->NumTotalRFPath; eRFPath++) { for (eRFPath = (enum rf90_radio_path_e)RF90_PATH_A; eRFPath < priv->NumTotalRFPath; eRFPath++) {
if (!rtl8192_phy_CheckIsLegalRFPath(dev, eRFPath)) if (!rtl8192_phy_CheckIsLegalRFPath(dev, eRFPath))
continue; continue;
pPhyReg = &priv->PHYRegDef[eRFPath]; pPhyReg = &priv->PHYRegDef[eRFPath];
/* Joseph test for shorten RF config /* Joseph test for shorten RF config
* pHalData->RfReg0Value[eRFPath] = rtl8192_phy_QueryRFReg(dev, (enum RF90_RADIO_PATH_E)eRFPath, rGlobalCtrl, bMaskDWord); * pHalData->RfReg0Value[eRFPath] = rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path_e)eRFPath, rGlobalCtrl, bMaskDWord);
* ----Store original RFENV control type * ----Store original RFENV control type
*/ */
switch (eRFPath) { switch (eRFPath) {
...@@ -146,12 +146,12 @@ void phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -146,12 +146,12 @@ void phy_RF8256_Config_ParaFile(struct net_device *dev)
rtl8192_setBBreg(dev, pPhyReg->rfHSSIPara2, b3WireAddressLength, 0x0); /* Set 0 to 4 bits for Z-serial and set 1 to 6 bits for 8258 */ rtl8192_setBBreg(dev, pPhyReg->rfHSSIPara2, b3WireAddressLength, 0x0); /* Set 0 to 4 bits for Z-serial and set 1 to 6 bits for 8258 */
rtl8192_setBBreg(dev, pPhyReg->rfHSSIPara2, b3WireDataLength, 0x0); /* Set 0 to 12 bits for Z-serial and 8258, and set 1 to 14 bits for ??? */ rtl8192_setBBreg(dev, pPhyReg->rfHSSIPara2, b3WireDataLength, 0x0); /* Set 0 to 12 bits for Z-serial and 8258, and set 1 to 14 bits for ??? */
rtl8192_phy_SetRFReg(dev, (enum RF90_RADIO_PATH_E) eRFPath, 0x0, bMask12Bits, 0xbf); rtl8192_phy_SetRFReg(dev, (enum rf90_radio_path_e) eRFPath, 0x0, bMask12Bits, 0xbf);
/* Check RF block (for FPGA platform only)---- /* Check RF block (for FPGA platform only)----
* TODO: this function should be removed on ASIC , Emily 2007.2.2 * TODO: this function should be removed on ASIC , Emily 2007.2.2
*/ */
if (rtl8192_phy_checkBBAndRF(dev, HW90_BLOCK_RF, (enum RF90_RADIO_PATH_E)eRFPath)) { if (rtl8192_phy_checkBBAndRF(dev, HW90_BLOCK_RF, (enum rf90_radio_path_e)eRFPath)) {
RT_TRACE(COMP_ERR, "PHY_RF8256_Config():Check Radio[%d] Fail!!\n", eRFPath); RT_TRACE(COMP_ERR, "PHY_RF8256_Config():Check Radio[%d] Fail!!\n", eRFPath);
goto phy_RF8256_Config_ParaFile_Fail; goto phy_RF8256_Config_ParaFile_Fail;
} }
...@@ -162,32 +162,32 @@ void phy_RF8256_Config_ParaFile(struct net_device *dev) ...@@ -162,32 +162,32 @@ void phy_RF8256_Config_ParaFile(struct net_device *dev)
switch (eRFPath) { switch (eRFPath) {
case RF90_PATH_A: case RF90_PATH_A:
while (RF3_Final_Value != RegValueToBeCheck && RetryTimes != 0) { while (RF3_Final_Value != RegValueToBeCheck && RetryTimes != 0) {
ret = rtl8192_phy_ConfigRFWithHeaderFile(dev, (enum RF90_RADIO_PATH_E)eRFPath); ret = rtl8192_phy_ConfigRFWithHeaderFile(dev, (enum rf90_radio_path_e)eRFPath);
RF3_Final_Value = rtl8192_phy_QueryRFReg(dev, (enum RF90_RADIO_PATH_E)eRFPath, RegOffSetToBeCheck, bMask12Bits); RF3_Final_Value = rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path_e)eRFPath, RegOffSetToBeCheck, bMask12Bits);
RT_TRACE(COMP_RF, "RF %d %d register final value: %x\n", eRFPath, RegOffSetToBeCheck, RF3_Final_Value); RT_TRACE(COMP_RF, "RF %d %d register final value: %x\n", eRFPath, RegOffSetToBeCheck, RF3_Final_Value);
RetryTimes--; RetryTimes--;
} }
break; break;
case RF90_PATH_B: case RF90_PATH_B:
while (RF3_Final_Value != RegValueToBeCheck && RetryTimes != 0) { while (RF3_Final_Value != RegValueToBeCheck && RetryTimes != 0) {
ret = rtl8192_phy_ConfigRFWithHeaderFile(dev, (enum RF90_RADIO_PATH_E)eRFPath); ret = rtl8192_phy_ConfigRFWithHeaderFile(dev, (enum rf90_radio_path_e)eRFPath);
RF3_Final_Value = rtl8192_phy_QueryRFReg(dev, (enum RF90_RADIO_PATH_E)eRFPath, RegOffSetToBeCheck, bMask12Bits); RF3_Final_Value = rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path_e)eRFPath, RegOffSetToBeCheck, bMask12Bits);
RT_TRACE(COMP_RF, "RF %d %d register final value: %x\n", eRFPath, RegOffSetToBeCheck, RF3_Final_Value); RT_TRACE(COMP_RF, "RF %d %d register final value: %x\n", eRFPath, RegOffSetToBeCheck, RF3_Final_Value);
RetryTimes--; RetryTimes--;
} }
break; break;
case RF90_PATH_C: case RF90_PATH_C:
while (RF3_Final_Value != RegValueToBeCheck && RetryTimes != 0) { while (RF3_Final_Value != RegValueToBeCheck && RetryTimes != 0) {
ret = rtl8192_phy_ConfigRFWithHeaderFile(dev, (enum RF90_RADIO_PATH_E)eRFPath); ret = rtl8192_phy_ConfigRFWithHeaderFile(dev, (enum rf90_radio_path_e)eRFPath);
RF3_Final_Value = rtl8192_phy_QueryRFReg(dev, (enum RF90_RADIO_PATH_E)eRFPath, RegOffSetToBeCheck, bMask12Bits); RF3_Final_Value = rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path_e)eRFPath, RegOffSetToBeCheck, bMask12Bits);
RT_TRACE(COMP_RF, "RF %d %d register final value: %x\n", eRFPath, RegOffSetToBeCheck, RF3_Final_Value); RT_TRACE(COMP_RF, "RF %d %d register final value: %x\n", eRFPath, RegOffSetToBeCheck, RF3_Final_Value);
RetryTimes--; RetryTimes--;
} }
break; break;
case RF90_PATH_D: case RF90_PATH_D:
while (RF3_Final_Value != RegValueToBeCheck && RetryTimes != 0) { while (RF3_Final_Value != RegValueToBeCheck && RetryTimes != 0) {
ret = rtl8192_phy_ConfigRFWithHeaderFile(dev, (enum RF90_RADIO_PATH_E)eRFPath); ret = rtl8192_phy_ConfigRFWithHeaderFile(dev, (enum rf90_radio_path_e)eRFPath);
RF3_Final_Value = rtl8192_phy_QueryRFReg(dev, (enum RF90_RADIO_PATH_E)eRFPath, RegOffSetToBeCheck, bMask12Bits); RF3_Final_Value = rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path_e)eRFPath, RegOffSetToBeCheck, bMask12Bits);
RT_TRACE(COMP_RF, "RF %d %d register final value: %x\n", eRFPath, RegOffSetToBeCheck, RF3_Final_Value); RT_TRACE(COMP_RF, "RF %d %d register final value: %x\n", eRFPath, RegOffSetToBeCheck, RF3_Final_Value);
RetryTimes--; RetryTimes--;
} }
......
drivers/staging/rtl8192u/r8192U_core.c
View file @ fb37edcf
...@@ -2897,7 +2897,7 @@ static bool rtl8192_adapter_start(struct net_device *dev) ...@@ -2897,7 +2897,7 @@ static bool rtl8192_adapter_start(struct net_device *dev)
*/ */
for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++) for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++)
PHY_SetRFReg(Adapter, PHY_SetRFReg(Adapter,
(enum RF90_RADIO_PATH_E)eRFPath, (enum rf90_radio_path_e)eRFPath,
0x4, 0xC00, 0x0); 0x4, 0xC00, 0x0);
} else if (pMgntInfo->RfOffReason > RF_CHANGE_BY_PS) { } else if (pMgntInfo->RfOffReason > RF_CHANGE_BY_PS) {
/* H/W or S/W RF OFF before sleep. */ /* H/W or S/W RF OFF before sleep. */
...@@ -2923,7 +2923,7 @@ static bool rtl8192_adapter_start(struct net_device *dev) ...@@ -2923,7 +2923,7 @@ static bool rtl8192_adapter_start(struct net_device *dev)
*/ */
for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++) for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++)
PHY_SetRFReg(Adapter, PHY_SetRFReg(Adapter,
(enum RF90_RADIO_PATH_E)eRFPath, (enum rf90_radio_path_e)eRFPath,
0x4, 0xC00, 0x0); 0x4, 0xC00, 0x0);
} }
} }
......
drivers/staging/rtl8192u/r819xU_phy.c
View file @ fb37edcf
...@@ -101,18 +101,18 @@ u32 rtl8192_QueryBBReg(struct net_device *dev, u32 reg_addr, u32 bitmask) ...@@ -101,18 +101,18 @@ u32 rtl8192_QueryBBReg(struct net_device *dev, u32 reg_addr, u32 bitmask)
} }
static u32 phy_FwRFSerialRead(struct net_device *dev, static u32 phy_FwRFSerialRead(struct net_device *dev,
enum RF90_RADIO_PATH_E eRFPath, enum rf90_radio_path_e eRFPath,
u32 offset); u32 offset);
static void phy_FwRFSerialWrite(struct net_device *dev, static void phy_FwRFSerialWrite(struct net_device *dev,
enum RF90_RADIO_PATH_E eRFPath, enum rf90_radio_path_e eRFPath,
u32 offset, u32 offset,
u32 data); u32 data);
/****************************************************************************** /******************************************************************************
* function: This function reads register from RF chip * function: This function reads register from RF chip
* input: net_device *dev * input: net_device *dev
* RF90_RADIO_PATH_E eRFPath //radio path of A/B/C/D * rf90_radio_path_e eRFPath //radio path of A/B/C/D
* u32 offset //target address to be read * u32 offset //target address to be read
* output: none * output: none
* return: u32 readback value * return: u32 readback value
...@@ -124,7 +124,7 @@ static void phy_FwRFSerialWrite(struct net_device *dev, ...@@ -124,7 +124,7 @@ static void phy_FwRFSerialWrite(struct net_device *dev,
* ---need more spec for this information. * ---need more spec for this information.
******************************************************************************/ ******************************************************************************/
static u32 rtl8192_phy_RFSerialRead(struct net_device *dev, static u32 rtl8192_phy_RFSerialRead(struct net_device *dev,
enum RF90_RADIO_PATH_E eRFPath, u32 offset) enum rf90_radio_path_e eRFPath, u32 offset)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
u32 ret = 0; u32 ret = 0;
...@@ -191,7 +191,7 @@ static u32 rtl8192_phy_RFSerialRead(struct net_device *dev, ...@@ -191,7 +191,7 @@ static u32 rtl8192_phy_RFSerialRead(struct net_device *dev,
/****************************************************************************** /******************************************************************************
* function: This function writes data to RF register * function: This function writes data to RF register
* input: net_device *dev * input: net_device *dev
* RF90_RADIO_PATH_E eRFPath //radio path of A/B/C/D * rf90_radio_path_e eRFPath //radio path of A/B/C/D
* u32 offset //target address to be written * u32 offset //target address to be written
* u32 data //the new register data to be written * u32 data //the new register data to be written
* output: none * output: none
...@@ -209,7 +209,7 @@ static u32 rtl8192_phy_RFSerialRead(struct net_device *dev, ...@@ -209,7 +209,7 @@ static u32 rtl8192_phy_RFSerialRead(struct net_device *dev,
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
*****************************************************************************/ *****************************************************************************/
static void rtl8192_phy_RFSerialWrite(struct net_device *dev, static void rtl8192_phy_RFSerialWrite(struct net_device *dev,
enum RF90_RADIO_PATH_E eRFPath, enum rf90_radio_path_e eRFPath,
u32 offset, u32 offset,
u32 data) u32 data)
{ {
...@@ -266,7 +266,7 @@ static void rtl8192_phy_RFSerialWrite(struct net_device *dev, ...@@ -266,7 +266,7 @@ static void rtl8192_phy_RFSerialWrite(struct net_device *dev,
/****************************************************************************** /******************************************************************************
* function: This function set specific bits to RF register * function: This function set specific bits to RF register
* input: net_device dev * input: net_device dev
* RF90_RADIO_PATH_E eRFPath //radio path of A/B/C/D * rf90_radio_path_e eRFPath //radio path of A/B/C/D
* u32 reg_addr //target addr to be modified * u32 reg_addr //target addr to be modified
* u32 bitmask //taget bit pos to be modified * u32 bitmask //taget bit pos to be modified
* u32 data //value to be written * u32 data //value to be written
...@@ -275,7 +275,7 @@ static void rtl8192_phy_RFSerialWrite(struct net_device *dev, ...@@ -275,7 +275,7 @@ static void rtl8192_phy_RFSerialWrite(struct net_device *dev,
* notice: * notice:
*****************************************************************************/ *****************************************************************************/
void rtl8192_phy_SetRFReg(struct net_device *dev, void rtl8192_phy_SetRFReg(struct net_device *dev,
enum RF90_RADIO_PATH_E eRFPath, enum rf90_radio_path_e eRFPath,
u32 reg_addr, u32 bitmask, u32 data) u32 reg_addr, u32 bitmask, u32 data)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
...@@ -324,7 +324,7 @@ void rtl8192_phy_SetRFReg(struct net_device *dev, ...@@ -324,7 +324,7 @@ void rtl8192_phy_SetRFReg(struct net_device *dev,
* notice: * notice:
*****************************************************************************/ *****************************************************************************/
u32 rtl8192_phy_QueryRFReg(struct net_device *dev, u32 rtl8192_phy_QueryRFReg(struct net_device *dev,
enum RF90_RADIO_PATH_E eRFPath, enum rf90_radio_path_e eRFPath,
u32 reg_addr, u32 bitmask) u32 reg_addr, u32 bitmask)
{ {
u32 reg, bitshift; u32 reg, bitshift;
...@@ -348,14 +348,14 @@ u32 rtl8192_phy_QueryRFReg(struct net_device *dev, ...@@ -348,14 +348,14 @@ u32 rtl8192_phy_QueryRFReg(struct net_device *dev,
/****************************************************************************** /******************************************************************************
* function: We support firmware to execute RF-R/W. * function: We support firmware to execute RF-R/W.
* input: net_device *dev * input: net_device *dev
* RF90_RADIO_PATH_E eRFPath * rf90_radio_path_e eRFPath
* u32 offset * u32 offset
* output: none * output: none
* return: u32 * return: u32
* notice: * notice:
****************************************************************************/ ****************************************************************************/
static u32 phy_FwRFSerialRead(struct net_device *dev, static u32 phy_FwRFSerialRead(struct net_device *dev,
enum RF90_RADIO_PATH_E eRFPath, enum rf90_radio_path_e eRFPath,
u32 offset) u32 offset)
{ {
u32 reg = 0; u32 reg = 0;
...@@ -412,7 +412,7 @@ static u32 phy_FwRFSerialRead(struct net_device *dev, ...@@ -412,7 +412,7 @@ static u32 phy_FwRFSerialRead(struct net_device *dev,
/****************************************************************************** /******************************************************************************
* function: We support firmware to execute RF-R/W. * function: We support firmware to execute RF-R/W.
* input: net_device *dev * input: net_device *dev
* RF90_RADIO_PATH_E eRFPath * rf90_radio_path_e eRFPath
* u32 offset * u32 offset
* u32 data * u32 data
* output: none * output: none
...@@ -420,7 +420,7 @@ static u32 phy_FwRFSerialRead(struct net_device *dev, ...@@ -420,7 +420,7 @@ static u32 phy_FwRFSerialRead(struct net_device *dev,
* notice: * notice:
****************************************************************************/ ****************************************************************************/
static void phy_FwRFSerialWrite(struct net_device *dev, static void phy_FwRFSerialWrite(struct net_device *dev,
enum RF90_RADIO_PATH_E eRFPath, enum rf90_radio_path_e eRFPath,
u32 offset, u32 data) u32 offset, u32 data)
{ {
u8 time = 0; u8 time = 0;
...@@ -688,14 +688,14 @@ static void rtl8192_InitBBRFRegDef(struct net_device *dev) ...@@ -688,14 +688,14 @@ static void rtl8192_InitBBRFRegDef(struct net_device *dev)
* sure whether BB and RF is OK * sure whether BB and RF is OK
* input: net_device *dev * input: net_device *dev
* hw90_block_e CheckBlock * hw90_block_e CheckBlock
* RF90_RADIO_PATH_E eRFPath //only used when checkblock is * rf90_radio_path_e eRFPath //only used when checkblock is
* //HW90_BLOCK_RF * //HW90_BLOCK_RF
* output: none * output: none
* return: return whether BB and RF is ok (0:OK, 1:Fail) * return: return whether BB and RF is ok (0:OK, 1:Fail)
* notice: This function may be removed in the ASIC * notice: This function may be removed in the ASIC
******************************************************************************/ ******************************************************************************/
u8 rtl8192_phy_checkBBAndRF(struct net_device *dev, enum hw90_block_e CheckBlock, u8 rtl8192_phy_checkBBAndRF(struct net_device *dev, enum hw90_block_e CheckBlock,
enum RF90_RADIO_PATH_E eRFPath) enum rf90_radio_path_e eRFPath)
{ {
u8 ret = 0; u8 ret = 0;
u32 i, CheckTimes = 4, reg = 0; u32 i, CheckTimes = 4, reg = 0;
...@@ -790,7 +790,7 @@ static void rtl8192_BB_Config_ParaFile(struct net_device *dev) ...@@ -790,7 +790,7 @@ static void rtl8192_BB_Config_ParaFile(struct net_device *dev)
eCheckItem <= HW90_BLOCK_PHY1; eCheckItem++) { eCheckItem <= HW90_BLOCK_PHY1; eCheckItem++) {
/* don't care RF path */ /* don't care RF path */
status = rtl8192_phy_checkBBAndRF(dev, (enum hw90_block_e)eCheckItem, status = rtl8192_phy_checkBBAndRF(dev, (enum hw90_block_e)eCheckItem,
(enum RF90_RADIO_PATH_E)0); (enum rf90_radio_path_e)0);
if (status != 0) { if (status != 0) {
RT_TRACE((COMP_ERR | COMP_PHY), RT_TRACE((COMP_ERR | COMP_PHY),
"PHY_RF8256_Config(): Check PHY%d Fail!!\n", "PHY_RF8256_Config(): Check PHY%d Fail!!\n",
...@@ -962,13 +962,13 @@ void rtl8192_phy_updateInitGain(struct net_device *dev) ...@@ -962,13 +962,13 @@ void rtl8192_phy_updateInitGain(struct net_device *dev)
* function: This function read RF parameters from general head file, * function: This function read RF parameters from general head file,
* and do RF 3-wire * and do RF 3-wire
* input: net_device *dev * input: net_device *dev
* RF90_RADIO_PATH_E eRFPath * rf90_radio_path_e eRFPath
* output: none * output: none
* return: return code show if RF configuration is successful(0:pass, 1:fail) * return: return code show if RF configuration is successful(0:pass, 1:fail)
* notice: Delay may be required for RF configuration * notice: Delay may be required for RF configuration
*****************************************************************************/ *****************************************************************************/
u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev, u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev,
enum RF90_RADIO_PATH_E eRFPath) enum rf90_radio_path_e eRFPath)
{ {
int i; int i;
...@@ -1386,7 +1386,7 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, ...@@ -1386,7 +1386,7 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel,
case CMD_ID_RF_WRITE_REG: case CMD_ID_RF_WRITE_REG:
for (eRFPath = 0; eRFPath < RF90_PATH_MAX; eRFPath++) { for (eRFPath = 0; eRFPath < RF90_PATH_MAX; eRFPath++) {
rtl8192_phy_SetRFReg(dev, rtl8192_phy_SetRFReg(dev,
(enum RF90_RADIO_PATH_E)eRFPath, (enum rf90_radio_path_e)eRFPath,
CurrentCmd->para_1, CurrentCmd->para_1,
bZebra1_ChannelNum, bZebra1_ChannelNum,
CurrentCmd->para_2); CurrentCmd->para_2);
......
drivers/staging/rtl8192u/r819xU_phy.h
View file @ fb37edcf
...@@ -33,7 +33,7 @@ enum hw90_block_e { ...@@ -33,7 +33,7 @@ enum hw90_block_e {
HW90_BLOCK_MAXIMUM = 4, /* Never use this */ HW90_BLOCK_MAXIMUM = 4, /* Never use this */
}; };
enum RF90_RADIO_PATH_E { enum rf90_radio_path_e {
RF90_PATH_A = 0, /* Radio Path A */ RF90_PATH_A = 0, /* Radio Path A */
RF90_PATH_B = 1, /* Radio Path B */ RF90_PATH_B = 1, /* Radio Path B */
RF90_PATH_C = 2, /* Radio Path C */ RF90_PATH_C = 2, /* Radio Path C */
...@@ -54,23 +54,23 @@ void rtl8192_setBBreg(struct net_device *dev, u32 reg_addr, ...@@ -54,23 +54,23 @@ void rtl8192_setBBreg(struct net_device *dev, u32 reg_addr,
u32 bitmask, u32 data); u32 bitmask, u32 data);
u32 rtl8192_QueryBBReg(struct net_device *dev, u32 reg_addr, u32 bitmask); u32 rtl8192_QueryBBReg(struct net_device *dev, u32 reg_addr, u32 bitmask);
void rtl8192_phy_SetRFReg(struct net_device *dev, void rtl8192_phy_SetRFReg(struct net_device *dev,
enum RF90_RADIO_PATH_E eRFPath, enum rf90_radio_path_e eRFPath,
u32 reg_addr, u32 bitmask, u32 data); u32 reg_addr, u32 bitmask, u32 data);
u32 rtl8192_phy_QueryRFReg(struct net_device *dev, u32 rtl8192_phy_QueryRFReg(struct net_device *dev,
enum RF90_RADIO_PATH_E eRFPath, enum rf90_radio_path_e eRFPath,
u32 reg_addr, u32 bitmask); u32 reg_addr, u32 bitmask);
void rtl8192_phy_configmac(struct net_device *dev); void rtl8192_phy_configmac(struct net_device *dev);
void rtl8192_phyConfigBB(struct net_device *dev, u8 ConfigType); void rtl8192_phyConfigBB(struct net_device *dev, u8 ConfigType);
u8 rtl8192_phy_checkBBAndRF(struct net_device *dev, u8 rtl8192_phy_checkBBAndRF(struct net_device *dev,
enum hw90_block_e CheckBlock, enum hw90_block_e CheckBlock,
enum RF90_RADIO_PATH_E eRFPath); enum rf90_radio_path_e eRFPath);
void rtl8192_BBConfig(struct net_device *dev); void rtl8192_BBConfig(struct net_device *dev);
void rtl8192_phy_getTxPower(struct net_device *dev); void rtl8192_phy_getTxPower(struct net_device *dev);
void rtl8192_phy_setTxPower(struct net_device *dev, u8 channel); void rtl8192_phy_setTxPower(struct net_device *dev, u8 channel);
void rtl8192_phy_RFConfig(struct net_device *dev); void rtl8192_phy_RFConfig(struct net_device *dev);
void rtl8192_phy_updateInitGain(struct net_device *dev); void rtl8192_phy_updateInitGain(struct net_device *dev);
u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev, u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev,
enum RF90_RADIO_PATH_E eRFPath); enum rf90_radio_path_e eRFPath);
u8 rtl8192_phy_SwChnl(struct net_device *dev, u8 channel); u8 rtl8192_phy_SwChnl(struct net_device *dev, u8 channel);
void rtl8192_SetBWMode(struct net_device *dev, void rtl8192_SetBWMode(struct net_device *dev,
......
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