mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-08 14:33:05 +00:00
rtl8188eu: Fix some checkpatch warnings
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
0b659bd591
commit
242c9f54cc
32 changed files with 501 additions and 506 deletions
|
|
@ -347,7 +347,7 @@ odm_RateDecision_8188E(
|
|||
pRaInfo->RssiStaRA,RtyPtID, PenaltyID1,PenaltyID2, RateID, pRaInfo->NscDown, pRaInfo->NscUp, pRaInfo->RateSGI));
|
||||
if ((pRaInfo->NscDown < N_THRESHOLD_LOW[RateID]) ||(pRaInfo->DROP>DROPING_NECESSARY[RateID]))
|
||||
odm_RateDown_8188E(pDM_Odm,pRaInfo);
|
||||
/* else if ((pRaInfo->NscUp > N_THRESHOLD_HIGH[RateID])&&(pool_retry<POOL_RETRY_TH[RateID])) */
|
||||
/* else if ((pRaInfo->NscUp > N_THRESHOLD_HIGH[RateID])&&pool_retry<POOL_RETRY_TH[RateID]) */
|
||||
else if (pRaInfo->NscUp > N_THRESHOLD_HIGH[RateID])
|
||||
odm_RateUp_8188E(pDM_Odm,pRaInfo);
|
||||
|
||||
|
|
@ -757,7 +757,7 @@ ODM_RA_UpdateRateInfo_8188E(
|
|||
if ((NULL == pDM_Odm) || (MacID >= ASSOCIATE_ENTRY_NUM))
|
||||
return;
|
||||
|
||||
pRaInfo = &(pDM_Odm->RAInfo[MacID]);
|
||||
pRaInfo = &pDM_Odm->RAInfo[MacID];
|
||||
pRaInfo->RateID = RateID;
|
||||
pRaInfo->RateMask = RateMask;
|
||||
pRaInfo->SGIEnable = SGIEnable;
|
||||
|
|
@ -778,7 +778,7 @@ ODM_RA_SetRSSI_8188E(
|
|||
if ((NULL == pDM_Odm) || (MacID >= ASSOCIATE_ENTRY_NUM))
|
||||
return;
|
||||
|
||||
pRaInfo = &(pDM_Odm->RAInfo[MacID]);
|
||||
pRaInfo = &pDM_Odm->RAInfo[MacID];
|
||||
pRaInfo->RssiStaRA = Rssi;
|
||||
}
|
||||
|
||||
|
|
@ -822,7 +822,7 @@ ODM_RA_TxRPT2Handle_8188E(
|
|||
else
|
||||
valid = (1<<MacId) & MacIDValidEntry0;
|
||||
|
||||
pRAInfo = &(pDM_Odm->RAInfo[MacId]);
|
||||
pRAInfo = &pDM_Odm->RAInfo[MacId];
|
||||
if (valid)
|
||||
{
|
||||
|
||||
|
|
|
|||
|
|
@ -1052,9 +1052,9 @@ _PHY_MACSettingCalibration(
|
|||
ODM_Write1Byte(pDM_Odm, MACReg[i], 0x3F);
|
||||
|
||||
for (i = 1 ; i < (IQK_MAC_REG_NUM - 1); i++) {
|
||||
ODM_Write1Byte(pDM_Odm, MACReg[i], (u8)(MACBackup[i]&(~BIT3)));
|
||||
ODM_Write1Byte(pDM_Odm, MACReg[i], (u8)(MACBackup[i]&~BIT3));
|
||||
}
|
||||
ODM_Write1Byte(pDM_Odm, MACReg[i], (u8)(MACBackup[i]&(~BIT5)));
|
||||
ODM_Write1Byte(pDM_Odm, MACReg[i], (u8)(MACBackup[i]&~BIT5));
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1578,7 +1578,7 @@ phy_APCalibrate_8188E(
|
|||
#if MP_DRIVER == 1
|
||||
if ( *(pDM_Odm->mp_mode) == 1)
|
||||
{
|
||||
struct mpt_context *pMptCtx = &(pAdapter->mppriv.MptCtx);
|
||||
struct mpt_context *pMptCtx = &pAdapter->mppriv.MptCtx;
|
||||
pMptCtx->APK_bound[0] = 45;
|
||||
pMptCtx->APK_bound[1] = 52;
|
||||
}
|
||||
|
|
@ -1917,7 +1917,7 @@ PHY_IQCalibrate_8188E(
|
|||
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
|
||||
|
||||
#if (MP_DRIVER == 1)
|
||||
struct mpt_context *pMptCtx = &(pAdapter->mppriv.MptCtx);
|
||||
struct mpt_context *pMptCtx = &pAdapter->mppriv.MptCtx;
|
||||
#endif/* MP_DRIVER == 1) */
|
||||
|
||||
s32 result[4][8]; /* last is final result */
|
||||
|
|
@ -2065,11 +2065,11 @@ if (*(pDM_Odm->mp_mode) == 1)
|
|||
pDM_Odm->RFCalibrateInfo.RegE9C = pDM_Odm->RFCalibrateInfo.RegEBC = 0x0; /* Y default value */
|
||||
}
|
||||
|
||||
if ((RegE94 != 0)/*&&(RegEA4 != 0)*/)
|
||||
if ((RegE94 != 0)/*&&RegEA4 != 0*/)
|
||||
_PHY_PathAFillIQKMatrix(pAdapter, bPathAOK, result, final_candidate, (RegEA4 == 0));
|
||||
|
||||
if (is2T) {
|
||||
if ((RegEB4 != 0)/*&&(RegEC4 != 0)*/)
|
||||
if ((RegEB4 != 0)/*&&RegEC4 != 0*/)
|
||||
_PHY_PathBFillIQKMatrix(pAdapter, bPathBOK, result, final_candidate, (RegEC4 == 0));
|
||||
}
|
||||
|
||||
|
|
@ -2102,7 +2102,7 @@ PHY_LCCalibrate_8188E(
|
|||
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
|
||||
|
||||
#if (MP_DRIVER == 1)
|
||||
struct mpt_context *pMptCtx = &(pAdapter->mppriv.MptCtx);
|
||||
struct mpt_context *pMptCtx = &pAdapter->mppriv.MptCtx;
|
||||
#endif/* MP_DRIVER == 1) */
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -384,7 +384,7 @@ u8
|
|||
SetHalDefVar(struct adapter *adapter, enum HAL_DEF_VARIABLE variable, void *value)
|
||||
{
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter);
|
||||
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
|
||||
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
|
||||
u8 bResult = _SUCCESS;
|
||||
|
||||
switch (variable) {
|
||||
|
|
@ -413,7 +413,7 @@ u8
|
|||
GetHalDefVar(struct adapter *adapter, enum HAL_DEF_VARIABLE variable, void *value)
|
||||
{
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter);
|
||||
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
|
||||
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
|
||||
u8 bResult = _SUCCESS;
|
||||
|
||||
switch (variable) {
|
||||
|
|
|
|||
|
|
@ -338,7 +338,7 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level)
|
|||
|
||||
padapter = psta->padapter;
|
||||
|
||||
pmlmepriv = &(padapter->mlmepriv);
|
||||
pmlmepriv = &padapter->mlmepriv;
|
||||
|
||||
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
|
||||
{
|
||||
|
|
|
|||
36
hal/odm.c
36
hal/odm.c
|
|
@ -1247,7 +1247,7 @@ PDM_ODM_T pDM_Odm
|
|||
{
|
||||
pDM_Odm->TH_L2H_ini = 0xf8; /* -8 */
|
||||
}
|
||||
if ((pDM_Odm->SupportICType == ODM_RTL8192E)&&(pDM_Odm->SupportInterface == ODM_ITRF_PCIE))
|
||||
if ((pDM_Odm->SupportICType == ODM_RTL8192E)&&pDM_Odm->SupportInterface == ODM_ITRF_PCIE)
|
||||
{
|
||||
pDM_Odm->TH_L2H_ini = 0xf0; /* -16 */
|
||||
}
|
||||
|
|
@ -1481,7 +1481,7 @@ odm_DIG(
|
|||
}
|
||||
|
||||
/* 1 Boundary Decision */
|
||||
if (pDM_Odm->SupportICType & (ODM_RTL8192C) &&(pDM_Odm->BoardType & (ODM_BOARD_EXT_LNA | ODM_BOARD_EXT_PA)))
|
||||
if (pDM_Odm->SupportICType & (ODM_RTL8192C) &&pDM_Odm->BoardType & (ODM_BOARD_EXT_LNA | ODM_BOARD_EXT_PA))
|
||||
{
|
||||
if (pDM_Odm->SupportPlatform & (ODM_AP|ODM_ADSL))
|
||||
{
|
||||
|
|
@ -1523,7 +1523,7 @@ odm_DIG(
|
|||
|
||||
if (pDM_Odm->bLinked)
|
||||
{
|
||||
if (pDM_Odm->SupportICType&(ODM_RTL8723A/*|ODM_RTL8821*/))
|
||||
if (pDM_Odm->SupportICType&ODM_RTL8723A/*|ODM_RTL8821*/)
|
||||
{
|
||||
/* 2 Upper Bound */
|
||||
if (( pDM_Odm->RSSI_Min + 10) > DM_DIG_MAX_NIC )
|
||||
|
|
@ -1590,7 +1590,7 @@ odm_DIG(
|
|||
}
|
||||
|
||||
/* 1 Lower Bound for 88E AntDiv */
|
||||
if ((pDM_Odm->SupportICType == ODM_RTL8188E)&&(pDM_Odm->SupportAbility & ODM_BB_ANT_DIV))
|
||||
if ((pDM_Odm->SupportICType == ODM_RTL8188E)&&pDM_Odm->SupportAbility & ODM_BB_ANT_DIV)
|
||||
{
|
||||
if ((pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV) ||(pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV))
|
||||
{
|
||||
|
|
@ -1679,7 +1679,7 @@ odm_DIG(
|
|||
}
|
||||
ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): pDM_DigTable->LargeFAHit=%d\n",pDM_DigTable->LargeFAHit));
|
||||
|
||||
if ((pDM_Odm->SupportPlatform&(ODM_CE))&&(pDM_Odm->PhyDbgInfo.NumQryBeaconPkt < 10) && (pDM_Odm->bsta_state))
|
||||
if ((pDM_Odm->SupportPlatform&ODM_CE)&&pDM_Odm->PhyDbgInfo.NumQryBeaconPkt < 10 && (pDM_Odm->bsta_state))
|
||||
pDM_DigTable->rx_gain_range_min = dm_dig_min;
|
||||
|
||||
if (pDM_DigTable->rx_gain_range_min > pDM_DigTable->rx_gain_range_max)
|
||||
|
|
@ -1744,8 +1744,8 @@ odm_DIG(
|
|||
else if (pFalseAlmCnt->Cnt_all < DM_DIG_FA_TH0)
|
||||
CurrentIGI = CurrentIGI - 2;/* pDM_DigTable->CurIGValue =pDM_DigTable->PreIGValue-1; */
|
||||
|
||||
if ((pDM_Odm->SupportPlatform&(ODM_CE))&&(pDM_Odm->PhyDbgInfo.NumQryBeaconPkt < 10)
|
||||
&&(pFalseAlmCnt->Cnt_all < DM_DIG_FA_TH1) && (pDM_Odm->bsta_state))
|
||||
if ((pDM_Odm->SupportPlatform&ODM_CE)&&pDM_Odm->PhyDbgInfo.NumQryBeaconPkt < 10
|
||||
&&pFalseAlmCnt->Cnt_all < DM_DIG_FA_TH1 && (pDM_Odm->bsta_state))
|
||||
{
|
||||
CurrentIGI = pDM_DigTable->rx_gain_range_min;
|
||||
ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): Beacon is less than 10 and FA is less than 768, IGI GOES TO 0x1E!!!!!!!!!!!!\n"));
|
||||
|
|
@ -1859,7 +1859,7 @@ odm_FalseAlarmCounterStatistics(
|
|||
)
|
||||
{
|
||||
u32 ret_value;
|
||||
Pfalse_ALARM_STATISTICS FalseAlmCnt = &(pDM_Odm->FalseAlmCnt);
|
||||
Pfalse_ALARM_STATISTICS FalseAlmCnt = &pDM_Odm->FalseAlmCnt;
|
||||
|
||||
if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT))
|
||||
return;
|
||||
|
|
@ -1972,7 +1972,7 @@ odm_CCKPacketDetectionThresh(
|
|||
|
||||
pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable;
|
||||
u8 CurCCK_CCAThres;
|
||||
Pfalse_ALARM_STATISTICS FalseAlmCnt = &(pDM_Odm->FalseAlmCnt);
|
||||
Pfalse_ALARM_STATISTICS FalseAlmCnt = &pDM_Odm->FalseAlmCnt;
|
||||
|
||||
if (!(pDM_Odm->SupportAbility & (ODM_BB_CCK_PD|ODM_BB_FA_CNT)))
|
||||
return;
|
||||
|
|
@ -2054,7 +2054,7 @@ odm_DynamicBBPowerSaving(
|
|||
return;
|
||||
|
||||
/* 1 2.Power Saving for 92C */
|
||||
if ((pDM_Odm->SupportICType == ODM_RTL8192C) &&(pDM_Odm->RFType == ODM_2T2R))
|
||||
if ((pDM_Odm->SupportICType == ODM_RTL8192C) &&pDM_Odm->RFType == ODM_2T2R)
|
||||
{
|
||||
odm_1R_CCA(pDM_Odm);
|
||||
}
|
||||
|
|
@ -2667,7 +2667,7 @@ struct adapter *pAdapter
|
|||
{
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
|
||||
struct dm_priv *pdmpriv = &pHalData->dmpriv;
|
||||
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
|
||||
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
|
||||
|
||||
/* 1 1.Determine the minimum RSSI */
|
||||
|
||||
|
|
@ -2723,7 +2723,7 @@ odm_RSSIMonitorCheckCE(
|
|||
else {
|
||||
#if (RATE_ADAPTIVE_SUPPORT == 1)
|
||||
ODM_RA_SetRSSI_8188E(
|
||||
&(pHalData->odmpriv), (PWDB_rssi[i]&0xFF), (u8)((PWDB_rssi[i]>>16) & 0xFF));
|
||||
&pHalData->odmpriv, (PWDB_rssi[i]&0xFF), (u8)((PWDB_rssi[i]>>16) & 0xFF));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
@ -3031,7 +3031,7 @@ odm_StaDefAntSel(
|
|||
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV,ODM_DBG_LOUD,("CCK_Ant1_Cnt:%d, CCK_Ant2_Cnt:%d\n",CCK_Ant1_Cnt,CCK_Ant2_Cnt));
|
||||
|
||||
|
||||
if (((OFDM_Ant1_Cnt+OFDM_Ant2_Cnt)== 0)&&((CCK_Ant1_Cnt + CCK_Ant2_Cnt) <10)) {
|
||||
if (((OFDM_Ant1_Cnt+OFDM_Ant2_Cnt)== 0)&&CCK_Ant1_Cnt + CCK_Ant2_Cnt <10) {
|
||||
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV,ODM_DBG_LOUD,("odm_StaDefAntSelect Fail: No enough packet info!\n"));
|
||||
return false;
|
||||
}
|
||||
|
|
@ -3287,11 +3287,11 @@ odm_EdcaTurboCheckCE(
|
|||
u64 cur_rx_bytes = 0;
|
||||
u8 bbtchange = false;
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
|
||||
struct xmit_priv *pxmitpriv = &(Adapter->xmitpriv);
|
||||
struct recv_priv *precvpriv = &(Adapter->recvpriv);
|
||||
struct xmit_priv *pxmitpriv = &Adapter->xmitpriv;
|
||||
struct recv_priv *precvpriv = &Adapter->recvpriv;
|
||||
struct registry_priv *pregpriv = &Adapter->registrypriv;
|
||||
struct mlme_ext_priv *pmlmeext = &(Adapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
|
||||
|
||||
if ((pregpriv->wifi_spec == 1) )/* (pmlmeinfo->HT_enable == 0)) */
|
||||
|
|
@ -3697,7 +3697,7 @@ ODM_SingleDualAntennaDetection(
|
|||
}
|
||||
/* 2 Test Ant A and B based on DPDT Open */
|
||||
else if (mode==ANTTESTALL) {
|
||||
if ((AntO_report >=100)&(AntO_report <118)) {
|
||||
if (AntO_report >= 100 && AntO_report < 118) {
|
||||
if (AntA_report > (AntO_report+1)) {
|
||||
pDM_SWAT_Table->ANTA_ON=false;
|
||||
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD,("Ant A is OFF"));
|
||||
|
|
|
|||
|
|
@ -504,7 +504,7 @@ void
|
|||
odm_PrimaryCCA_Init(
|
||||
PDM_ODM_T pDM_Odm)
|
||||
{
|
||||
pPri_CCA_T PrimaryCCA = &(pDM_Odm->DM_PriCCA);
|
||||
pPri_CCA_T PrimaryCCA = &pDM_Odm->DM_PriCCA;
|
||||
PrimaryCCA->DupRTS_flag = 0;
|
||||
PrimaryCCA->intf_flag = 0;
|
||||
PrimaryCCA->intf_type = 0;
|
||||
|
|
@ -517,7 +517,7 @@ ODM_DynamicPrimaryCCA_DupRTS(
|
|||
PDM_ODM_T pDM_Odm
|
||||
)
|
||||
{
|
||||
pPri_CCA_T PrimaryCCA = &(pDM_Odm->DM_PriCCA);
|
||||
pPri_CCA_T PrimaryCCA = &pDM_Odm->DM_PriCCA;
|
||||
|
||||
return PrimaryCCA->DupRTS_flag;
|
||||
}
|
||||
|
|
@ -530,8 +530,8 @@ odm_DynamicPrimaryCCA(
|
|||
struct adapter *Adapter = pDM_Odm->Adapter; /* for NIC */
|
||||
prtl8192cd_priv priv = pDM_Odm->priv; /* for AP */
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
|
||||
Pfalse_ALARM_STATISTICS FalseAlmCnt = &(pDM_Odm->FalseAlmCnt);
|
||||
pPri_CCA_T PrimaryCCA = &(pDM_Odm->DM_PriCCA);
|
||||
Pfalse_ALARM_STATISTICS FalseAlmCnt = &pDM_Odm->FalseAlmCnt;
|
||||
pPri_CCA_T PrimaryCCA = &pDM_Odm->DM_PriCCA;
|
||||
bool Is40MHz;
|
||||
bool Client_40MHz = false, Client_tmp = false; /* connected client BW */
|
||||
bool bConnected = false; /* connected or not */
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ static s32 FillH2CCmd_88E(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8
|
|||
return ret;
|
||||
}
|
||||
|
||||
_enter_critical_mutex(&(adapter_to_dvobj(padapter)->h2c_fwcmd_mutex), NULL);
|
||||
_enter_critical_mutex(&adapter_to_dvobj(padapter)->h2c_fwcmd_mutex, NULL);
|
||||
|
||||
if (!pCmdBuffer) {
|
||||
goto exit;
|
||||
|
|
@ -156,7 +156,7 @@ static s32 FillH2CCmd_88E(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8
|
|||
|
||||
exit:
|
||||
|
||||
_exit_critical_mutex(&(adapter_to_dvobj(padapter)->h2c_fwcmd_mutex), NULL);
|
||||
_exit_critical_mutex(&adapter_to_dvobj(padapter)->h2c_fwcmd_mutex, NULL);
|
||||
|
||||
;
|
||||
|
||||
|
|
@ -234,7 +234,7 @@ void rtl8188e_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi
|
|||
|
||||
#if (RATE_ADAPTIVE_SUPPORT == 1)
|
||||
ODM_RA_UpdateRateInfo_8188E(
|
||||
&(pHalData->odmpriv),
|
||||
&pHalData->odmpriv,
|
||||
macid,
|
||||
raid,
|
||||
bitmap,
|
||||
|
|
@ -336,9 +336,9 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)
|
|||
struct rtw_ieee80211_hdr *pwlanhdr;
|
||||
__le16 *fctrl;
|
||||
u32 rate_len, pktlen;
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;
|
||||
u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
|
||||
|
||||
|
||||
|
|
@ -346,11 +346,11 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)
|
|||
|
||||
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
|
||||
|
||||
fctrl = &(pwlanhdr->frame_ctl);
|
||||
fctrl = &pwlanhdr->frame_ctl;
|
||||
*(fctrl) = 0;
|
||||
|
||||
memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr2, myid(&padapter->eeprompriv), ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr3, get_my_bssid(cur_network), ETH_ALEN);
|
||||
|
||||
SetSeqNum(pwlanhdr, 0/*pmlmeext->mgnt_seq*/);
|
||||
|
|
@ -395,7 +395,7 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)
|
|||
pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, ((rate_len > 8)? 8: rate_len), cur_network->SupportedRates, &pktlen);
|
||||
|
||||
/* DS parameter set */
|
||||
pframe = rtw_set_ie(pframe, _DSSET_IE_, 1, (unsigned char *)&(cur_network->Configuration.DSConfig), &pktlen);
|
||||
pframe = rtw_set_ie(pframe, _DSSET_IE_, 1, (unsigned char *)&cur_network->Configuration.DSConfig, &pktlen);
|
||||
|
||||
if ( (pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE)
|
||||
{
|
||||
|
|
@ -438,15 +438,15 @@ static void ConstructPSPoll(struct adapter *padapter, u8 *pframe, u32 *pLength)
|
|||
struct rtw_ieee80211_hdr *pwlanhdr;
|
||||
__le16 *fctrl;
|
||||
u32 pktlen;
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
|
||||
/* DBG_88E("%s\n", __FUNCTION__); */
|
||||
|
||||
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
|
||||
|
||||
/* Frame control. */
|
||||
fctrl = &(pwlanhdr->frame_ctl);
|
||||
fctrl = &pwlanhdr->frame_ctl;
|
||||
*(fctrl) = 0;
|
||||
SetPwrMgt(fctrl);
|
||||
SetFrameSubType(pframe, WIFI_PSPOLL);
|
||||
|
|
@ -455,10 +455,10 @@ static void ConstructPSPoll(struct adapter *padapter, u8 *pframe, u32 *pLength)
|
|||
SetDuration(pframe, (pmlmeinfo->aid | 0xc000));
|
||||
|
||||
/* BSSID. */
|
||||
memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr1, get_my_bssid(&pmlmeinfo->network), ETH_ALEN);
|
||||
|
||||
/* TA. */
|
||||
memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr2, myid(&padapter->eeprompriv), ETH_ALEN);
|
||||
|
||||
*pLength = 16;
|
||||
}
|
||||
|
|
@ -478,8 +478,8 @@ static void ConstructNullFunctionData(
|
|||
u32 pktlen;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct wlan_network *cur_network = &pmlmepriv->cur_network;
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
|
||||
|
||||
/* DBG_88E("%s:%d\n", __FUNCTION__, bForcePowerSave); */
|
||||
|
|
@ -497,21 +497,21 @@ static void ConstructNullFunctionData(
|
|||
{
|
||||
case Ndis802_11Infrastructure:
|
||||
SetToDs(fctrl);
|
||||
memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr1, get_my_bssid(&pmlmeinfo->network), ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr2, myid(&padapter->eeprompriv), ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr3, StaAddr, ETH_ALEN);
|
||||
break;
|
||||
case Ndis802_11APMode:
|
||||
SetFrDs(fctrl);
|
||||
memcpy(pwlanhdr->addr1, StaAddr, ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr2, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr3, myid(&(padapter->eeprompriv)), ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr2, get_my_bssid(&pmlmeinfo->network), ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr3, myid(&padapter->eeprompriv), ETH_ALEN);
|
||||
break;
|
||||
case Ndis802_11IBSS:
|
||||
default:
|
||||
memcpy(pwlanhdr->addr1, StaAddr, ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr2, myid(&padapter->eeprompriv), ETH_ALEN);
|
||||
memcpy(pwlanhdr->addr3, get_my_bssid(&pmlmeinfo->network), ETH_ALEN);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -699,8 +699,8 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus)
|
|||
{
|
||||
JOINBSSRPT_PARM JoinBssRptParm;
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
bool bSendBeacon=false;
|
||||
bool bcn_valid = false;
|
||||
u8 DLBcnCount=0;
|
||||
|
|
@ -727,7 +727,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus)
|
|||
/* 2010.05.11. Added by tynli. */
|
||||
/* SetBcnCtrlReg(padapter, 0, BIT3); */
|
||||
/* SetBcnCtrlReg(padapter, BIT4, 0); */
|
||||
rtw_write8(padapter, REG_BCN_CTRL, rtw_read8(padapter, REG_BCN_CTRL)&(~BIT(3)));
|
||||
rtw_write8(padapter, REG_BCN_CTRL, rtw_read8(padapter, REG_BCN_CTRL)&~BIT(3));
|
||||
rtw_write8(padapter, REG_BCN_CTRL, rtw_read8(padapter, REG_BCN_CTRL)|BIT(4));
|
||||
|
||||
if (pHalData->RegFwHwTxQCtrl&BIT6)
|
||||
|
|
@ -737,7 +737,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus)
|
|||
}
|
||||
|
||||
/* Set FWHW_TXQ_CTRL 0x422[6]=0 to tell Hw the packet is not a real beacon frame. */
|
||||
rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, (pHalData->RegFwHwTxQCtrl&(~BIT6)));
|
||||
rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, (pHalData->RegFwHwTxQCtrl&~BIT6));
|
||||
pHalData->RegFwHwTxQCtrl &= (~BIT6);
|
||||
|
||||
/* Clear beacon valid check bit. */
|
||||
|
|
@ -812,7 +812,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus)
|
|||
/* SetBcnCtrlReg(padapter, BIT3, 0); */
|
||||
/* SetBcnCtrlReg(padapter, 0, BIT4); */
|
||||
rtw_write8(padapter, REG_BCN_CTRL, rtw_read8(padapter, REG_BCN_CTRL)|BIT(3));
|
||||
rtw_write8(padapter, REG_BCN_CTRL, rtw_read8(padapter, REG_BCN_CTRL)&(~BIT(4)));
|
||||
rtw_write8(padapter, REG_BCN_CTRL, rtw_read8(padapter, REG_BCN_CTRL)&~BIT(4));
|
||||
|
||||
/* To make sure that if there exists an adapter which would like to send beacon. */
|
||||
/* If exists, the origianl value of 0x422[6] will be 1, we should check this to */
|
||||
|
|
@ -850,7 +850,7 @@ void rtl8188e_set_p2p_ps_offload_cmd(struct adapter* padapter, u8 p2p_ps_state)
|
|||
{
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
|
||||
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
|
||||
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
|
||||
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
|
||||
struct P2P_PS_Offload_t *p2p_ps_offload = &pHalData->p2p_ps_offload;
|
||||
u8 i;
|
||||
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)
|
|||
|
||||
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter);
|
||||
struct dm_priv *pdmpriv = &pHalData->dmpriv;
|
||||
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
|
||||
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
|
||||
u8 cut_ver,fab_ver;
|
||||
|
||||
/* */
|
||||
|
|
@ -185,7 +185,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)
|
|||
struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;
|
||||
struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(Adapter);
|
||||
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter);
|
||||
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
|
||||
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
|
||||
struct dm_priv *pdmpriv = &pHalData->dmpriv;
|
||||
int i;
|
||||
|
||||
|
|
@ -218,21 +218,21 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)
|
|||
|
||||
ODM_CmnInfoUpdate(pDM_Odm,ODM_CMNINFO_ABILITY,pdmpriv->InitODMFlag);
|
||||
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_TX_UNI,&(Adapter->xmitpriv.tx_bytes));
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_RX_UNI,&(Adapter->recvpriv.rx_bytes));
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_WM_MODE,&(pmlmeext->cur_wireless_mode));
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_SEC_CHNL_OFFSET,&(pHalData->nCur40MhzPrimeSC));
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_SEC_MODE,&(Adapter->securitypriv.dot11PrivacyAlgrthm));
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_BW,&(pHalData->CurrentChannelBW ));
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_CHNL,&( pHalData->CurrentChannel));
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_NET_CLOSED,&( Adapter->net_closed));
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_MP_MODE,&(Adapter->registrypriv.mp_mode));
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_TX_UNI,&Adapter->xmitpriv.tx_bytes);
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_RX_UNI,&Adapter->recvpriv.rx_bytes);
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_WM_MODE,&pmlmeext->cur_wireless_mode);
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_SEC_CHNL_OFFSET,&pHalData->nCur40MhzPrimeSC);
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_SEC_MODE,&Adapter->securitypriv.dot11PrivacyAlgrthm);
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_BW,&pHalData->CurrentChannelBW );
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_CHNL,& pHalData->CurrentChannel);
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_NET_CLOSED,& Adapter->net_closed);
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_MP_MODE,&Adapter->registrypriv.mp_mode);
|
||||
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_BAND,&(pDM_Odm->u8_temp));
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_BAND,&pDM_Odm->u8_temp);
|
||||
/* only for 8192D ================= */
|
||||
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_SCAN,&(pmlmepriv->bScanInProcess));
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_POWER_SAVING,&(pwrctrlpriv->bpower_saving));
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_SCAN,&pmlmepriv->bScanInProcess);
|
||||
ODM_CmnInfoHook(pDM_Odm,ODM_CMNINFO_POWER_SAVING,&pwrctrlpriv->bpower_saving);
|
||||
ODM_CmnInfoInit(pDM_Odm, ODM_CMNINFO_RF_ANTENNA_TYPE, pHalData->TRxAntDivType);
|
||||
|
||||
for (i=0; i< NUM_STA; i++)
|
||||
|
|
@ -249,7 +249,7 @@ rtl8188e_InitHalDm(
|
|||
{
|
||||
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter);
|
||||
struct dm_priv *pdmpriv = &pHalData->dmpriv;
|
||||
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
|
||||
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
|
||||
u8 i;
|
||||
|
||||
dm_InitGPIOSetting(Adapter);
|
||||
|
|
@ -275,7 +275,7 @@ rtl8188e_HalDmWatchDog(
|
|||
u8 hw_init_completed = false;
|
||||
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter);
|
||||
struct dm_priv *pdmpriv = &pHalData->dmpriv;
|
||||
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
|
||||
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
|
||||
|
||||
hw_init_completed = Adapter->hw_init_completed;
|
||||
|
||||
|
|
@ -335,7 +335,7 @@ void rtl8188e_init_dm_priv(struct adapter *Adapter)
|
|||
struct dm_priv *pdmpriv = &pHalData->dmpriv;
|
||||
PDM_ODM_T podmpriv = &pHalData->odmpriv;
|
||||
memset(pdmpriv, 0, sizeof(struct dm_priv));
|
||||
/* spin_lock_init(&(pHalData->odm_stainfo_lock)); */
|
||||
/* spin_lock_init(&pHalData->odm_stainfo_lock); */
|
||||
Init_ODM_ComInfo_88E(Adapter);
|
||||
ODM_InitDebugSetting(podmpriv);
|
||||
}
|
||||
|
|
@ -375,7 +375,7 @@ u8 AntDivBeforeLink8188E(struct adapter *Adapter )
|
|||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
|
||||
PDM_ODM_T pDM_Odm =&pHalData->odmpriv;
|
||||
SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
|
||||
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
|
||||
struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;
|
||||
|
||||
/* Condition that does not need to use antenna diversity. */
|
||||
if (pHalData->AntDivCfg== 0)
|
||||
|
|
|
|||
|
|
@ -708,7 +708,7 @@ static void _MCUIO_Reset88E(struct adapter *padapter,u8 bReset)
|
|||
if (bReset==true) {
|
||||
/* Reset MCU IO Wrapper- sugggest by SD1-Gimmy */
|
||||
u1bTmp = rtw_read8(padapter, REG_RSV_CTRL+1);
|
||||
rtw_write8(padapter,REG_RSV_CTRL+1, (u1bTmp&(~BIT3)));
|
||||
rtw_write8(padapter,REG_RSV_CTRL+1, (u1bTmp&~BIT3));
|
||||
} else {
|
||||
/* Enable MCU IO Wrapper */
|
||||
u1bTmp = rtw_read8(padapter, REG_RSV_CTRL+1);
|
||||
|
|
@ -722,7 +722,7 @@ void _8051Reset88E(struct adapter *padapter)
|
|||
|
||||
_MCUIO_Reset88E(padapter,true);
|
||||
u1bTmp = rtw_read8(padapter, REG_SYS_FUNC_EN+1);
|
||||
rtw_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp&(~BIT2));
|
||||
rtw_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp&~BIT2);
|
||||
_MCUIO_Reset88E(padapter,false);
|
||||
rtw_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp|(BIT2));
|
||||
|
||||
|
|
@ -1788,7 +1788,7 @@ hal_EfusePgPacketRead_8188e(
|
|||
/* Header Read ------------- */
|
||||
if (ReadState & PG_STATE_HEADER)
|
||||
{
|
||||
if (efuse_OneByteRead(pAdapter, efuse_addr ,&efuse_data, bPseudoTest)&&(efuse_data!=0xFF))
|
||||
if (efuse_OneByteRead(pAdapter, efuse_addr ,&efuse_data, bPseudoTest)&&efuse_data!=0xFF)
|
||||
{
|
||||
if (EXT_HEADER(efuse_data))
|
||||
{
|
||||
|
|
@ -1855,8 +1855,8 @@ hal_EfusePgPacketRead_8188e(
|
|||
|
||||
}
|
||||
|
||||
if ( (data[0]== 0xff) &&(data[1]== 0xff) && (data[2]== 0xff) && (data[3]== 0xff) &&
|
||||
(data[4]== 0xff) &&(data[5]== 0xff) && (data[6]== 0xff) && (data[7]== 0xff))
|
||||
if ( (data[0]== 0xff) &&data[1]== 0xff && (data[2]== 0xff) && (data[3]== 0xff) &&
|
||||
(data[4]== 0xff) &&data[5]== 0xff && (data[6]== 0xff) && (data[7]== 0xff))
|
||||
return false;
|
||||
else
|
||||
return true;
|
||||
|
|
@ -2208,7 +2208,7 @@ hal_EfuseCheckIfDatafollowed(
|
|||
|
||||
for (i=0; i<(word_cnts*2) ; i++)
|
||||
{
|
||||
if (efuse_OneByteRead(pAdapter, (startAddr+i) ,&efuse_data, bPseudoTest)&&(efuse_data != 0xFF))
|
||||
if (efuse_OneByteRead(pAdapter, (startAddr+i) ,&efuse_data, bPseudoTest)&&efuse_data != 0xFF)
|
||||
bRet = true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -434,7 +434,7 @@ phy_RFSerialRead(
|
|||
|
||||
tmplong2 = (tmplong2 & (~bLSSIReadAddress)) | (NewOffset<<23) | bLSSIReadEdge; /* T65 RF */
|
||||
|
||||
PHY_SetBBReg(Adapter, rFPGA0_XA_HSSIParameter2, bMaskDWord, tmplong&(~bLSSIReadEdge));
|
||||
PHY_SetBBReg(Adapter, rFPGA0_XA_HSSIParameter2, bMaskDWord, tmplong&~bLSSIReadEdge);
|
||||
rtw_udelay_os(10);/* PlatformStallExecution(10); */
|
||||
|
||||
PHY_SetBBReg(Adapter, pPhyReg->rfHSSIPara2, bMaskDWord, tmplong2);
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@ rtl8188e_PHY_RF6052SetCckTxPower(
|
|||
|
||||
for (idx1=RF_PATH_A; idx1<=RF_PATH_B; idx1++)
|
||||
{
|
||||
ptr = (u8*)(&(TxAGC[idx1]));
|
||||
ptr = (u8*)(&TxAGC[idx1]);
|
||||
for (idx2=0; idx2<4; idx2++)
|
||||
{
|
||||
if (*ptr > RF6052_MAX_TX_PWR)
|
||||
|
|
@ -400,7 +400,7 @@ static void getTxPowerWriteValByRegulatory88E(
|
|||
|
||||
for (i=0; i<4; i++)
|
||||
{
|
||||
pwr_diff_limit[i] = (u8)((pHalData->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf?8:0)]&(0x7f<<(i*8)))>>(i*8));
|
||||
pwr_diff_limit[i] = (u8)((pHalData->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf?8:0)]&0x7f<<(i*8))>>(i*8));
|
||||
|
||||
if (pwr_diff_limit[i] > pwr_diff)
|
||||
pwr_diff_limit[i] = pwr_diff;
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@ void update_recvframe_phyinfo_88e(
|
|||
pkt_info.StationID = psta->mac_id;
|
||||
pkt_info.Rate = pattrib->mcs_rate;
|
||||
|
||||
ODM_PhyStatusQuery(&pHalData->odmpriv,pPHYInfo,(u8 *)pphy_status,&(pkt_info));
|
||||
ODM_PhyStatusQuery(&pHalData->odmpriv,pPHYInfo,(u8 *)pphy_status,&pkt_info);
|
||||
|
||||
precvframe->u.hdr.psta = NULL;
|
||||
if (pkt_info.bPacketMatchBSSID &&
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ void _dbg_dump_tx_info(struct adapter *padapter,int frame_tag,struct tx_desc *pt
|
|||
{
|
||||
u8 bDumpTxPkt;
|
||||
u8 bDumpTxDesc = false;
|
||||
rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DUMP_TXPKT, &(bDumpTxPkt));
|
||||
rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DUMP_TXPKT, &bDumpTxPkt);
|
||||
|
||||
if (bDumpTxPkt ==1) {/* dump txdesc for data frame */
|
||||
DBG_88E("dump tx_desc for data frame\n");
|
||||
|
|
|
|||
|
|
@ -145,13 +145,13 @@ rtl8188eu_InitSwLeds(
|
|||
struct adapter *padapter
|
||||
)
|
||||
{
|
||||
struct led_priv *pledpriv = &(padapter->ledpriv);
|
||||
struct led_priv *pledpriv = &padapter->ledpriv;
|
||||
|
||||
pledpriv->LedControlHandler = LedControl871x;
|
||||
|
||||
InitLed871x(padapter, &(pledpriv->SwLed0), LED_PIN_LED0);
|
||||
InitLed871x(padapter, &pledpriv->SwLed0, LED_PIN_LED0);
|
||||
|
||||
InitLed871x(padapter,&(pledpriv->SwLed1), LED_PIN_LED1);
|
||||
InitLed871x(padapter,&pledpriv->SwLed1, LED_PIN_LED1);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -164,8 +164,8 @@ rtl8188eu_DeInitSwLeds(
|
|||
struct adapter *padapter
|
||||
)
|
||||
{
|
||||
struct led_priv *ledpriv = &(padapter->ledpriv);
|
||||
struct led_priv *ledpriv = &padapter->ledpriv;
|
||||
|
||||
DeInitLed871x( &(ledpriv->SwLed0) );
|
||||
DeInitLed871x( &(ledpriv->SwLed1) );
|
||||
DeInitLed871x( &ledpriv->SwLed0 );
|
||||
DeInitLed871x( &ledpriv->SwLed1 );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter)
|
|||
precvbuf->adapter =padapter;
|
||||
|
||||
|
||||
/* rtw_list_insert_tail(&precvbuf->list, &(precvpriv->free_recv_buf_queue.queue)); */
|
||||
/* rtw_list_insert_tail(&precvbuf->list, &precvpriv->free_recv_buf_queue.queue); */
|
||||
|
||||
precvbuf++;
|
||||
|
||||
|
|
|
|||
|
|
@ -214,14 +214,14 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
|
|||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
|
||||
struct tx_desc *ptxdesc = (struct tx_desc *)pmem;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
sint bmcst = IS_MCAST(pattrib->ra);
|
||||
#ifdef CONFIG_P2P
|
||||
struct wifidirect_info* pwdinfo = &padapter->wdinfo;
|
||||
#endif /* CONFIG_P2P */
|
||||
|
||||
if (padapter->registrypriv.mp_mode == 0) {
|
||||
if ((!bagg_pkt) &&(urb_zero_packet_chk(padapter, sz)== 0)) {
|
||||
if ((!bagg_pkt) &&urb_zero_packet_chk(padapter, sz== 0)) {
|
||||
ptxdesc = (struct tx_desc *)(pmem+PACKET_OFFSET_SZ);
|
||||
pull = 1;
|
||||
}
|
||||
|
|
@ -641,26 +641,26 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm
|
|||
switch (pfirstframe->attrib.priority) {
|
||||
case 1:
|
||||
case 2:
|
||||
ptxservq = &(psta->sta_xmitpriv.bk_q);
|
||||
ptxservq = &psta->sta_xmitpriv.bk_q;
|
||||
phwxmit = pxmitpriv->hwxmits + 3;
|
||||
break;
|
||||
|
||||
case 4:
|
||||
case 5:
|
||||
ptxservq = &(psta->sta_xmitpriv.vi_q);
|
||||
ptxservq = &psta->sta_xmitpriv.vi_q;
|
||||
phwxmit = pxmitpriv->hwxmits + 1;
|
||||
break;
|
||||
|
||||
case 6:
|
||||
case 7:
|
||||
ptxservq = &(psta->sta_xmitpriv.vo_q);
|
||||
ptxservq = &psta->sta_xmitpriv.vo_q;
|
||||
phwxmit = pxmitpriv->hwxmits;
|
||||
break;
|
||||
|
||||
case 0:
|
||||
case 3:
|
||||
default:
|
||||
ptxservq = &(psta->sta_xmitpriv.be_q);
|
||||
ptxservq = &psta->sta_xmitpriv.be_q;
|
||||
phwxmit = pxmitpriv->hwxmits + 2;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ static void _InitPABias(struct adapter *padapter)
|
|||
static void _InitBTCoexist(struct adapter *padapter)
|
||||
{
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
|
||||
struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist);
|
||||
struct btcoexist_priv *pbtpriv = &pHalData->bt_coexist;
|
||||
u8 u1Tmp;
|
||||
|
||||
if (pbtpriv->BT_Coexist && pbtpriv->BT_CoexistType == BT_CSR_BC4)
|
||||
|
|
@ -800,7 +800,7 @@ usb_AggSettingTxUpdate(
|
|||
)
|
||||
{
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
|
||||
/* PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); */
|
||||
/* PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; */
|
||||
u32 value32;
|
||||
|
||||
if (Adapter->registrypriv.wifi_spec)
|
||||
|
|
@ -837,7 +837,7 @@ usb_AggSettingRxUpdate(
|
|||
)
|
||||
{
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
|
||||
/* PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); */
|
||||
/* PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; */
|
||||
u8 valueDMA;
|
||||
u8 valueUSB;
|
||||
|
||||
|
|
@ -1158,7 +1158,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
|
|||
|
||||
rt_rf_power_state eRfPowerStateToSet;
|
||||
#ifdef CONFIG_BT_COEXIST
|
||||
struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist);
|
||||
struct btcoexist_priv *pbtpriv = &pHalData->bt_coexist;
|
||||
#endif
|
||||
|
||||
u32 init_start_time = jiffies;
|
||||
|
|
@ -1561,7 +1561,7 @@ static void hal_poweroff_rtl8188eu(
|
|||
|
||||
/* Stop Tx Report Timer. 0x4EC[Bit1]=b'0 */
|
||||
val8 = rtw_read8(Adapter, REG_TX_RPT_CTRL);
|
||||
rtw_write8(Adapter, REG_TX_RPT_CTRL, val8&(~BIT1));
|
||||
rtw_write8(Adapter, REG_TX_RPT_CTRL, val8&~BIT1);
|
||||
|
||||
/* stop rx */
|
||||
rtw_write8(Adapter, REG_CR, 0x0);
|
||||
|
|
@ -1589,14 +1589,14 @@ static void hal_poweroff_rtl8188eu(
|
|||
/* YJ,add,111212 */
|
||||
/* Disable 32k */
|
||||
val8 = rtw_read8(Adapter, REG_32K_CTRL);
|
||||
rtw_write8(Adapter, REG_32K_CTRL, val8&(~BIT0));
|
||||
rtw_write8(Adapter, REG_32K_CTRL, val8&~BIT0);
|
||||
|
||||
/* Card disable power action flow */
|
||||
HalPwrSeqCmdParsing(Adapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK, Rtl8188E_NIC_DISABLE_FLOW);
|
||||
|
||||
/* Reset MCU IO Wrapper */
|
||||
val8 = rtw_read8(Adapter, REG_RSV_CTRL+1);
|
||||
rtw_write8(Adapter, REG_RSV_CTRL+1, (val8&(~BIT3)));
|
||||
rtw_write8(Adapter, REG_RSV_CTRL+1, (val8&~BIT3));
|
||||
val8 = rtw_read8(Adapter, REG_RSV_CTRL+1);
|
||||
rtw_write8(Adapter, REG_RSV_CTRL+1, val8|BIT3);
|
||||
|
||||
|
|
@ -1659,7 +1659,7 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)
|
|||
uint status;
|
||||
struct dvobj_priv *pdev= adapter_to_dvobj(Adapter);
|
||||
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);
|
||||
#ifdef CONFIG_USB_INTERRUPT_IN_PIPE
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
|
||||
|
|
@ -1769,7 +1769,7 @@ _ReadLEDSetting(
|
|||
bool AutoloadFail
|
||||
)
|
||||
{
|
||||
struct led_priv *pledpriv = &(Adapter->ledpriv);
|
||||
struct led_priv *pledpriv = &Adapter->ledpriv;
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
|
||||
pledpriv->bRegUseLed = true;
|
||||
|
||||
|
|
@ -2042,9 +2042,9 @@ static void UpdateInterruptMask8188EU(struct adapter *padapter,u8 bHIMR0 ,u32 Ad
|
|||
pHalData = GET_HAL_DATA(padapter);
|
||||
|
||||
if (bHIMR0)
|
||||
himr = &(pHalData->IntrMask[0]);
|
||||
himr = &pHalData->IntrMask[0];
|
||||
else
|
||||
himr = &(pHalData->IntrMask[1]);
|
||||
himr = &pHalData->IntrMask[1];
|
||||
|
||||
if (AddMSR)
|
||||
*himr |= AddMSR;
|
||||
|
|
@ -2181,7 +2181,7 @@ static void hw_var_set_bcn_func(struct adapter *Adapter, u8 variable, u8* val)
|
|||
if (*((u8 *)val))
|
||||
rtw_write8(Adapter, bcn_ctrl_reg, (EN_BCN_FUNCTION | EN_TXBCN_RPT));
|
||||
else
|
||||
rtw_write8(Adapter, bcn_ctrl_reg, rtw_read8(Adapter, bcn_ctrl_reg)&(~(EN_BCN_FUNCTION | EN_TXBCN_RPT)));
|
||||
rtw_write8(Adapter, bcn_ctrl_reg, rtw_read8(Adapter, bcn_ctrl_reg)&~(EN_BCN_FUNCTION | EN_TXBCN_RPT));
|
||||
}
|
||||
|
||||
static void hw_var_set_correct_tsf(struct adapter *Adapter, u8 variable, u8* val)
|
||||
|
|
@ -2281,7 +2281,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
|
|||
{
|
||||
u64 tsf;
|
||||
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
|
||||
tsf = pmlmeext->TSFValue - rtw_modular64(pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024)) -1024; /* us */
|
||||
|
||||
|
|
@ -2293,7 +2293,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
|
|||
}
|
||||
|
||||
/* disable related TSF function */
|
||||
rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)&(~BIT(3)));
|
||||
rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)&~BIT(3));
|
||||
|
||||
rtw_write32(Adapter, REG_TSFTR, tsf);
|
||||
rtw_write32(Adapter, REG_TSFTR+4, tsf>>32);
|
||||
|
|
@ -2305,7 +2305,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
|
|||
if (((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) || ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE))
|
||||
{
|
||||
/* pHalData->RegTxPause &= (~STOP_BCNQ); */
|
||||
/* rtw_write8(Adapter, REG_TXPAUSE, (rtw_read8(Adapter, REG_TXPAUSE)&(~BIT(6)))); */
|
||||
/* rtw_write8(Adapter, REG_TXPAUSE, (rtw_read8(Adapter, REG_TXPAUSE)&~BIT(6))); */
|
||||
ResumeTxBeacon(Adapter);
|
||||
}
|
||||
}
|
||||
|
|
@ -2356,7 +2356,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
|
|||
else/* sitesurvey done */
|
||||
{
|
||||
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
|
||||
if ((is_client_associated_to_ap(Adapter) == true) ||
|
||||
((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) )
|
||||
|
|
@ -2366,7 +2366,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
|
|||
rtw_write16(Adapter, REG_RXFLTMAP2,0xFFFF);
|
||||
|
||||
/* enable update TSF */
|
||||
rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)&(~BIT(4)));
|
||||
rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)&~BIT(4));
|
||||
}
|
||||
else if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
|
||||
{
|
||||
|
|
@ -2374,7 +2374,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
|
|||
rtw_write16(Adapter, REG_RXFLTMAP2,0xFFFF);
|
||||
|
||||
/* enable update TSF */
|
||||
rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)&(~BIT(4)));
|
||||
rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)&~BIT(4));
|
||||
}
|
||||
|
||||
if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
|
||||
|
|
@ -2433,7 +2433,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
|
|||
else if (type == 2) /* sta add event call back */
|
||||
{
|
||||
/* enable update TSF */
|
||||
rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)&(~BIT(4)));
|
||||
rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL)&~BIT(4));
|
||||
|
||||
if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE))
|
||||
{
|
||||
|
|
@ -2459,7 +2459,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
|
|||
{
|
||||
u8 u1bAIFS, aSifsTime;
|
||||
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
|
||||
rtw_write8(Adapter, REG_SLOT, val[0]);
|
||||
|
||||
|
|
@ -3145,8 +3145,8 @@ static void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rss
|
|||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
|
||||
/* struct dm_priv *pdmpriv = &pHalData->dmpriv; */
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;
|
||||
|
||||
if (mac_id >= NUM_STA) /* CAM_SIZE */
|
||||
return;
|
||||
|
|
@ -3163,9 +3163,9 @@ static void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rss
|
|||
raid = networktype_to_raid(networkType);
|
||||
|
||||
mask = update_supported_rate(cur_network->SupportedRates, supportRateNum);
|
||||
mask |= (pmlmeinfo->HT_enable)? update_MSC_rate(&(pmlmeinfo->HT_caps)): 0;
|
||||
mask |= (pmlmeinfo->HT_enable)? update_MSC_rate(&pmlmeinfo->HT_caps): 0;
|
||||
|
||||
if (support_short_GI(padapter, &(pmlmeinfo->HT_caps)))
|
||||
if (support_short_GI(padapter, &pmlmeinfo->HT_caps))
|
||||
shortGIrate = true;
|
||||
break;
|
||||
case 1:/* for broadcast/multicast */
|
||||
|
|
@ -3217,7 +3217,7 @@ static void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rss
|
|||
} else {
|
||||
#if (RATE_ADAPTIVE_SUPPORT == 1)
|
||||
ODM_RA_UpdateRateInfo_8188E(
|
||||
&(pHalData->odmpriv),
|
||||
&pHalData->odmpriv,
|
||||
mac_id,
|
||||
raid,
|
||||
mask,
|
||||
|
|
@ -3238,8 +3238,8 @@ static void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rss
|
|||
static void SetBeaconRelatedRegisters8188EUsb(struct adapter *padapter)
|
||||
{
|
||||
u32 value32;
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
u32 bcn_ctrl_reg = REG_BCN_CTRL;
|
||||
/* reset TSF, enable update TSF, correcting TSF On Beacon */
|
||||
|
||||
|
|
|
|||
|
|
@ -297,8 +297,8 @@ static void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pb
|
|||
}
|
||||
|
||||
/* HISR */
|
||||
memcpy(&(pHalData->IntArray[0]), &(pbuf[USB_INTR_CONTENT_HISR_OFFSET]), 4);
|
||||
memcpy(&(pHalData->IntArray[1]), &(pbuf[USB_INTR_CONTENT_HISRE_OFFSET]), 4);
|
||||
memcpy(&pHalData->IntArray[0], &pbuf[USB_INTR_CONTENT_HISR_OFFSET], 4);
|
||||
memcpy(&pHalData->IntArray[1], &pbuf[USB_INTR_CONTENT_HISRE_OFFSET], 4);
|
||||
|
||||
if ( pHalData->IntArray[1] & IMR_TXERR_88E )
|
||||
DBG_88E("===> %s Tx Error Flag Interrupt Status\n",__FUNCTION__);
|
||||
|
|
@ -311,7 +311,7 @@ static void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pb
|
|||
|
||||
/* C2H Event */
|
||||
if (pbuf[0]!= 0) {
|
||||
memcpy(&(pHalData->C2hArray[0]), &(pbuf[USB_INTR_CONTENT_C2H_OFFSET]), 16);
|
||||
memcpy(&pHalData->C2hArray[0], &pbuf[USB_INTR_CONTENT_C2H_OFFSET], 16);
|
||||
/* rtw_c2h_wk_cmd(padapter); to do.. */
|
||||
}
|
||||
|
||||
|
|
@ -460,7 +460,7 @@ static int recvbuf2recvframe(struct adapter *padapter, struct sk_buff *pskb)
|
|||
|
||||
pattrib = &precvframe->u.hdr.attrib;
|
||||
|
||||
if ((padapter->registrypriv.mp_mode == 0) &&((pattrib->crc_err) || (pattrib->icv_err)))
|
||||
if ((padapter->registrypriv.mp_mode == 0) && (pattrib->crc_err || pattrib->icv_err))
|
||||
{
|
||||
DBG_8192C("%s: RX Warning! crc_err=%d icv_err=%d, skip!\n", __FUNCTION__, pattrib->crc_err, pattrib->icv_err);
|
||||
|
||||
|
|
@ -498,7 +498,7 @@ static int recvbuf2recvframe(struct adapter *padapter, struct sk_buff *pskb)
|
|||
|
||||
/* for first fragment packet, driver need allocate 1536+drvinfo_sz+RXDESC_SIZE to defrag packet. */
|
||||
/* modify alloc_sz for recvive crc error packet by thomas 2011-06-02 */
|
||||
if ((pattrib->mfrag == 1)&&(pattrib->frag_num == 0)) {
|
||||
if ((pattrib->mfrag == 1)&&pattrib->frag_num == 0) {
|
||||
if (skb_len <= 1650)
|
||||
alloc_sz = 1664;
|
||||
else
|
||||
|
|
@ -526,7 +526,7 @@ static int recvbuf2recvframe(struct adapter *padapter, struct sk_buff *pskb)
|
|||
}
|
||||
else
|
||||
{
|
||||
if ((pattrib->mfrag == 1)&&(pattrib->frag_num == 0))
|
||||
if ((pattrib->mfrag == 1)&&pattrib->frag_num == 0)
|
||||
{
|
||||
DBG_8192C("recvbuf2recvframe: alloc_skb fail , drop frag frame\n");
|
||||
rtw_free_recvframe(precvframe, pfree_recv_queue);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue