skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-29 07:33:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove "enum ODM_RF_RADIO_PATH" and ODM_RF_PATH_x

Browse source 
These are already expressed as "enum rf_radio_path" and RF_PATH_x. Having
two definitions is ridiculous.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2016-02-14 20:14:42 -06:00
parent 2936b46458
commit f8ec1962dd
17 changed files with 80 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hal/odm.h
View file

@ -1170,13 +1170,6 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure
/* ODM relative workitem. */ /* ODM relative workitem. */
} DM_ODM_T, *PDM_ODM_T; /* DM_Dynamic_Mechanism_Structure */ } DM_ODM_T, *PDM_ODM_T; /* DM_Dynamic_Mechanism_Structure */
typedef enum _ODM_RF_RADIO_PATH {
ODM_RF_PATH_A = 0, /* Radio Path A */
ODM_RF_PATH_B = 1, /* Radio Path B */
ODM_RF_PATH_C = 2, /* Radio Path C */
ODM_RF_PATH_D = 3, /* Radio Path D */
} ODM_RF_RADIO_PATH_E, *PODM_RF_RADIO_PATH_E;
typedef enum _ODM_RF_CONTENT{ typedef enum _ODM_RF_CONTENT{
odm_radioa_txt = 0x1000, odm_radioa_txt = 0x1000,
odm_radiob_txt = 0x1001, odm_radiob_txt = 0x1001,

38
hal/odm_HWConfig.c
View file

@ -257,8 +257,8 @@ odm_RxPhyStatus92CSeries_Parsing(
isCCKrate = (pPktinfo->Rate <= DESC92C_RATE11M) ? true : false; isCCKrate = (pPktinfo->Rate <= DESC92C_RATE11M) ? true : false;
pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_A] = -1; pPhyInfo->RxMIMOSignalQuality[RF_PATH_A] = -1;
pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_B] = -1; pPhyInfo->RxMIMOSignalQuality[RF_PATH_B] = -1;
if (isCCKrate) { if (isCCKrate) {
@ -433,8 +433,8 @@ odm_RxPhyStatus92CSeries_Parsing(
/* DbgPrint("cck SQ = %d\n", SQ); */ /* DbgPrint("cck SQ = %d\n", SQ); */
pPhyInfo->SignalQuality = SQ; pPhyInfo->SignalQuality = SQ;
pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_A] = SQ; pPhyInfo->RxMIMOSignalQuality[RF_PATH_A] = SQ;
pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_B] = -1; pPhyInfo->RxMIMOSignalQuality[RF_PATH_B] = -1;
} }
} }
else /* is OFDM rate */ else /* is OFDM rate */
@ -442,7 +442,7 @@ odm_RxPhyStatus92CSeries_Parsing(
pDM_Odm->PhyDbgInfo.NumQryPhyStatusOFDM++; pDM_Odm->PhyDbgInfo.NumQryPhyStatusOFDM++;
/* (1)Get RSSI for HT rate */ /* (1)Get RSSI for HT rate */
for (i = ODM_RF_PATH_A; i < RF_PATH_MAX; i++) for (i = RF_PATH_A; i < RF_PATH_MAX; i++)
{ {
/* 2008/01/30 MH we will judge RF RX path now. */ /* 2008/01/30 MH we will judge RF RX path now. */
if (pDM_Odm->RFPathRxEnable & BIT(i)) if (pDM_Odm->RFPathRxEnable & BIT(i))
@ -481,7 +481,7 @@ odm_RxPhyStatus92CSeries_Parsing(
{ {
if ((pDM_Odm->SupportPlatform == ODM_MP) &&(pDM_Odm->PatchID==19)) if ((pDM_Odm->SupportPlatform == ODM_MP) &&(pDM_Odm->PatchID==19))
{ {
if (i==ODM_RF_PATH_A) if (i==RF_PATH_A)
pPhyInfo->SignalQuality = odm_SQ_process_patch_RT_CID_819x_Lenovo(pDM_Odm,isCCKrate,PWDB_ALL,i,RSSI); pPhyInfo->SignalQuality = odm_SQ_process_patch_RT_CID_819x_Lenovo(pDM_Odm,isCCKrate,PWDB_ALL,i,RSSI);
} }
@ -524,7 +524,7 @@ odm_RxPhyStatus92CSeries_Parsing(
if (pPktinfo->bPacketMatchBSSID) if (pPktinfo->bPacketMatchBSSID)
{ {
if (i==ODM_RF_PATH_A) /* Fill value in RFD, Get the first spatial stream only */ if (i==RF_PATH_A) /* Fill value in RFD, Get the first spatial stream only */
{ {
pPhyInfo->SignalQuality = (u8)(EVM & 0xff); pPhyInfo->SignalQuality = (u8)(EVM & 0xff);
} }
@ -636,27 +636,27 @@ odm_Process_RSSIForDM(
if (!isCCKrate)/* ofdm rate */ if (!isCCKrate)/* ofdm rate */
{ {
if (pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B] == 0) { if (pPhyInfo->RxMIMOSignalStrength[RF_PATH_B] == 0) {
RSSI_Ave = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A]; RSSI_Ave = pPhyInfo->RxMIMOSignalStrength[RF_PATH_A];
pDM_Odm->RSSI_A = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A]; pDM_Odm->RSSI_A = pPhyInfo->RxMIMOSignalStrength[RF_PATH_A];
pDM_Odm->RSSI_B = 0; pDM_Odm->RSSI_B = 0;
} }
else else
{ {
/* DbgPrint("pRfd->Status.RxMIMOSignalStrength[0] = %d, pRfd->Status.RxMIMOSignalStrength[1] = %d\n", */ /* DbgPrint("pRfd->Status.RxMIMOSignalStrength[0] = %d, pRfd->Status.RxMIMOSignalStrength[1] = %d\n", */
/* pRfd->Status.RxMIMOSignalStrength[0], pRfd->Status.RxMIMOSignalStrength[1]); */ /* pRfd->Status.RxMIMOSignalStrength[0], pRfd->Status.RxMIMOSignalStrength[1]); */
pDM_Odm->RSSI_A = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A]; pDM_Odm->RSSI_A = pPhyInfo->RxMIMOSignalStrength[RF_PATH_A];
pDM_Odm->RSSI_B = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B]; pDM_Odm->RSSI_B = pPhyInfo->RxMIMOSignalStrength[RF_PATH_B];
if (pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A] > pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B]) if (pPhyInfo->RxMIMOSignalStrength[RF_PATH_A] > pPhyInfo->RxMIMOSignalStrength[RF_PATH_B])
{ {
RSSI_max = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A]; RSSI_max = pPhyInfo->RxMIMOSignalStrength[RF_PATH_A];
RSSI_min = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B]; RSSI_min = pPhyInfo->RxMIMOSignalStrength[RF_PATH_B];
} }
else else
{ {
RSSI_max = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B]; RSSI_max = pPhyInfo->RxMIMOSignalStrength[RF_PATH_B];
RSSI_min = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A]; RSSI_min = pPhyInfo->RxMIMOSignalStrength[RF_PATH_A];
} }
if ((RSSI_max -RSSI_min) < 3) if ((RSSI_max -RSSI_min) < 3)
RSSI_Ave = RSSI_max; RSSI_Ave = RSSI_max;
@ -832,8 +832,8 @@ ODM_MacStatusQuery(
HAL_STATUS HAL_STATUS
ODM_ConfigRFWithHeaderFile( ODM_ConfigRFWithHeaderFile(
PDM_ODM_T pDM_Odm, PDM_ODM_T pDM_Odm,
ODM_RF_RADIO_PATH_E Content, enum rf_radio_path Content,
ODM_RF_RADIO_PATH_E eRFPath enum rf_radio_path eRFPath
) )
{ {
/* RT_STATUS rtStatus = RT_STATUS_SUCCESS; */ /* RT_STATUS rtStatus = RT_STATUS_SUCCESS; */

11
hal/odm_HWConfig.h
View file

@ -22,11 +22,10 @@
#ifndef __HALHWOUTSRC_H__ #ifndef __HALHWOUTSRC_H__
#define __HALHWOUTSRC_H__ #define __HALHWOUTSRC_H__
/* */ #include "Hal8188EPhyCfg.h"
/* Definition */ /* Definition */
/* */
/* */
/* */
/* CCK Rates, TxHT = 0 */ /* CCK Rates, TxHT = 0 */
#define DESC92C_RATE1M 0x00 #define DESC92C_RATE1M 0x00
#define DESC92C_RATE2M 0x01 #define DESC92C_RATE2M 0x01
@ -173,8 +172,8 @@ ODM_MacStatusQuery(
HAL_STATUS HAL_STATUS
ODM_ConfigRFWithHeaderFile( ODM_ConfigRFWithHeaderFile(
PDM_ODM_T pDM_Odm, PDM_ODM_T pDM_Odm,
ODM_RF_RADIO_PATH_E Content, enum rf_radio_path Content,
ODM_RF_RADIO_PATH_E eRFPath enum rf_radio_path eRFPath
); );
HAL_STATUS HAL_STATUS

6
hal/odm_RegConfig8188E.c
View file

@ -25,7 +25,7 @@ odm_ConfigRFReg_8188E(
PDM_ODM_T pDM_Odm, PDM_ODM_T pDM_Odm,
u32 Addr, u32 Addr,
u32 Data, u32 Data,
ODM_RF_RADIO_PATH_E RF_PATH, enum rf_radio_path RF_PATH,
u32 RegAddr u32 RegAddr
) )
{ {
@ -72,7 +72,7 @@ odm_ConfigRF_RadioA_8188E(
u32 content = 0x1000; /* RF_Content: radioa_txt */ u32 content = 0x1000; /* RF_Content: radioa_txt */
u32 maskforPhySet= (u32)(content&0xE000); u32 maskforPhySet= (u32)(content&0xE000);
odm_ConfigRFReg_8188E(pDM_Odm, Addr, Data, ODM_RF_PATH_A, Addr|maskforPhySet); odm_ConfigRFReg_8188E(pDM_Odm, Addr, Data, RF_PATH_A, Addr|maskforPhySet);
ODM_RT_TRACE(pDM_Odm,ODM_COMP_INIT, ODM_DBG_TRACE, ("===> ODM_ConfigRFWithHeaderFile: [RadioA] %08X %08X\n", Addr, Data)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_INIT, ODM_DBG_TRACE, ("===> ODM_ConfigRFWithHeaderFile: [RadioA] %08X %08X\n", Addr, Data));
} }
@ -87,7 +87,7 @@ odm_ConfigRF_RadioB_8188E(
u32 content = 0x1001; /* RF_Content: radiob_txt */ u32 content = 0x1001; /* RF_Content: radiob_txt */
u32 maskforPhySet= (u32)(content&0xE000); u32 maskforPhySet= (u32)(content&0xE000);
odm_ConfigRFReg_8188E(pDM_Odm, Addr, Data, ODM_RF_PATH_B, Addr|maskforPhySet); odm_ConfigRFReg_8188E(pDM_Odm, Addr, Data, RF_PATH_B, Addr|maskforPhySet);
ODM_RT_TRACE(pDM_Odm,ODM_COMP_INIT, ODM_DBG_TRACE, ("===> ODM_ConfigRFWithHeaderFile: [RadioB] %08X %08X\n", Addr, Data)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_INIT, ODM_DBG_TRACE, ("===> ODM_ConfigRFWithHeaderFile: [RadioB] %08X %08X\n", Addr, Data));

2
hal/odm_RegConfig8188E.h
View file

@ -25,7 +25,7 @@ odm_ConfigRFReg_8188E(
PDM_ODM_T pDM_Odm, PDM_ODM_T pDM_Odm,
u32 Addr, u32 Addr,
u32 Data, u32 Data,
ODM_RF_RADIO_PATH_E RF_PATH, enum rf_radio_path RF_PATH,
u32 RegAddr u32 RegAddr
); );

12
hal/odm_interface.c
View file

@ -23,9 +23,9 @@
/* */ /* */
#include "odm_precomp.h" #include "odm_precomp.h"
/* */ #include "Hal8188EPhyCfg.h"
/* ODM IO Relative API. */ /* ODM IO Relative API. */
/* */
u8 u8
ODM_Read1Byte( ODM_Read1Byte(
@ -141,27 +141,27 @@ ODM_GetBBReg(
void void
ODM_SetRFReg( ODM_SetRFReg(
PDM_ODM_T pDM_Odm, PDM_ODM_T pDM_Odm,
ODM_RF_RADIO_PATH_E eRFPath, enum rf_radio_path eRFPath,
u32 RegAddr, u32 RegAddr,
u32 BitMask, u32 BitMask,
u32 Data u32 Data
) )
{ {
struct adapter * Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)eRFPath, RegAddr, BitMask, Data); PHY_SetRFReg(Adapter, (enum rf_radio_path)eRFPath, RegAddr, BitMask, Data);
} }
u32 u32
ODM_GetRFReg( ODM_GetRFReg(
PDM_ODM_T pDM_Odm, PDM_ODM_T pDM_Odm,
ODM_RF_RADIO_PATH_E eRFPath, enum rf_radio_path eRFPath,
u32 RegAddr, u32 RegAddr,
u32 BitMask u32 BitMask
) )
{ {
struct adapter * Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return PHY_QueryRFReg(Adapter, (RF_RADIO_PATH_E)eRFPath, return PHY_QueryRFReg(Adapter, (enum rf_radio_path)eRFPath,
RegAddr, BitMask); RegAddr, BitMask);
} }

4
hal/odm_interface.h
View file

@ -163,7 +163,7 @@ ODM_GetBBReg(
void void
ODM_SetRFReg( ODM_SetRFReg(
PDM_ODM_T pDM_Odm, PDM_ODM_T pDM_Odm,
ODM_RF_RADIO_PATH_E eRFPath, enum rf_radio_path eRFPath,
u32 RegAddr, u32 RegAddr,
u32 BitMask, u32 BitMask,
u32 Data u32 Data
@ -172,7 +172,7 @@ ODM_SetRFReg(
u32 u32
ODM_GetRFReg( ODM_GetRFReg(
PDM_ODM_T pDM_Odm, PDM_ODM_T pDM_Odm,
ODM_RF_RADIO_PATH_E eRFPath, enum rf_radio_path eRFPath,
u32 RegAddr, u32 RegAddr,
u32 BitMask u32 BitMask
); );

28
hal/rtl8188e_phycfg.c
View file

@ -380,7 +380,7 @@ rtl8188e_PHY_SetBBReg(
* *
* Input: * Input:
* struct adapter * Adapter, * struct adapter * Adapter,
* RF_RADIO_PATH_E eRFPath, Radio path of A/B/C/D * enum rf_radio_path eRFPath, Radio path of A/B/C/D
* u32 Offset, The target address to be read * u32 Offset, The target address to be read
* *
* Output: None * Output: None
@ -395,7 +395,7 @@ rtl8188e_PHY_SetBBReg(
static u32 static u32
phy_RFSerialRead( phy_RFSerialRead(
struct adapter * Adapter, struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath, enum rf_radio_path eRFPath,
u32 Offset u32 Offset
) )
{ {
@ -473,7 +473,7 @@ phy_RFSerialRead(
* *
* Input: * Input:
* struct adapter * Adapter, * struct adapter * Adapter,
* RF_RADIO_PATH_E eRFPath, Radio path of A/B/C/D * enum rf_radio_path eRFPath, Radio path of A/B/C/D
* u32 Offset, The target address to be read * u32 Offset, The target address to be read
* u32 Data The new register Data in the target bit position * u32 Data The new register Data in the target bit position
* of the target to be read * of the target to be read
@ -512,7 +512,7 @@ phy_RFSerialRead(
static void static void
phy_RFSerialWrite( phy_RFSerialWrite(
struct adapter * Adapter, struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath, enum rf_radio_path eRFPath,
u32 Offset, u32 Offset,
u32 Data u32 Data
) )
@ -547,7 +547,7 @@ phy_RFSerialWrite(
* *
* Input: * Input:
* struct adapter * Adapter, * struct adapter * Adapter,
* RF_RADIO_PATH_E eRFPath, Radio path of A/B/C/D * enum rf_radio_path eRFPath, Radio path of A/B/C/D
* u32 RegAddr, The target address to be read * u32 RegAddr, The target address to be read
* u32 BitMask The target bit position in the target address * u32 BitMask The target bit position in the target address
* to be read * to be read
@ -556,7 +556,7 @@ phy_RFSerialWrite(
* Return: u32 Readback value * Return: u32 Readback value
* Note: This function is equal to "GetRFRegSetting" in PHY programming guide * Note: This function is equal to "GetRFRegSetting" in PHY programming guide
*/ */
u32 rtl8188e_PHY_QueryRFReg(struct adapter *Adapter, RF_RADIO_PATH_E eRFPath, u32 RegAddr, u32 BitMask) u32 rtl8188e_PHY_QueryRFReg(struct adapter *Adapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask)
{ {
u32 Original_Value, Readback_Value, BitShift; u32 Original_Value, Readback_Value, BitShift;
@ -579,7 +579,7 @@ u32 rtl8188e_PHY_QueryRFReg(struct adapter *Adapter, RF_RADIO_PATH_E eRFPath, u3
* *
* Input: * Input:
* struct adapter * Adapter, * struct adapter * Adapter,
* RF_RADIO_PATH_E eRFPath, Radio path of A/B/C/D * enum rf_radio_path eRFPath, Radio path of A/B/C/D
* u32 RegAddr, The target address to be modified * u32 RegAddr, The target address to be modified
* u32 BitMask The target bit position in the target address * u32 BitMask The target bit position in the target address
* to be modified * to be modified
@ -593,7 +593,7 @@ u32 rtl8188e_PHY_QueryRFReg(struct adapter *Adapter, RF_RADIO_PATH_E eRFPath, u3
void void
rtl8188e_PHY_SetRFReg( rtl8188e_PHY_SetRFReg(
struct adapter * Adapter, struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath, enum rf_radio_path eRFPath,
u32 RegAddr, u32 RegAddr,
u32 BitMask, u32 BitMask,
u32 Data u32 Data
@ -1173,7 +1173,7 @@ PHY_RFConfig8188E(
* *
* Input: struct adapter * Adapter * Input: struct adapter * Adapter
* s8 * pFileName * s8 * pFileName
* RF_RADIO_PATH_E eRFPath * enum rf_radio_path eRFPath
* *
* Output: NONE * Output: NONE
* *
@ -1185,7 +1185,7 @@ int
rtl8188e_PHY_ConfigRFWithParaFile( rtl8188e_PHY_ConfigRFWithParaFile(
struct adapter * Adapter, struct adapter * Adapter,
u8* pFileName, u8* pFileName,
RF_RADIO_PATH_E eRFPath enum rf_radio_path eRFPath
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -1219,7 +1219,7 @@ static u32 Rtl8192S_HighPower_RadioA_Array[HighPowerRadioAArrayLen] = {
static int static int
PHY_ConfigRFExternalPA( PHY_ConfigRFExternalPA(
struct adapter * Adapter, struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath enum rf_radio_path eRFPath
) )
{ {
int rtStatus = _SUCCESS; int rtStatus = _SUCCESS;
@ -1239,7 +1239,7 @@ PHY_ConfigRFExternalPA(
* *
* Input: struct adapter * Adapter * Input: struct adapter * Adapter
* HW90_BLOCK_E CheckBlock * HW90_BLOCK_E CheckBlock
* RF_RADIO_PATH_E eRFPath it is used only when CheckBlock is HW90_BLOCK_RF * enum rf_radio_path eRFPath it is used only when CheckBlock is HW90_BLOCK_RF
* *
* Output: NONE * Output: NONE
* *
@ -1251,7 +1251,7 @@ static int
PHY_CheckBBAndRFOK( PHY_CheckBBAndRFOK(
struct adapter * Adapter, struct adapter * Adapter,
HW90_BLOCK_E CheckBlock, HW90_BLOCK_E CheckBlock,
RF_RADIO_PATH_E eRFPath enum rf_radio_path eRFPath
) )
{ {
int rtStatus = _SUCCESS; int rtStatus = _SUCCESS;
@ -1884,7 +1884,7 @@ static void _PHY_SwChnl8192C(struct adapter *Adapter, u8 channel)
for (eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++) for (eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++)
{ {
pHalData->RfRegChnlVal[eRFPath] = ((pHalData->RfRegChnlVal[eRFPath] & 0xfffffc00) | param2); pHalData->RfRegChnlVal[eRFPath] = ((pHalData->RfRegChnlVal[eRFPath] & 0xfffffc00) | param2);
PHY_SetRFReg(Adapter, (RF_RADIO_PATH_E)eRFPath, param1, bRFRegOffsetMask, pHalData->RfRegChnlVal[eRFPath]); PHY_SetRFReg(Adapter, (enum rf_radio_path)eRFPath, param1, bRFRegOffsetMask, pHalData->RfRegChnlVal[eRFPath]);
} }

28
hal/rtl8188e_rf6052.c
View file

@ -648,11 +648,11 @@ phy_RF6052_Config_ParaFile(
switch (eRFPath) switch (eRFPath)
{ {
case RF_PATH_A: case RF_PATH_A:
if (HAL_STATUS_FAILURE ==ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv,(ODM_RF_RADIO_PATH_E)eRFPath, (ODM_RF_RADIO_PATH_E)eRFPath)) if (HAL_STATUS_FAILURE ==ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv,(enum rf_radio_path)eRFPath, (enum rf_radio_path)eRFPath))
rtStatus= _FAIL; rtStatus= _FAIL;
break; break;
case RF_PATH_B: case RF_PATH_B:
if (HAL_STATUS_FAILURE ==ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv,(ODM_RF_RADIO_PATH_E)eRFPath, (ODM_RF_RADIO_PATH_E)eRFPath)) if (HAL_STATUS_FAILURE ==ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv,(enum rf_radio_path)eRFPath, (enum rf_radio_path)eRFPath))
rtStatus= _FAIL; rtStatus= _FAIL;
break; break;
case RF_PATH_C: case RF_PATH_C:
@ -744,7 +744,7 @@ PHY_RF6052_Config8188E(
static u32 static u32
PHY_RFShadowRead( PHY_RFShadowRead(
struct adapter * Adapter, struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath, enum rf_radio_path eRFPath,
u32 Offset) u32 Offset)
{ {
return RF_Shadow[eRFPath][Offset].Value; return RF_Shadow[eRFPath][Offset].Value;
@ -755,7 +755,7 @@ PHY_RFShadowRead(
static void static void
PHY_RFShadowWrite( PHY_RFShadowWrite(
struct adapter * Adapter, struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath, enum rf_radio_path eRFPath,
u32 Offset, u32 Offset,
u32 Data) u32 Data)
{ {
@ -768,7 +768,7 @@ PHY_RFShadowWrite(
static bool static bool
PHY_RFShadowCompare( PHY_RFShadowCompare(
struct adapter * Adapter, struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath, enum rf_radio_path eRFPath,
u32 Offset) u32 Offset)
{ {
u32 reg; u32 reg;
@ -794,7 +794,7 @@ PHY_RFShadowCompare(
static void static void
PHY_RFShadowRecorver( PHY_RFShadowRecorver(
struct adapter * Adapter, struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath, enum rf_radio_path eRFPath,
u32 Offset) u32 Offset)
{ {
/* Check if the address is error */ /* Check if the address is error */
@ -825,7 +825,7 @@ PHY_RFShadowCompareAll(
{ {
for (Offset = 0; Offset <= RF6052_MAX_REG; Offset++) for (Offset = 0; Offset <= RF6052_MAX_REG; Offset++)
{ {
PHY_RFShadowCompare(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset); PHY_RFShadowCompare(Adapter, (enum rf_radio_path)eRFPath, Offset);
} }
} }
@ -843,7 +843,7 @@ PHY_RFShadowRecorverAll(
{ {
for (Offset = 0; Offset <= RF6052_MAX_REG; Offset++) for (Offset = 0; Offset <= RF6052_MAX_REG; Offset++)
{ {
PHY_RFShadowRecorver(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset); PHY_RFShadowRecorver(Adapter, (enum rf_radio_path)eRFPath, Offset);
} }
} }
@ -853,7 +853,7 @@ PHY_RFShadowRecorverAll(
static void static void
PHY_RFShadowCompareFlagSet( PHY_RFShadowCompareFlagSet(
struct adapter * Adapter, struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath, enum rf_radio_path eRFPath,
u32 Offset, u32 Offset,
u8 Type) u8 Type)
{ {
@ -866,7 +866,7 @@ PHY_RFShadowCompareFlagSet(
static void static void
PHY_RFShadowRecorverFlagSet( PHY_RFShadowRecorverFlagSet(
struct adapter * Adapter, struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath, enum rf_radio_path eRFPath,
u32 Offset, u32 Offset,
u8 Type) u8 Type)
{ {
@ -889,9 +889,9 @@ PHY_RFShadowCompareFlagSetAll(
{ {
/* 2008/11/20 MH For S3S4 test, we only check reg 26/27 now!!!! */ /* 2008/11/20 MH For S3S4 test, we only check reg 26/27 now!!!! */
if (Offset != 0x26 && Offset != 0x27) if (Offset != 0x26 && Offset != 0x27)
PHY_RFShadowCompareFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, false); PHY_RFShadowCompareFlagSet(Adapter, (enum rf_radio_path)eRFPath, Offset, false);
else else
PHY_RFShadowCompareFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, true); PHY_RFShadowCompareFlagSet(Adapter, (enum rf_radio_path)eRFPath, Offset, true);
} }
} }
@ -911,9 +911,9 @@ PHY_RFShadowRecorverFlagSetAll(
{ {
/* 2008/11/20 MH For S3S4 test, we only check reg 26/27 now!!!! */ /* 2008/11/20 MH For S3S4 test, we only check reg 26/27 now!!!! */
if (Offset != 0x26 && Offset != 0x27) if (Offset != 0x26 && Offset != 0x27)
PHY_RFShadowRecorverFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, false); PHY_RFShadowRecorverFlagSet(Adapter, (enum rf_radio_path)eRFPath, Offset, false);
else else
PHY_RFShadowRecorverFlagSet(Adapter, (RF_RADIO_PATH_E)eRFPath, Offset, true); PHY_RFShadowRecorverFlagSet(Adapter, (enum rf_radio_path)eRFPath, Offset, true);
} }
} }

4
hal/usb_halinit.c
View file

@ -1420,8 +1420,8 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
rtw_write16(Adapter, REG_PKT_BE_BK_LIFE_TIME, 0x0400); /* unit: 256us. 256ms */ rtw_write16(Adapter, REG_PKT_BE_BK_LIFE_TIME, 0x0400); /* unit: 256us. 256ms */
/* Joseph Note: Keep RfRegChnlVal for later use. */ /* Joseph Note: Keep RfRegChnlVal for later use. */
pHalData->RfRegChnlVal[0] = PHY_QueryRFReg(Adapter, (RF_RADIO_PATH_E)0, RF_CHNLBW, bRFRegOffsetMask); pHalData->RfRegChnlVal[0] = PHY_QueryRFReg(Adapter, (enum rf_radio_path)0, RF_CHNLBW, bRFRegOffsetMask);
pHalData->RfRegChnlVal[1] = PHY_QueryRFReg(Adapter, (RF_RADIO_PATH_E)1, RF_CHNLBW, bRFRegOffsetMask); pHalData->RfRegChnlVal[1] = PHY_QueryRFReg(Adapter, (enum rf_radio_path)1, RF_CHNLBW, bRFRegOffsetMask);
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_TURN_ON_BLOCK); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_TURN_ON_BLOCK);
_BBTurnOnBlock(Adapter); _BBTurnOnBlock(Adapter);

12
include/Hal8188EPhyCfg.h
View file

@ -67,12 +67,12 @@ typedef enum _HW90_BLOCK{
HW90_BLOCK_MAXIMUM = 4, /* Never use this */ HW90_BLOCK_MAXIMUM = 4, /* Never use this */
}HW90_BLOCK_E, *PHW90_BLOCK_E; }HW90_BLOCK_E, *PHW90_BLOCK_E;
typedef enum _RF_RADIO_PATH{ enum rf_radio_path {
RF_PATH_A = 0, /* Radio Path A */ RF_PATH_A = 0, /* Radio Path A */
RF_PATH_B = 1, /* Radio Path B */ RF_PATH_B = 1, /* Radio Path B */
RF_PATH_C = 2, /* Radio Path C */ RF_PATH_C = 2, /* Radio Path C */
RF_PATH_D = 3, /* Radio Path D */ RF_PATH_D = 3, /* Radio Path D */
}RF_RADIO_PATH_E, *PRF_RADIO_PATH_E; };
#define MAX_PG_GROUP 13 #define MAX_PG_GROUP 13
@ -217,11 +217,11 @@ void rtl8188e_PHY_SetBBReg( struct adapter *Adapter,
u32 BitMask, u32 BitMask,
u32 Data ); u32 Data );
u32 rtl8188e_PHY_QueryRFReg( struct adapter * Adapter, u32 rtl8188e_PHY_QueryRFReg( struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath, enum rf_radio_path eRFPath,
u32 RegAddr, u32 RegAddr,
u32 BitMask ); u32 BitMask );
void rtl8188e_PHY_SetRFReg( struct adapter * Adapter, void rtl8188e_PHY_SetRFReg( struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath, enum rf_radio_path eRFPath,
u32 RegAddr, u32 RegAddr,
u32 BitMask, u32 BitMask,
u32 Data ); u32 Data );
@ -235,9 +235,9 @@ int PHY_BBConfig8188E(struct adapter *Adapter );
int PHY_RFConfig8188E(struct adapter *Adapter ); int PHY_RFConfig8188E(struct adapter *Adapter );
/* RF config */ /* RF config */
int rtl8188e_PHY_ConfigRFWithParaFile(struct adapter *Adapter, u8 * pFileName, RF_RADIO_PATH_E eRFPath); int rtl8188e_PHY_ConfigRFWithParaFile(struct adapter *Adapter, u8 * pFileName, enum rf_radio_path eRFPath);
int rtl8188e_PHY_ConfigRFWithHeaderFile(struct adapter *Adapter, int rtl8188e_PHY_ConfigRFWithHeaderFile(struct adapter *Adapter,
RF_RADIO_PATH_E eRFPath); enum rf_radio_path eRFPath);
/* Read initi reg value for tx power setting. */ /* Read initi reg value for tx power setting. */
void rtl8192c_PHY_GetHWRegOriginalValue(struct adapter * Adapter ); void rtl8192c_PHY_GetHWRegOriginalValue(struct adapter * Adapter );

7
include/odm.h
View file

@ -946,13 +946,6 @@ struct odm_dm_struct {
struct timer_list FastAntTrainingTimer; struct timer_list FastAntTrainingTimer;
}; /* DM_Dynamic_Mechanism_Structure */ }; /* DM_Dynamic_Mechanism_Structure */
enum ODM_RF_RADIO_PATH {
ODM_RF_PATH_A = 0, /* Radio Path A */
ODM_RF_PATH_B = 1, /* Radio Path B */
ODM_RF_PATH_C = 2, /* Radio Path C */
ODM_RF_PATH_D = 3, /* Radio Path D */
};
enum ODM_RF_CONTENT { enum ODM_RF_CONTENT {
odm_radioa_txt = 0x1000, odm_radioa_txt = 0x1000,
odm_radiob_txt = 0x1001, odm_radiob_txt = 0x1001,

4
include/odm_HWConfig.h
View file

@ -122,8 +122,8 @@ void ODM_MacStatusQuery(struct odm_dm_struct *pDM_Odm,
bool bPacketBeacon); bool bPacketBeacon);
enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *pDM_Odm, enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *pDM_Odm,
enum ODM_RF_RADIO_PATH Content, enum rf_radio_path Content,
enum ODM_RF_RADIO_PATH eRFPath); enum rf_radio_path eRFPath);
enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *pDM_Odm, enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *pDM_Odm,
enum odm_bb_config_type ConfigType); enum odm_bb_config_type ConfigType);

2
include/odm_RegConfig8188E.h
View file

@ -21,7 +21,7 @@
#define __INC_ODM_REGCONFIG_H_8188E #define __INC_ODM_REGCONFIG_H_8188E
void odm_ConfigRFReg_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 Data, void odm_ConfigRFReg_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 Data,
enum ODM_RF_RADIO_PATH RF_PATH, u32 RegAddr); enum rf_radio_path RF_PATH, u32 RegAddr);
void odm_ConfigRF_RadioA_8188E(struct odm_dm_struct *pDM_Odm, void odm_ConfigRF_RadioA_8188E(struct odm_dm_struct *pDM_Odm,
u32 Addr, u32 Data); u32 Addr, u32 Data);

4
include/odm_interface.h
View file

@ -99,10 +99,10 @@ void ODM_SetBBReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr,
u32 ODM_GetBBReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask); u32 ODM_GetBBReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask);
void ODM_SetRFReg(struct odm_dm_struct *pDM_Odm, enum ODM_RF_RADIO_PATH eRFPath, void ODM_SetRFReg(struct odm_dm_struct *pDM_Odm, enum rf_radio_path eRFPath,
u32 RegAddr, u32 BitMask, u32 Data); u32 RegAddr, u32 BitMask, u32 Data);
u32 ODM_GetRFReg(struct odm_dm_struct *pDM_Odm, enum ODM_RF_RADIO_PATH eRFPath, u32 ODM_GetRFReg(struct odm_dm_struct *pDM_Odm, enum rf_radio_path eRFPath,
u32 RegAddr, u32 BitMask); u32 RegAddr, u32 BitMask);
/* Memory Relative Function. */ /* Memory Relative Function. */

2
include/rtw_mp.h
View file

@ -436,7 +436,7 @@ u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz);
void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz); void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz);
u32 read_bbreg(struct adapter *padapter, u32 addr, u32 bitmask); u32 read_bbreg(struct adapter *padapter, u32 addr, u32 bitmask);
void write_bbreg(struct adapter *padapter, u32 addr, u32 bitmask, u32 val); void write_bbreg(struct adapter *padapter, u32 addr, u32 bitmask, u32 val);
u32 read_rfreg(struct adapter *padapter, RF_RADIO_PATH_E rfpath, u32 addr); u32 read_rfreg(struct adapter *padapter, enum rf_radio_path rfpath, u32 addr);
void write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 val); void write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 val);
void SetChannel(struct adapter *pAdapter); void SetChannel(struct adapter *pAdapter);

2
os_dep/ioctl_linux.c
View file

@ -5514,7 +5514,7 @@ static void rf_reg_dump(struct adapter *padapter)
printk("\nRF_Path(%x)\n",path); printk("\nRF_Path(%x)\n",path);
for (i=0;i<0x100;i++) for (i=0;i<0x100;i++)
{ {
/* value = PHY_QueryRFReg(padapter, (RF_RADIO_PATH_E)path,i, bMaskDWord); */ /* value = PHY_QueryRFReg(padapter, (enum rf_radio_path)path,i, bMaskDWord); */
value = rtw_hal_read_rfreg(padapter, path, i, 0xffffffff); value = rtw_hal_read_rfreg(padapter, path, i, 0xffffffff);
if (j%4==1) printk("0x%02x ",i); if (j%4==1) printk("0x%02x ",i);
printk(" 0x%08x ",value); printk(" 0x%08x ",value);