rtl8188eu: More Sparse fixes

There are only a few more left. Most are in the P2P code

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-01-29 21:41:53 -06:00
parent 481d6c817d
commit 5b8f5bc69d
22 changed files with 212 additions and 393 deletions

View file

@ -281,7 +281,7 @@ exit:
rtw_mfree2d((void *)eFuseWord, EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16));
}
void efuse_read_phymap_from_txpktbuf(
static void efuse_read_phymap_from_txpktbuf(
struct adapter *adapter,
int bcnhead, //beacon head, where FW store len(2-byte) and efuse physical map.
u8 *content, //buffer to store efuse physical map
@ -433,7 +433,7 @@ static s32 iol_ioconfig(
return rst;
}
int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms,u32 bndy_cnt)
static int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms,u32 bndy_cnt)
{
u32 start_time = rtw_get_current_time();
@ -704,7 +704,7 @@ exit:
return ret;
}
void _MCUIO_Reset88E(struct adapter *padapter,u8 bReset)
static void _MCUIO_Reset88E(struct adapter *padapter,u8 bReset)
{
u8 u1bTmp;
@ -1506,76 +1506,74 @@ rtl8188e_ReadEFuse(
}
//Do not support BT
void
Hal_EFUSEGetEfuseDefinition88E(
static void Hal_EFUSEGetEfuseDefinition88E(
IN struct adapter *pAdapter,
IN u8 efuseType,
IN u8 type,
OUT void * pOut
)
{
switch(type)
{
case TYPE_EFUSE_MAX_SECTION:
{
u8* pMax_section;
pMax_section = (u8*)pOut;
*pMax_section = EFUSE_MAX_SECTION_88E;
}
break;
case TYPE_EFUSE_REAL_CONTENT_LEN:
{
u16* pu2Tmp;
pu2Tmp = (u16*)pOut;
*pu2Tmp = EFUSE_REAL_CONTENT_LEN_88E;
}
break;
case TYPE_EFUSE_CONTENT_LEN_BANK:
{
u16* pu2Tmp;
pu2Tmp = (u16*)pOut;
*pu2Tmp = EFUSE_REAL_CONTENT_LEN_88E;
}
break;
case TYPE_AVAILABLE_EFUSE_BYTES_BANK:
{
u16* pu2Tmp;
pu2Tmp = (u16*)pOut;
*pu2Tmp = (u16)(EFUSE_REAL_CONTENT_LEN_88E-EFUSE_OOB_PROTECT_BYTES_88E);
}
break;
case TYPE_AVAILABLE_EFUSE_BYTES_TOTAL:
{
u16* pu2Tmp;
pu2Tmp = (u16*)pOut;
*pu2Tmp = (u16)(EFUSE_REAL_CONTENT_LEN_88E-EFUSE_OOB_PROTECT_BYTES_88E);
}
break;
case TYPE_EFUSE_MAP_LEN:
{
u16* pu2Tmp;
pu2Tmp = (u16*)pOut;
*pu2Tmp = (u16)EFUSE_MAP_LEN_88E;
}
break;
case TYPE_EFUSE_PROTECT_BYTES_BANK:
{
u8* pu1Tmp;
pu1Tmp = (u8*)pOut;
*pu1Tmp = (u8)(EFUSE_OOB_PROTECT_BYTES_88E);
}
break;
default:
{
u8* pu1Tmp;
pu1Tmp = (u8*)pOut;
*pu1Tmp = 0;
}
break;
switch(type) {
case TYPE_EFUSE_MAX_SECTION:
{
u8* pMax_section;
pMax_section = (u8*)pOut;
*pMax_section = EFUSE_MAX_SECTION_88E;
}
break;
case TYPE_EFUSE_REAL_CONTENT_LEN:
{
u16* pu2Tmp;
pu2Tmp = (u16*)pOut;
*pu2Tmp = EFUSE_REAL_CONTENT_LEN_88E;
}
break;
case TYPE_EFUSE_CONTENT_LEN_BANK:
{
u16* pu2Tmp;
pu2Tmp = (u16*)pOut;
*pu2Tmp = EFUSE_REAL_CONTENT_LEN_88E;
}
break;
case TYPE_AVAILABLE_EFUSE_BYTES_BANK:
{
u16* pu2Tmp;
pu2Tmp = (u16*)pOut;
*pu2Tmp = (u16)(EFUSE_REAL_CONTENT_LEN_88E-EFUSE_OOB_PROTECT_BYTES_88E);
}
break;
case TYPE_AVAILABLE_EFUSE_BYTES_TOTAL:
{
u16* pu2Tmp;
pu2Tmp = (u16*)pOut;
*pu2Tmp = (u16)(EFUSE_REAL_CONTENT_LEN_88E-EFUSE_OOB_PROTECT_BYTES_88E);
}
break;
case TYPE_EFUSE_MAP_LEN:
{
u16* pu2Tmp;
pu2Tmp = (u16*)pOut;
*pu2Tmp = (u16)EFUSE_MAP_LEN_88E;
}
break;
case TYPE_EFUSE_PROTECT_BYTES_BANK:
{
u8* pu1Tmp;
pu1Tmp = (u8*)pOut;
*pu1Tmp = (u8)(EFUSE_OOB_PROTECT_BYTES_88E);
}
break;
default:
{
u8* pu1Tmp;
pu1Tmp = (u8*)pOut;
*pu1Tmp = 0;
}
break;
}
}
void
Hal_EFUSEGetEfuseDefinition_Pseudo88E(
static void Hal_EFUSEGetEfuseDefinition_Pseudo88E(
IN struct adapter *pAdapter,
IN u8 efuseType,
IN u8 type,
@ -2669,7 +2667,8 @@ static void rtl8188e_read_chip_version(struct adapter *padapter)
{
ReadChipVersion8188E(padapter);
}
void rtl8188e_GetHalODMVar(
static void rtl8188e_GetHalODMVar(
struct adapter * Adapter,
HAL_ODM_VARIABLE eVariable,
void * pValue1,
@ -2684,7 +2683,8 @@ void rtl8188e_GetHalODMVar(
break;
}
}
void rtl8188e_SetHalODMVar(
static void rtl8188e_SetHalODMVar(
struct adapter * Adapter,
HAL_ODM_VARIABLE eVariable,
void * pValue1,
@ -2732,7 +2732,7 @@ void rtl8188e_stop_thread(struct adapter *padapter)
{
}
void hal_notch_filter_8188e(struct adapter *adapter, bool enable)
static void hal_notch_filter_8188e(struct adapter *adapter, bool enable)
{
if (enable) {
DBG_871X("Enable notch filter\n");
@ -2742,6 +2742,7 @@ void hal_notch_filter_8188e(struct adapter *adapter, bool enable)
rtw_write8(adapter, rOFDM0_RxDSP+1, rtw_read8(adapter, rOFDM0_RxDSP+1) & ~BIT1);
}
}
void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
{
pHalFunc->free_hal_data = &rtl8188e_free_hal_data;
@ -2825,7 +2826,7 @@ u8 GetEEPROMSize8188E(struct adapter *padapter)
// LLT R/W/Init function
//
//-------------------------------------------------------------------------
s32 _LLTWrite(struct adapter *padapter, u32 address, u32 data)
static s32 _LLTWrite(struct adapter *padapter, u32 address, u32 data)
{
s32 status = _SUCCESS;
s32 count = 0;
@ -2852,7 +2853,7 @@ s32 _LLTWrite(struct adapter *padapter, u32 address, u32 data)
return status;
}
u8 _LLTRead(struct adapter *padapter, u32 address)
static u8 _LLTRead(struct adapter *padapter, u32 address)
{
s32 count = 0;
u32 value = _LLT_INIT_ADDR(address) | _LLT_OP(_LLT_READ_ACCESS);

View file

@ -617,18 +617,9 @@ phy_RFSerialWrite(
* Return: u32 Readback value
* Note: This function is equal to "GetRFRegSetting" in PHY programming guide
*/
u32
rtl8188e_PHY_QueryRFReg(
IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath,
IN u32 RegAddr,
IN u32 BitMask
)
u32 rtl8188e_PHY_QueryRFReg(struct adapter *Adapter, RF_RADIO_PATH_E eRFPath, u32 RegAddr, u32 BitMask)
{
u32 Original_Value, Readback_Value, BitShift;
//HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
//u8 RFWaitCounter = 0;
//_irqL irqL;
#if (DISABLE_BB_RF == 1)
return 0;
@ -985,7 +976,7 @@ phy_ConfigBBWithParaFile(
//****************************************
// The following is for High Power PA
//****************************************
void
static void
phy_ConfigBBExternalPA(
IN struct adapter * Adapter
)
@ -1564,7 +1555,7 @@ rtl8188e_PHY_ConfigRFWithParaFile(
//****************************************
#define HighPowerRadioAArrayLen 22
//This is for High power PA
u32 Rtl8192S_HighPower_RadioA_Array[HighPowerRadioAArrayLen] = {
static u32 Rtl8192S_HighPower_RadioA_Array[HighPowerRadioAArrayLen] = {
0x013,0x00029ea4,
0x013,0x00025e74,
0x013,0x00020ea4,
@ -1578,7 +1569,7 @@ u32 Rtl8192S_HighPower_RadioA_Array[HighPowerRadioAArrayLen] = {
0x013,0x00000240,
};
int
static int
PHY_ConfigRFExternalPA(
IN struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath
@ -1794,7 +1785,7 @@ exit:
*
* Note: This function may be removed in the ASIC
*---------------------------------------------------------------------------*/
int
static int
PHY_CheckBBAndRFOK(
IN struct adapter * Adapter,
IN HW90_BLOCK_E CheckBlock,
@ -1957,7 +1948,7 @@ phy_DbmToTxPwrIdx(
// current wireless mode.
// By Bruce, 2008-01-29.
//
int
static int
phy_TxPwrIdxToDbm(
IN struct adapter * Adapter,
IN WIRELESS_MODE WirelessMode,
@ -2042,7 +2033,7 @@ PHY_GetTxPowerLevel8188E(
*powerlevel = TxPwrDbm;
}
void getTxPowerIndex88E(
static void getTxPowerIndex88E(
IN struct adapter * Adapter,
IN u8 channel,
IN OUT u8* cckPowerLevel,
@ -2140,7 +2131,7 @@ void getTxPowerIndex88E(
}
}
void phy_PowerIndexCheck88E(
static void phy_PowerIndexCheck88E(
IN struct adapter *Adapter,
IN u8 channel,
IN OUT u8 * cckPowerLevel,
@ -2263,7 +2254,7 @@ PHY_UpdateTxPowerDbm8188E(
*/
void
static void
rtl8192c_PHY_SetBeaconHwReg(
IN struct adapter * Adapter,
IN u16 BeaconInterval
@ -2535,8 +2526,7 @@ static void _PHY_SwChnl8192C(struct adapter *Adapter, u8 channel)
}
// <20130708, James> A workaround to eliminate the 2480MHz spur for 8188E I-Cut
void
phy_SpurCalibration_8188E(
static void phy_SpurCalibration_8188E(
IN struct adapter * Adapter
)
{
@ -2882,8 +2872,7 @@ _PHY_DumpRFReg(IN struct adapter *pAdapter)
// To dump all Tx FIFO LLT related link-list table.
// Added by Roger, 2009.03.10.
//
void
DumpBBDbgPort_92CU(
static void DumpBBDbgPort_92CU(
IN struct adapter * Adapter
)
{

View file

@ -285,7 +285,7 @@ rtl8188e_PHY_RF6052SetCckTxPower(
// powerbase0 for OFDM rates
// powerbase1 for HT MCS rates
void getPowerBase88E(
static void getPowerBase88E(
IN struct adapter *Adapter,
IN u8* pPowerLevelOFDM,
IN u8* pPowerLevelBW20,
@ -328,7 +328,7 @@ void getPowerBase88E(
}
}
void getTxPowerWriteValByRegulatory88E(
static void getTxPowerWriteValByRegulatory88E(
IN struct adapter *Adapter,
IN u8 Channel,
IN u8 index,
@ -814,7 +814,7 @@ PHY_RF6052_Config8188E(
* 11/20/2008 MHC Create Version 0.
*
*---------------------------------------------------------------------------*/
u32
static u32
PHY_RFShadowRead(
IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath,
@ -825,7 +825,7 @@ PHY_RFShadowRead(
} /* PHY_RFShadowRead */
void
static void
PHY_RFShadowWrite(
IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath,
@ -838,7 +838,7 @@ PHY_RFShadowWrite(
} /* PHY_RFShadowWrite */
BOOLEAN
static BOOLEAN
PHY_RFShadowCompare(
IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath,
@ -864,7 +864,7 @@ PHY_RFShadowCompare(
} /* PHY_RFShadowCompare */
void
static void
PHY_RFShadowRecorver(
IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath,
@ -887,7 +887,7 @@ PHY_RFShadowRecorver(
} /* PHY_RFShadowRecorver */
void
static void
PHY_RFShadowCompareAll(
IN struct adapter * Adapter)
{
@ -905,7 +905,7 @@ PHY_RFShadowCompareAll(
} /* PHY_RFShadowCompareAll */
void
static void
PHY_RFShadowRecorverAll(
IN struct adapter * Adapter)
{
@ -923,7 +923,7 @@ PHY_RFShadowRecorverAll(
} /* PHY_RFShadowRecorverAll */
void
static void
PHY_RFShadowCompareFlagSet(
IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath,
@ -936,7 +936,7 @@ PHY_RFShadowCompareFlagSet(
} /* PHY_RFShadowCompareFlagSet */
void
static void
PHY_RFShadowRecorverFlagSet(
IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath,
@ -949,7 +949,7 @@ PHY_RFShadowRecorverFlagSet(
} /* PHY_RFShadowRecorverFlagSet */
void
static void
PHY_RFShadowCompareFlagSetAll(
IN struct adapter * Adapter)
{
@ -971,7 +971,7 @@ PHY_RFShadowCompareFlagSetAll(
} /* PHY_RFShadowCompareFlagSetAll */
void
static void
PHY_RFShadowRecorverFlagSetAll(
IN struct adapter * Adapter)
{
@ -992,7 +992,7 @@ PHY_RFShadowRecorverFlagSetAll(
} /* PHY_RFShadowCompareFlagSetAll */
void
static void
PHY_RFShadowRefresh(
IN struct adapter * Adapter)
{

View file

@ -109,7 +109,7 @@ static BOOLEAN HalUsbSetQueuePipeMapping8188EUsb(
}
void rtl8188eu_interface_configure(struct adapter *padapter)
static void rtl8188eu_interface_configure(struct adapter *padapter)
{
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
@ -985,8 +985,7 @@ InitUsbAggregationSetting(
// 201/12/10 MH Add for USB agg mode dynamic switch.
pHalData->UsbRxHighSpeedMode = false;
}
void
HalRxAggr8188EUsb(
static void HalRxAggr8188EUsb(
IN struct adapter *Adapter,
IN BOOLEAN Value
)
@ -1012,8 +1011,7 @@ HalRxAggr8188EUsb(
* 12/10/2010 MHC Create Version 0.
*
*---------------------------------------------------------------------------*/
void
USB_AggModeSwitch(
static void USB_AggModeSwitch(
IN struct adapter * Adapter
)
{
@ -1235,7 +1233,7 @@ rt_rf_power_state RfOnOffDetect(IN struct adapter *pAdapter )
void _ps_open_RF(struct adapter *padapter);
u32 rtl8188eu_hal_init(struct adapter *Adapter)
static u32 rtl8188eu_hal_init(struct adapter *Adapter)
{
u8 value8 = 0;
u16 value16;
@ -1740,13 +1738,7 @@ void _ps_open_RF(struct adapter *padapter) {
//phy_SsPwrSwitch92CU(padapter, rf_on, 1);
}
void _ps_close_RF(struct adapter *padapter){
//here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified
//phy_SsPwrSwitch92CU(padapter, rf_off, 1);
}
void hal_poweroff_rtl8188eu(
static void hal_poweroff_rtl8188eu(
IN struct adapter * Adapter
)
{
@ -1836,7 +1828,7 @@ static void rtl8188eu_hw_power_down(struct adapter *padapter)
rtw_write16(padapter, REG_APS_FSMCO, 0x8812);
}
u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
static u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
{
struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(Adapter);
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -1851,7 +1843,6 @@ u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
DBG_8192C("bkeepfwalive(%x)\n", pwrctl->bkeepfwalive);
if(pwrctl->bkeepfwalive)
{
_ps_close_RF(Adapter);
if((pwrctl->bHWPwrPindetect) && (pwrctl->bHWPowerdown))
rtl8188eu_hw_power_down(Adapter);
}
@ -1870,7 +1861,7 @@ u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
}
unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)
static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)
{
u8 i;
struct recv_buf *precvbuf;
@ -1934,7 +1925,7 @@ exit:
}
unsigned int rtl8188eu_inirp_deinit(struct adapter *Adapter)
static unsigned int rtl8188eu_inirp_deinit(struct adapter *Adapter)
{
RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n ===> usb_rx_deinit \n"));
@ -2378,7 +2369,8 @@ static void ResumeTxBeacon(struct adapter *padapter)
pHalData->RegReg542 |= BIT0;
rtw_write8(padapter, REG_TBTT_PROHIBIT+2, pHalData->RegReg542);
}
void UpdateInterruptMask8188EU(struct adapter *padapter,u8 bHIMR0 ,u32 AddMSR, u32 RemoveMSR)
static void UpdateInterruptMask8188EU(struct adapter *padapter,u8 bHIMR0 ,u32 AddMSR, u32 RemoveMSR)
{
HAL_DATA_TYPE *pHalData;
@ -2995,7 +2987,7 @@ static void hw_var_set_mlme_join(struct adapter *Adapter, u8 variable, u8* val)
#endif
}
void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
{
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
@ -3838,7 +3830,7 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
;
}
void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
static void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
{
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
DM_ODM_T *podmpriv = &pHalData->odmpriv;
@ -3927,8 +3919,7 @@ void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
// Description:
// Query setting of specified variable.
//
u8
GetHalDefVar8188EUsb(
static u8 GetHalDefVar8188EUsb(
IN struct adapter * Adapter,
IN HAL_DEF_VARIABLE eVariable,
IN void * pValue
@ -4074,8 +4065,7 @@ GetHalDefVar8188EUsb(
// Description:
// Change default setting of specified variable.
//
u8
SetHalDefVar8188EUsb(
static u8 SetHalDefVar8188EUsb(
IN struct adapter * Adapter,
IN HAL_DEF_VARIABLE eVariable,
IN void * pValue
@ -4167,7 +4157,7 @@ u32 _update_92cu_basic_rate(struct adapter *padapter, unsigned int mask)
return BrateCfg;
}
*/
void _update_response_rate(struct adapter *padapter,unsigned int mask)
static void _update_response_rate(struct adapter *padapter,unsigned int mask)
{
u8 RateIndex = 0;
// Set RRSR rate table.
@ -4183,7 +4173,7 @@ void _update_response_rate(struct adapter *padapter,unsigned int mask)
rtw_write8(padapter, REG_INIRTS_RATE_SEL, RateIndex);
}
void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rssi_level)
static void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rssi_level)
{
//volatile unsigned int result;
u8 init_rate=0;