skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-07 22:13:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Convert typedef statements in include/Hal8188EPhyCfg.h

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-26 13:36:38 -05:00
parent b925112e2a
commit 7449a3d03b
11 changed files with 92 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hal/hal_intf.c
View file

@ -306,17 +306,17 @@ void rtw_hal_write_bbreg(_adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data)
padapter->HalFunc.write_bbreg(padapter, RegAddr, BitMask, Data);
}
u32 rtw_hal_read_rfreg(_adapter *padapter, RF_RADIO_PATH_E eRFPath, u32 RegAddr, u32 BitMask)
u32 rtw_hal_read_rfreg(_adapter *padapter, enum rf_radio_path rfpath, u32 RegAddr, u32 BitMask)
{
u32 data = 0;
if ( padapter->HalFunc.read_rfreg)
data = padapter->HalFunc.read_rfreg(padapter, eRFPath, RegAddr, BitMask);
data = padapter->HalFunc.read_rfreg(padapter, rfpath, RegAddr, BitMask);
return data;
}
void rtw_hal_write_rfreg(_adapter *padapter, RF_RADIO_PATH_E eRFPath, u32 RegAddr, u32 BitMask, u32 Data)
void rtw_hal_write_rfreg(_adapter *padapter, enum rf_radio_path rfpath, u32 RegAddr, u32 BitMask, u32 Data)
{
if (padapter->HalFunc.write_rfreg)
padapter->HalFunc.write_rfreg(padapter, eRFPath, RegAddr, BitMask, Data);
padapter->HalFunc.write_rfreg(padapter, rfpath, RegAddr, BitMask, Data);
}
s32 rtw_hal_interrupt_handler(_adapter *padapter)

7
hal/odm_interface.c
View file

@ -114,7 +114,7 @@ ODM_SetRFReg(
)
{
PADAPTER Adapter = pDM_Odm->Adapter;
PHY_SetRFReg(Adapter, (enum _RF_RADIO_PATH)eRFPath, RegAddr, BitMask, Data);
PHY_SetRFReg(Adapter, (enum rf_radio_path)eRFPath, RegAddr, BitMask, Data);
}
@ -127,12 +127,9 @@ ODM_GetRFReg(
)
{
PADAPTER Adapter = pDM_Odm->Adapter;
return PHY_QueryRFReg(Adapter, (enum _RF_RADIO_PATH)eRFPath, RegAddr, BitMask);
return PHY_QueryRFReg(Adapter, (enum rf_radio_path)eRFPath, RegAddr, BitMask);
}
/* */
/* ODM Memory relative API. */
/* */

10
hal/rtl8188e_mp.c
View file

@ -308,7 +308,7 @@ void Hal_SetChannel(PADAPTER pAdapter)
for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++)
{
if (IS_HARDWARE_TYPE_8192D(pAdapter))
_write_rfreg(pAdapter, (RF_RADIO_PATH_E)eRFPath, ODM_CHANNEL, 0xFF, channel);
_write_rfreg(pAdapter, (enum rf_radio_path)eRFPath, ODM_CHANNEL, 0xFF, channel);
else
_write_rfreg(pAdapter, eRFPath, ODM_CHANNEL, 0x3FF, channel);
}
@ -482,16 +482,16 @@ void Hal_SetAntenna(PADAPTER pAdapter)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
R_ANTENNA_SELECT_OFDM *p_ofdm_tx; /* OFDM Tx register */
R_ANTENNA_SELECT_CCK *p_cck_txrx;
struct ant_sel_ofdm *p_ofdm_tx; /* OFDM Tx register */
struct ant_sel_cck *p_cck_txrx;
u8 r_rx_antenna_ofdm = 0, r_ant_select_cck_val = 0;
u8 chgTx = 0, chgRx = 0;
u32 r_ant_sel_cck_val = 0, r_ant_select_ofdm_val = 0, r_ofdm_tx_en_val = 0;
p_ofdm_tx = (R_ANTENNA_SELECT_OFDM *)&r_ant_select_ofdm_val;
p_cck_txrx = (R_ANTENNA_SELECT_CCK *)&r_ant_select_cck_val;
p_ofdm_tx = (struct ant_sel_ofdm *)&r_ant_select_ofdm_val;
p_cck_txrx = (struct ant_sel_cck *)&r_ant_select_cck_val;
p_ofdm_tx->r_ant_ht1 = 0x1;
p_ofdm_tx->r_ant_ht2 = 0x2; /* Second TX RF path is A */

38
hal/rtl8188e_phycfg.c
View file

@ -345,7 +345,7 @@ rtl8188e_PHY_SetBBReg(
*
* Input:
* PADAPTER 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
* u4Byte Offset, The target address to be read
*
* Output: None
@ -360,13 +360,13 @@ rtl8188e_PHY_SetBBReg(
static u32
phy_RFSerialRead(
PADAPTER Adapter,
RF_RADIO_PATH_E eRFPath,
enum rf_radio_path eRFPath,
u32 Offset
)
{
u32 retValue = 0;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
BB_REGISTER_DEFINITION_T *pPhyReg = &pHalData->PHYRegDef[eRFPath];
struct bb_reg_def *pPhyReg = &pHalData->PHYRegDef[eRFPath];
u32 NewOffset;
u32 tmplong,tmplong2;
u8 RfPiEnable=0;
@ -423,7 +423,7 @@ phy_RFSerialRead(
*
* Input:
* PADAPTER 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
* u4Byte Offset, The target address to be read
* u4Byte Data The new register Data in the target bit position
* of the target to be read
@ -462,14 +462,14 @@ phy_RFSerialRead(
static void
phy_RFSerialWrite(
PADAPTER Adapter,
RF_RADIO_PATH_E eRFPath,
enum rf_radio_path eRFPath,
u32 Offset,
u32 Data
)
{
u32 DataAndAddr = 0;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
BB_REGISTER_DEFINITION_T *pPhyReg = &pHalData->PHYRegDef[eRFPath];
struct bb_reg_def *pPhyReg = &pHalData->PHYRegDef[eRFPath];
u32 NewOffset;
@ -500,7 +500,7 @@ phy_RFSerialWrite(
*
* Input:
* PADAPTER 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
* u4Byte RegAddr, The target address to be read
* u4Byte BitMask The target bit position in the target address
* to be read
@ -509,7 +509,7 @@ phy_RFSerialWrite(
* Return: u4Byte Readback value
* Note: This function is equal to "GetRFRegSetting" in PHY programming guide
*/
u32 rtl8188e_PHY_QueryRFReg(PADAPTER Adapter, RF_RADIO_PATH_E eRFPath,
u32 rtl8188e_PHY_QueryRFReg(PADAPTER Adapter, enum rf_radio_path eRFPath,
u32 RegAddr, u32 BitMask)
{
u32 Original_Value, Readback_Value, BitShift;
@ -532,7 +532,7 @@ u32 rtl8188e_PHY_QueryRFReg(PADAPTER Adapter, RF_RADIO_PATH_E eRFPath,
*
* Input:
* PADAPTER 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
* u4Byte RegAddr, The target address to be modified
* u4Byte BitMask The target bit position in the target address
* to be modified
@ -546,7 +546,7 @@ u32 rtl8188e_PHY_QueryRFReg(PADAPTER Adapter, RF_RADIO_PATH_E eRFPath,
void
rtl8188e_PHY_SetRFReg(
PADAPTER Adapter,
RF_RADIO_PATH_E eRFPath,
enum rf_radio_path eRFPath,
u32 RegAddr,
u32 BitMask,
u32 Data
@ -1022,7 +1022,7 @@ PHY_RFConfig8188E(
*
* Input: PADAPTER Adapter
* ps1Byte pFileName
* RF_RADIO_PATH_E eRFPath
* enum rf_radio_path eRFPath
*
* Output: NONE
*
@ -1034,13 +1034,13 @@ int
rtl8188e_PHY_ConfigRFWithParaFile(
PADAPTER Adapter,
u8* pFileName,
RF_RADIO_PATH_E eRFPath
enum rf_radio_path eRFPath
)
{
return _SUCCESS;
}
static int PHY_ConfigRFExternalPA(PADAPTER Adapter, RF_RADIO_PATH_E eRFPath)
static int PHY_ConfigRFExternalPA(PADAPTER Adapter, enum rf_radio_path eRFPath)
{
int rtStatus = _SUCCESS;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -1082,7 +1082,7 @@ rtl8192c_PHY_GetHWRegOriginalValue(
static u8
phy_DbmToTxPwrIdx(
PADAPTER Adapter,
WIRELESS_MODE WirelessMode,
enum wireless_mode WirelessMode,
int PowerInDbm
)
{
@ -1131,7 +1131,7 @@ phy_DbmToTxPwrIdx(
/* current wireless mode. */
/* By Bruce, 2008-01-29. */
/* */
static int phy_TxPwrIdxToDbm(PADAPTER Adapter, WIRELESS_MODE WirelessMode, u8 TxPwrIdx)
static int phy_TxPwrIdxToDbm(PADAPTER Adapter, enum wireless_mode WirelessMode, u8 TxPwrIdx)
{
int Offset = 0;
int PwrOutDbm = 0;
@ -1550,7 +1550,7 @@ static void _PHY_SwChnl8192C(PADAPTER Adapter, u8 channel)
param2 = channel;
for (eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++) {
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]);
}
}
@ -1618,16 +1618,16 @@ phy_SwChnlStepByStep(
static bool
phy_SetSwChnlCmdArray(
SwChnlCmd* CmdTable,
struct sw_chnl_cmd *CmdTable,
u32 CmdTableIdx,
u32 CmdTableSz,
SwChnlCmdID CmdID,
enum sw_chnl_cmd_id CmdID,
u32 Para1,
u32 Para2,
u32 msDelay
)
{
SwChnlCmd* pCmd;
struct sw_chnl_cmd *pCmd;
if (CmdTable == NULL)
return false;

4
hal/rtl8188e_rf6052.c
View file

@ -569,11 +569,9 @@ phy_RF6052_Config_ParaFile(
{
u32 u4RegValue;
u8 eRFPath;
BB_REGISTER_DEFINITION_T *pPhyReg;
struct bb_reg_def *pPhyReg;
int rtStatus = _SUCCESS;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
static char sz88eRadioAFile[] = RTL8188E_PHY_RADIO_A;
static char sz88eRadioBFile[] = RTL8188E_PHY_RADIO_B;

4
hal/usb_halinit.c
View file

@ -1341,8 +1341,8 @@ _func_enter_;
_InitHWLed(Adapter);
/* Keep RfRegChnlVal for later use. */
pHalData->RfRegChnlVal[0] = PHY_QueryRFReg(Adapter, (RF_RADIO_PATH_E)0, RF_CHNLBW, bRFRegOffsetMask);
pHalData->RfRegChnlVal[1] = PHY_QueryRFReg(Adapter, (RF_RADIO_PATH_E)1, RF_CHNLBW, bRFRegOffsetMask);
pHalData->RfRegChnlVal[0] = PHY_QueryRFReg(Adapter, (enum rf_radio_path)0, 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);
_BBTurnOnBlock(Adapter);