|
@@ -41,16 +41,16 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, enum ht_channel_width Bandwi
|
|
|
|| 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,
|
|
|
+ (enum rf90_radio_path_e)eRFPath,
|
|
|
0x0b, bMask12Bits, 0x100); /* phy para:1ba */
|
|
|
rtl8192_phy_SetRFReg(dev,
|
|
|
- (enum RF90_RADIO_PATH_E)eRFPath,
|
|
|
+ (enum rf90_radio_path_e)eRFPath,
|
|
|
0x2c, bMask12Bits, 0x3d7);
|
|
|
rtl8192_phy_SetRFReg(dev,
|
|
|
- (enum RF90_RADIO_PATH_E)eRFPath,
|
|
|
+ (enum rf90_radio_path_e)eRFPath,
|
|
|
0x0e, bMask12Bits, 0x021);
|
|
|
rtl8192_phy_SetRFReg(dev,
|
|
|
- (enum RF90_RADIO_PATH_E)eRFPath,
|
|
|
+ (enum rf90_radio_path_e)eRFPath,
|
|
|
0x14, bMask12Bits, 0x5ab);
|
|
|
} else {
|
|
|
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
|
|
|
break;
|
|
|
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! */
|
|
|
- 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, 0x0e, bMask12Bits, 0x0a1);
|
|
|
+ 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, 0x0e, bMask12Bits, 0x0a1);
|
|
|
|
|
|
if (priv->chan == 3 || priv->chan == 9)
|
|
|
/* 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
|
|
|
- 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 {
|
|
|
RT_TRACE(COMP_ERR, "PHY_SetRF8256Bandwidth(): unknown hardware version\n");
|
|
|
}
|
|
@@ -115,14 +115,14 @@ void phy_RF8256_Config_ParaFile(struct net_device *dev)
|
|
|
u8 ConstRetryTimes = 5, RetryTimes = 5;
|
|
|
u8 ret = 0;
|
|
|
/* 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))
|
|
|
continue;
|
|
|
|
|
|
pPhyReg = &priv->PHYRegDef[eRFPath];
|
|
|
|
|
|
/* 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
|
|
|
*/
|
|
|
switch (eRFPath) {
|
|
@@ -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, 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)----
|
|
|
* 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);
|
|
|
goto phy_RF8256_Config_ParaFile_Fail;
|
|
|
}
|
|
@@ -162,32 +162,32 @@ void phy_RF8256_Config_ParaFile(struct net_device *dev)
|
|
|
switch (eRFPath) {
|
|
|
case RF90_PATH_A:
|
|
|
while (RF3_Final_Value != RegValueToBeCheck && RetryTimes != 0) {
|
|
|
- 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);
|
|
|
+ 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);
|
|
|
RT_TRACE(COMP_RF, "RF %d %d register final value: %x\n", eRFPath, RegOffSetToBeCheck, RF3_Final_Value);
|
|
|
RetryTimes--;
|
|
|
}
|
|
|
break;
|
|
|
case RF90_PATH_B:
|
|
|
while (RF3_Final_Value != RegValueToBeCheck && RetryTimes != 0) {
|
|
|
- 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);
|
|
|
+ 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);
|
|
|
RT_TRACE(COMP_RF, "RF %d %d register final value: %x\n", eRFPath, RegOffSetToBeCheck, RF3_Final_Value);
|
|
|
RetryTimes--;
|
|
|
}
|
|
|
break;
|
|
|
case RF90_PATH_C:
|
|
|
while (RF3_Final_Value != RegValueToBeCheck && RetryTimes != 0) {
|
|
|
- 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);
|
|
|
+ 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);
|
|
|
RT_TRACE(COMP_RF, "RF %d %d register final value: %x\n", eRFPath, RegOffSetToBeCheck, RF3_Final_Value);
|
|
|
RetryTimes--;
|
|
|
}
|
|
|
break;
|
|
|
case RF90_PATH_D:
|
|
|
while (RF3_Final_Value != RegValueToBeCheck && RetryTimes != 0) {
|
|
|
- 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);
|
|
|
+ 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);
|
|
|
RT_TRACE(COMP_RF, "RF %d %d register final value: %x\n", eRFPath, RegOffSetToBeCheck, RF3_Final_Value);
|
|
|
RetryTimes--;
|
|
|
}
|