skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-25 14:03:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unused variables from hal files.

Browse source
This commit is contained in:
Álvaro Fernández Rojas 2013-09-27 21:41:36 +02:00
parent 3695d581c6
commit 9365e8f151
18 changed files with 14 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
hal/Hal8188ERateAdaptive.c
View file

@ -43,8 +43,6 @@ static u8 RETRY_PENALTY[PERENTRY][RETRYSIZE+1] = {
{49, 16, 16, 0, 0, 48} {49, 16, 16, 0, 0, 48}
}; /* 3, idx = 0x16 */ }; /* 3, idx = 0x16 */
static u8 RETRY_PENALTY_UP[RETRYSIZE+1] = {49, 44, 16, 16, 0, 48}; /* 12% for rate up */
static u8 PT_PENALTY[RETRYSIZE+1] = {34, 31, 30, 24, 0, 32}; static u8 PT_PENALTY[RETRYSIZE+1] = {34, 31, 30, 24, 0, 32};
/* wilson modify */ /* wilson modify */
@ -80,11 +78,6 @@ static u16 N_THRESHOLD_LOW[RATESIZE] = {
12, 18, 24, 36, 48, 72, 96, 108, 12, 18, 24, 36, 48, 72, 96, 108,
30, 40, 50, 80, 120, 200, 280, 320, 30, 40, 50, 80, 120, 200, 280, 320,
150, 160, 240, 360, 500, 600, 800, 1000}; 150, 160, 240, 360, 500, 600, 800, 1000};
static u8 TRYING_NECESSARY[RATESIZE] = {
2, 2, 2, 2,
2, 2, 3, 3, 4, 4, 5, 7,
4, 4, 7, 10, 10, 12, 12, 18,
5, 7, 7, 8, 11, 18, 36, 60}; /* 0329 1207 */
static u8 DROPING_NECESSARY[RATESIZE] = { static u8 DROPING_NECESSARY[RATESIZE] = {
1, 1, 1, 1, 1, 1, 1, 1,
@ -92,25 +85,6 @@ static u8 DROPING_NECESSARY[RATESIZE] = {
1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8,
5, 6, 7, 8, 9, 10, 11, 12}; 5, 6, 7, 8, 9, 10, 11, 12};
static u32 INIT_RATE_FALLBACK_TABLE[16] = {
0x0f8ff015, /* 0: 40M BGN mode */
0x0f8ff010, /* 1: 40M GN mode */
0x0f8ff005, /* 2: BN mode/ 40M BGN mode */
0x0f8ff000, /* 3: N mode */
0x00000ff5, /* 4: BG mode */
0x00000ff0, /* 5: G mode */
0x0000000d, /* 6: B mode */
0, /* 7: */
0, /* 8: */
0, /* 9: */
0, /* 10: */
0, /* 11: */
0, /* 12: */
0, /* 13: */
0, /* 14: */
0, /* 15: */
};
static u8 PendingForRateUpFail[5] = {2, 10, 24, 40, 60}; static u8 PendingForRateUpFail[5] = {2, 10, 24, 40, 60};
static u16 DynamicTxRPTTiming[6] = { static u16 DynamicTxRPTTiming[6] = {
0x186a, 0x30d4, 0x493e, 0x61a8, 0x7a12 , 0x927c}; /* 200ms-1200ms */ 0x186a, 0x30d4, 0x493e, 0x61a8, 0x7a12 , 0x927c}; /* 200ms-1200ms */

7
hal/HalHWImg8188E_BB.c
View file

@ -195,8 +195,6 @@ enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E(struct odm_dm_struct *dm_odm)
{ {
u32 hex = 0; u32 hex = 0;
u32 i = 0; u32 i = 0;
u16 count = 0;
u32 *ptr_array = NULL;
u8 platform = dm_odm->SupportPlatform; u8 platform = dm_odm->SupportPlatform;
u8 interfaceValue = dm_odm->SupportInterface; u8 interfaceValue = dm_odm->SupportInterface;
u8 board = dm_odm->BoardType; u8 board = dm_odm->BoardType;
@ -477,8 +475,6 @@ enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E(struct odm_dm_struct *dm_odm)
{ {
u32 hex = 0; u32 hex = 0;
u32 i = 0; u32 i = 0;
u16 count = 0;
u32 *ptr_array = NULL;
u8 platform = dm_odm->SupportPlatform; u8 platform = dm_odm->SupportPlatform;
u8 interfaceValue = dm_odm->SupportInterface; u8 interfaceValue = dm_odm->SupportInterface;
u8 board = dm_odm->BoardType; u8 board = dm_odm->BoardType;
@ -688,14 +684,11 @@ void ODM_ReadAndConfig_PHY_REG_PG_8188E(struct odm_dm_struct *dm_odm)
{ {
u32 hex; u32 hex;
u32 i = 0; u32 i = 0;
u16 count = 0;
u32 *ptr_array = NULL;
u8 platform = dm_odm->SupportPlatform; u8 platform = dm_odm->SupportPlatform;
u8 interfaceValue = dm_odm->SupportInterface; u8 interfaceValue = dm_odm->SupportInterface;
u8 board = dm_odm->BoardType; u8 board = dm_odm->BoardType;
u32 arraylen = sizeof(array_phy_reg_pg_8188e) / sizeof(u32); u32 arraylen = sizeof(array_phy_reg_pg_8188e) / sizeof(u32);
u32 *array = array_phy_reg_pg_8188e; u32 *array = array_phy_reg_pg_8188e;
bool biol = false;
hex = board + (interfaceValue << 8); hex = board + (interfaceValue << 8);
hex += (platform << 16) + 0xFF000000; hex += (platform << 16) + 0xFF000000;

2
hal/HalHWImg8188E_MAC.c
View file

@ -151,8 +151,6 @@ enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E(struct odm_dm_struct *dm_odm)
u32 hex = 0; u32 hex = 0;
u32 i; u32 i;
u16 count = 0;
u32 *ptr_array = NULL;
u8 platform = dm_odm->SupportPlatform; u8 platform = dm_odm->SupportPlatform;
u8 interface_val = dm_odm->SupportInterface; u8 interface_val = dm_odm->SupportInterface;
u8 board = dm_odm->BoardType; u8 board = dm_odm->BoardType;

2
hal/HalHWImg8188E_RF.c
View file

@ -163,8 +163,6 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm)
u32 hex = 0; u32 hex = 0;
u32 i = 0; u32 i = 0;
u16 count = 0;
u32 *ptr_array = NULL;
u8 platform = pDM_Odm->SupportPlatform; u8 platform = pDM_Odm->SupportPlatform;
u8 interfaceValue = pDM_Odm->SupportInterface; u8 interfaceValue = pDM_Odm->SupportInterface;
u8 board = pDM_Odm->BoardType; u8 board = pDM_Odm->BoardType;

1
hal/HalPhyRf_8188e.c
View file

@ -139,7 +139,6 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
s8 OFDM_index_old[2] = {0, 0}, CCK_index_old = 0; s8 OFDM_index_old[2] = {0, 0}, CCK_index_old = 0;
u32 i = 0, j = 0; u32 i = 0, j = 0;
bool is2t = false; bool is2t = false;
bool bInteralPA = false;
u8 OFDM_min_index = 6, rf; /* OFDM BB Swing should be less than +3.0dB, which is required by Arthur */ u8 OFDM_min_index = 6, rf; /* OFDM BB Swing should be less than +3.0dB, which is required by Arthur */
u8 Indexforchannel = 0/*GetRightChnlPlaceforIQK(pHalData->CurrentChannel)*/; u8 Indexforchannel = 0/*GetRightChnlPlaceforIQK(pHalData->CurrentChannel)*/;

21
hal/odm.c
View file

@ -646,7 +646,6 @@ void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI)
void odm_DIGbyRSSI_LPS(struct odm_dm_struct *pDM_Odm) void odm_DIGbyRSSI_LPS(struct odm_dm_struct *pDM_Odm)
{ {
struct adapter *pAdapter = pDM_Odm->Adapter; struct adapter *pAdapter = pDM_Odm->Adapter;
struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;
struct false_alarm_stats *pFalseAlmCnt = &pDM_Odm->FalseAlmCnt; struct false_alarm_stats *pFalseAlmCnt = &pDM_Odm->FalseAlmCnt;
u8 RSSI_Lower = DM_DIG_MIN_NIC; /* 0x1E or 0x1C */ u8 RSSI_Lower = DM_DIG_MIN_NIC; /* 0x1E or 0x1C */
@ -727,7 +726,6 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm)
{ {
struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable; struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;
struct false_alarm_stats *pFalseAlmCnt = &pDM_Odm->FalseAlmCnt; struct false_alarm_stats *pFalseAlmCnt = &pDM_Odm->FalseAlmCnt;
struct rx_hpc *pRX_HP_Table = &pDM_Odm->DM_RXHP_Table;
u8 DIG_Dynamic_MIN; u8 DIG_Dynamic_MIN;
u8 DIG_MaxOfMin; u8 DIG_MaxOfMin;
bool FirstConnect, FirstDisConnect; bool FirstConnect, FirstDisConnect;
@ -1070,7 +1068,6 @@ void odm_FalseAlarmCounterStatistics(struct odm_dm_struct *pDM_Odm)
void odm_CCKPacketDetectionThresh(struct odm_dm_struct *pDM_Odm) void odm_CCKPacketDetectionThresh(struct odm_dm_struct *pDM_Odm)
{ {
struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;
u8 CurCCK_CCAThres; u8 CurCCK_CCAThres;
struct false_alarm_stats *FalseAlmCnt = &(pDM_Odm->FalseAlmCnt); struct false_alarm_stats *FalseAlmCnt = &(pDM_Odm->FalseAlmCnt);
@ -1563,13 +1560,6 @@ static void odm_RSSIMonitorInit(struct odm_dm_struct *pDM_Odm)
void odm_RSSIMonitorCheck(struct odm_dm_struct *pDM_Odm) void odm_RSSIMonitorCheck(struct odm_dm_struct *pDM_Odm)
{ {
/* */
/* For AP/ADSL use struct rtl8192cd_priv * */
/* For CE/NIC use struct adapter * */
/* */
struct adapter *pAdapter = pDM_Odm->Adapter;
struct rtl8192cd_priv *priv = pDM_Odm->priv;
if (!(pDM_Odm->SupportAbility & ODM_BB_RSSI_MONITOR)) if (!(pDM_Odm->SupportAbility & ODM_BB_RSSI_MONITOR))
return; return;
@ -1632,7 +1622,6 @@ void odm_RSSIMonitorCheckCE(struct odm_dm_struct *pDM_Odm)
u8 sta_cnt = 0; u8 sta_cnt = 0;
u32 PWDB_rssi[NUM_STA] = {0};/* 0~15]:MACID, [16~31]:PWDB_rssi */ u32 PWDB_rssi[NUM_STA] = {0};/* 0~15]:MACID, [16~31]:PWDB_rssi */
struct sta_info *psta; struct sta_info *psta;
struct sta_priv *pstapriv = &Adapter->stapriv;
u8 bcast_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bcast_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
if (!check_fwstate(&Adapter->mlmepriv, _FW_LINKED)) if (!check_fwstate(&Adapter->mlmepriv, _FW_LINKED))
@ -1724,11 +1713,6 @@ void odm_TXPowerTrackingThermalMeterInit(struct odm_dm_struct *pDM_Odm)
void ODM_TXPowerTrackingCheck(struct odm_dm_struct *pDM_Odm) void ODM_TXPowerTrackingCheck(struct odm_dm_struct *pDM_Odm)
{ {
/* For AP/ADSL use struct rtl8192cd_priv * */
/* For CE/NIC use struct adapter * */
struct adapter *pAdapter = pDM_Odm->Adapter;
struct rtl8192cd_priv *priv = pDM_Odm->priv;
/* 2011/09/29 MH In HW integration first stage, we provide 4 different handle to operate */ /* 2011/09/29 MH In HW integration first stage, we provide 4 different handle to operate */
/* at the same time. In the stage2/3, we need to prive universal interface and merge all */ /* at the same time. In the stage2/3, we need to prive universal interface and merge all */
/* HW dynamic mechanism. */ /* HW dynamic mechanism. */
@ -2069,11 +2053,6 @@ void ODM_EdcaTurboInit(struct odm_dm_struct *pDM_Odm)
void odm_EdcaTurboCheck(struct odm_dm_struct *pDM_Odm) void odm_EdcaTurboCheck(struct odm_dm_struct *pDM_Odm)
{ {
/* For AP/ADSL use struct rtl8192cd_priv * */
/* For CE/NIC use struct adapter * */
struct adapter *pAdapter = pDM_Odm->Adapter;
struct rtl8192cd_priv *priv = pDM_Odm->priv;
/* 2011/09/29 MH In HW integration first stage, we provide 4 different handle to operate */ /* 2011/09/29 MH In HW integration first stage, we provide 4 different handle to operate */
/* at the same time. In the stage2/3, we need to prive universal interface and merge all */ /* at the same time. In the stage2/3, we need to prive universal interface and merge all */
/* HW dynamic mechanism. */ /* HW dynamic mechanism. */

5
hal/odm_RTL8188E.c
View file

@ -35,7 +35,6 @@ void ODM_DIG_LowerBound_88E(struct odm_dm_struct *dm_odm)
static void odm_RX_HWAntDivInit(struct odm_dm_struct *dm_odm) static void odm_RX_HWAntDivInit(struct odm_dm_struct *dm_odm)
{ {
u32 value32; u32 value32;
struct adapter *Adapter = dm_odm->Adapter;
if (*(dm_odm->mp_mode) == 1) { if (*(dm_odm->mp_mode) == 1) {
dm_odm->AntDivType = CGCS_RX_SW_ANTDIV; dm_odm->AntDivType = CGCS_RX_SW_ANTDIV;
@ -65,7 +64,6 @@ static void odm_RX_HWAntDivInit(struct odm_dm_struct *dm_odm)
static void odm_TRX_HWAntDivInit(struct odm_dm_struct *dm_odm) static void odm_TRX_HWAntDivInit(struct odm_dm_struct *dm_odm)
{ {
u32 value32; u32 value32;
struct adapter *Adapter = dm_odm->Adapter;
if (*(dm_odm->mp_mode) == 1) { if (*(dm_odm->mp_mode) == 1) {
dm_odm->AntDivType = CGCS_RX_SW_ANTDIV; dm_odm->AntDivType = CGCS_RX_SW_ANTDIV;
@ -106,7 +104,6 @@ static void odm_FastAntTrainingInit(struct odm_dm_struct *dm_odm)
u32 value32, i; u32 value32, i;
struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable; struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable;
u32 AntCombination = 2; u32 AntCombination = 2;
struct adapter *Adapter = dm_odm->Adapter;
ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_FastAntTrainingInit()\n")); ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_FastAntTrainingInit()\n"));
@ -289,8 +286,6 @@ static void odm_HWAntDiv(struct odm_dm_struct *dm_odm)
u8 RxIdleAnt = 0, TargetAnt = 7; u8 RxIdleAnt = 0, TargetAnt = 7;
struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable; struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable;
struct rtw_dig *pDM_DigTable = &dm_odm->DM_DigTable; struct rtw_dig *pDM_DigTable = &dm_odm->DM_DigTable;
bool bMatchBSSID;
bool bPktFilterMacth = false;
struct sta_info *pEntry; struct sta_info *pEntry;
for (i = 0; i < ODM_ASSOCIATE_ENTRY_NUM; i++) { for (i = 0; i < ODM_ASSOCIATE_ENTRY_NUM; i++) {

5
hal/rtl8188e_cmd.c
View file

@ -362,7 +362,6 @@ static void ConstructPSPoll(struct adapter *adapt, u8 *pframe, u32 *pLength)
{ {
struct rtw_ieee80211_hdr *pwlanhdr; struct rtw_ieee80211_hdr *pwlanhdr;
u16 *fctrl; u16 *fctrl;
u32 pktlen;
struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -513,7 +512,7 @@ static void SetFwRsvdPagePkt(struct adapter *adapt, bool bDLFinished)
struct mlme_ext_priv *pmlmeext; struct mlme_ext_priv *pmlmeext;
struct mlme_ext_info *pmlmeinfo; struct mlme_ext_info *pmlmeinfo;
u32 BeaconLength, ProbeRspLength, PSPollLength; u32 BeaconLength, ProbeRspLength, PSPollLength;
u32 NullDataLength, QosNullLength, BTQosNullLength; u32 NullDataLength, QosNullLength;
u8 *ReservedPagePacket; u8 *ReservedPagePacket;
u8 PageNum, PageNeed, TxDescLen; u8 PageNum, PageNeed, TxDescLen;
u16 BufIndex; u16 BufIndex;
@ -613,7 +612,6 @@ exit:
void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus) void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)
{ {
struct joinbssrpt_parm JoinBssRptParm;
struct hal_data_8188e *haldata = GET_HAL_DATA(adapt); struct hal_data_8188e *haldata = GET_HAL_DATA(adapt);
struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -722,7 +720,6 @@ _func_exit_;
void rtl8188e_set_p2p_ps_offload_cmd(struct adapter *adapt, u8 p2p_ps_state) void rtl8188e_set_p2p_ps_offload_cmd(struct adapter *adapt, u8 p2p_ps_state)
{ {
struct hal_data_8188e *haldata = GET_HAL_DATA(adapt); struct hal_data_8188e *haldata = GET_HAL_DATA(adapt);
struct pwrctrl_priv *pwrpriv = &adapt->pwrctrlpriv;
struct wifidirect_info *pwdinfo = &(adapt->wdinfo); struct wifidirect_info *pwdinfo = &(adapt->wdinfo);
struct P2P_PS_Offload_t *p2p_ps_offload = &haldata->p2p_ps_offload; struct P2P_PS_Offload_t *p2p_ps_offload = &haldata->p2p_ps_offload;
u8 i; u8 i;

5
hal/rtl8188e_dm.c
View file

@ -86,7 +86,9 @@ static void dm_CheckPbcGPIO(struct adapter *padapter)
/* */ /* */
static void dm_InitGPIOSetting(struct adapter *Adapter) static void dm_InitGPIOSetting(struct adapter *Adapter)
{ {
#ifdef CONFIG_BT_COEXIST
struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter); struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter);
#endif
u8 tmp1byte; u8 tmp1byte;
tmp1byte = rtw_read8(Adapter, REG_GPIO_MUXCFG); tmp1byte = rtw_read8(Adapter, REG_GPIO_MUXCFG);
@ -204,7 +206,6 @@ void rtl8188e_InitHalDm(struct adapter *Adapter)
struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter); struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &hal_data->dmpriv; struct dm_priv *pdmpriv = &hal_data->dmpriv;
struct odm_dm_struct *dm_odm = &(hal_data->odmpriv); struct odm_dm_struct *dm_odm = &(hal_data->odmpriv);
u8 i;
dm_InitGPIOSetting(Adapter); dm_InitGPIOSetting(Adapter);
pdmpriv->DM_Type = DM_Type_ByDriver; pdmpriv->DM_Type = DM_Type_ByDriver;
@ -220,8 +221,6 @@ void rtl8188e_HalDmWatchDog(struct adapter *Adapter)
bool fw_ps_awake = true; bool fw_ps_awake = true;
u8 hw_init_completed = false; u8 hw_init_completed = false;
struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter); struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &hal_data->dmpriv;
struct odm_dm_struct *dm_odm = &(hal_data->odmpriv);
_func_enter_; _func_enter_;
hw_init_completed = Adapter->hw_init_completed; hw_init_completed = Adapter->hw_init_completed;

31
hal/rtl8188e_hal_init.c
View file

@ -52,7 +52,7 @@ static void iol_mode_enable(struct adapter *padapter, u8 enable)
static s32 iol_execute(struct adapter *padapter, u8 control) static s32 iol_execute(struct adapter *padapter, u8 control)
{ {
s32 status = _FAIL; s32 status = _FAIL;
u8 reg_0x88 = 0, reg_1c7 = 0; u8 reg_0x88 = 0;
u32 start = 0, passing_time = 0; u32 start = 0, passing_time = 0;
control = control&0x0f; control = control&0x0f;
@ -218,7 +218,6 @@ static void efuse_read_phymap_from_txpktbuf(
u16 dbg_addr = 0; u16 dbg_addr = 0;
u32 start = 0, passing_time = 0; u32 start = 0, passing_time = 0;
u8 reg_0x143 = 0; u8 reg_0x143 = 0;
u8 reg_0x106 = 0;
u32 lo32 = 0, hi32 = 0; u32 lo32 = 0, hi32 = 0;
u16 len = 0, count = 0; u16 len = 0, count = 0;
int i = 0; int i = 0;
@ -293,10 +292,8 @@ static void efuse_read_phymap_from_txpktbuf(
static s32 iol_read_efuse(struct adapter *padapter, u8 txpktbuf_bndy, u16 offset, u16 size_byte, u8 *logical_map) static s32 iol_read_efuse(struct adapter *padapter, u8 txpktbuf_bndy, u16 offset, u16 size_byte, u8 *logical_map)
{ {
s32 status = _FAIL; s32 status = _FAIL;
u8 reg_0x106 = 0;
u8 physical_map[512]; u8 physical_map[512];
u16 size = 512; u16 size = 512;
int i;
rtw_write8(padapter, REG_TDECTRL+1, txpktbuf_bndy); rtw_write8(padapter, REG_TDECTRL+1, txpktbuf_bndy);
_rtw_memset(physical_map, 0xFF, 512); _rtw_memset(physical_map, 0xFF, 512);
@ -335,9 +332,7 @@ static s32 iol_ioconfig(struct adapter *padapter, u8 iocfg_bndy)
static 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(); u8 i;
u32 passing_time_ms;
u8 polling_ret, i;
int ret = _FAIL; int ret = _FAIL;
struct pkt_attrib *pattrib = &xmit_frame->attrib; struct pkt_attrib *pattrib = &xmit_frame->attrib;
@ -566,7 +561,6 @@ static s32 _FWFreeToGo(struct adapter *padapter)
{ {
u32 counter = 0; u32 counter = 0;
u32 value32; u32 value32;
u8 value8;
/* polling CheckSum report */ /* polling CheckSum report */
do { do {
@ -623,12 +617,10 @@ s32 rtl8188e_FirmwareDownload(struct adapter *padapter)
u8 *FwImage; u8 *FwImage;
u32 FwImageLen; u32 FwImageLen;
u8 *pFwImageFileName;
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
u8 *FwImageWoWLAN; u8 *FwImageWoWLAN;
u32 FwImageWoWLANLen; u32 FwImageWoWLANLen;
#endif #endif
u8 *pucMappedFile = NULL;
struct rt_firmware *pFirmware = NULL; struct rt_firmware *pFirmware = NULL;
struct rt_firmware_hdr *pFwHdr = NULL; struct rt_firmware_hdr *pFwHdr = NULL;
u8 *pFirmwareBuf; u8 *pFirmwareBuf;
@ -1573,7 +1565,7 @@ static bool hal_EfuseFixHeaderProcess(struct adapter *pAdapter, u8 efuseType, st
static bool hal_EfusePgPacketWrite2ByteHeader(struct adapter *pAdapter, u8 efuseType, u16 *pAddr, struct pgpkt *pTargetPkt, bool bPseudoTest) static bool hal_EfusePgPacketWrite2ByteHeader(struct adapter *pAdapter, u8 efuseType, u16 *pAddr, struct pgpkt *pTargetPkt, bool bPseudoTest)
{ {
bool bRet = false, bContinual = true; bool bRet = false;
u16 efuse_addr = *pAddr, efuse_max_available_len = 0; u16 efuse_addr = *pAddr, efuse_max_available_len = 0;
u8 pg_header = 0, tmp_header = 0, pg_header_temp = 0; u8 pg_header = 0, tmp_header = 0, pg_header_temp = 0;
u8 repeatcnt = 0; u8 repeatcnt = 0;
@ -1719,7 +1711,6 @@ wordEnMatched(
) )
{ {
u8 match_word_en = 0x0F; /* default all words are disabled */ u8 match_word_en = 0x0F; /* default all words are disabled */
u8 i;
/* check if the same words are enabled both target and current PG packet */ /* check if the same words are enabled both target and current PG packet */
if (((pTargetPkt->word_en & BIT0) == 0) && if (((pTargetPkt->word_en & BIT0) == 0) &&
@ -1759,7 +1750,7 @@ static bool hal_EfusePartialWriteCheck(struct adapter *pAdapter, u8 efuseType, u
{ {
bool bRet = false; bool bRet = false;
u8 i, efuse_data = 0, cur_header = 0; u8 i, efuse_data = 0, cur_header = 0;
u8 new_wden = 0, matched_wden = 0, badworden = 0; u8 matched_wden = 0, badworden = 0;
u16 startAddr = 0, efuse_max_available_len = 0, efuse_max = 0; u16 startAddr = 0, efuse_max_available_len = 0, efuse_max = 0;
struct pgpkt curPkt; struct pgpkt curPkt;
@ -1990,8 +1981,6 @@ static void rtl8188e_read_chip_version(struct adapter *padapter)
static void rtl8188e_GetHalODMVar(struct adapter *Adapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet) static void rtl8188e_GetHalODMVar(struct adapter *Adapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
struct odm_dm_struct *podmpriv = &pHalData->odmpriv;
switch (eVariable) { switch (eVariable) {
case HAL_ODM_STA_INFO: case HAL_ODM_STA_INFO:
break; break;
@ -2150,7 +2139,6 @@ s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy)
s32 status = _FAIL; s32 status = _FAIL;
u32 i; u32 i;
u32 Last_Entry_Of_TxPktBuf = LAST_ENTRY_OF_TX_PKT_BUFFER;/* 176, 22k */ u32 Last_Entry_Of_TxPktBuf = LAST_ENTRY_OF_TX_PKT_BUFFER;/* 176, 22k */
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
if (rtw_IOL_applied(padapter)) { if (rtw_IOL_applied(padapter)) {
status = iol_InitLLTTable(padapter, txpktbuf_bndy); status = iol_InitLLTTable(padapter, txpktbuf_bndy);
@ -2189,8 +2177,6 @@ void
Hal_InitPGData88E(struct adapter *padapter) Hal_InitPGData88E(struct adapter *padapter)
{ {
struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
u32 i;
u16 value16;
if (!pEEPROM->bautoload_fail_flag) { /* autoload OK. */ if (!pEEPROM->bautoload_fail_flag) { /* autoload OK. */
if (!is_boot_from_eeprom(padapter)) { if (!is_boot_from_eeprom(padapter)) {
@ -2419,10 +2405,6 @@ static u8 Hal_GetChnlGroup88E(u8 chnl, u8 *pGroup)
void Hal_ReadPowerSavingMode88E(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail) void Hal_ReadPowerSavingMode88E(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
u8 tmpvalue;
if (AutoLoadFail) { if (AutoLoadFail) {
padapter->pwrctrlpriv.bHWPowerdown = false; padapter->pwrctrlpriv.bHWPowerdown = false;
padapter->pwrctrlpriv.bSupportRemoteWakeup = false; padapter->pwrctrlpriv.bSupportRemoteWakeup = false;
@ -2449,8 +2431,8 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct txpowerinfo24g pwrInfo24G; struct txpowerinfo24g pwrInfo24G;
u8 rfPath, ch, group, rfPathMax = 1; u8 rfPath, ch, group;
u8 pwr, diff, bIn24G, TxCount; u8 bIn24G, TxCount;
Hal_ReadPowerValueFromPROM_8188E(&pwrInfo24G, PROMContent, AutoLoadFail); Hal_ReadPowerValueFromPROM_8188E(&pwrInfo24G, PROMContent, AutoLoadFail);
@ -2598,7 +2580,6 @@ void Hal_ReadAntennaDiversity88E(struct adapter *pAdapter, u8 *PROMContent, bool
void Hal_ReadThermalMeter_88E(struct adapter *Adapter, u8 *PROMContent, bool AutoloadFail) void Hal_ReadThermalMeter_88E(struct adapter *Adapter, u8 *PROMContent, bool AutoloadFail)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
u8 tempval;
/* ThermalMeter from EEPROM */ /* ThermalMeter from EEPROM */
if (!AutoloadFail) if (!AutoloadFail)

22
hal/rtl8188e_mp.c
View file

@ -28,7 +28,6 @@ s32 Hal_SetPowerTracking(struct adapter *padapter, u8 enable)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv); struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv);
@ -56,7 +55,6 @@ void Hal_GetPowerTracking(struct adapter *padapter, u8 *enable)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv); struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv);
@ -68,7 +66,6 @@ static void Hal_disable_dm(struct adapter *padapter)
u8 v8; u8 v8;
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv); struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv);
@ -110,10 +107,6 @@ void Hal_mpt_SwitchRfSetting(struct adapter *pAdapter)
{ {
/* struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); */ /* struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); */
struct mp_priv *pmp = &pAdapter->mppriv; struct mp_priv *pmp = &pAdapter->mppriv;
u8 ChannelToSw = pmp->channel;
u32 ulRateIdx = pmp->rateidx;
u32 ulbandwidth = pmp->bandwidth;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
/* <20120525, Kordan> Dynamic mechanism for APK, asked by Dennis. */ /* <20120525, Kordan> Dynamic mechanism for APK, asked by Dennis. */
pmp->MptCtx.backup0x52_RF_A = (u8)PHY_QueryRFReg(pAdapter, RF_PATH_A, RF_0x52, 0x000F0); pmp->MptCtx.backup0x52_RF_A = (u8)PHY_QueryRFReg(pAdapter, RF_PATH_A, RF_0x52, 0x000F0);
@ -131,7 +124,6 @@ void Hal_MPT_CCKTxPowerAdjust(struct adapter *Adapter, bool bInCH14)
u32 TempVal = 0, TempVal2 = 0, TempVal3 = 0; u32 TempVal = 0, TempVal2 = 0, TempVal3 = 0;
u32 CurrCCKSwingVal = 0, CCKSwingIndex = 12; u32 CurrCCKSwingVal = 0, CCKSwingIndex = 12;
u8 i; u8 i;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
/* get current cck swing value and check 0xa22 & 0xa23 later to match the table. */ /* get current cck swing value and check 0xa22 & 0xa23 later to match the table. */
CurrCCKSwingVal = read_bbreg(Adapter, rCCK0_TxFilter1, bMaskHWord); CurrCCKSwingVal = read_bbreg(Adapter, rCCK0_TxFilter1, bMaskHWord);
@ -199,12 +191,10 @@ void Hal_MPT_CCKTxPowerAdjustbyIndex(struct adapter *pAdapter, bool beven)
s32 TempCCk; s32 TempCCk;
u8 CCK_index, CCK_index_old; u8 CCK_index, CCK_index_old;
u8 Action = 0; /* 0: no action, 1: even->odd, 2:odd->even */ u8 Action = 0; /* 0: no action, 1: even->odd, 2:odd->even */
u8 TimeOut = 100;
s32 i = 0; s32 i = 0;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
struct mpt_context *pMptCtx = &pAdapter->mppriv.MptCtx; struct mpt_context *pMptCtx = &pAdapter->mppriv.MptCtx;
struct dm_priv *pdmpriv = &pHalData->dmpriv;
struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv); struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv);
@ -278,12 +268,9 @@ void Hal_SetChannel(struct adapter *pAdapter)
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
struct mp_priv *pmp = &pAdapter->mppriv; struct mp_priv *pmp = &pAdapter->mppriv;
struct dm_priv *pdmpriv = &pHalData->dmpriv;
struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv); struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv);
u8 channel = pmp->channel; u8 channel = pmp->channel;
u8 bandwidth = pmp->bandwidth;
u8 rate = pmp->rateidx;
/* set RF channel register */ /* set RF channel register */
@ -343,9 +330,6 @@ void Hal_SetOFDMTxPower(struct adapter *pAdapter, u8 *TxPower)
{ {
u32 TxAGC = 0; u32 TxAGC = 0;
u8 tmpval = 0; u8 tmpval = 0;
struct mpt_context *pMptCtx = &pAdapter->mppriv.MptCtx;
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
/* HT Tx-rf(A) */ /* HT Tx-rf(A) */
tmpval = TxPower[RF_PATH_A]; tmpval = TxPower[RF_PATH_A];
@ -458,7 +442,7 @@ void Hal_SetAntenna(struct adapter *pAdapter)
struct ant_sel_cck *p_cck_txrx; struct ant_sel_cck *p_cck_txrx;
u8 r_rx_antenna_ofdm = 0, r_ant_select_cck_val = 0; u8 r_rx_antenna_ofdm = 0, r_ant_select_cck_val = 0;
u8 chgTx = 0, chgRx = 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; u32 r_ant_select_ofdm_val = 0, r_ofdm_tx_en_val = 0;
p_ofdm_tx = (struct ant_sel_ofdm *)&r_ant_select_ofdm_val; p_ofdm_tx = (struct ant_sel_ofdm *)&r_ant_select_ofdm_val;
@ -641,8 +625,6 @@ void Hal_GetThermalMeter(struct adapter *pAdapter, u8 *value)
void Hal_SetSingleCarrierTx(struct adapter *pAdapter, u8 bStart) void Hal_SetSingleCarrierTx(struct adapter *pAdapter, u8 bStart)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
pAdapter->mppriv.MptCtx.bSingleCarrier = bStart; pAdapter->mppriv.MptCtx.bSingleCarrier = bStart;
if (bStart) { if (bStart) {
/* Start Single Carrier. */ /* Start Single Carrier. */
@ -862,8 +844,6 @@ void Hal_SetCCKContinuousTx(struct adapter *pAdapter, u8 bStart)
void Hal_SetOFDMContinuousTx(struct adapter *pAdapter, u8 bStart) void Hal_SetOFDMContinuousTx(struct adapter *pAdapter, u8 bStart)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
if (bStart) { if (bStart) {
RT_TRACE(_module_mp_, _drv_info_, ("SetOFDMContinuousTx: test start\n")); RT_TRACE(_module_mp_, _drv_info_, ("SetOFDMContinuousTx: test start\n"));
/* 1. if OFDM block on? */ /* 1. if OFDM block on? */

17
hal/rtl8188e_phycfg.c
View file

@ -93,7 +93,6 @@ rtl8188e_PHY_QueryBBReg(
) )
{ {
u32 ReturnValue = 0, OriginalValue, BitShift; u32 ReturnValue = 0, OriginalValue, BitShift;
u16 BBWaitCounter = 0;
OriginalValue = rtw_read32(Adapter, RegAddr); OriginalValue = rtw_read32(Adapter, RegAddr);
BitShift = phy_CalculateBitShift(BitMask); BitShift = phy_CalculateBitShift(BitMask);
@ -122,7 +121,6 @@ rtl8188e_PHY_QueryBBReg(
void rtl8188e_PHY_SetBBReg(struct adapter *Adapter, u32 RegAddr, u32 BitMask, u32 Data) void rtl8188e_PHY_SetBBReg(struct adapter *Adapter, u32 RegAddr, u32 BitMask, u32 Data)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
u32 OriginalValue, BitShift; u32 OriginalValue, BitShift;
if (BitMask != bMaskDWord) { /* if not "double word" write */ if (BitMask != bMaskDWord) { /* if not "double word" write */
@ -378,8 +376,6 @@ rtl8188e_PHY_SetRFReg(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static int phy_ConfigMACWithParaFile(struct adapter *Adapter, u8 *pFileName) static int phy_ConfigMACWithParaFile(struct adapter *Adapter, u8 *pFileName)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
int rtStatus = _FAIL; int rtStatus = _FAIL;
return rtStatus; return rtStatus;
@ -405,7 +401,6 @@ s32 PHY_MACConfig8188E(struct adapter *Adapter)
{ {
int rtStatus = _SUCCESS; int rtStatus = _SUCCESS;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
s8 sz8188EMACRegFile[] = RTL8188E_PHY_MACREG;
/* */ /* */
/* Config MAC */ /* Config MAC */
@ -665,11 +660,6 @@ phy_BB8188E_Config_ParaFile(
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
int rtStatus = _SUCCESS; int rtStatus = _SUCCESS;
u8 sz8188EBBRegFile[] = RTL8188E_PHY_REG;
u8 sz8188EAGCTableFile[] = RTL8188E_AGC_TAB;
u8 sz8188EBBRegPgFile[] = RTL8188E_PHY_REG_PG;
u8 sz8188EBBRegMpFile[] = RTL8188E_PHY_REG_MP;
/* */ /* */
/* 1. Read PHY_REG.TXT BB INIT!! */ /* 1. Read PHY_REG.TXT BB INIT!! */
/* We will seperate as 88C / 92C according to chip version */ /* We will seperate as 88C / 92C according to chip version */
@ -710,8 +700,7 @@ PHY_BBConfig8188E(
int rtStatus = _SUCCESS; int rtStatus = _SUCCESS;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
u32 RegVal; u32 RegVal;
u8 TmpU1B = 0; u8 CrystalCap;
u8 value8, CrystalCap;
phy_InitBBRFRegisterDefinition(Adapter); phy_InitBBRFRegisterDefinition(Adapter);
@ -738,7 +727,6 @@ PHY_BBConfig8188E(
int PHY_RFConfig8188E(struct adapter *Adapter) int PHY_RFConfig8188E(struct adapter *Adapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
int rtStatus = _SUCCESS; int rtStatus = _SUCCESS;
/* RF config */ /* RF config */
@ -1024,11 +1012,8 @@ PHY_SetTxPowerLevel8188E(
u8 channel u8 channel
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
u8 cckPowerLevel[MAX_TX_COUNT], ofdmPowerLevel[MAX_TX_COUNT];/* [0]:RF-A, [1]:RF-B */ u8 cckPowerLevel[MAX_TX_COUNT], ofdmPowerLevel[MAX_TX_COUNT];/* [0]:RF-A, [1]:RF-B */
u8 BW20PowerLevel[MAX_TX_COUNT], BW40PowerLevel[MAX_TX_COUNT]; u8 BW20PowerLevel[MAX_TX_COUNT], BW40PowerLevel[MAX_TX_COUNT];
u8 i = 0;
getTxPowerIndex88E(Adapter, channel, &cckPowerLevel[0], &ofdmPowerLevel[0], &BW20PowerLevel[0], &BW40PowerLevel[0]); getTxPowerIndex88E(Adapter, channel, &cckPowerLevel[0], &ofdmPowerLevel[0], &BW20PowerLevel[0], &BW40PowerLevel[0]);

32
hal/rtl8188e_rf6052.c
View file

@ -46,33 +46,6 @@
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>
/*---------------------------Define Local Constant---------------------------*/
/* Define local structure for debug!!!!! */
struct rf_shadow {
/* Shadow register value */
u32 Value;
/* Compare or not flag */
u8 Compare;
/* Record If it had ever modified unpredicted */
u8 ErrorOrNot;
/* Recorver Flag */
u8 Recorver;
/* */
u8 Driver_Write;
};
/*---------------------------Define Local Constant---------------------------*/
/*------------------------Define global variable-----------------------------*/
/*------------------------Define global variable-----------------------------*/
/*------------------------Define local variable------------------------------*/
/* 2008/11/20 MH For Debug only, RF */
static struct rf_shadow RF_Shadow[RF6052_MAX_PATH][RF6052_MAX_REG];
/*------------------------Define local variable------------------------------*/
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
* Function: RF_ChangeTxPath * Function: RF_ChangeTxPath
@ -153,7 +126,6 @@ rtl8188e_PHY_RF6052SetCckTxPower(
u8 *pPowerlevel) u8 *pPowerlevel)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
u32 TxAGC[2] = {0, 0}, tmpval = 0, pwrtrac_value; u32 TxAGC[2] = {0, 0}, tmpval = 0, pwrtrac_value;
@ -254,8 +226,6 @@ static void getpowerbase88e(struct adapter *Adapter, u8 *pPowerLevelOFDM,
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
u32 powerBase0, powerBase1; u32 powerBase0, powerBase1;
u8 Legacy_pwrdiff = 0;
s8 HT20_pwrdiff = 0;
u8 i, powerlevel[2]; u8 i, powerlevel[2];
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
@ -491,8 +461,6 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter)
struct bb_reg_def *pPhyReg; struct bb_reg_def *pPhyReg;
int rtStatus = _SUCCESS; int rtStatus = _SUCCESS;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
static char sz88eRadioAFile[] = RTL8188E_PHY_RADIO_A;
static char sz88eRadioBFile[] = RTL8188E_PHY_RADIO_B;
/* 3----------------------------------------------------------------- */ /* 3----------------------------------------------------------------- */
/* 3 <2> Initialize RF */ /* 3 <2> Initialize RF */

2
hal/rtl8188e_rxdesc.c
View file

@ -36,7 +36,6 @@ static s32 translate2dbm(u8 signal_strength_idx)
static void process_rssi(struct adapter *padapter, union recv_frame *prframe) static void process_rssi(struct adapter *padapter, union recv_frame *prframe)
{ {
u32 last_rssi, tmp_val;
struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
struct signal_stat *signal_stat = &padapter->recvpriv.signal_strength_data; struct signal_stat *signal_stat = &padapter->recvpriv.signal_strength_data;
@ -53,7 +52,6 @@ static void process_rssi(struct adapter *padapter, union recv_frame *prframe)
static void process_link_qual(struct adapter *padapter, union recv_frame *prframe) static void process_link_qual(struct adapter *padapter, union recv_frame *prframe)
{ {
u32 last_evm = 0, tmpVal;
struct rx_pkt_attrib *pattrib; struct rx_pkt_attrib *pattrib;
struct signal_stat *signal_stat; struct signal_stat *signal_stat;

3
hal/rtl8188e_sreset.c
View file

@ -58,11 +58,8 @@ static void _restore_security_setting(struct adapter *padapter)
static void _restore_network_status(struct adapter *padapter) static void _restore_network_status(struct adapter *padapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network));
unsigned short caps;
u8 join_type; u8 join_type;
/* */ /* */

6
hal/rtl8188eu_xmit.c
View file

@ -28,7 +28,6 @@
s32 rtl8188eu_init_xmit_priv(struct adapter *adapt) s32 rtl8188eu_init_xmit_priv(struct adapter *adapt)
{ {
struct xmit_priv *pxmitpriv = &adapt->xmitpriv; struct xmit_priv *pxmitpriv = &adapt->xmitpriv;
struct hal_data_8188e *haldata = GET_HAL_DATA(adapt);
tasklet_init(&pxmitpriv->xmit_tasklet, tasklet_init(&pxmitpriv->xmit_tasklet,
(void(*)(unsigned long))rtl8188eu_xmit_tasklet, (void(*)(unsigned long))rtl8188eu_xmit_tasklet,
@ -183,7 +182,6 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag
uint qsel; uint qsel;
u8 data_rate, pwr_status, offset; u8 data_rate, pwr_status, offset;
struct adapter *adapt = pxmitframe->padapter; struct adapter *adapt = pxmitframe->padapter;
struct mlme_priv *pmlmepriv = &adapt->mlmepriv;
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
struct hal_data_8188e *haldata = GET_HAL_DATA(adapt); struct hal_data_8188e *haldata = GET_HAL_DATA(adapt);
struct tx_desc *ptxdesc = (struct tx_desc *)pmem; struct tx_desc *ptxdesc = (struct tx_desc *)pmem;
@ -191,10 +189,6 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
int bmcst = IS_MCAST(pattrib->ra); int bmcst = IS_MCAST(pattrib->ra);
#ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo = &adapt->wdinfo;
#endif /* CONFIG_P2P */
if (adapt->registrypriv.mp_mode == 0) { if (adapt->registrypriv.mp_mode == 0) {
if ((!bagg_pkt) && (urb_zero_packet_chk(adapt, sz) == 0)) { if ((!bagg_pkt) && (urb_zero_packet_chk(adapt, sz) == 0)) {
ptxdesc = (struct tx_desc *)(pmem+PACKET_OFFSET_SZ); ptxdesc = (struct tx_desc *)(pmem+PACKET_OFFSET_SZ);

20
hal/usb_halinit.c
View file

@ -270,7 +270,6 @@ static void _InitQueueReservedPage(struct adapter *Adapter)
{ {
struct hal_data_8188e *haldata = GET_HAL_DATA(Adapter); struct hal_data_8188e *haldata = GET_HAL_DATA(Adapter);
struct registry_priv *pregistrypriv = &Adapter->registrypriv; struct registry_priv *pregistrypriv = &Adapter->registrypriv;
u32 outEPNum = (u32)haldata->OutEpNumber;
u32 numHQ = 0; u32 numHQ = 0;
u32 numLQ = 0; u32 numLQ = 0;
u32 numNQ = 0; u32 numNQ = 0;
@ -310,8 +309,6 @@ _InitTxBufferBoundary(
u8 txpktbuf_bndy u8 txpktbuf_bndy
) )
{ {
struct registry_priv *pregistrypriv = &Adapter->registrypriv;
rtw_write8(Adapter, REG_TXPKTBUF_BCNQ_BDNY, txpktbuf_bndy); rtw_write8(Adapter, REG_TXPKTBUF_BCNQ_BDNY, txpktbuf_bndy);
rtw_write8(Adapter, REG_TXPKTBUF_MGQ_BDNY, txpktbuf_bndy); rtw_write8(Adapter, REG_TXPKTBUF_MGQ_BDNY, txpktbuf_bndy);
rtw_write8(Adapter, REG_TXPKTBUF_WMAC_LBK_BF_HD, txpktbuf_bndy); rtw_write8(Adapter, REG_TXPKTBUF_WMAC_LBK_BF_HD, txpktbuf_bndy);
@ -786,7 +783,6 @@ static void _InitBeaconParameters(struct adapter *Adapter)
static void _InitRFType(struct adapter *Adapter) static void _InitRFType(struct adapter *Adapter)
{ {
struct registry_priv *pregpriv = &Adapter->registrypriv;
struct hal_data_8188e *haldata = GET_HAL_DATA(Adapter); struct hal_data_8188e *haldata = GET_HAL_DATA(Adapter);
bool is92CU = IS_92C_SERIAL(haldata->VersionID); bool is92CU = IS_92C_SERIAL(haldata->VersionID);
@ -883,7 +879,6 @@ HalDetectSelectiveSuspendMode(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
enum rt_rf_power_state RfOnOffDetect(struct adapter *adapt) enum rt_rf_power_state RfOnOffDetect(struct adapter *adapt)
{ {
struct hal_data_8188e *haldata = GET_HAL_DATA(adapt);
u8 val8; u8 val8;
enum rt_rf_power_state rfpowerstate = rf_off; enum rt_rf_power_state rfpowerstate = rf_off;
@ -909,10 +904,6 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
struct hal_data_8188e *haldata = GET_HAL_DATA(Adapter); struct hal_data_8188e *haldata = GET_HAL_DATA(Adapter);
struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv;
struct registry_priv *pregistrypriv = &Adapter->registrypriv; struct registry_priv *pregistrypriv = &Adapter->registrypriv;
enum rt_rf_power_state eRfPowerStateToSet;
#ifdef CONFIG_BT_COEXIST
struct btcoexist_priv *pbtpriv = &(haldata->bt_coexist);
#endif
u32 init_start_time = rtw_get_current_time(); u32 init_start_time = rtw_get_current_time();
#define HAL_INIT_PROFILE_TAG(stage) do {} while (0) #define HAL_INIT_PROFILE_TAG(stage) do {} while (0)
@ -1230,8 +1221,6 @@ static void _ps_close_RF(struct adapter *adapt)
static void CardDisableRTL8188EU(struct adapter *Adapter) static void CardDisableRTL8188EU(struct adapter *Adapter)
{ {
u8 val8; u8 val8;
u16 val16;
u32 val32;
struct hal_data_8188e *haldata = GET_HAL_DATA(Adapter); struct hal_data_8188e *haldata = GET_HAL_DATA(Adapter);
RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("CardDisableRTL8188EU\n")); RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("CardDisableRTL8188EU\n"));
@ -1298,8 +1287,6 @@ static void rtl8192cu_hw_power_down(struct adapter *adapt)
static u32 rtl8188eu_hal_deinit(struct adapter *Adapter) static u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
{ {
struct hal_data_8188e *haldata = GET_HAL_DATA(Adapter);
DBG_88E("==> %s\n", __func__); DBG_88E("==> %s\n", __func__);
rtw_write32(Adapter, REG_HIMR_88E, IMR_DISABLED_88E); rtw_write32(Adapter, REG_HIMR_88E, IMR_DISABLED_88E);
@ -1326,7 +1313,6 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)
u8 i; u8 i;
struct recv_buf *precvbuf; struct recv_buf *precvbuf;
uint status; uint status;
struct dvobj_priv *pdev = adapter_to_dvobj(Adapter);
struct intf_hdl *pintfhdl = &Adapter->iopriv.intf; struct intf_hdl *pintfhdl = &Adapter->iopriv.intf;
struct recv_priv *precvpriv = &(Adapter->recvpriv); struct recv_priv *precvpriv = &(Adapter->recvpriv);
u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
@ -1425,7 +1411,7 @@ static void Hal_EfuseParsePIDVID_8188EU(struct adapter *adapt, u8 *hwinfo, bool
static void Hal_EfuseParseMACAddr_8188EU(struct adapter *adapt, u8 *hwinfo, bool AutoLoadFail) static void Hal_EfuseParseMACAddr_8188EU(struct adapter *adapt, u8 *hwinfo, bool AutoLoadFail)
{ {
u16 i, usValue; u16 i;
u8 sMacAddr[6] = {0x00, 0xE0, 0x4C, 0x81, 0x88, 0x02}; u8 sMacAddr[6] = {0x00, 0xE0, 0x4C, 0x81, 0x88, 0x02};
struct eeprom_priv *eeprom = GET_EEPROM_EFUSE_PRIV(adapt); struct eeprom_priv *eeprom = GET_EEPROM_EFUSE_PRIV(adapt);
@ -2074,7 +2060,9 @@ _func_enter_;
case HW_VAR_AMPDU_FACTOR: case HW_VAR_AMPDU_FACTOR:
{ {
u8 RegToSet_Normal[4] = {0x41, 0xa8, 0x72, 0xb9}; u8 RegToSet_Normal[4] = {0x41, 0xa8, 0x72, 0xb9};
#ifdef CONFIG_BT_COEXIST
u8 RegToSet_BT[4] = {0x31, 0x74, 0x42, 0x97}; u8 RegToSet_BT[4] = {0x31, 0x74, 0x42, 0x97};
#endif
u8 FactorToSet; u8 FactorToSet;
u8 *pRegToSet; u8 *pRegToSet;
u8 index = 0; u8 index = 0;
@ -2472,7 +2460,6 @@ GetHalDefVar8188EUsb(
break; break;
case HW_DEF_ODM_DBG_FLAG: case HW_DEF_ODM_DBG_FLAG:
{ {
u64 DebugComponents = *((u32 *)pValue);
struct odm_dm_struct *dm_ocm = &(haldata->odmpriv); struct odm_dm_struct *dm_ocm = &(haldata->odmpriv);
pr_info("dm_ocm->DebugComponents = 0x%llx\n", dm_ocm->DebugComponents); pr_info("dm_ocm->DebugComponents = 0x%llx\n", dm_ocm->DebugComponents);
} }
@ -2504,7 +2491,6 @@ static u8 SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eV
case HAL_DEF_DBG_DM_FUNC: case HAL_DEF_DBG_DM_FUNC:
{ {
u8 dm_func = *((u8 *)pValue); u8 dm_func = *((u8 *)pValue);
struct dm_priv *pdmpriv = &haldata->dmpriv;
struct odm_dm_struct *podmpriv = &haldata->odmpriv; struct odm_dm_struct *podmpriv = &haldata->odmpriv;
if (dm_func == 0) { /* disable all dynamic func */ if (dm_func == 0) { /* disable all dynamic func */

6
hal/usb_ops_linux.c
View file

@ -34,11 +34,9 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
unsigned int pipe; unsigned int pipe;
int status = 0; int status = 0;
u32 tmp_buflen = 0;
u8 reqtype; u8 reqtype;
u8 *pIo_buf; u8 *pIo_buf;
int vendorreq_times = 0; int vendorreq_times = 0;
u8 tmp_buf[MAX_USB_IO_CTL_SIZE];
if ((adapt->bSurpriseRemoved) || (adapt->pwrctrlpriv.pnp_bstop_trx)) { if ((adapt->bSurpriseRemoved) || (adapt->pwrctrlpriv.pnp_bstop_trx)) {
RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usbctrl_vendorreq:(adapt->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n")); RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usbctrl_vendorreq:(adapt->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n"));
@ -298,7 +296,6 @@ static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata
static void interrupt_handler_8188eu(struct adapter *adapt, u16 pkt_len, u8 *pbuf) static void interrupt_handler_8188eu(struct adapter *adapt, u16 pkt_len, u8 *pbuf)
{ {
struct hal_data_8188e *haldata = GET_HAL_DATA(adapt); struct hal_data_8188e *haldata = GET_HAL_DATA(adapt);
struct reportpwrstate_parm pwr_rpt;
if (pkt_len != INTERRUPT_MSG_FORMAT_LEN) { if (pkt_len != INTERRUPT_MSG_FORMAT_LEN) {
DBG_88E("%s Invalid interrupt content length (%d)!\n", __func__, pkt_len); DBG_88E("%s Invalid interrupt content length (%d)!\n", __func__, pkt_len);
@ -515,8 +512,6 @@ void rtl8188eu_recv_tasklet(void *priv)
static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
{ {
unsigned long irql;
uint isevt, *pbuf;
struct recv_buf *precvbuf = (struct recv_buf *)purb->context; struct recv_buf *precvbuf = (struct recv_buf *)purb->context;
struct adapter *adapt = (struct adapter *)precvbuf->adapter; struct adapter *adapt = (struct adapter *)precvbuf->adapter;
struct recv_priv *precvpriv = &adapt->recvpriv; struct recv_priv *precvpriv = &adapt->recvpriv;
@ -599,7 +594,6 @@ _func_exit_;
static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)
{ {
unsigned long irql;
int err; int err;
unsigned int pipe; unsigned int pipe;
size_t tmpaddr = 0; size_t tmpaddr = 0;