diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index 0c69693..157c2da 100755 --- a/core/rtw_efuse.c +++ b/core/rtw_efuse.c @@ -52,14 +52,14 @@ u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN]={0}; bool Efuse_Read1ByteFromFakeContent( - IN struct adapter *pAdapter, - IN u16 Offset, - IN OUT u8 *Value ); + struct adapter *pAdapter, + u16 Offset, + u8 *Value ); bool Efuse_Read1ByteFromFakeContent( - IN struct adapter *pAdapter, - IN u16 Offset, - IN OUT u8 *Value ) + struct adapter *pAdapter, + u16 Offset, + u8 *Value ) { if(Offset >= EFUSE_MAX_HW_SIZE) { @@ -75,14 +75,14 @@ Efuse_Read1ByteFromFakeContent( bool Efuse_Write1ByteToFakeContent( - IN struct adapter *pAdapter, - IN u16 Offset, - IN u8 Value ); + struct adapter *pAdapter, + u16 Offset, + u8 Value ); bool Efuse_Write1ByteToFakeContent( - IN struct adapter *pAdapter, - IN u16 Offset, - IN u8 Value ) + struct adapter *pAdapter, + u16 Offset, + u8 Value ) { if(Offset >= EFUSE_MAX_HW_SIZE) { @@ -117,9 +117,9 @@ Efuse_Write1ByteToFakeContent( *---------------------------------------------------------------------------*/ void Efuse_PowerSwitch( - IN struct adapter *pAdapter, - IN u8 bWrite, - IN u8 PwrState) + struct adapter *pAdapter, + u8 bWrite, + u8 PwrState) { pAdapter->HalFunc.EfusePowerSwitch(pAdapter, bWrite, PwrState); } @@ -142,9 +142,9 @@ Efuse_PowerSwitch( *---------------------------------------------------------------------------*/ u16 Efuse_GetCurrentSize( - IN struct adapter * pAdapter, - IN u8 efuseType, - IN bool bPseudoTest) + struct adapter * pAdapter, + u8 efuseType, + bool bPseudoTest) { u16 ret=0; @@ -155,7 +155,7 @@ Efuse_GetCurrentSize( /* 11/16/2008 MH Add description. Get current efuse area enabled word!!. */ u8 -Efuse_CalculateWordCnts(IN u8 word_en) +Efuse_CalculateWordCnts(u8 word_en) { u8 word_cnts = 0; if(!(word_en & BIT(0))) word_cnts++; /* 0 : write enable */ @@ -181,7 +181,7 @@ ReadEFuseByte( struct adapter *Adapter, u16 _offset, u8 *pbuf, - IN bool bPseudoTest) + bool bPseudoTest) { u32 value32; u8 readbyte; @@ -251,7 +251,7 @@ efuse_ReadEFuse( u16 _offset, u16 _size_byte, u8 *pbuf, - IN bool bPseudoTest + bool bPseudoTest ); void efuse_ReadEFuse( @@ -260,7 +260,7 @@ efuse_ReadEFuse( u16 _offset, u16 _size_byte, u8 *pbuf, - IN bool bPseudoTest + bool bPseudoTest ) { Adapter->HalFunc.ReadEFuse(Adapter, efuseType, _offset, _size_byte, pbuf, bPseudoTest); @@ -268,11 +268,11 @@ efuse_ReadEFuse( void EFUSE_GetEfuseDefinition( - IN struct adapter *pAdapter, - IN u8 efuseType, - IN u8 type, - OUT void *pOut, - IN bool bPseudoTest + struct adapter *pAdapter, + u8 efuseType, + u8 type, + void *pOut, + bool bPseudoTest ) { pAdapter->HalFunc.EFUSEGetEfuseDefinition(pAdapter, efuseType, type, pOut, bPseudoTest); @@ -296,8 +296,8 @@ EFUSE_GetEfuseDefinition( *---------------------------------------------------------------------------*/ u8 EFUSE_Read1Byte( - IN struct adapter *Adapter, - IN u16 Address) + struct adapter *Adapter, + u16 Address) { u8 data; u8 Bytetemp = {0x00}; @@ -361,14 +361,14 @@ EFUSE_Read1Byte( void EFUSE_Write1Byte( - IN struct adapter *Adapter, - IN u16 Address, - IN u8 Value); + struct adapter *Adapter, + u16 Address, + u8 Value); void EFUSE_Write1Byte( - IN struct adapter *Adapter, - IN u16 Address, - IN u8 Value) + struct adapter *Adapter, + u16 Address, + u8 Value) { u8 Bytetemp = {0x00}; u8 temp = {0x00}; @@ -414,10 +414,10 @@ EFUSE_Write1Byte( /* 11/16/2008 MH Read one byte from real Efuse. */ u8 efuse_OneByteRead( - IN struct adapter *pAdapter, - IN u16 addr, - IN u8 *data, - IN bool bPseudoTest) + struct adapter *pAdapter, + u16 addr, + u8 *data, + bool bPseudoTest) { u8 tmpidx = 0; u8 bResult; @@ -455,10 +455,10 @@ efuse_OneByteRead( /* 11/16/2008 MH Write one byte to reald Efuse. */ u8 efuse_OneByteWrite( - IN struct adapter *pAdapter, - IN u16 addr, - IN u8 data, - IN bool bPseudoTest) + struct adapter *pAdapter, + u16 addr, + u8 data, + bool bPseudoTest) { u8 tmpidx = 0; u8 bResult; @@ -498,10 +498,10 @@ efuse_OneByteWrite( } int -Efuse_PgPacketRead( IN struct adapter *pAdapter, - IN u8 offset, - IN u8 *data, - IN bool bPseudoTest) +Efuse_PgPacketRead( struct adapter *pAdapter, + u8 offset, + u8 *data, + bool bPseudoTest) { int ret=0; @@ -511,11 +511,11 @@ Efuse_PgPacketRead( IN struct adapter *pAdapter, } int -Efuse_PgPacketWrite(IN struct adapter *pAdapter, - IN u8 offset, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +Efuse_PgPacketWrite(struct adapter *pAdapter, + u8 offset, + u8 word_en, + u8 *data, + bool bPseudoTest) { int ret; @@ -526,11 +526,11 @@ Efuse_PgPacketWrite(IN struct adapter *pAdapter, static int -Efuse_PgPacketWrite_BT(IN struct adapter *pAdapter, - IN u8 offset, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +Efuse_PgPacketWrite_BT(struct adapter *pAdapter, + u8 offset, + u8 word_en, + u8 *data, + bool bPseudoTest) { int ret; @@ -557,9 +557,9 @@ Efuse_PgPacketWrite_BT(IN struct adapter *pAdapter, * *---------------------------------------------------------------------------*/ void -efuse_WordEnableDataRead(IN u8 word_en, - IN u8 *sourdata, - IN u8 *targetdata) +efuse_WordEnableDataRead(u8 word_en, + u8 *sourdata, + u8 *targetdata) { if (!(word_en&BIT(0))) { @@ -585,11 +585,11 @@ efuse_WordEnableDataRead(IN u8 word_en, u8 -Efuse_WordEnableDataWrite( IN struct adapter *pAdapter, - IN u16 efuse_addr, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +Efuse_WordEnableDataWrite( struct adapter *pAdapter, + u16 efuse_addr, + u8 word_en, + u8 *data, + bool bPseudoTest) { u8 ret=0; @@ -916,16 +916,16 @@ exit: *---------------------------------------------------------------------------*/ void Efuse_ReadAllMap( - IN struct adapter *pAdapter, - IN u8 efuseType, - IN OUT u8 *Efuse, - IN bool bPseudoTest); + struct adapter *pAdapter, + u8 efuseType, + u8 *Efuse, + bool bPseudoTest); void Efuse_ReadAllMap( - IN struct adapter *pAdapter, - IN u8 efuseType, - IN OUT u8 *Efuse, - IN bool bPseudoTest) + struct adapter *pAdapter, + u8 efuseType, + u8 *Efuse, + bool bPseudoTest) { u16 mapLen=0; @@ -958,9 +958,9 @@ Efuse_ReadAllMap( *---------------------------------------------------------------------------*/ static void efuse_ShadowRead1Byte( - IN struct adapter *pAdapter, - IN u16 Offset, - IN OUT u8 *Value) + struct adapter *pAdapter, + u16 Offset, + u8 *Value) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); @@ -971,9 +971,9 @@ efuse_ShadowRead1Byte( /* Read Two Bytes */ static void efuse_ShadowRead2Byte( - IN struct adapter *pAdapter, - IN u16 Offset, - IN OUT u16 *Value) + struct adapter *pAdapter, + u16 Offset, + u16 *Value) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); @@ -985,9 +985,9 @@ efuse_ShadowRead2Byte( /* Read Four Bytes */ static void efuse_ShadowRead4Byte( - IN struct adapter *pAdapter, - IN u16 Offset, - IN OUT u32 *Value) + struct adapter *pAdapter, + u16 Offset, + u32 *Value) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); @@ -1020,15 +1020,15 @@ efuse_ShadowRead4Byte( #ifdef PLATFORM static void efuse_ShadowWrite1Byte( - IN struct adapter *pAdapter, - IN u16 Offset, - IN u8 Value); + struct adapter *pAdapter, + u16 Offset, + u8 Value); #endif /* PLATFORM */ static void efuse_ShadowWrite1Byte( - IN struct adapter *pAdapter, - IN u16 Offset, - IN u8 Value) + struct adapter *pAdapter, + u16 Offset, + u8 Value) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); @@ -1039,9 +1039,9 @@ efuse_ShadowWrite1Byte( /* Write Two Bytes */ static void efuse_ShadowWrite2Byte( - IN struct adapter *pAdapter, - IN u16 Offset, - IN u16 Value) + struct adapter *pAdapter, + u16 Offset, + u16 Value) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); @@ -1053,9 +1053,9 @@ efuse_ShadowWrite2Byte( /* Write Four Bytes */ static void efuse_ShadowWrite4Byte( - IN struct adapter *pAdapter, - IN u16 Offset, - IN u32 Value) + struct adapter *pAdapter, + u16 Offset, + u32 Value) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); @@ -1083,9 +1083,9 @@ efuse_ShadowWrite4Byte( * *---------------------------------------------------------------------------*/ void EFUSE_ShadowMapUpdate( - IN struct adapter *pAdapter, - IN u8 efuseType, - IN bool bPseudoTest) + struct adapter *pAdapter, + u8 efuseType, + bool bPseudoTest) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); u16 mapLen=0; @@ -1116,10 +1116,10 @@ void EFUSE_ShadowMapUpdate( *---------------------------------------------------------------------------*/ void EFUSE_ShadowRead( - IN struct adapter *pAdapter, - IN u8 Type, - IN u16 Offset, - IN OUT u32 *Value ) + struct adapter *pAdapter, + u8 Type, + u16 Offset, + u32 *Value ) { if (Type == 1) efuse_ShadowRead1Byte(pAdapter, Offset, (u8 *)Value); @@ -1148,16 +1148,16 @@ EFUSE_ShadowRead( *---------------------------------------------------------------------------*/ void EFUSE_ShadowWrite( - IN struct adapter *pAdapter, - IN u8 Type, - IN u16 Offset, - IN OUT u32 Value); + struct adapter *pAdapter, + u8 Type, + u16 Offset, + u32 Value); void EFUSE_ShadowWrite( - IN struct adapter *pAdapter, - IN u8 Type, - IN u16 Offset, - IN OUT u32 Value) + struct adapter *pAdapter, + u8 Type, + u16 Offset, + u32 Value) { #if (MP_DRIVER == 0) return; @@ -1177,11 +1177,11 @@ EFUSE_ShadowWrite( void Efuse_InitSomeVar( - IN struct adapter *pAdapter + struct adapter *pAdapter ); void Efuse_InitSomeVar( - IN struct adapter *pAdapter + struct adapter *pAdapter ) { u8 i; diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index c86dcd5..85708c4 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -5111,7 +5111,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame) /* The peer interface address should be the address for WPS mac address */ memcpy( pwdinfo->p2p_peer_device_addr, group_id.go_device_addr , ETH_ALEN ); rtw_p2p_set_role( pwdinfo, P2P_ROLE_CLIENT ); - rtw_p2p_set_state(pwdinfo, P2P_STATE_RECV_INVITE_REQ_JOIN ); + rtw_p2p_set_state(pwdinfo, P2P_STATE_RECV_INVITE_REQ_JOIN); status_code = P2P_STATUS_SUCCESS; } } @@ -6956,8 +6956,8 @@ void issue_assocreq(struct adapter *padapter) /* Config Method */ /* This field should be big endian. Noted by P2P specification. */ - if ( ( pwdinfo->ui_got_wps_info == P2P_GOT_WPSINFO_PEER_DISPLAY_PIN ) || - ( pwdinfo->ui_got_wps_info == P2P_GOT_WPSINFO_SELF_DISPLAY_PIN ) ) + if ( ( pwdinfo->ui_got_wps_info == P2P_GOT_WPSINFO_PEER_DISPLAY_PIN) || + ( pwdinfo->ui_got_wps_info == P2P_GOT_WPSINFO_SELF_DISPLAY_PIN) ) { *(__be16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_CONFIG_METHOD_DISPLAY ); } @@ -8000,8 +8000,8 @@ Following are some utitity fuctions for WiFi MLME *****************************************************************************/ bool IsLegal5GChannel( - IN struct adapter * Adapter, - IN u8 channel) + struct adapter * Adapter, + u8 channel) { int i=0; diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c index 8aa9903..48cf0fc 100755 --- a/core/rtw_pwrctrl.c +++ b/core/rtw_pwrctrl.c @@ -627,7 +627,7 @@ void LPS_Leave(struct adapter *padapter) /* Description: Leave all power save mode: LPS, FwLPS, IPS if needed. */ /* Move code to function by tynli. 2010.03.26. */ /* */ -void LeaveAllPowerSaveMode(IN struct adapter *Adapter) +void LeaveAllPowerSaveMode(struct adapter *Adapter) { struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); u8 enqueue = 0; diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index fe8931c..f43c3c2 100755 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -302,8 +302,8 @@ void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *bssrat } void UpdateBrateTbl( - IN struct adapter * Adapter, - IN u8 *mBratesOS + struct adapter * Adapter, + u8 *mBratesOS ) { u8 i; diff --git a/hal/Hal8188ERateAdaptive.c b/hal/Hal8188ERateAdaptive.c index 1c3a9bd..3f3a1db 100755 --- a/hal/Hal8188ERateAdaptive.c +++ b/hal/Hal8188ERateAdaptive.c @@ -105,9 +105,9 @@ static u16 DynamicTxRPTTiming[6]={0x186a, 0x30d4, 0x493e, 0x61a8, 0x7a12 ,0x927c static void odm_SetTxRPTTiming_8188E( - IN PDM_ODM_T pDM_Odm, - IN PODM_RA_INFO_T pRaInfo, - IN u8 extend + PDM_ODM_T pDM_Odm, + PODM_RA_INFO_T pRaInfo, + u8 extend ) { u8 idx = 0; @@ -134,8 +134,8 @@ odm_SetTxRPTTiming_8188E( static int odm_RateDown_8188E( - IN PDM_ODM_T pDM_Odm, - IN PODM_RA_INFO_T pRaInfo + PDM_ODM_T pDM_Odm, + PODM_RA_INFO_T pRaInfo ) { u8 RateID, LowestRate, HighestRate; @@ -207,8 +207,8 @@ RateDownFinish: static int odm_RateUp_8188E( - IN PDM_ODM_T pDM_Odm, - IN PODM_RA_INFO_T pRaInfo + PDM_ODM_T pDM_Odm, + PODM_RA_INFO_T pRaInfo ) { u8 RateID, HighestRate; @@ -273,7 +273,7 @@ RateUpfinish: return 0; } -static void odm_ResetRaCounter_8188E( IN PODM_RA_INFO_T pRaInfo){ +static void odm_ResetRaCounter_8188E(PODM_RA_INFO_T pRaInfo){ u8 RateID; RateID=pRaInfo->DecisionRate; pRaInfo->NscUp=(N_THRESHOLD_HIGH[RateID]+N_THRESHOLD_LOW[RateID])>>1; @@ -282,8 +282,8 @@ static void odm_ResetRaCounter_8188E( IN PODM_RA_INFO_T pRaInfo){ static void odm_RateDecision_8188E( - IN PDM_ODM_T pDM_Odm, - IN PODM_RA_INFO_T pRaInfo + PDM_ODM_T pDM_Odm, + PODM_RA_INFO_T pRaInfo ) { u8 RateID = 0, RtyPtID = 0, PenaltyID1 = 0, PenaltyID2 = 0; @@ -374,8 +374,8 @@ odm_RateDecision_8188E( static int odm_ARFBRefresh_8188E( - IN PDM_ODM_T pDM_Odm, - IN PODM_RA_INFO_T pRaInfo + PDM_ODM_T pDM_Odm, + PODM_RA_INFO_T pRaInfo ) { /* Wilson 2011/10/26 */ u32 MaskFromReg; @@ -478,7 +478,7 @@ odm_ARFBRefresh_8188E( #if POWER_TRAINING_ACTIVE == 1 static void odm_PTTryState_8188E( - IN PODM_RA_INFO_T pRaInfo + PODM_RA_INFO_T pRaInfo ) { pRaInfo->PTTryState=0; @@ -538,7 +538,7 @@ odm_PTTryState_8188E( static void odm_PTDecision_8188E( - IN PODM_RA_INFO_T pRaInfo + PODM_RA_INFO_T pRaInfo ) { u8 stage_BUF; @@ -581,8 +581,8 @@ odm_PTDecision_8188E( static void odm_RATxRPTTimerSetting( - IN PDM_ODM_T pDM_Odm, - IN u16 minRptTime + PDM_ODM_T pDM_Odm, + u16 minRptTime ) { ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,(" =====>odm_RATxRPTTimerSetting()\n")); @@ -600,7 +600,7 @@ odm_RATxRPTTimerSetting( void ODM_RASupport_Init( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("=====>ODM_RASupport_Init()\n")); @@ -615,8 +615,8 @@ ODM_RASupport_Init( int ODM_RAInfo_Init( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID + PDM_ODM_T pDM_Odm, + u8 MacID ) { PODM_RA_INFO_T pRaInfo = &pDM_Odm->RAInfo[MacID]; @@ -681,7 +681,7 @@ ODM_RAInfo_Init( int ODM_RAInfo_Init_all( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u8 MacID = 0; @@ -698,8 +698,8 @@ ODM_RAInfo_Init_all( u8 ODM_RA_GetShortGI_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID + PDM_ODM_T pDM_Odm, + u8 MacID ) { if((NULL == pDM_Odm) || (MacID >= ASSOCIATE_ENTRY_NUM)) @@ -711,8 +711,8 @@ ODM_RA_GetShortGI_8188E( u8 ODM_RA_GetDecisionRate_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID + PDM_ODM_T pDM_Odm, + u8 MacID ) { u8 DecisionRate = 0; @@ -727,8 +727,8 @@ ODM_RA_GetDecisionRate_8188E( u8 ODM_RA_GetHwPwrStatus_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID + PDM_ODM_T pDM_Odm, + u8 MacID ) { u8 PTStage = 5; @@ -742,11 +742,11 @@ ODM_RA_GetHwPwrStatus_8188E( void ODM_RA_UpdateRateInfo_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID, - IN u8 RateID, - IN u32 RateMask, - IN u8 SGIEnable + PDM_ODM_T pDM_Odm, + u8 MacID, + u8 RateID, + u32 RateMask, + u8 SGIEnable ) { PODM_RA_INFO_T pRaInfo = NULL; @@ -766,9 +766,9 @@ ODM_RA_UpdateRateInfo_8188E( void ODM_RA_SetRSSI_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID, - IN u8 Rssi + PDM_ODM_T pDM_Odm, + u8 MacID, + u8 Rssi ) { PODM_RA_INFO_T pRaInfo = NULL; @@ -784,8 +784,8 @@ ODM_RA_SetRSSI_8188E( void ODM_RA_Set_TxRPT_Time( - IN PDM_ODM_T pDM_Odm, - IN u16 minRptTime + PDM_ODM_T pDM_Odm, + u16 minRptTime ) { ODM_Write2Byte(pDM_Odm, REG_TX_RPT_TIME, minRptTime); @@ -794,11 +794,11 @@ ODM_RA_Set_TxRPT_Time( void ODM_RA_TxRPT2Handle_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 * TxRPT_Buf, - IN u16 TxRPT_Len, - IN u32 MacIDValidEntry0, - IN u32 MacIDValidEntry1 + PDM_ODM_T pDM_Odm, + u8 * TxRPT_Buf, + u16 TxRPT_Len, + u32 MacIDValidEntry0, + u32 MacIDValidEntry1 ) { PODM_RA_INFO_T pRAInfo = NULL; @@ -912,8 +912,8 @@ ODM_RA_TxRPT2Handle_8188E( static void odm_RATxRPTTimerSetting( - IN PDM_ODM_T pDM_Odm, - IN u16 minRptTime + PDM_ODM_T pDM_Odm, + u16 minRptTime ) { return; @@ -922,7 +922,7 @@ odm_RATxRPTTimerSetting( void ODM_RASupport_Init( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { return; @@ -930,8 +930,8 @@ ODM_RASupport_Init( int ODM_RAInfo_Init( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID + PDM_ODM_T pDM_Odm, + u8 MacID ) { return 0; @@ -939,7 +939,7 @@ ODM_RAInfo_Init( int ODM_RAInfo_Init_all( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { return 0; @@ -947,8 +947,8 @@ ODM_RAInfo_Init_all( u8 ODM_RA_GetShortGI_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID + PDM_ODM_T pDM_Odm, + u8 MacID ) { return 0; @@ -956,16 +956,16 @@ ODM_RA_GetShortGI_8188E( u8 ODM_RA_GetDecisionRate_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID + PDM_ODM_T pDM_Odm, + u8 MacID ) { return 0; } u8 ODM_RA_GetHwPwrStatus_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID + PDM_ODM_T pDM_Odm, + u8 MacID ) { return 0; @@ -973,11 +973,11 @@ ODM_RA_GetHwPwrStatus_8188E( void ODM_RA_UpdateRateInfo_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID, - IN u8 RateID, - IN u32 RateMask, - IN u8 SGIEnable + PDM_ODM_T pDM_Odm, + u8 MacID, + u8 RateID, + u32 RateMask, + u8 SGIEnable ) { return; @@ -985,9 +985,9 @@ ODM_RA_UpdateRateInfo_8188E( void ODM_RA_SetRSSI_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID, - IN u8 Rssi + PDM_ODM_T pDM_Odm, + u8 MacID, + u8 Rssi ) { return; @@ -995,8 +995,8 @@ ODM_RA_SetRSSI_8188E( void ODM_RA_Set_TxRPT_Time( - IN PDM_ODM_T pDM_Odm, - IN u16 minRptTime + PDM_ODM_T pDM_Odm, + u16 minRptTime ) { return; @@ -1004,11 +1004,11 @@ ODM_RA_Set_TxRPT_Time( void ODM_RA_TxRPT2Handle_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 * TxRPT_Buf, - IN u16 TxRPT_Len, - IN u32 MacIDValidEntry0, - IN u32 MacIDValidEntry1 + PDM_ODM_T pDM_Odm, + u8 * TxRPT_Buf, + u16 TxRPT_Len, + u32 MacIDValidEntry0, + u32 MacIDValidEntry1 ) { return; diff --git a/hal/Hal8188ERateAdaptive.h b/hal/Hal8188ERateAdaptive.h index c0c251a..bd197e3 100755 --- a/hal/Hal8188ERateAdaptive.h +++ b/hal/Hal8188ERateAdaptive.h @@ -40,67 +40,67 @@ Major Change History: void ODM_RASupport_Init( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); int ODM_RAInfo_Init_all( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); int ODM_RAInfo_Init( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID + PDM_ODM_T pDM_Odm, + u8 MacID ); u8 ODM_RA_GetShortGI_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID + PDM_ODM_T pDM_Odm, + u8 MacID ); u8 ODM_RA_GetDecisionRate_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID + PDM_ODM_T pDM_Odm, + u8 MacID ); u8 ODM_RA_GetHwPwrStatus_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID + PDM_ODM_T pDM_Odm, + u8 MacID ); void ODM_RA_UpdateRateInfo_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID, - IN u8 RateID, - IN u32 RateMask, - IN u8 SGIEnable + PDM_ODM_T pDM_Odm, + u8 MacID, + u8 RateID, + u32 RateMask, + u8 SGIEnable ); void ODM_RA_SetRSSI_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 MacID, - IN u8 Rssi + PDM_ODM_T pDM_Odm, + u8 MacID, + u8 Rssi ); void ODM_RA_TxRPT2Handle_8188E( - IN PDM_ODM_T pDM_Odm, - IN u8 * TxRPT_Buf, - IN u16 TxRPT_Len, - IN u32 MacIDValidEntry0, - IN u32 MacIDValidEntry1 + PDM_ODM_T pDM_Odm, + u8 * TxRPT_Buf, + u16 TxRPT_Len, + u32 MacIDValidEntry0, + u32 MacIDValidEntry1 ); void ODM_RA_Set_TxRPT_Time( - IN PDM_ODM_T pDM_Odm, - IN u16 minRptTime + PDM_ODM_T pDM_Odm, + u16 minRptTime ); #endif diff --git a/hal/HalHWImg8188E_BB.c b/hal/HalHWImg8188E_BB.c index ee0a644..2c77cf5 100755 --- a/hal/HalHWImg8188E_BB.c +++ b/hal/HalHWImg8188E_BB.c @@ -325,7 +325,7 @@ static u32 Array_AGC_TAB_1T_8188E[] = { HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) @@ -532,7 +532,7 @@ static u32 Array_MP_8188E_AGC_TAB_1T_ICUT[] = { void ODM_ReadAndConfig_AGC_TAB_1T_ICUT_8188E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) @@ -812,7 +812,7 @@ static u32 Array_PHY_REG_1T_8188E[] = { HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) @@ -1071,7 +1071,7 @@ static u32 Array_MP_8188E_PHY_REG_1T_ICUT[] = { void ODM_ReadAndConfig_PHY_REG_1T_ICUT_8188E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) @@ -1143,7 +1143,7 @@ static u32 Array_PHY_REG_PG_8188E[] = { void ODM_ReadAndConfig_PHY_REG_PG_8188E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u32 hex = 0; diff --git a/hal/HalHWImg8188E_BB.h b/hal/HalHWImg8188E_BB.h index 34af089..81eb10d 100755 --- a/hal/HalHWImg8188E_BB.h +++ b/hal/HalHWImg8188E_BB.h @@ -29,7 +29,7 @@ HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); /****************************************************************************** * AGC_TAB_1T_ICUT.TXT @@ -37,7 +37,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E( void ODM_ReadAndConfig_AGC_TAB_1T_ICUT_8188E( /* TC: Test Chip, MP: MP Chip */ - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); /****************************************************************************** * PHY_REG_1T.TXT @@ -45,7 +45,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_ICUT_8188E( /* TC: Test Chip, MP: MP Chip */ HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); /****************************************************************************** * PHY_REG_1T_ICUT.TXT @@ -53,7 +53,7 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E( void ODM_ReadAndConfig_PHY_REG_1T_ICUT_8188E( /* TC: Test Chip, MP: MP Chip */ - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); /****************************************************************************** @@ -62,7 +62,7 @@ ODM_ReadAndConfig_PHY_REG_1T_ICUT_8188E( /* TC: Test Chip, MP: MP Chip */ void ODM_ReadAndConfig_PHY_REG_PG_8188E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); #endif /* end of HWIMG_SUPPORT */ diff --git a/hal/HalHWImg8188E_MAC.c b/hal/HalHWImg8188E_MAC.c index 8ce870b..a2d8214 100755 --- a/hal/HalHWImg8188E_MAC.c +++ b/hal/HalHWImg8188E_MAC.c @@ -155,7 +155,7 @@ static u32 Array_MAC_REG_8188E[] = { HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) @@ -315,7 +315,7 @@ static u32 Array_MP_8188E_MAC_REG_ICUT[] = { void ODM_ReadAndConfig_MAC_REG_ICUT_8188E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) diff --git a/hal/HalHWImg8188E_MAC.h b/hal/HalHWImg8188E_MAC.h index 49c206d..54fbe07 100755 --- a/hal/HalHWImg8188E_MAC.h +++ b/hal/HalHWImg8188E_MAC.h @@ -29,7 +29,7 @@ HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); /****************************************************************************** @@ -38,7 +38,7 @@ ODM_ReadAndConfig_MAC_REG_8188E( void ODM_ReadAndConfig_MAC_REG_ICUT_8188E( /* TC: Test Chip, MP: MP Chip */ - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); #endif diff --git a/hal/HalHWImg8188E_RF.c b/hal/HalHWImg8188E_RF.c index ed5b6cb..899c204 100755 --- a/hal/HalHWImg8188E_RF.c +++ b/hal/HalHWImg8188E_RF.c @@ -174,7 +174,7 @@ static u32 Array_RadioA_1T_8188E[] = { HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) @@ -345,7 +345,7 @@ static u32 Array_MP_8188E_RadioA_1T_ICUT[] = { void ODM_ReadAndConfig_RadioA_1T_ICUT_8188E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while(0) diff --git a/hal/HalHWImg8188E_RF.h b/hal/HalHWImg8188E_RF.h index 60ea2b6..50f5576 100755 --- a/hal/HalHWImg8188E_RF.h +++ b/hal/HalHWImg8188E_RF.h @@ -29,7 +29,7 @@ HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); /****************************************************************************** * RadioA_1T_ICUT.TXT @@ -37,7 +37,7 @@ ODM_ReadAndConfig_RadioA_1T_8188E( void ODM_ReadAndConfig_RadioA_1T_ICUT_8188E( /* TC: Test Chip, MP: MP Chip */ - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); #endif diff --git a/hal/HalPhyRf.c b/hal/HalPhyRf.c index f150994..845d0be 100755 --- a/hal/HalPhyRf.c +++ b/hal/HalPhyRf.c @@ -26,7 +26,7 @@ void ODM_ResetIQKResult( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u8 i; diff --git a/hal/HalPhyRf_8188e.c b/hal/HalPhyRf_8188e.c index 77733c7..1e84eef 100755 --- a/hal/HalPhyRf_8188e.c +++ b/hal/HalPhyRf_8188e.c @@ -337,7 +337,7 @@ odm_TxPwrTrackSetPwr88E( void odm_TXPowerTrackingCallback_ThermalMeter_8188E( - IN struct adapter *Adapter + struct adapter *Adapter ) { @@ -560,8 +560,8 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( static u8 /* bit0 = 1 => Tx OK, bit1 = 1 => Rx OK */ phy_PathA_IQK_8188E( - IN struct adapter *pAdapter, - IN bool configPathB + struct adapter *pAdapter, + bool configPathB ) { u32 regEAC, regE94, regE9C, regEA4; @@ -613,8 +613,8 @@ phy_PathA_IQK_8188E( static u8 /* bit0 = 1 => Tx OK, bit1 = 1 => Rx OK */ phy_PathA_RxIQK( - IN struct adapter *pAdapter, - IN bool configPathB + struct adapter *pAdapter, + bool configPathB ) { u32 regEAC, regE94, regE9C, regEA4, u4tmp; @@ -750,7 +750,7 @@ phy_PathA_RxIQK( static u8 /* bit0 = 1 => Tx OK, bit1 = 1 => Rx OK */ phy_PathB_IQK_8188E( - IN struct adapter *pAdapter + struct adapter *pAdapter ) { u32 regEAC, regEB4, regEBC, regEC4, regECC; @@ -802,11 +802,11 @@ phy_PathB_IQK_8188E( static void _PHY_PathAFillIQKMatrix( - IN struct adapter *pAdapter, - IN bool bIQKOK, - IN s32 result[][8], - IN u8 final_candidate, - IN bool bTxOnly + struct adapter *pAdapter, + bool bIQKOK, + s32 result[][8], + u8 final_candidate, + bool bTxOnly ) { u32 Oldval_0, X, TX0_A, reg; @@ -862,11 +862,11 @@ _PHY_PathAFillIQKMatrix( static void _PHY_PathBFillIQKMatrix( - IN struct adapter *pAdapter, - IN bool bIQKOK, - IN s32 result[][8], - IN u8 final_candidate, - IN bool bTxOnly /* do Tx only */ + struct adapter *pAdapter, + bool bIQKOK, + s32 result[][8], + u8 final_candidate, + bool bTxOnly /* do Tx only */ ) { u32 Oldval_1, X, TX1_A, reg; @@ -922,17 +922,17 @@ _PHY_PathBFillIQKMatrix( /* MP Already declare in odm.c */ static bool ODM_CheckPowerStatus( - IN struct adapter * Adapter) + struct adapter * Adapter) { return true; } void _PHY_SaveADDARegisters( - IN struct adapter *pAdapter, - IN u32 * ADDAReg, - IN u32 * ADDABackup, - IN u32 RegisterNum + struct adapter *pAdapter, + u32 * ADDAReg, + u32 * ADDABackup, + u32 RegisterNum ) { u32 i; @@ -950,9 +950,9 @@ _PHY_SaveADDARegisters( static void _PHY_SaveMACRegisters( - IN struct adapter *pAdapter, - IN u32 * MACReg, - IN u32 * MACBackup + struct adapter *pAdapter, + u32 * MACReg, + u32 * MACBackup ) { u32 i; @@ -970,10 +970,10 @@ _PHY_SaveMACRegisters( static void _PHY_ReloadADDARegisters( - IN struct adapter *pAdapter, - IN u32 * ADDAReg, - IN u32 * ADDABackup, - IN u32 RegiesterNum + struct adapter *pAdapter, + u32 * ADDAReg, + u32 * ADDABackup, + u32 RegiesterNum ) { u32 i; @@ -989,9 +989,9 @@ _PHY_ReloadADDARegisters( static void _PHY_ReloadMACRegisters( - IN struct adapter *pAdapter, - IN u32 * MACReg, - IN u32 * MACBackup + struct adapter *pAdapter, + u32 * MACReg, + u32 * MACBackup ) { u32 i; @@ -1008,10 +1008,10 @@ _PHY_ReloadMACRegisters( void _PHY_PathADDAOn( - IN struct adapter *pAdapter, - IN u32 * ADDAReg, - IN bool isPathAOn, - IN bool is2T + struct adapter *pAdapter, + u32 * ADDAReg, + bool isPathAOn, + bool is2T ) { u32 pathOn; @@ -1038,9 +1038,9 @@ _PHY_PathADDAOn( void _PHY_MACSettingCalibration( - IN struct adapter *pAdapter, - IN u32 * MACReg, - IN u32 * MACBackup + struct adapter *pAdapter, + u32 * MACReg, + u32 * MACBackup ) { u32 i = 0; @@ -1060,7 +1060,7 @@ _PHY_MACSettingCalibration( void _PHY_PathAStandBy( - IN struct adapter *pAdapter + struct adapter *pAdapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -1075,8 +1075,8 @@ _PHY_PathAStandBy( static void _PHY_PIModeSwitch( - IN struct adapter *pAdapter, - IN bool PIMode + struct adapter *pAdapter, + bool PIMode ) { u32 mode; @@ -1092,10 +1092,10 @@ _PHY_PIModeSwitch( static bool phy_SimularityCompare_8188E( - IN struct adapter *pAdapter, - IN s32 result[][8], - IN u8 c1, - IN u8 c2 + struct adapter *pAdapter, + s32 result[][8], + u8 c1, + u8 c2 ) { u32 i, j, diff, SimularityBitMap, bound = 0; @@ -1213,10 +1213,10 @@ phy_SimularityCompare_8188E( static void phy_IQCalibrate_8188E( - IN struct adapter *pAdapter, - IN s32 result[][8], - IN u8 t, - IN bool is2T + struct adapter *pAdapter, + s32 result[][8], + u8 t, + bool is2T ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -1406,8 +1406,8 @@ else static void phy_LCCalibrate_8188E( - IN struct adapter *pAdapter, - IN bool is2T + struct adapter *pAdapter, + bool is2T ) { u8 tmpReg; @@ -1475,9 +1475,9 @@ phy_LCCalibrate_8188E( static void phy_APCalibrate_8188E( - IN struct adapter *pAdapter, - IN s8 delta, - IN bool is2T + struct adapter *pAdapter, + s8 delta, + bool is2T ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -1908,8 +1908,8 @@ if ( *(pDM_Odm->mp_mode) == 1) void PHY_IQCalibrate_8188E( - IN struct adapter *pAdapter, - IN bool bReCovery + struct adapter *pAdapter, + bool bReCovery ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -2093,7 +2093,7 @@ if (*(pDM_Odm->mp_mode) == 1) void PHY_LCCalibrate_8188E( - IN struct adapter *pAdapter + struct adapter *pAdapter ) { bool bStartContTx = false, bSingleTone = false, bCarrierSuppression = false; @@ -2158,16 +2158,16 @@ if (*(pDM_Odm->mp_mode) == 1) void PHY_APCalibrate_8188E( - IN struct adapter *pAdapter, - IN s8 delta + struct adapter *pAdapter, + s8 delta ) { } static void phy_SetRFPathSwitch_8188E( - IN struct adapter *pAdapter, - IN bool bMain, - IN bool is2T + struct adapter *pAdapter, + bool bMain, + bool is2T ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -2198,8 +2198,8 @@ static void phy_SetRFPathSwitch_8188E( } } void PHY_SetRFPathSwitch_8188E( - IN struct adapter *pAdapter, - IN bool bMain + struct adapter *pAdapter, + bool bMain ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); diff --git a/hal/HalPhyRf_8188e.h b/hal/HalPhyRf_8188e.h index 5e84f34..d7fb029 100755 --- a/hal/HalPhyRf_8188e.h +++ b/hal/HalPhyRf_8188e.h @@ -44,7 +44,7 @@ ODM_TxPwrTrackAdjust88E( void odm_TXPowerTrackingCallback_ThermalMeter_8188E( - IN struct adapter * Adapter + struct adapter * Adapter ); @@ -52,8 +52,8 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( void PHY_IQCalibrate_8188E( - IN struct adapter * Adapter, - IN bool bReCovery); + struct adapter * Adapter, + bool bReCovery); /* */ @@ -61,7 +61,7 @@ PHY_IQCalibrate_8188E( /* */ void PHY_LCCalibrate_8188E( - IN struct adapter * pAdapter + struct adapter * pAdapter ); /* */ @@ -69,40 +69,40 @@ PHY_LCCalibrate_8188E( /* */ void PHY_APCalibrate_8188E( - IN struct adapter * pAdapter, - IN s8 delta); + struct adapter * pAdapter, + s8 delta); void -PHY_DigitalPredistortion_8188E( IN struct adapter * pAdapter); +PHY_DigitalPredistortion_8188E(struct adapter * pAdapter); void _PHY_SaveADDARegisters( - IN struct adapter * pAdapter, - IN u32 * ADDAReg, - IN u32 * ADDABackup, - IN u32 RegisterNum + struct adapter * pAdapter, + u32 * ADDAReg, + u32 * ADDABackup, + u32 RegisterNum ); void _PHY_PathADDAOn( - IN struct adapter * pAdapter, - IN u32 * ADDAReg, - IN bool isPathAOn, - IN bool is2T + struct adapter * pAdapter, + u32 * ADDAReg, + bool isPathAOn, + bool is2T ); void _PHY_MACSettingCalibration( - IN struct adapter * pAdapter, - IN u32 * MACReg, - IN u32 * MACBackup + struct adapter * pAdapter, + u32 * MACReg, + u32 * MACBackup ); void _PHY_PathAStandBy( - IN struct adapter * pAdapter + struct adapter * pAdapter ); diff --git a/hal/hal_com.c b/hal/hal_com.c index 2de9e5a..858a99a 100755 --- a/hal/hal_com.c +++ b/hal/hal_com.c @@ -73,11 +73,11 @@ void dump_chip_info(HAL_VERSION ChipVersion) u8 /* return the final channel plan decision */ hal_com_get_channel_plan( - IN struct adapter *padapter, - IN u8 hw_channel_plan, /* channel plan from HW (efuse/eeprom) */ - IN u8 sw_channel_plan, /* channel plan from SW (registry/module param) */ - IN u8 def_channel_plan, /* channel plan used when the former two is invalid */ - IN bool AutoLoadFail + struct adapter *padapter, + u8 hw_channel_plan, /* channel plan from HW (efuse/eeprom) */ + u8 sw_channel_plan, /* channel plan from SW (registry/module param) */ + u8 def_channel_plan, /* channel plan used when the former two is invalid */ + bool AutoLoadFail ) { u8 swConfig; @@ -140,9 +140,9 @@ u8 MRateToHwRate(u8 rate) } void HalSetBrateCfg( - IN struct adapter * Adapter, - IN u8 *mBratesOS, - OUT u16 *pBrateCfg) + struct adapter * Adapter, + u8 *mBratesOS, + u16 *pBrateCfg) { u8 i, is_brate, brate; @@ -174,7 +174,7 @@ void HalSetBrateCfg( static void _OneOutPipeMapping( - IN struct adapter *pAdapter + struct adapter *pAdapter ) { struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); @@ -192,8 +192,8 @@ _OneOutPipeMapping( static void _TwoOutPipeMapping( - IN struct adapter *pAdapter, - IN bool bWIFICfg + struct adapter *pAdapter, + bool bWIFICfg ) { struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); @@ -237,8 +237,8 @@ _TwoOutPipeMapping( } static void _ThreeOutPipeMapping( - IN struct adapter *pAdapter, - IN bool bWIFICfg + struct adapter *pAdapter, + bool bWIFICfg ) { struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); @@ -282,8 +282,8 @@ static void _ThreeOutPipeMapping( bool Hal_MappingOutPipe( - IN struct adapter *pAdapter, - IN u8 NumOutPipe + struct adapter *pAdapter, + u8 NumOutPipe ) { struct registry_priv *pregistrypriv = &pAdapter->registrypriv; diff --git a/hal/odm.c b/hal/odm.c index 5ebe11e..6a90731 100755 --- a/hal/odm.c +++ b/hal/odm.c @@ -231,37 +231,37 @@ unsigned int TxPwrTrk_OFDM_SwingTbl[TxPwrTrk_OFDM_SwingTbl_Len] = { /* START------------COMMON INFO RELATED--------------- */ void odm_CommonInfoSelfInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_CommonInfoSelfUpdate( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_CmnInfoInit_Debug( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_CmnInfoHook_Debug( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_CmnInfoUpdate_Debug( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); /* void odm_FindMinimumRSSI( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_IsLinked( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); */ /* END------------COMMON INFO RELATED--------------- */ @@ -269,158 +269,158 @@ odm_IsLinked( /* START---------------DIG--------------------------- */ void odm_FalseAlarmCounterStatistics( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_DIGInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_DIG( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_CCKPacketDetectionThresh( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); /* END---------------DIG--------------------------- */ /* START-------BB POWER SAVE----------------------- */ void odm_DynamicBBPowerSavingInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_DynamicBBPowerSaving( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_1R_CCA( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_AdaptivityInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_Adaptivity( - IN PDM_ODM_T pDM_Odm, - IN u8 IGI + PDM_ODM_T pDM_Odm, + u8 IGI ); /* END---------BB POWER SAVE----------------------- */ void odm_RefreshRateAdaptiveMaskMP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_RefreshRateAdaptiveMaskCE( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_RefreshRateAdaptiveMaskAPADSL( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_DynamicTxPowerInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_DynamicTxPowerRestorePowerIndex( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_DynamicTxPowerNIC( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_DynamicTxPowerSavePowerIndex( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_DynamicTxPowerWritePowerIndex( - IN PDM_ODM_T pDM_Odm, - IN u8 Value); + PDM_ODM_T pDM_Odm, + u8 Value); void odm_DynamicTxPower_92C( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_DynamicTxPower_92D( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_RSSIMonitorInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_RSSIMonitorCheckMP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_RSSIMonitorCheckCE( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_RSSIMonitorCheckAP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_RSSIMonitorCheck( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_DynamicTxPower( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_DynamicTxPowerAP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_SwAntDivInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_SwAntDivInit_NIC( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_SwAntDivChkAntSwitch( - IN PDM_ODM_T pDM_Odm, - IN u8 Step + PDM_ODM_T pDM_Odm, + u8 Step ); void odm_SwAntDivChkAntSwitchNIC( - IN PDM_ODM_T pDM_Odm, - IN u8 Step + PDM_ODM_T pDM_Odm, + u8 Step ); @@ -428,22 +428,22 @@ void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext); void odm_GlobalAdapterCheck( - IN void + void ); void odm_RefreshRateAdaptiveMask( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void ODM_TXPowerTrackingCheck( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_TXPowerTrackingCheckAP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); @@ -454,43 +454,43 @@ odm_TXPowerTrackingCheckAP( void odm_RateAdaptiveMaskInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_TXPowerTrackingThermalMeterInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_TXPowerTrackingInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_TXPowerTrackingCheckMP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_TXPowerTrackingCheckCE( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_EdcaTurboCheck( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void ODM_EdcaTurboInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_EdcaTurboCheckCE( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); #define RxDefaultAnt1 0x65a9 @@ -498,31 +498,31 @@ odm_EdcaTurboCheckCE( void odm_InitHybridAntDiv( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); bool odm_StaDefAntSel( - IN PDM_ODM_T pDM_Odm, - IN u32 OFDM_Ant1_Cnt, - IN u32 OFDM_Ant2_Cnt, - IN u32 CCK_Ant1_Cnt, - IN u32 CCK_Ant2_Cnt, - OUT u8 *pDefAnt + PDM_ODM_T pDM_Odm, + u32 OFDM_Ant1_Cnt, + u32 OFDM_Ant2_Cnt, + u32 CCK_Ant1_Cnt, + u32 CCK_Ant2_Cnt, + u8 *pDefAnt ); void odm_SetRxIdleAnt( - IN PDM_ODM_T pDM_Odm, - IN u8 Ant, - IN bool bDualPath + PDM_ODM_T pDM_Odm, + u8 Ant, + bool bDualPath ); void odm_HwAntDiv( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); /* */ @@ -534,7 +534,7 @@ odm_HwAntDiv( /* */ void ODM_DMInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -582,7 +582,7 @@ ODM_DMInit( /* */ void ODM_DMWatchdog( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { /* 2012.05.03 Luke: For all IC series */ @@ -653,9 +653,9 @@ ODM_DMWatchdog( /* */ void ODM_CmnInfoInit( - IN PDM_ODM_T pDM_Odm, - IN ODM_CMNINFO_E CmnInfo, - IN u32 Value + PDM_ODM_T pDM_Odm, + ODM_CMNINFO_E CmnInfo, + u32 Value ) { /* ODM_RT_TRACE(pDM_Odm,); */ @@ -745,9 +745,9 @@ ODM_CmnInfoInit( void ODM_CmnInfoHook( - IN PDM_ODM_T pDM_Odm, - IN ODM_CMNINFO_E CmnInfo, - IN void * pValue + PDM_ODM_T pDM_Odm, + ODM_CMNINFO_E CmnInfo, + void * pValue ) { /* */ @@ -867,10 +867,10 @@ ODM_CmnInfoHook( void ODM_CmnInfoPtrArrayHook( - IN PDM_ODM_T pDM_Odm, - IN ODM_CMNINFO_E CmnInfo, - IN u16 Index, - IN void * pValue + PDM_ODM_T pDM_Odm, + ODM_CMNINFO_E CmnInfo, + u16 Index, + void * pValue ) { /* */ @@ -898,9 +898,9 @@ ODM_CmnInfoPtrArrayHook( /* */ void ODM_CmnInfoUpdate( - IN PDM_ODM_T pDM_Odm, - IN u32 CmnInfo, - IN u64 Value + PDM_ODM_T pDM_Odm, + u32 CmnInfo, + u64 Value ) { /* */ @@ -978,7 +978,7 @@ ODM_CmnInfoUpdate( void odm_CommonInfoSelfInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pDM_Odm->bCckHighPower = (bool) ODM_GetBBReg(pDM_Odm, 0x824, BIT9); @@ -993,7 +993,7 @@ odm_CommonInfoSelfInit( void odm_CommonInfoSelfUpdate( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u8 EntryCnt=0; @@ -1021,7 +1021,7 @@ odm_CommonInfoSelfUpdate( void odm_CmnInfoInit_Debug( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_CmnInfoInit_Debug==>\n")); @@ -1045,7 +1045,7 @@ odm_CmnInfoInit_Debug( void odm_CmnInfoHook_Debug( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_CmnInfoHook_Debug==>\n")); @@ -1066,7 +1066,7 @@ odm_CmnInfoHook_Debug( void odm_CmnInfoUpdate_Debug( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_CmnInfoUpdate_Debug==>\n")); @@ -1096,9 +1096,9 @@ odm_CmnInfoUpdate_Debug( *---------------------------------------------------------------------------*/ static void ODM_ChangeDynamicInitGainThresh( - IN PDM_ODM_T pDM_Odm, - IN u32 DM_Type, - IN u32 DM_Value + PDM_ODM_T pDM_Odm, + u32 DM_Type, + u32 DM_Value ) { pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; @@ -1156,8 +1156,8 @@ static int getIGIForDiff(int value_IGI) void ODM_Write_DIG( - IN PDM_ODM_T pDM_Odm, - IN u8 CurrentIGI + PDM_ODM_T pDM_Odm, + u8 CurrentIGI ) { pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; @@ -1202,7 +1202,7 @@ ODM_Write_DIG( void odm_DIGbyRSSI_LPS( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { struct adapter * pAdapter =pDM_Odm->Adapter; @@ -1257,7 +1257,7 @@ odm_DIGbyRSSI_LPS( void odm_AdaptivityInit( -IN PDM_ODM_T pDM_Odm +PDM_ODM_T pDM_Odm ) { if(pDM_Odm->SupportICType == ODM_RTL8723B) @@ -1283,8 +1283,8 @@ IN PDM_ODM_T pDM_Odm void odm_Adaptivity( - IN PDM_ODM_T pDM_Odm, - IN u8 IGI + PDM_ODM_T pDM_Odm, + u8 IGI ) { s8 TH_L2H_dmc, TH_H2L_dmc; @@ -1366,7 +1366,7 @@ odm_Adaptivity( void odm_DIGInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; @@ -1414,14 +1414,14 @@ odm_DIGInit( static void odm_DigForBtHsMode( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { } void odm_DIG( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; @@ -1606,15 +1606,6 @@ odm_DIG( } - /* 2 Modify DIG lower bound */ - /* - if((pFalseAlmCnt->Cnt_all > 500)&&(DIG_Dynamic_MIN < 0x25)) - DIG_Dynamic_MIN++; - else if(((pFalseAlmCnt->Cnt_all < 500)||(pDM_Odm->RSSI_Min < 8))&&(DIG_Dynamic_MIN > dm_dig_min)) - DIG_Dynamic_MIN--; - */ - - /* 1 Lower Bound for 88E AntDiv */ if((pDM_Odm->SupportICType == ODM_RTL8188E)&&(pDM_Odm->SupportAbility & ODM_BB_ANT_DIV)) { @@ -1869,7 +1860,7 @@ odm_DIG( static bool odm_DigAbort( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { return false; @@ -1881,7 +1872,7 @@ odm_DigAbort( void odm_FalseAlarmCounterStatistics( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u32 ret_value; @@ -1992,7 +1983,7 @@ odm_FalseAlarmCounterStatistics( void odm_CCKPacketDetectionThresh( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -2033,8 +2024,8 @@ odm_CCKPacketDetectionThresh( void ODM_Write_CCK_CCA_Thres( - IN PDM_ODM_T pDM_Odm, - IN u8 CurCCK_CCAThres + PDM_ODM_T pDM_Odm, + u8 CurCCK_CCAThres ) { pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; @@ -2053,7 +2044,7 @@ ODM_Write_CCK_CCA_Thres( /* 3============================================================ */ void odm_DynamicBBPowerSavingInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pPS_T pDM_PSTable = &pDM_Odm->DM_PSTable; @@ -2069,7 +2060,7 @@ odm_DynamicBBPowerSavingInit( void odm_DynamicBBPowerSaving( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { if ((pDM_Odm->SupportICType != ODM_RTL8192C) && (pDM_Odm->SupportICType != ODM_RTL8723A)) @@ -2096,7 +2087,7 @@ odm_DynamicBBPowerSaving( void odm_1R_CCA( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pPS_T pDM_PSTable = &pDM_Odm->DM_PSTable; @@ -2138,8 +2129,8 @@ odm_1R_CCA( void ODM_RF_Saving( - IN PDM_ODM_T pDM_Odm, - IN u8 bForceInNormal + PDM_ODM_T pDM_Odm, + u8 bForceInNormal ) { pPS_T pDM_PSTable = &pDM_Odm->DM_PSTable; @@ -2233,7 +2224,7 @@ ODM_RF_Saving( void odm_RateAdaptiveMaskInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { PODM_RATE_ADAPTIVE pOdmRA = &pDM_Odm->RateAdaptive; @@ -2249,10 +2240,10 @@ odm_RateAdaptiveMaskInit( } u32 ODM_Get_Rate_Bitmap( - IN PDM_ODM_T pDM_Odm, - IN u32 macid, - IN u32 ra_mask, - IN u8 rssi_level) + PDM_ODM_T pDM_Odm, + u32 macid, + u32 ra_mask, + u8 rssi_level) { PSTA_INFO_T pEntry; u32 rate_bitmap = 0x0fffffff; @@ -2368,7 +2359,7 @@ u32 ODM_Get_Rate_Bitmap( *---------------------------------------------------------------------------*/ void odm_RefreshRateAdaptiveMask( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { if (!(pDM_Odm->SupportAbility & ODM_BB_RA_MASK)) @@ -2398,14 +2389,14 @@ odm_RefreshRateAdaptiveMask( void odm_RefreshRateAdaptiveMaskMP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { } void odm_RefreshRateAdaptiveMaskCE( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u8 i; @@ -2439,7 +2430,7 @@ odm_RefreshRateAdaptiveMaskCE( void odm_RefreshRateAdaptiveMaskAPADSL( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { } @@ -2448,10 +2439,10 @@ odm_RefreshRateAdaptiveMaskAPADSL( /* - true: RATRState is changed. */ bool ODM_RAStateCheck( - IN PDM_ODM_T pDM_Odm, - IN s32 RSSI, - IN bool bForceUpdate, - OUT u8 * pRATRState + PDM_ODM_T pDM_Odm, + s32 RSSI, + bool bForceUpdate, + u8 * pRATRState ) { PODM_RATE_ADAPTIVE pRA = &pDM_Odm->RateAdaptive; @@ -2511,7 +2502,7 @@ ODM_RAStateCheck( void odm_DynamicTxPowerInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { struct adapter *Adapter = pDM_Odm->Adapter; @@ -2525,7 +2516,7 @@ odm_DynamicTxPowerInit( void odm_DynamicTxPowerSavePowerIndex( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u8 index; @@ -2540,7 +2531,7 @@ odm_DynamicTxPowerSavePowerIndex( void odm_DynamicTxPowerRestorePowerIndex( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u8 index; @@ -2555,8 +2546,8 @@ odm_DynamicTxPowerRestorePowerIndex( void odm_DynamicTxPowerWritePowerIndex( - IN PDM_ODM_T pDM_Odm, - IN u8 Value) + PDM_ODM_T pDM_Odm, + u8 Value) { u8 index; @@ -2571,7 +2562,7 @@ odm_DynamicTxPowerWritePowerIndex( void odm_DynamicTxPower( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { /* */ @@ -2615,7 +2606,7 @@ odm_DynamicTxPower( void odm_DynamicTxPowerNIC( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { if (!(pDM_Odm->SupportAbility & ODM_BB_DYNAMIC_TXPWR)) @@ -2642,7 +2633,7 @@ odm_DynamicTxPowerNIC( void odm_DynamicTxPowerAP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -2650,14 +2641,14 @@ odm_DynamicTxPowerAP( void odm_DynamicTxPower_92C( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { } void odm_DynamicTxPower_92D( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { } @@ -2669,14 +2660,14 @@ odm_DynamicTxPower_92D( void odm_RSSIMonitorInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { } void odm_RSSIMonitorCheck( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { /* */ @@ -2718,7 +2709,7 @@ odm_RSSIMonitorCheck( void odm_RSSIMonitorCheckMP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { } @@ -2728,14 +2719,14 @@ odm_RSSIMonitorCheckMP( /* */ static void FindMinimumRSSI_Dmsp( - IN struct adapter *pAdapter + struct adapter *pAdapter ) { } static void FindMinimumRSSI( -IN struct adapter *pAdapter +struct adapter *pAdapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -2753,7 +2744,7 @@ IN struct adapter *pAdapter void odm_RSSIMonitorCheckCE( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { struct adapter *Adapter = pDM_Odm->Adapter; @@ -2827,7 +2818,7 @@ odm_RSSIMonitorCheckCE( } void odm_RSSIMonitorCheckAP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { } @@ -2836,7 +2827,7 @@ odm_RSSIMonitorCheckAP( void ODM_InitAllTimers( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { ODM_InitializeTimer(pDM_Odm,&pDM_Odm->DM_SWAT_Table.SwAntennaSwitchTimer, @@ -2845,7 +2836,7 @@ ODM_InitAllTimers( void ODM_CancelAllTimers( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { ODM_CancelTimer(pDM_Odm,&pDM_Odm->DM_SWAT_Table.SwAntennaSwitchTimer); @@ -2854,7 +2845,7 @@ ODM_CancelAllTimers( void ODM_ReleaseAllTimers( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { ODM_ReleaseTimer(pDM_Odm,&pDM_Odm->DM_SWAT_Table.SwAntennaSwitchTimer); @@ -2867,7 +2858,7 @@ ODM_ReleaseAllTimers( void odm_TXPowerTrackingInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { odm_TXPowerTrackingThermalMeterInit(pDM_Odm); @@ -2876,7 +2867,7 @@ odm_TXPowerTrackingInit( void odm_TXPowerTrackingThermalMeterInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { { @@ -2908,7 +2899,7 @@ odm_TXPowerTrackingThermalMeterInit( void ODM_TXPowerTrackingCheck( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { /* */ @@ -2949,7 +2940,7 @@ ODM_TXPowerTrackingCheck( void odm_TXPowerTrackingCheckCE( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { struct adapter *Adapter = pDM_Odm->Adapter; @@ -2974,14 +2965,14 @@ odm_TXPowerTrackingCheckCE( void odm_TXPowerTrackingCheckMP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { } void odm_TXPowerTrackingCheckAP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { } @@ -2997,18 +2988,18 @@ odm_TXPowerTrackingCheckAP( /* 3============================================================ */ /* 3 SW Antenna Diversity */ /* 3============================================================ */ -void odm_SwAntDivInit( IN PDM_ODM_T pDM_Odm ) {} +void odm_SwAntDivInit( PDM_ODM_T pDM_Odm ) {} void ODM_SwAntDivChkPerPktRssi( - IN PDM_ODM_T pDM_Odm, - IN u8 StationID, - IN PODM_PHY_INFO_T pPhyInfo + PDM_ODM_T pDM_Odm, + u8 StationID, + PODM_PHY_INFO_T pPhyInfo ) {} void odm_SwAntDivChkAntSwitch( - IN PDM_ODM_T pDM_Odm, - IN u8 Step + PDM_ODM_T pDM_Odm, + u8 Step ) {} -static void ODM_SwAntDivResetBeforeLink( IN PDM_ODM_T pDM_Odm ){} -void ODM_SwAntDivRestAfterLink( IN PDM_ODM_T pDM_Odm ){} +static void ODM_SwAntDivResetBeforeLink( PDM_ODM_T pDM_Odm ){} +void ODM_SwAntDivRestAfterLink( PDM_ODM_T pDM_Odm ){} void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext){} /* 3============================================================ */ @@ -3017,7 +3008,7 @@ void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext){} static void odm_InitHybridAntDiv_88C_92D( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; @@ -3083,7 +3074,7 @@ odm_InitHybridAntDiv_88C_92D( void odm_InitHybridAntDiv( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { if(!(pDM_Odm->SupportAbility & ODM_BB_ANT_DIV)) @@ -3105,12 +3096,12 @@ odm_InitHybridAntDiv( bool odm_StaDefAntSel( - IN PDM_ODM_T pDM_Odm, - IN u32 OFDM_Ant1_Cnt, - IN u32 OFDM_Ant2_Cnt, - IN u32 CCK_Ant1_Cnt, - IN u32 CCK_Ant2_Cnt, - OUT u8 *pDefAnt + PDM_ODM_T pDM_Odm, + u32 OFDM_Ant1_Cnt, + u32 OFDM_Ant2_Cnt, + u32 CCK_Ant1_Cnt, + u32 CCK_Ant2_Cnt, + u8 *pDefAnt ) { @@ -3155,9 +3146,9 @@ odm_StaDefAntSel( void odm_SetRxIdleAnt( - IN PDM_ODM_T pDM_Odm, - IN u8 Ant, - IN bool bDualPath + PDM_ODM_T pDM_Odm, + u8 Ant, + bool bDualPath ) { SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; @@ -3183,10 +3174,10 @@ odm_SetRxIdleAnt( void ODM_AntselStatistics_88C( - IN PDM_ODM_T pDM_Odm, - IN u8 MacId, - IN u32 PWDBAll, - IN bool isCCKrate + PDM_ODM_T pDM_Odm, + u8 MacId, + u32 PWDBAll, + bool isCCKrate ) { SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; @@ -3216,7 +3207,7 @@ ODM_AntselStatistics_88C( static void ODM_SetTxAntByTxInfo_88C_92D( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -3224,7 +3215,7 @@ ODM_SetTxAntByTxInfo_88C_92D( static void odm_HwAntDiv_92C_92D( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; @@ -3299,7 +3290,7 @@ odm_HwAntDiv_92C_92D( void odm_HwAntDiv( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { if(!(pDM_Odm->SupportAbility & ODM_BB_ANT_DIV)) @@ -3323,7 +3314,7 @@ odm_HwAntDiv( /* */ void ODM_EdcaTurboInit( - IN PDM_ODM_T pDM_Odm) + PDM_ODM_T pDM_Odm) { struct adapter *Adapter = pDM_Odm->Adapter; pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = false; @@ -3337,7 +3328,7 @@ ODM_EdcaTurboInit( void odm_EdcaTurboCheck( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { /* */ @@ -3373,7 +3364,7 @@ odm_EdcaTurboCheck( void odm_EdcaTurboCheckCE( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -3482,7 +3473,7 @@ dm_CheckEdcaTurbo_EXIT: u32 GetPSDData( - IN PDM_ODM_T pDM_Odm, + PDM_ODM_T pDM_Odm, unsigned int point, u8 initial_gain_psd) { @@ -3539,7 +3530,7 @@ ConvertTo_dB( /* */ void odm_GlobalAdapterCheck( - IN void + void ) { } /* odm_GlobalAdapterCheck */ @@ -3552,7 +3543,7 @@ odm_GlobalAdapterCheck( /* */ void ODM_SingleDualAntennaDefaultSetting( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pSWAT_T pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; @@ -3566,10 +3557,10 @@ ODM_SingleDualAntennaDefaultSetting( static void odm_PHY_SaveAFERegisters( - IN PDM_ODM_T pDM_Odm, - IN u32 * AFEReg, - IN u32 * AFEBackup, - IN u32 RegisterNum + PDM_ODM_T pDM_Odm, + u32 * AFEReg, + u32 * AFEBackup, + u32 RegisterNum ) { u32 i; @@ -3582,10 +3573,10 @@ odm_PHY_SaveAFERegisters( static void odm_PHY_ReloadAFERegisters( - IN PDM_ODM_T pDM_Odm, - IN u32 * AFEReg, - IN u32 * AFEBackup, - IN u32 RegiesterNum + PDM_ODM_T pDM_Odm, + u32 * AFEReg, + u32 * AFEBackup, + u32 RegiesterNum ) { u32 i; @@ -3608,8 +3599,8 @@ odm_PHY_ReloadAFERegisters( /* */ bool ODM_SingleDualAntennaDetection( - IN PDM_ODM_T pDM_Odm, - IN u8 mode + PDM_ODM_T pDM_Odm, + u8 mode ) { diff --git a/hal/odm.h b/hal/odm.h index e0f6812..a611f9f 100755 --- a/hal/odm.h +++ b/hal/odm.h @@ -1425,7 +1425,7 @@ ODM_RAStateCheck( PDM_ODM_T pDM_Odm, s32 RSSI, bool bForceUpdate, - OUT u8 * pRATRState + u8 * pRATRState ); #define dm_SWAW_RSSI_Check ODM_SwAntDivChkPerPktRssi diff --git a/hal/odm_HWConfig.c b/hal/odm_HWConfig.c index 0595990..22aebb7 100755 --- a/hal/odm_HWConfig.c +++ b/hal/odm_HWConfig.c @@ -31,7 +31,7 @@ static u8 odm_QueryRxPwrPercentage( - IN s8 AntPower + s8 AntPower ) { if ((AntPower <= -100) || (AntPower >= 20)) @@ -55,7 +55,7 @@ odm_QueryRxPwrPercentage( /* */ static s32 odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Lenovo( - IN OUT PDM_ODM_T pDM_Odm, + PDM_ODM_T pDM_Odm, s32 CurrSig ) { @@ -65,7 +65,7 @@ odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Lenovo( static s32 odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Netcore( - IN OUT PDM_ODM_T pDM_Odm, + PDM_ODM_T pDM_Odm, s32 CurrSig ) { @@ -76,8 +76,8 @@ odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Netcore( static s32 odm_SignalScaleMapping_92CSeries( - IN OUT PDM_ODM_T pDM_Odm, - IN s32 CurrSig + PDM_ODM_T pDM_Odm, + s32 CurrSig ) { s32 RetSig; @@ -169,8 +169,8 @@ odm_SignalScaleMapping_92CSeries( } static s32 odm_SignalScaleMapping( - IN OUT PDM_ODM_T pDM_Odm, - IN s32 CurrSig + PDM_ODM_T pDM_Odm, + s32 CurrSig ) { if( (pDM_Odm->SupportPlatform == ODM_MP) && @@ -193,11 +193,11 @@ odm_SignalScaleMapping( /* pMgntInfo->CustomerID == RT_CID_819x_Lenovo */ static u8 odm_SQ_process_patch_RT_CID_819x_Lenovo( - IN PDM_ODM_T pDM_Odm, - IN u8 isCCKrate, - IN u8 PWDB_ALL, - IN u8 path, - IN u8 RSSI + PDM_ODM_T pDM_Odm, + u8 isCCKrate, + u8 PWDB_ALL, + u8 path, + u8 RSSI ) { u8 SQ; @@ -206,7 +206,7 @@ static u8 odm_SQ_process_patch_RT_CID_819x_Lenovo( static u8 odm_EVMdbToPercentage( - IN s8 Value + s8 Value ) { /* */ @@ -237,10 +237,10 @@ odm_EVMdbToPercentage( static void odm_RxPhyStatus92CSeries_Parsing( - IN OUT PDM_ODM_T pDM_Odm, - OUT PODM_PHY_INFO_T pPhyInfo, - IN u8 * pPhyStatus, - IN PODM_PACKET_INFO_T pPktinfo + PDM_ODM_T pDM_Odm, + PODM_PHY_INFO_T pPhyInfo, + u8 * pPhyStatus, + PODM_PACKET_INFO_T pPktinfo ) { SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; @@ -558,7 +558,7 @@ odm_RxPhyStatus92CSeries_Parsing( void odm_Init_RSSIForDM( - IN OUT PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -566,9 +566,9 @@ odm_Init_RSSIForDM( static void odm_Process_RSSIForDM( - IN OUT PDM_ODM_T pDM_Odm, - IN PODM_PHY_INFO_T pPhyInfo, - IN PODM_PACKET_INFO_T pPktinfo + PDM_ODM_T pDM_Odm, + PODM_PHY_INFO_T pPhyInfo, + PODM_PACKET_INFO_T pPktinfo ) { @@ -765,10 +765,10 @@ odm_Process_RSSIForDM( /* */ static void ODM_PhyStatusQuery_92CSeries( - IN OUT PDM_ODM_T pDM_Odm, - OUT PODM_PHY_INFO_T pPhyInfo, - IN u8 * pPhyStatus, - IN PODM_PACKET_INFO_T pPktinfo + PDM_ODM_T pDM_Odm, + PODM_PHY_INFO_T pPhyInfo, + u8 * pPhyStatus, + PODM_PACKET_INFO_T pPktinfo ) { @@ -793,10 +793,10 @@ ODM_PhyStatusQuery_92CSeries( /* */ static void ODM_PhyStatusQuery_JaguarSeries( - IN OUT PDM_ODM_T pDM_Odm, - OUT PODM_PHY_INFO_T pPhyInfo, - IN u8 * pPhyStatus, - IN PODM_PACKET_INFO_T pPktinfo + PDM_ODM_T pDM_Odm, + PODM_PHY_INFO_T pPhyInfo, + u8 * pPhyStatus, + PODM_PACKET_INFO_T pPktinfo ) { @@ -805,10 +805,10 @@ ODM_PhyStatusQuery_JaguarSeries( void ODM_PhyStatusQuery( - IN OUT PDM_ODM_T pDM_Odm, - OUT PODM_PHY_INFO_T pPhyInfo, - IN u8 * pPhyStatus, - IN PODM_PACKET_INFO_T pPktinfo + PDM_ODM_T pDM_Odm, + PODM_PHY_INFO_T pPhyInfo, + u8 * pPhyStatus, + PODM_PACKET_INFO_T pPktinfo ) { ODM_PhyStatusQuery_92CSeries(pDM_Odm,pPhyInfo,pPhyStatus,pPktinfo); @@ -817,12 +817,12 @@ ODM_PhyStatusQuery( /* For future use. */ void ODM_MacStatusQuery( - IN OUT PDM_ODM_T pDM_Odm, - IN u8 * pMacStatus, - IN u8 MacID, - IN bool bPacketMatchBSSID, - IN bool bPacketToSelf, - IN bool bPacketBeacon + PDM_ODM_T pDM_Odm, + u8 * pMacStatus, + u8 MacID, + bool bPacketMatchBSSID, + bool bPacketToSelf, + bool bPacketBeacon ) { /* 2011/10/19 Driver team will handle in the future. */ @@ -831,9 +831,9 @@ ODM_MacStatusQuery( HAL_STATUS ODM_ConfigRFWithHeaderFile( - IN PDM_ODM_T pDM_Odm, - IN ODM_RF_RADIO_PATH_E Content, - IN ODM_RF_RADIO_PATH_E eRFPath + PDM_ODM_T pDM_Odm, + ODM_RF_RADIO_PATH_E Content, + ODM_RF_RADIO_PATH_E eRFPath ) { /* RT_STATUS rtStatus = RT_STATUS_SUCCESS; */ @@ -859,8 +859,8 @@ ODM_ConfigRFWithHeaderFile( HAL_STATUS ODM_ConfigBBWithHeaderFile( - IN PDM_ODM_T pDM_Odm, - IN ODM_BB_Config_Type ConfigType + PDM_ODM_T pDM_Odm, + ODM_BB_Config_Type ConfigType ) { if(pDM_Odm->SupportICType == ODM_RTL8188E) { @@ -884,7 +884,7 @@ ODM_ConfigBBWithHeaderFile( HAL_STATUS ODM_ConfigMACWithHeaderFile( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u8 result = HAL_STATUS_SUCCESS; diff --git a/hal/odm_HWConfig.h b/hal/odm_HWConfig.h index 6e1d22c..8c74e2f 100755 --- a/hal/odm_HWConfig.h +++ b/hal/odm_HWConfig.h @@ -185,7 +185,7 @@ ODM_ConfigBBWithHeaderFile( HAL_STATUS ODM_ConfigMACWithHeaderFile( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); diff --git a/hal/odm_RTL8188E.c b/hal/odm_RTL8188E.c index 8107ff8..fc2fc98 100755 --- a/hal/odm_RTL8188E.c +++ b/hal/odm_RTL8188E.c @@ -26,7 +26,7 @@ void ODM_DIG_LowerBound_88E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; @@ -44,7 +44,7 @@ ODM_DIG_LowerBound_88E( static void odm_RX_HWAntDivInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u32 value32; @@ -82,7 +82,7 @@ odm_RX_HWAntDivInit( static void odm_TRX_HWAntDivInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u32 value32; @@ -133,7 +133,7 @@ odm_TRX_HWAntDivInit( void odm_FastAntTrainingInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u32 value32, i; @@ -239,7 +239,7 @@ odm_FastAntTrainingInit( void ODM_AntennaDiversityInit_88E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { if(pDM_Odm->SupportICType != ODM_RTL8188E) @@ -260,7 +260,7 @@ ODM_AntennaDiversityInit_88E( void -ODM_UpdateRxIdleAnt_88E(IN PDM_ODM_T pDM_Odm, IN u8 Ant) +ODM_UpdateRxIdleAnt_88E(PDM_ODM_T pDM_Odm, u8 Ant) { pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; u32 DefaultAnt, OptionalAnt; @@ -300,7 +300,7 @@ ODM_UpdateRxIdleAnt_88E(IN PDM_ODM_T pDM_Odm, IN u8 Ant) static void -odm_UpdateTxAnt_88E(IN PDM_ODM_T pDM_Odm, IN u8 Ant, IN u32 MacId) +odm_UpdateTxAnt_88E(PDM_ODM_T pDM_Odm, u8 Ant, u32 MacId) { pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; u8 TargetAnt; @@ -322,9 +322,9 @@ odm_UpdateTxAnt_88E(IN PDM_ODM_T pDM_Odm, IN u8 Ant, IN u32 MacId) void ODM_SetTxAntByTxInfo_88E( - IN PDM_ODM_T pDM_Odm, - IN u8 * pDesc, - IN u8 macId + PDM_ODM_T pDM_Odm, + u8 * pDesc, + u8 macId ) { pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; @@ -341,10 +341,10 @@ ODM_SetTxAntByTxInfo_88E( void ODM_AntselStatistics_88E( - IN PDM_ODM_T pDM_Odm, - IN u8 antsel_tr_mux, - IN u32 MacId, - IN u8 RxPWDBAll + PDM_ODM_T pDM_Odm, + u8 antsel_tr_mux, + u32 MacId, + u8 RxPWDBAll ) { pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; @@ -383,7 +383,7 @@ ODM_AntselStatistics_88E( #define TX_BY_REG 0 static void odm_HWAntDiv( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u32 i, MinRSSI=0xFF, AntDivMaxRSSI=0, MaxRSSI=0, LocalMinRSSI, LocalMaxRSSI; @@ -450,7 +450,7 @@ odm_HWAntDiv( void ODM_AntennaDiversity_88E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; @@ -502,7 +502,7 @@ ODM_AntennaDiversity_88E( void odm_PrimaryCCA_Init( - IN PDM_ODM_T pDM_Odm) + PDM_ODM_T pDM_Odm) { pPri_CCA_T PrimaryCCA = &(pDM_Odm->DM_PriCCA); PrimaryCCA->DupRTS_flag = 0; @@ -514,7 +514,7 @@ odm_PrimaryCCA_Init( bool ODM_DynamicPrimaryCCA_DupRTS( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pPri_CCA_T PrimaryCCA = &(pDM_Odm->DM_PriCCA); @@ -524,7 +524,7 @@ ODM_DynamicPrimaryCCA_DupRTS( void odm_DynamicPrimaryCCA( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { struct adapter *Adapter = pDM_Odm->Adapter; /* for NIC */ diff --git a/hal/odm_RegConfig8188E.c b/hal/odm_RegConfig8188E.c index 0fceba0..3563267 100755 --- a/hal/odm_RegConfig8188E.c +++ b/hal/odm_RegConfig8188E.c @@ -22,11 +22,11 @@ void odm_ConfigRFReg_8188E( - IN PDM_ODM_T pDM_Odm, - IN u32 Addr, - IN u32 Data, - IN ODM_RF_RADIO_PATH_E RF_PATH, - IN u32 RegAddr + PDM_ODM_T pDM_Odm, + u32 Addr, + u32 Data, + ODM_RF_RADIO_PATH_E RF_PATH, + u32 RegAddr ) { if(Addr == 0xffe) @@ -64,9 +64,9 @@ odm_ConfigRFReg_8188E( void odm_ConfigRF_RadioA_8188E( - IN PDM_ODM_T pDM_Odm, - IN u32 Addr, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 Addr, + u32 Data ) { u32 content = 0x1000; /* RF_Content: radioa_txt */ @@ -79,9 +79,9 @@ odm_ConfigRF_RadioA_8188E( void odm_ConfigRF_RadioB_8188E( - IN PDM_ODM_T pDM_Odm, - IN u32 Addr, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 Addr, + u32 Data ) { u32 content = 0x1001; /* RF_Content: radiob_txt */ @@ -95,9 +95,9 @@ odm_ConfigRF_RadioB_8188E( void odm_ConfigMAC_8188E( - IN PDM_ODM_T pDM_Odm, - IN u32 Addr, - IN u8 Data + PDM_ODM_T pDM_Odm, + u32 Addr, + u8 Data ) { ODM_Write1Byte(pDM_Odm, Addr, Data); @@ -106,10 +106,10 @@ odm_ConfigMAC_8188E( void odm_ConfigBB_AGC_8188E( - IN PDM_ODM_T pDM_Odm, - IN u32 Addr, - IN u32 Bitmask, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 Addr, + u32 Bitmask, + u32 Data ) { ODM_SetBBReg(pDM_Odm, Addr, Bitmask, Data); @@ -121,10 +121,10 @@ odm_ConfigBB_AGC_8188E( void odm_ConfigBB_PHY_REG_PG_8188E( - IN PDM_ODM_T pDM_Odm, - IN u32 Addr, - IN u32 Bitmask, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 Addr, + u32 Bitmask, + u32 Data ) { if (Addr == 0xfe){ @@ -149,10 +149,10 @@ odm_ConfigBB_PHY_REG_PG_8188E( void odm_ConfigBB_PHY_8188E( - IN PDM_ODM_T pDM_Odm, - IN u32 Addr, - IN u32 Bitmask, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 Addr, + u32 Bitmask, + u32 Data ) { if (Addr == 0xfe){ diff --git a/hal/odm_RegConfig8188E.h b/hal/odm_RegConfig8188E.h index c9d05ee..f9825a7 100755 --- a/hal/odm_RegConfig8188E.h +++ b/hal/odm_RegConfig8188E.h @@ -22,56 +22,56 @@ void odm_ConfigRFReg_8188E( - IN PDM_ODM_T pDM_Odm, - IN u32 Addr, - IN u32 Data, - IN ODM_RF_RADIO_PATH_E RF_PATH, - IN u32 RegAddr + PDM_ODM_T pDM_Odm, + u32 Addr, + u32 Data, + ODM_RF_RADIO_PATH_E RF_PATH, + u32 RegAddr ); void odm_ConfigRF_RadioA_8188E( - IN PDM_ODM_T pDM_Odm, - IN u32 Addr, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 Addr, + u32 Data ); void odm_ConfigRF_RadioB_8188E( - IN PDM_ODM_T pDM_Odm, - IN u32 Addr, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 Addr, + u32 Data ); void odm_ConfigMAC_8188E( - IN PDM_ODM_T pDM_Odm, - IN u32 Addr, - IN u8 Data + PDM_ODM_T pDM_Odm, + u32 Addr, + u8 Data ); void odm_ConfigBB_AGC_8188E( - IN PDM_ODM_T pDM_Odm, - IN u32 Addr, - IN u32 Bitmask, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 Addr, + u32 Bitmask, + u32 Data ); void odm_ConfigBB_PHY_REG_PG_8188E( - IN PDM_ODM_T pDM_Odm, - IN u32 Addr, - IN u32 Bitmask, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 Addr, + u32 Bitmask, + u32 Data ); void odm_ConfigBB_PHY_8188E( - IN PDM_ODM_T pDM_Odm, - IN u32 Addr, - IN u32 Bitmask, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 Addr, + u32 Bitmask, + u32 Data ); #endif /* end of SUPPORT */ diff --git a/hal/odm_debug.c b/hal/odm_debug.c index c84da86..e71cd6f 100755 --- a/hal/odm_debug.c +++ b/hal/odm_debug.c @@ -26,7 +26,7 @@ void ODM_InitDebugSetting( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pDM_Odm->DebugLevel = ODM_DBG_TRACE; diff --git a/hal/odm_debug.h b/hal/odm_debug.h index 8dd84ef..03901c8 100755 --- a/hal/odm_debug.h +++ b/hal/odm_debug.h @@ -163,7 +163,7 @@ void ODM_InitDebugSetting( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); #endif /* __ODM_DBG_H__ */ diff --git a/hal/odm_interface.c b/hal/odm_interface.c index 53109ac..09b601f 100755 --- a/hal/odm_interface.c +++ b/hal/odm_interface.c @@ -29,8 +29,8 @@ u8 ODM_Read1Byte( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr + PDM_ODM_T pDM_Odm, + u32 RegAddr ) { struct adapter * Adapter = pDM_Odm->Adapter; @@ -40,8 +40,8 @@ ODM_Read1Byte( u16 ODM_Read2Byte( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr + PDM_ODM_T pDM_Odm, + u32 RegAddr ) { struct adapter * Adapter = pDM_Odm->Adapter; @@ -50,8 +50,8 @@ ODM_Read2Byte( u32 ODM_Read4Byte( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr + PDM_ODM_T pDM_Odm, + u32 RegAddr ) { struct adapter * Adapter = pDM_Odm->Adapter; @@ -60,9 +60,9 @@ ODM_Read4Byte( void ODM_Write1Byte( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr, - IN u8 Data + PDM_ODM_T pDM_Odm, + u32 RegAddr, + u8 Data ) { struct adapter * Adapter = pDM_Odm->Adapter; @@ -71,9 +71,9 @@ ODM_Write1Byte( void ODM_Write2Byte( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr, - IN u16 Data + PDM_ODM_T pDM_Odm, + u32 RegAddr, + u16 Data ) { struct adapter * Adapter = pDM_Odm->Adapter; @@ -82,9 +82,9 @@ ODM_Write2Byte( void ODM_Write4Byte( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 RegAddr, + u32 Data ) { struct adapter * Adapter = pDM_Odm->Adapter; @@ -93,10 +93,10 @@ ODM_Write4Byte( void ODM_SetMACReg( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 RegAddr, + u32 BitMask, + u32 Data ) { struct adapter * Adapter = pDM_Odm->Adapter; @@ -105,9 +105,9 @@ ODM_SetMACReg( u32 ODM_GetMACReg( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr, - IN u32 BitMask + PDM_ODM_T pDM_Odm, + u32 RegAddr, + u32 BitMask ) { struct adapter * Adapter = pDM_Odm->Adapter; @@ -116,10 +116,10 @@ ODM_GetMACReg( void ODM_SetBBReg( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 RegAddr, + u32 BitMask, + u32 Data ) { struct adapter * Adapter = pDM_Odm->Adapter; @@ -129,9 +129,9 @@ ODM_SetBBReg( u32 ODM_GetBBReg( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr, - IN u32 BitMask + PDM_ODM_T pDM_Odm, + u32 RegAddr, + u32 BitMask ) { struct adapter * Adapter = pDM_Odm->Adapter; @@ -140,11 +140,11 @@ ODM_GetBBReg( void ODM_SetRFReg( - IN PDM_ODM_T pDM_Odm, - IN ODM_RF_RADIO_PATH_E eRFPath, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + PDM_ODM_T pDM_Odm, + ODM_RF_RADIO_PATH_E eRFPath, + u32 RegAddr, + u32 BitMask, + u32 Data ) { struct adapter * Adapter = pDM_Odm->Adapter; @@ -153,10 +153,10 @@ ODM_SetRFReg( u32 ODM_GetRFReg( - IN PDM_ODM_T pDM_Odm, - IN ODM_RF_RADIO_PATH_E eRFPath, - IN u32 RegAddr, - IN u32 BitMask + PDM_ODM_T pDM_Odm, + ODM_RF_RADIO_PATH_E eRFPath, + u32 RegAddr, + u32 BitMask ) { struct adapter * Adapter = pDM_Odm->Adapter; @@ -170,9 +170,9 @@ ODM_GetRFReg( /* */ void ODM_AllocateMemory( - IN PDM_ODM_T pDM_Odm, - OUT void * *pPtr, - IN u32 length + PDM_ODM_T pDM_Odm, + void * *pPtr, + u32 length ) { *pPtr = rtw_zvmalloc(length); @@ -181,19 +181,19 @@ ODM_AllocateMemory( /* length could be ignored, used to detect memory leakage. */ void ODM_FreeMemory( - IN PDM_ODM_T pDM_Odm, - OUT void * pPtr, - IN u32 length + PDM_ODM_T pDM_Odm, + void * pPtr, + u32 length ) { rtw_vmfree(pPtr, length); } s32 ODM_CompareMemory( - IN PDM_ODM_T pDM_Odm, - IN void * pBuf1, - IN void * pBuf2, - IN u32 length + PDM_ODM_T pDM_Odm, + void * pBuf1, + void * pBuf2, + u32 length ) { return _rtw_memcmp(pBuf1,pBuf2,length); @@ -204,16 +204,16 @@ s32 ODM_CompareMemory( /* */ void ODM_AcquireSpinLock( - IN PDM_ODM_T pDM_Odm, - IN RT_SPINLOCK_TYPE type + PDM_ODM_T pDM_Odm, + RT_SPINLOCK_TYPE type ) { } void ODM_ReleaseSpinLock( - IN PDM_ODM_T pDM_Odm, - IN RT_SPINLOCK_TYPE type + PDM_ODM_T pDM_Odm, + RT_SPINLOCK_TYPE type ) { } @@ -223,46 +223,46 @@ ODM_ReleaseSpinLock( /* */ void ODM_InitializeWorkItem( - IN PDM_ODM_T pDM_Odm, - IN PRT_WORK_ITEM pRtWorkItem, - IN RT_WORKITEM_CALL_BACK RtWorkItemCallback, - IN void * pContext, - IN const char* szID + PDM_ODM_T pDM_Odm, + PRT_WORK_ITEM pRtWorkItem, + RT_WORKITEM_CALL_BACK RtWorkItemCallback, + void * pContext, + const char* szID ) { } void ODM_StartWorkItem( - IN PRT_WORK_ITEM pRtWorkItem + PRT_WORK_ITEM pRtWorkItem ) { } void ODM_StopWorkItem( - IN PRT_WORK_ITEM pRtWorkItem + PRT_WORK_ITEM pRtWorkItem ) { } void ODM_FreeWorkItem( - IN PRT_WORK_ITEM pRtWorkItem + PRT_WORK_ITEM pRtWorkItem ) { } void ODM_ScheduleWorkItem( - IN PRT_WORK_ITEM pRtWorkItem + PRT_WORK_ITEM pRtWorkItem ) { } void ODM_IsWorkItemScheduled( - IN PRT_WORK_ITEM pRtWorkItem + PRT_WORK_ITEM pRtWorkItem ) { } @@ -272,41 +272,41 @@ ODM_IsWorkItemScheduled( /* */ void ODM_StallExecution( - IN u32 usDelay + u32 usDelay ) { rtw_udelay_os(usDelay); } void -ODM_delay_ms(IN u32 ms) +ODM_delay_ms(u32 ms) { rtw_mdelay_os(ms); } void -ODM_delay_us(IN u32 us) +ODM_delay_us(u32 us) { rtw_udelay_os(us); } void -ODM_sleep_ms(IN u32 ms) +ODM_sleep_ms(u32 ms) { rtw_msleep_os(ms); } void -ODM_sleep_us(IN u32 us) +ODM_sleep_us(u32 us) { rtw_usleep_os(us); } void ODM_SetTimer( - IN PDM_ODM_T pDM_Odm, - IN PRT_TIMER pTimer, - IN u32 msDelay + PDM_ODM_T pDM_Odm, + PRT_TIMER pTimer, + u32 msDelay ) { _set_timer(pTimer,msDelay ); /* ms */ @@ -314,11 +314,11 @@ ODM_SetTimer( void ODM_InitializeTimer( - IN PDM_ODM_T pDM_Odm, - IN PRT_TIMER pTimer, - IN RT_TIMER_CALL_BACK CallBackFunc, - IN void * pContext, - IN const char* szID + PDM_ODM_T pDM_Odm, + PRT_TIMER pTimer, + RT_TIMER_CALL_BACK CallBackFunc, + void * pContext, + const char* szID ) { struct adapter *Adapter = pDM_Odm->Adapter; @@ -327,8 +327,8 @@ ODM_InitializeTimer( void ODM_CancelTimer( - IN PDM_ODM_T pDM_Odm, - IN PRT_TIMER pTimer + PDM_ODM_T pDM_Odm, + PRT_TIMER pTimer ) { _cancel_timer_ex(pTimer); @@ -336,8 +336,8 @@ ODM_CancelTimer( void ODM_ReleaseTimer( - IN PDM_ODM_T pDM_Odm, - IN PRT_TIMER pTimer + PDM_ODM_T pDM_Odm, + PRT_TIMER pTimer ) { } @@ -347,13 +347,13 @@ ODM_ReleaseTimer( /* */ u32 ODM_FillH2CCmd( - IN u8 * pH2CBuffer, - IN u32 H2CBufferLen, - IN u32 CmdNum, - IN u32 * pElementID, - IN u32 * pCmdLen, - IN u8 ** pCmbBuffer, - IN u8 * CmdStartSeq + u8 * pH2CBuffer, + u32 H2CBufferLen, + u32 CmdNum, + u32 * pElementID, + u32 * pCmdLen, + u8 ** pCmbBuffer, + u8 * CmdStartSeq ) { return true; diff --git a/hal/odm_interface.h b/hal/odm_interface.h index 943845c..9861b52 100755 --- a/hal/odm_interface.h +++ b/hal/odm_interface.h @@ -93,88 +93,88 @@ typedef void (*RT_WORKITEM_CALL_BACK)(void * pContext); u8 ODM_Read1Byte( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr + PDM_ODM_T pDM_Odm, + u32 RegAddr ); u16 ODM_Read2Byte( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr + PDM_ODM_T pDM_Odm, + u32 RegAddr ); u32 ODM_Read4Byte( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr + PDM_ODM_T pDM_Odm, + u32 RegAddr ); void ODM_Write1Byte( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr, - IN u8 Data + PDM_ODM_T pDM_Odm, + u32 RegAddr, + u8 Data ); void ODM_Write2Byte( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr, - IN u16 Data + PDM_ODM_T pDM_Odm, + u32 RegAddr, + u16 Data ); void ODM_Write4Byte( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 RegAddr, + u32 Data ); void ODM_SetMACReg( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 RegAddr, + u32 BitMask, + u32 Data ); u32 ODM_GetMACReg( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr, - IN u32 BitMask + PDM_ODM_T pDM_Odm, + u32 RegAddr, + u32 BitMask ); void ODM_SetBBReg( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + PDM_ODM_T pDM_Odm, + u32 RegAddr, + u32 BitMask, + u32 Data ); u32 ODM_GetBBReg( - IN PDM_ODM_T pDM_Odm, - IN u32 RegAddr, - IN u32 BitMask + PDM_ODM_T pDM_Odm, + u32 RegAddr, + u32 BitMask ); void ODM_SetRFReg( - IN PDM_ODM_T pDM_Odm, - IN ODM_RF_RADIO_PATH_E eRFPath, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + PDM_ODM_T pDM_Odm, + ODM_RF_RADIO_PATH_E eRFPath, + u32 RegAddr, + u32 BitMask, + u32 Data ); u32 ODM_GetRFReg( - IN PDM_ODM_T pDM_Odm, - IN ODM_RF_RADIO_PATH_E eRFPath, - IN u32 RegAddr, - IN u32 BitMask + PDM_ODM_T pDM_Odm, + ODM_RF_RADIO_PATH_E eRFPath, + u32 RegAddr, + u32 BitMask ); @@ -183,22 +183,22 @@ ODM_GetRFReg( /* */ void ODM_AllocateMemory( - IN PDM_ODM_T pDM_Odm, - OUT void * *pPtr, - IN u32 length + PDM_ODM_T pDM_Odm, + void * *pPtr, + u32 length ); void ODM_FreeMemory( - IN PDM_ODM_T pDM_Odm, - OUT void * pPtr, - IN u32 length + PDM_ODM_T pDM_Odm, + void * pPtr, + u32 length ); s32 ODM_CompareMemory( - IN PDM_ODM_T pDM_Odm, - IN void * pBuf1, - IN void * pBuf2, - IN u32 length + PDM_ODM_T pDM_Odm, + void * pBuf1, + void * pBuf2, + u32 length ); /* */ @@ -206,14 +206,14 @@ s32 ODM_CompareMemory( /* */ void ODM_AcquireSpinLock( - IN PDM_ODM_T pDM_Odm, - IN RT_SPINLOCK_TYPE type + PDM_ODM_T pDM_Odm, + RT_SPINLOCK_TYPE type ); void ODM_ReleaseSpinLock( - IN PDM_ODM_T pDM_Odm, - IN RT_SPINLOCK_TYPE type + PDM_ODM_T pDM_Odm, + RT_SPINLOCK_TYPE type ); @@ -222,36 +222,36 @@ ODM_ReleaseSpinLock( /* */ void ODM_InitializeWorkItem( - IN PDM_ODM_T pDM_Odm, - IN PRT_WORK_ITEM pRtWorkItem, - IN RT_WORKITEM_CALL_BACK RtWorkItemCallback, - IN void * pContext, - IN const char* szID + PDM_ODM_T pDM_Odm, + PRT_WORK_ITEM pRtWorkItem, + RT_WORKITEM_CALL_BACK RtWorkItemCallback, + void * pContext, + const char* szID ); void ODM_StartWorkItem( - IN PRT_WORK_ITEM pRtWorkItem + PRT_WORK_ITEM pRtWorkItem ); void ODM_StopWorkItem( - IN PRT_WORK_ITEM pRtWorkItem + PRT_WORK_ITEM pRtWorkItem ); void ODM_FreeWorkItem( - IN PRT_WORK_ITEM pRtWorkItem + PRT_WORK_ITEM pRtWorkItem ); void ODM_ScheduleWorkItem( - IN PRT_WORK_ITEM pRtWorkItem + PRT_WORK_ITEM pRtWorkItem ); void ODM_IsWorkItemScheduled( - IN PRT_WORK_ITEM pRtWorkItem + PRT_WORK_ITEM pRtWorkItem ); /* */ @@ -259,48 +259,48 @@ ODM_IsWorkItemScheduled( /* */ void ODM_StallExecution( - IN u32 usDelay + u32 usDelay ); void -ODM_delay_ms(IN u32 ms); - +ODM_delay_ms(u32 ms); + void -ODM_delay_us(IN u32 us); +ODM_delay_us(u32 us); void -ODM_sleep_ms(IN u32 ms); +ODM_sleep_ms(u32 ms); void -ODM_sleep_us(IN u32 us); +ODM_sleep_us(u32 us); void -ODM_SetTimer( - IN PDM_ODM_T pDM_Odm, - IN PRT_TIMER pTimer, - IN u32 msDelay +ODM_SetTimer( + PDM_ODM_T pDM_Odm, + PRT_TIMER pTimer, + u32 msDelay ); void ODM_InitializeTimer( - IN PDM_ODM_T pDM_Odm, - IN PRT_TIMER pTimer, - IN RT_TIMER_CALL_BACK CallBackFunc, - IN void * pContext, - IN const char* szID + PDM_ODM_T pDM_Odm, + PRT_TIMER pTimer, + RT_TIMER_CALL_BACK CallBackFunc, + void * pContext, + const char* szID ); void ODM_CancelTimer( - IN PDM_ODM_T pDM_Odm, - IN PRT_TIMER pTimer + PDM_ODM_T pDM_Odm, + PRT_TIMER pTimer ); void ODM_ReleaseTimer( - IN PDM_ODM_T pDM_Odm, - IN PRT_TIMER pTimer + PDM_ODM_T pDM_Odm, + PRT_TIMER pTimer ); @@ -309,13 +309,13 @@ ODM_ReleaseTimer( /* */ u32 ODM_FillH2CCmd( - IN u8 * pH2CBuffer, - IN u32 H2CBufferLen, - IN u32 CmdNum, - IN u32 * pElementID, - IN u32 * pCmdLen, - IN u8 ** pCmbBuffer, - IN u8 * CmdStartSeq + u8 * pH2CBuffer, + u32 H2CBufferLen, + u32 CmdNum, + u32 * pElementID, + u32 * pCmdLen, + u8 ** pCmbBuffer, + u8 * CmdStartSeq ); #endif /* __ODM_INTERFACE_H__ */ diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c index db51e2d..7e123e2 100755 --- a/hal/rtl8188e_cmd.c +++ b/hal/rtl8188e_cmd.c @@ -555,7 +555,7 @@ static void rtl8188e_set_FwRsvdPage_cmd(struct adapter *padapter, PRSVDPAGE_LOC /* 2010.06.23. Added by tynli. */ void CheckFwRsvdPageContent( - IN struct adapter * Adapter + struct adapter * Adapter ) { HAL_DATA_TYPE* pHalData = GET_HAL_DATA(Adapter); diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c index 8490d0d..3f4beab 100755 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -42,14 +42,14 @@ static void dm_CheckProtection( - IN struct adapter *Adapter + struct adapter *Adapter ) { } static void dm_CheckStatistics( - IN struct adapter *Adapter + struct adapter *Adapter ) { } @@ -99,7 +99,7 @@ static void dm_CheckPbcGPIO(struct adapter *padapter) /* Initialize GPIO setting registers */ static void dm_InitGPIOSetting( - IN struct adapter *Adapter + struct adapter *Adapter ) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); @@ -244,7 +244,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter) void rtl8188e_InitHalDm( - IN struct adapter *Adapter + struct adapter *Adapter ) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); @@ -267,7 +267,7 @@ rtl8188e_InitHalDm( void rtl8188e_HalDmWatchDog( - IN struct adapter *Adapter + struct adapter *Adapter ) { bool bFwCurrentInPSMode = false; @@ -329,7 +329,7 @@ skip_dm: return; } -void rtl8188e_init_dm_priv(IN struct adapter *Adapter) +void rtl8188e_init_dm_priv(struct adapter *Adapter) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); struct dm_priv *pdmpriv = &pHalData->dmpriv; @@ -340,7 +340,7 @@ void rtl8188e_init_dm_priv(IN struct adapter *Adapter) ODM_InitDebugSetting(podmpriv); } -void rtl8188e_deinit_dm_priv(IN struct adapter *Adapter) +void rtl8188e_deinit_dm_priv(struct adapter *Adapter) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); struct dm_priv *pdmpriv = &pHalData->dmpriv; diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c index 46a8d1d..afc5538 100755 --- a/hal/rtl8188e_hal_init.c +++ b/hal/rtl8188e_hal_init.c @@ -517,8 +517,8 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter,int data_len) static void _FWDownloadEnable( - IN struct adapter * padapter, - IN bool enable + struct adapter * padapter, + bool enable ) { u8 tmp; @@ -547,9 +547,9 @@ _FWDownloadEnable( #define MAX_REG_BOLCK_SIZE 196 static int _BlockWrite( - IN struct adapter * padapter, - IN void * buffer, - IN u32 buffSize + struct adapter * padapter, + void * buffer, + u32 buffSize ) { int ret = _SUCCESS; @@ -627,10 +627,10 @@ exit: static int _PageWrite( - IN struct adapter *padapter, - IN u32 page, - IN void * buffer, - IN u32 size + struct adapter *padapter, + u32 page, + void * buffer, + u32 size ) { u8 value8; @@ -664,9 +664,9 @@ _FillDummy( static int _WriteFW( - IN struct adapter * padapter, - IN void * buffer, - IN u32 size + struct adapter * padapter, + void * buffer, + u32 size ) { /* Since we need dynamic decide method of dwonload fw, so we call this function to get chip version. */ @@ -921,31 +921,31 @@ enum{ static bool hal_EfusePgPacketWrite2ByteHeader( - IN struct adapter * pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest); + struct adapter * pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest); static bool hal_EfusePgPacketWrite1ByteHeader( - IN struct adapter * pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest); + struct adapter * pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest); static bool hal_EfusePgPacketWriteData( - IN struct adapter * pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest); + struct adapter * pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest); static void hal_EfusePowerSwitch_RTL8188E( - IN struct adapter *pAdapter, - IN u8 bWrite, - IN u8 PwrState) + struct adapter *pAdapter, + u8 bWrite, + u8 PwrState) { u8 tempval; u16 tmpV16; @@ -997,9 +997,9 @@ hal_EfusePowerSwitch_RTL8188E( static void rtl8188e_EfusePowerSwitch( - IN struct adapter *pAdapter, - IN u8 bWrite, - IN u8 PwrState) + struct adapter *pAdapter, + u8 bWrite, + u8 PwrState) { hal_EfusePowerSwitch_RTL8188E(pAdapter, bWrite, PwrState); } @@ -1053,7 +1053,7 @@ Hal_EfuseReadEFuse88E( u16 _offset, u16 _size_byte, u8 *pbuf, - IN bool bPseudoTest + bool bPseudoTest ) { /* u8 efuseTbl[EFUSE_MAP_LEN_88E]; */ @@ -1244,9 +1244,9 @@ exit: static bool Hal_EfuseSwitchToBank( - IN struct adapter *pAdapter, - IN u8 bank, - IN bool bPseudoTest + struct adapter *pAdapter, + u8 bank, + bool bPseudoTest ) { bool bRet = false; @@ -1301,7 +1301,7 @@ ReadEFuseByIC( u16 _offset, u16 _size_byte, u8 *pbuf, - IN bool bPseudoTest + bool bPseudoTest ) { #ifdef DBG_IOL_READ_EFUSE_MAP @@ -1358,7 +1358,7 @@ ReadEFuse_Pseudo( u16 _offset, u16 _size_byte, u8 *pbuf, - IN bool bPseudoTest + bool bPseudoTest ) { Hal_EfuseReadEFuse88E(Adapter, _offset, _size_byte, pbuf, bPseudoTest); @@ -1371,7 +1371,7 @@ rtl8188e_ReadEFuse( u16 _offset, u16 _size_byte, u8 *pbuf, - IN bool bPseudoTest + bool bPseudoTest ) { if(bPseudoTest) @@ -1386,10 +1386,10 @@ rtl8188e_ReadEFuse( /* Do not support BT */ static void Hal_EFUSEGetEfuseDefinition88E( - IN struct adapter *pAdapter, - IN u8 efuseType, - IN u8 type, - OUT void * pOut + struct adapter *pAdapter, + u8 efuseType, + u8 type, + void * pOut ) { switch(type) { @@ -1453,10 +1453,10 @@ static void Hal_EFUSEGetEfuseDefinition88E( } static void Hal_EFUSEGetEfuseDefinition_Pseudo88E( - IN struct adapter *pAdapter, - IN u8 efuseType, - IN u8 type, - OUT void * pOut + struct adapter *pAdapter, + u8 efuseType, + u8 type, + void * pOut ) { switch(type) @@ -1523,11 +1523,11 @@ static void Hal_EFUSEGetEfuseDefinition_Pseudo88E( static void rtl8188e_EFUSE_GetEfuseDefinition( - IN struct adapter *pAdapter, - IN u8 efuseType, - IN u8 type, - OUT void *pOut, - IN bool bPseudoTest + struct adapter *pAdapter, + u8 efuseType, + u8 type, + void *pOut, + bool bPseudoTest ) { if(bPseudoTest) @@ -1541,11 +1541,11 @@ rtl8188e_EFUSE_GetEfuseDefinition( } static u8 -Hal_EfuseWordEnableDataWrite( IN struct adapter *pAdapter, - IN u16 efuse_addr, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +Hal_EfuseWordEnableDataWrite(struct adapter *pAdapter, + u16 efuse_addr, + u8 word_en, + u8 *data, + bool bPseudoTest) { u16 tmpaddr = 0; u16 start_addr = efuse_addr; @@ -1607,11 +1607,11 @@ Hal_EfuseWordEnableDataWrite( IN struct adapter *pAdapter, } static u8 -Hal_EfuseWordEnableDataWrite_Pseudo( IN struct adapter *pAdapter, - IN u16 efuse_addr, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +Hal_EfuseWordEnableDataWrite_Pseudo(struct adapter *pAdapter, + u16 efuse_addr, + u8 word_en, + u8 *data, + bool bPseudoTest) { u8 ret=0; @@ -1621,11 +1621,11 @@ Hal_EfuseWordEnableDataWrite_Pseudo( IN struct adapter *pAdapter, } static u8 -rtl8188e_Efuse_WordEnableDataWrite( IN struct adapter *pAdapter, - IN u16 efuse_addr, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +rtl8188e_Efuse_WordEnableDataWrite(struct adapter *pAdapter, + u16 efuse_addr, + u8 word_en, + u8 *data, + bool bPseudoTest) { u8 ret=0; @@ -1643,8 +1643,8 @@ rtl8188e_Efuse_WordEnableDataWrite( IN struct adapter *pAdapter, static u16 -hal_EfuseGetCurrentSize_8188e(IN struct adapter *pAdapter, - IN bool bPseudoTest) +hal_EfuseGetCurrentSize_8188e(struct adapter *pAdapter, + bool bPseudoTest) { int bContinual = true; @@ -1714,8 +1714,8 @@ hal_EfuseGetCurrentSize_8188e(IN struct adapter *pAdapter, } static u16 -Hal_EfuseGetCurrentSize_Pseudo(IN struct adapter *pAdapter, - IN bool bPseudoTest) +Hal_EfuseGetCurrentSize_Pseudo(struct adapter *pAdapter, + bool bPseudoTest) { u16 ret=0; @@ -1727,9 +1727,9 @@ Hal_EfuseGetCurrentSize_Pseudo(IN struct adapter *pAdapter, static u16 rtl8188e_EfuseGetCurrentSize( - IN struct adapter *pAdapter, - IN u8 efuseType, - IN bool bPseudoTest) + struct adapter *pAdapter, + u8 efuseType, + bool bPseudoTest) { u16 ret=0; @@ -1749,10 +1749,10 @@ rtl8188e_EfuseGetCurrentSize( static int hal_EfusePgPacketRead_8188e( - IN struct adapter *pAdapter, - IN u8 offset, - IN u8 *data, - IN bool bPseudoTest) + struct adapter *pAdapter, + u8 offset, + u8 *data, + bool bPseudoTest) { u8 ReadState = PG_STATE_HEADER; @@ -1864,10 +1864,10 @@ hal_EfusePgPacketRead_8188e( } static int -Hal_EfusePgPacketRead( IN struct adapter *pAdapter, - IN u8 offset, - IN u8 *data, - IN bool bPseudoTest) +Hal_EfusePgPacketRead( struct adapter *pAdapter, + u8 offset, + u8 *data, + bool bPseudoTest) { int ret=0; @@ -1878,10 +1878,10 @@ Hal_EfusePgPacketRead( IN struct adapter *pAdapter, } static int -Hal_EfusePgPacketRead_Pseudo( IN struct adapter *pAdapter, - IN u8 offset, - IN u8 *data, - IN bool bPseudoTest) +Hal_EfusePgPacketRead_Pseudo( struct adapter *pAdapter, + u8 offset, + u8 *data, + bool bPseudoTest) { int ret=0; @@ -1891,10 +1891,10 @@ Hal_EfusePgPacketRead_Pseudo( IN struct adapter *pAdapter, } static int -rtl8188e_Efuse_PgPacketRead( IN struct adapter *pAdapter, - IN u8 offset, - IN u8 *data, - IN bool bPseudoTest) +rtl8188e_Efuse_PgPacketRead( struct adapter *pAdapter, + u8 offset, + u8 *data, + bool bPseudoTest) { int ret=0; @@ -1912,11 +1912,11 @@ rtl8188e_Efuse_PgPacketRead( IN struct adapter *pAdapter, static bool hal_EfuseFixHeaderProcess( - IN struct adapter * pAdapter, - IN u8 efuseType, - IN PPGPKT_STRUCT pFixPkt, - IN u16 *pAddr, - IN bool bPseudoTest + struct adapter * pAdapter, + u8 efuseType, + PPGPKT_STRUCT pFixPkt, + u16 *pAddr, + bool bPseudoTest ) { u8 originaldata[8], badworden=0; @@ -1953,11 +1953,11 @@ hal_EfuseFixHeaderProcess( static bool hal_EfusePgPacketWrite2ByteHeader( - IN struct adapter * pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest) + struct adapter * pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest) { bool bRet=false, bContinual=true; u16 efuse_addr=*pAddr, efuse_max_available_len=0; @@ -2050,11 +2050,11 @@ hal_EfusePgPacketWrite2ByteHeader( static bool hal_EfusePgPacketWrite1ByteHeader( - IN struct adapter * pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest) + struct adapter * pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest) { bool bRet=false; u8 pg_header=0, tmp_header=0; @@ -2098,11 +2098,11 @@ hal_EfusePgPacketWrite1ByteHeader( static bool hal_EfusePgPacketWriteData( - IN struct adapter * pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest) + struct adapter * pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest) { bool bRet=false; u16 efuse_addr=*pAddr; @@ -2135,11 +2135,11 @@ hal_EfusePgPacketWriteData( static bool hal_EfusePgPacketWriteHeader( - IN struct adapter * pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest) + struct adapter * pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest) { bool bRet=false; @@ -2157,9 +2157,9 @@ hal_EfusePgPacketWriteHeader( static bool wordEnMatched( - IN PPGPKT_STRUCT pTargetPkt, - IN PPGPKT_STRUCT pCurPkt, - IN u8 *pWden + PPGPKT_STRUCT pTargetPkt, + PPGPKT_STRUCT pCurPkt, + u8 *pWden ) { u8 match_word_en = 0x0F; /* default all words are disabled */ @@ -2197,10 +2197,10 @@ wordEnMatched( static bool hal_EfuseCheckIfDatafollowed( - IN struct adapter * pAdapter, - IN u8 word_cnts, - IN u16 startAddr, - IN bool bPseudoTest + struct adapter * pAdapter, + u8 word_cnts, + u16 startAddr, + bool bPseudoTest ) { bool bRet=false; @@ -2217,11 +2217,11 @@ hal_EfuseCheckIfDatafollowed( static bool hal_EfusePartialWriteCheck( - IN struct adapter * pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest + struct adapter * pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest ) { bool bRet=false; @@ -2342,9 +2342,9 @@ hal_EfusePartialWriteCheck( static bool hal_EfusePgCheckAvailableAddr( - IN struct adapter *pAdapter, - IN u8 efuseType, - IN bool bPseudoTest + struct adapter *pAdapter, + u8 efuseType, + bool bPseudoTest ) { u16 efuse_max_available_len=0; @@ -2365,10 +2365,10 @@ hal_EfusePgCheckAvailableAddr( static void hal_EfuseConstructPGPkt( - IN u8 offset, - IN u8 word_en, - IN u8 *pData, - IN PPGPKT_STRUCT pTargetPkt + u8 offset, + u8 word_en, + u8 *pData, + PPGPKT_STRUCT pTargetPkt ) { @@ -2383,11 +2383,11 @@ hal_EfuseConstructPGPkt( static bool hal_EfusePgPacketWrite_BT( - IN struct adapter *pAdapter, - IN u8 offset, - IN u8 word_en, - IN u8 *pData, - IN bool bPseudoTest + struct adapter *pAdapter, + u8 offset, + u8 word_en, + u8 *pData, + bool bPseudoTest ) { PGPKT_STRUCT targetPkt; @@ -2413,11 +2413,11 @@ hal_EfusePgPacketWrite_BT( static bool hal_EfusePgPacketWrite_8188e( - IN struct adapter * pAdapter, - IN u8 offset, - IN u8 word_en, - IN u8 *pData, - IN bool bPseudoTest + struct adapter * pAdapter, + u8 offset, + u8 word_en, + u8 *pData, + bool bPseudoTest ) { PGPKT_STRUCT targetPkt; @@ -2443,11 +2443,11 @@ hal_EfusePgPacketWrite_8188e( static int -Hal_EfusePgPacketWrite_Pseudo(IN struct adapter *pAdapter, - IN u8 offset, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +Hal_EfusePgPacketWrite_Pseudo(struct adapter *pAdapter, + u8 offset, + u8 word_en, + u8 *data, + bool bPseudoTest) { int ret; @@ -2457,11 +2457,11 @@ Hal_EfusePgPacketWrite_Pseudo(IN struct adapter *pAdapter, } static int -Hal_EfusePgPacketWrite(IN struct adapter *pAdapter, - IN u8 offset, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +Hal_EfusePgPacketWrite(struct adapter *pAdapter, + u8 offset, + u8 word_en, + u8 *data, + bool bPseudoTest) { int ret=0; ret = hal_EfusePgPacketWrite_8188e(pAdapter, offset, word_en, data, bPseudoTest); @@ -2471,11 +2471,11 @@ Hal_EfusePgPacketWrite(IN struct adapter *pAdapter, } static int -rtl8188e_Efuse_PgPacketWrite(IN struct adapter *pAdapter, - IN u8 offset, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +rtl8188e_Efuse_PgPacketWrite(struct adapter *pAdapter, + u8 offset, + u8 word_en, + u8 *data, + bool bPseudoTest) { int ret; @@ -2492,7 +2492,7 @@ rtl8188e_Efuse_PgPacketWrite(IN struct adapter *pAdapter, static HAL_VERSION ReadChipVersion8188E( - IN struct adapter *padapter + struct adapter *padapter ) { u32 value32; @@ -2827,8 +2827,8 @@ Hal_InitPGData88E(struct adapter *padapter) void Hal_EfuseParseIDCode88E( - IN struct adapter *padapter, - IN u8 *hwinfo + struct adapter *padapter, + u8 *hwinfo ) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); @@ -2850,9 +2850,9 @@ Hal_EfuseParseIDCode88E( static void Hal_EEValueCheck( - IN u8 EEType, - IN void * pInValue, - OUT void * pOutValue + u8 EEType, + void * pInValue, + void * pOutValue ) { switch(EEType) @@ -2881,10 +2881,10 @@ Hal_EEValueCheck( static void Hal_ReadPowerValueFromPROM_8188E( - IN struct adapter * padapter, - IN PTxPowerInfo24G pwrInfo24G, - IN u8* PROMContent, - IN bool AutoLoadFail + struct adapter * padapter, + PTxPowerInfo24G pwrInfo24G, + u8* PROMContent, + bool AutoLoadFail ) { u32 rfPath, eeAddr=EEPROM_TX_PWR_INX_88E, group,TxCount=0; @@ -3021,7 +3021,7 @@ Hal_ReadPowerValueFromPROM_8188E( static u8 Hal_GetChnlGroup( - IN u8 chnl + u8 chnl ) { u8 group=0; @@ -3037,8 +3037,8 @@ Hal_GetChnlGroup( } static u8 Hal_GetChnlGroup88E( - IN u8 chnl, - OUT u8* pGroup + u8 chnl, + u8* pGroup ) { u8 bIn24G=true; @@ -3106,8 +3106,8 @@ Hal_GetChnlGroup88E( void Hal_ReadPowerSavingMode88E( struct adapter * padapter, - IN u8* hwinfo, - IN bool AutoLoadFail + u8* hwinfo, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -3144,9 +3144,9 @@ void Hal_ReadPowerSavingMode88E( void Hal_ReadTxPowerInfo88E( - IN struct adapter * padapter, - IN u8* PROMContent, - IN bool AutoLoadFail + struct adapter * padapter, + u8* PROMContent, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -3225,9 +3225,9 @@ Hal_ReadTxPowerInfo88E( void Hal_EfuseParseXtal_8188E( - IN struct adapter * pAdapter, - IN u8* hwinfo, - IN bool AutoLoadFail + struct adapter * pAdapter, + u8* hwinfo, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -3247,9 +3247,9 @@ Hal_EfuseParseXtal_8188E( void Hal_EfuseParseBoardType88E( - IN struct adapter * pAdapter, - IN u8* hwinfo, - IN bool AutoLoadFail + struct adapter * pAdapter, + u8* hwinfo, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -3263,9 +3263,9 @@ Hal_EfuseParseBoardType88E( void Hal_EfuseParseEEPROMVer88E( - IN struct adapter * padapter, - IN u8* hwinfo, - IN bool AutoLoadFail + struct adapter * padapter, + u8* hwinfo, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -3284,9 +3284,9 @@ Hal_EfuseParseEEPROMVer88E( void rtl8188e_EfuseParseChnlPlan( - IN struct adapter * padapter, - IN u8* hwinfo, - IN bool AutoLoadFail + struct adapter * padapter, + u8* hwinfo, + bool AutoLoadFail ) { padapter->mlmepriv.ChannelPlan = hal_com_get_channel_plan( @@ -3302,9 +3302,9 @@ rtl8188e_EfuseParseChnlPlan( void Hal_EfuseParseCustomerID88E( - IN struct adapter * padapter, - IN u8* hwinfo, - IN bool AutoLoadFail + struct adapter * padapter, + u8* hwinfo, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -3326,9 +3326,9 @@ Hal_EfuseParseCustomerID88E( void Hal_ReadAntennaDiversity88E( - IN struct adapter * pAdapter, - IN u8* PROMContent, - IN bool AutoLoadFail + struct adapter * pAdapter, + u8* PROMContent, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -3374,9 +3374,9 @@ Hal_ReadAntennaDiversity88E( void Hal_ReadThermalMeter_88E( - IN struct adapter *Adapter, - IN u8* PROMContent, - IN bool AutoloadFail + struct adapter *Adapter, + u8* PROMContent, + bool AutoloadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -3404,7 +3404,7 @@ Hal_ReadThermalMeter_88E( void Hal_InitChannelPlan( - IN struct adapter *padapter + struct adapter *padapter ) { } diff --git a/hal/rtl8188e_phycfg.c b/hal/rtl8188e_phycfg.c index 0371538..796557d 100755 --- a/hal/rtl8188e_phycfg.c +++ b/hal/rtl8188e_phycfg.c @@ -80,7 +80,7 @@ phy_CalculateBitShift( #if(SIC_ENABLE == 1) static bool sic_IsSICReady( - IN struct adapter *Adapter + struct adapter *Adapter ) { bool bRet=false; @@ -189,10 +189,10 @@ sic_Write4Byte( /* */ static void SIC_SetBBReg( - IN struct adapter *Adapter, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + struct adapter *Adapter, + u32 RegAddr, + u32 BitMask, + u32 Data ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -220,9 +220,9 @@ SIC_SetBBReg( static u32 SIC_QueryBBReg( - IN struct adapter *Adapter, - IN u32 RegAddr, - IN u32 BitMask + struct adapter *Adapter, + u32 RegAddr, + u32 BitMask ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -245,7 +245,7 @@ SIC_QueryBBReg( void SIC_Init( - IN struct adapter *Adapter + struct adapter *Adapter ) { /* Here we need to write 0x1b8~0x1bf = 0 after fw is downloaded */ @@ -271,7 +271,7 @@ SIC_Init( static bool SIC_LedOff( - IN struct adapter *Adapter + struct adapter *Adapter ) { /* When SIC is enabled, led pin will be used as debug pin, */ @@ -296,9 +296,9 @@ SIC_LedOff( */ u32 rtl8188e_PHY_QueryBBReg( - IN struct adapter *Adapter, - IN u32 RegAddr, - IN u32 BitMask + struct adapter *Adapter, + u32 RegAddr, + u32 BitMask ) { u32 ReturnValue = 0, OriginalValue, BitShift; @@ -341,10 +341,10 @@ rtl8188e_PHY_QueryBBReg( void rtl8188e_PHY_SetBBReg( - IN struct adapter *Adapter, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + struct adapter *Adapter, + u32 RegAddr, + u32 BitMask, + u32 Data ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -394,9 +394,9 @@ rtl8188e_PHY_SetBBReg( */ static u32 phy_RFSerialRead( - IN struct adapter * Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset + struct adapter * Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset ) { u32 retValue = 0; @@ -511,10 +511,10 @@ phy_RFSerialRead( */ static void phy_RFSerialWrite( - IN struct adapter * Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset, - IN u32 Data + struct adapter * Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset, + u32 Data ) { u32 DataAndAddr = 0; @@ -592,11 +592,11 @@ u32 rtl8188e_PHY_QueryRFReg(struct adapter *Adapter, RF_RADIO_PATH_E eRFPath, u3 */ void rtl8188e_PHY_SetRFReg( - IN struct adapter * Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + struct adapter * Adapter, + RF_RADIO_PATH_E eRFPath, + u32 RegAddr, + u32 BitMask, + u32 Data ) { @@ -643,8 +643,8 @@ rtl8188e_PHY_SetRFReg( *---------------------------------------------------------------------------*/ static int phy_ConfigMACWithParaFile( - IN struct adapter * Adapter, - IN u8* pFileName + struct adapter * Adapter, + u8* pFileName ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -706,7 +706,7 @@ s32 PHY_MACConfig8188E(struct adapter *Adapter) */ static void phy_InitBBRFRegisterDefinition( - IN struct adapter * Adapter + struct adapter * Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -830,8 +830,8 @@ phy_InitBBRFRegisterDefinition( *---------------------------------------------------------------------------*/ static int phy_ConfigBBWithParaFile( - IN struct adapter * Adapter, - IN u8* pFileName + struct adapter * Adapter, + u8* pFileName ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -848,17 +848,17 @@ phy_ConfigBBWithParaFile( /* */ static void phy_ConfigBBExternalPA( - IN struct adapter * Adapter + struct adapter * Adapter ) { } void storePwrIndexDiffRateOffset( - IN struct adapter *Adapter, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + struct adapter *Adapter, + u32 RegAddr, + u32 BitMask, + u32 Data ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -988,8 +988,8 @@ storePwrIndexDiffRateOffset( *---------------------------------------------------------------------------*/ static int phy_ConfigBBWithPgParaFile( - IN struct adapter * Adapter, - IN u8* pFileName) + struct adapter * Adapter, + u8* pFileName) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1002,7 +1002,7 @@ phy_ConfigBBWithPgParaFile( static void phy_BB8192C_Config_1T( - IN struct adapter *Adapter + struct adapter *Adapter ) { /* for path - B */ @@ -1028,7 +1028,7 @@ phy_BB8192C_Config_1T( /* Now it is just for 8256. */ static int phy_BB8190_Config_HardCode( - IN struct adapter *Adapter + struct adapter *Adapter ) { /* RT_ASSERT(false, ("This function is not implement yet!! \n")); */ @@ -1037,7 +1037,7 @@ phy_BB8190_Config_HardCode( static int phy_BB8188E_Config_ParaFile( - IN struct adapter *Adapter + struct adapter *Adapter ) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); @@ -1112,7 +1112,7 @@ phy_BB8190_Config_ParaFile_Fail: int PHY_BBConfig8188E( - IN struct adapter *Adapter + struct adapter *Adapter ) { int rtStatus = _SUCCESS; @@ -1152,7 +1152,7 @@ PHY_BBConfig8188E( int PHY_RFConfig8188E( - IN struct adapter *Adapter + struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1183,8 +1183,8 @@ PHY_RFConfig8188E( *---------------------------------------------------------------------------*/ int rtl8188e_PHY_ConfigRFWithParaFile( - IN struct adapter * Adapter, - IN u8* pFileName, + struct adapter * Adapter, + u8* pFileName, RF_RADIO_PATH_E eRFPath ) { @@ -1218,7 +1218,7 @@ static u32 Rtl8192S_HighPower_RadioA_Array[HighPowerRadioAArrayLen] = { static int PHY_ConfigRFExternalPA( - IN struct adapter * Adapter, + struct adapter * Adapter, RF_RADIO_PATH_E eRFPath ) { @@ -1249,9 +1249,9 @@ PHY_ConfigRFExternalPA( *---------------------------------------------------------------------------*/ static int PHY_CheckBBAndRFOK( - IN struct adapter * Adapter, - IN HW90_BLOCK_E CheckBlock, - IN RF_RADIO_PATH_E eRFPath + struct adapter * Adapter, + HW90_BLOCK_E CheckBlock, + RF_RADIO_PATH_E eRFPath ) { int rtStatus = _SUCCESS; @@ -1324,7 +1324,7 @@ PHY_CheckBBAndRFOK( void rtl8192c_PHY_GetHWRegOriginalValue( - IN struct adapter * Adapter + struct adapter * Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1356,9 +1356,9 @@ rtl8192c_PHY_GetHWRegOriginalValue( /* */ static u8 phy_DbmToTxPwrIdx( - IN struct adapter * Adapter, - IN WIRELESS_MODE WirelessMode, - IN int PowerInDbm + struct adapter * Adapter, + WIRELESS_MODE WirelessMode, + int PowerInDbm ) { u8 TxPwrIdx = 0; @@ -1412,9 +1412,9 @@ phy_DbmToTxPwrIdx( /* */ static int phy_TxPwrIdxToDbm( - IN struct adapter * Adapter, - IN WIRELESS_MODE WirelessMode, - IN u8 TxPwrIdx + struct adapter * Adapter, + WIRELESS_MODE WirelessMode, + u8 TxPwrIdx ) { int Offset = 0; @@ -1458,8 +1458,8 @@ phy_TxPwrIdxToDbm( *---------------------------------------------------------------------------*/ void PHY_GetTxPowerLevel8188E( - IN struct adapter * Adapter, - OUT u32* powerlevel + struct adapter * Adapter, + u32* powerlevel ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1493,12 +1493,12 @@ PHY_GetTxPowerLevel8188E( } static void getTxPowerIndex88E( - IN struct adapter * Adapter, - IN u8 channel, - IN OUT u8* cckPowerLevel, - IN OUT u8* ofdmPowerLevel, - IN OUT u8* BW20PowerLevel, - IN OUT u8* BW40PowerLevel + struct adapter * Adapter, + u8 channel, + u8* cckPowerLevel, + u8* ofdmPowerLevel, + u8* BW20PowerLevel, + u8* BW40PowerLevel ) { @@ -1550,12 +1550,12 @@ static void getTxPowerIndex88E( } static void phy_PowerIndexCheck88E( - IN struct adapter *Adapter, - IN u8 channel, - IN OUT u8 * cckPowerLevel, - IN OUT u8 * ofdmPowerLevel, - IN OUT u8 * BW20PowerLevel, - IN OUT u8 * BW40PowerLevel + struct adapter *Adapter, + u8 channel, + u8 * cckPowerLevel, + u8 * ofdmPowerLevel, + u8 * BW20PowerLevel, + u8 * BW40PowerLevel ) { @@ -1586,8 +1586,8 @@ static void phy_PowerIndexCheck88E( *---------------------------------------------------------------------------*/ void PHY_SetTxPowerLevel8188E( - IN struct adapter * Adapter, - IN u8 channel + struct adapter * Adapter, + u8 channel ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1628,8 +1628,8 @@ PHY_SetTxPowerLevel8188E( /* */ bool PHY_UpdateTxPowerDbm8188E( - IN struct adapter *Adapter, - IN int powerInDbm + struct adapter *Adapter, + int powerInDbm ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1671,8 +1671,8 @@ PHY_UpdateTxPowerDbm8188E( static void rtl8192c_PHY_SetBeaconHwReg( - IN struct adapter * Adapter, - IN u16 BeaconInterval + struct adapter * Adapter, + u16 BeaconInterval ) { @@ -1681,8 +1681,8 @@ rtl8192c_PHY_SetBeaconHwReg( void PHY_ScanOperationBackup8188E( - IN struct adapter *Adapter, - IN u8 Operation + struct adapter *Adapter, + u8 Operation ) { } @@ -1704,7 +1704,7 @@ PHY_ScanOperationBackup8188E( *---------------------------------------------------------------------------*/ static void _PHY_SetBWMode92C( - IN struct adapter *Adapter + struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1844,9 +1844,9 @@ _PHY_SetBWMode92C( *---------------------------------------------------------------------------*/ void PHY_SetBWMode8188E( - IN struct adapter * Adapter, - IN HT_CHANNEL_WIDTH Bandwidth, /* 20M or 40M */ - IN unsigned char Offset /* Upper, Lower, or Don't care */ + struct adapter * Adapter, + HT_CHANNEL_WIDTH Bandwidth, /* 20M or 40M */ + unsigned char Offset /* Upper, Lower, or Don't care */ ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1893,7 +1893,7 @@ static void _PHY_SwChnl8192C(struct adapter *Adapter, u8 channel) } /* <20130708, James> A workaround to eliminate the 2480MHz spur for 8188E I-Cut */ static void phy_SpurCalibration_8188E( - IN struct adapter * Adapter + struct adapter * Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1911,8 +1911,8 @@ static void phy_SpurCalibration_8188E( } void PHY_SwChnl8188E( /* Call after initialization */ - IN struct adapter *Adapter, - IN u8 channel + struct adapter *Adapter, + u8 channel ) { /* struct adapter *Adapter = ADJUST_TO_ADAPTIVE_ADAPTER(pAdapter, true); */ @@ -1998,11 +1998,11 @@ PHY_SwChnl8188E( /* Call after initialization */ static bool phy_SwChnlStepByStep( - IN struct adapter *Adapter, - IN u8 channel, - IN u8 *stage, - IN u8 *step, - OUT u32 *delay + struct adapter *Adapter, + u8 channel, + u8 *stage, + u8 *step, + u32 *delay ) { return true; @@ -2047,8 +2047,8 @@ phy_SetSwChnlCmdArray( static void phy_FinishSwChnlNow( /* We should not call this function directly */ - IN struct adapter *Adapter, - IN u8 channel + struct adapter *Adapter, + u8 channel ) { } @@ -2064,8 +2064,8 @@ phy_FinishSwChnlNow( /* We should not call this function directly */ /* */ void PHY_SwChnlPhy8192C( /* Only called during initialize */ - IN struct adapter *Adapter, - IN u8 channel + struct adapter *Adapter, + u8 channel ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2110,8 +2110,8 @@ PHY_SwChnlPhy8192C( /* Only called during initialize */ /* */ void PHY_SetMonitorMode8192C( - IN struct adapter * pAdapter, - IN bool bEnableMonitorMode + struct adapter * pAdapter, + bool bEnableMonitorMode ) { } @@ -2136,8 +2136,8 @@ PHY_SetMonitorMode8192C( *---------------------------------------------------------------------------*/ bool PHY_CheckIsLegalRfPath8192C( - IN struct adapter *pAdapter, - IN u32 eRFPath) + struct adapter *pAdapter, + u32 eRFPath) { bool rtValue = true; @@ -2147,9 +2147,9 @@ PHY_CheckIsLegalRfPath8192C( } /* PHY_CheckIsLegalRfPath8192C */ static void _PHY_SetRFPathSwitch( - IN struct adapter *pAdapter, - IN bool bMain, - IN bool is2T + struct adapter *pAdapter, + bool bMain, + bool is2T ) { u8 u1bTmp; @@ -2183,8 +2183,8 @@ static void _PHY_SetRFPathSwitch( /* return value true => Main; false => Aux */ static bool _PHY_QueryRFPathSwitch( - IN struct adapter *pAdapter, - IN bool is2T + struct adapter *pAdapter, + bool is2T ) { /* if(is2T) */ @@ -2214,7 +2214,7 @@ static bool _PHY_QueryRFPathSwitch( static void -_PHY_DumpRFReg(IN struct adapter *pAdapter) +_PHY_DumpRFReg(struct adapter *pAdapter) { u32 rfRegValue,rfRegOffset; @@ -2239,7 +2239,7 @@ _PHY_DumpRFReg(IN struct adapter *pAdapter) /* Added by Roger, 2009.03.10. */ /* */ static void DumpBBDbgPort_92CU( - IN struct adapter * Adapter + struct adapter * Adapter ) { PHY_SetBBReg(Adapter, 0x0908, 0xffff, 0x0000); diff --git a/hal/rtl8188e_rf6052.c b/hal/rtl8188e_rf6052.c index 5111cb7..c28700a 100755 --- a/hal/rtl8188e_rf6052.c +++ b/hal/rtl8188e_rf6052.c @@ -92,8 +92,8 @@ static RF_SHADOW_T RF_Shadow[RF6052_MAX_PATH][RF6052_MAX_REG]; * Firmwaer support the utility later. * *---------------------------------------------------------------------------*/ -void rtl8188e_RF_ChangeTxPath( IN struct adapter *Adapter, - IN u16 DataRate) +void rtl8188e_RF_ChangeTxPath( struct adapter *Adapter, + u16 DataRate) { /* We do not support gain table change inACUT now !!!! Delete later !!! */ } /* RF_ChangeTxPath */ @@ -115,8 +115,8 @@ void rtl8188e_RF_ChangeTxPath( IN struct adapter *Adapter, *---------------------------------------------------------------------------*/ void rtl8188e_PHY_RF6052SetBandwidth( - IN struct adapter * Adapter, - IN HT_CHANNEL_WIDTH Bandwidth) /* 20M or 40M */ + struct adapter * Adapter, + HT_CHANNEL_WIDTH Bandwidth) /* 20M or 40M */ { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -158,8 +158,8 @@ rtl8188e_PHY_RF6052SetBandwidth( void rtl8188e_PHY_RF6052SetCckTxPower( - IN struct adapter * Adapter, - IN u8* pPowerlevel) + struct adapter * Adapter, + u8* pPowerlevel) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; @@ -274,13 +274,13 @@ rtl8188e_PHY_RF6052SetCckTxPower( /* powerbase0 for OFDM rates */ /* powerbase1 for HT MCS rates */ static void getPowerBase88E( - IN struct adapter *Adapter, - IN u8* pPowerLevelOFDM, - IN u8* pPowerLevelBW20, - IN u8* pPowerLevelBW40, - IN u8 Channel, - IN OUT u32* OfdmBase, - IN OUT u32* MCSBase + struct adapter *Adapter, + u8* pPowerLevelOFDM, + u8* pPowerLevelBW20, + u8* pPowerLevelBW40, + u8 Channel, + u32* OfdmBase, + u32* MCSBase ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -317,12 +317,12 @@ static void getPowerBase88E( } static void getTxPowerWriteValByRegulatory88E( - IN struct adapter *Adapter, - IN u8 Channel, - IN u8 index, - IN u32* powerBase0, - IN u32* powerBase1, - OUT u32* pOutWriteVal + struct adapter *Adapter, + u8 Channel, + u8 index, + u32* powerBase0, + u32* powerBase1, + u32* pOutWriteVal ) { @@ -483,9 +483,9 @@ static void getTxPowerWriteValByRegulatory88E( } static void writeOFDMPowerReg88E( - IN struct adapter *Adapter, - IN u8 index, - IN u32* pValue + struct adapter *Adapter, + u8 index, + u32* pValue ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -567,11 +567,11 @@ static void writeOFDMPowerReg88E( void rtl8188e_PHY_RF6052SetOFDMTxPower( - IN struct adapter *Adapter, - IN u8* pPowerLevelOFDM, - IN u8* pPowerLevelBW20, - IN u8* pPowerLevelBW40, - IN u8 Channel) + struct adapter *Adapter, + u8* pPowerLevelOFDM, + u8* pPowerLevelBW20, + u8* pPowerLevelBW40, + u8 Channel) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u32 writeVal[2], powerBase0[2], powerBase1[2], pwrtrac_value; @@ -612,7 +612,7 @@ rtl8188e_PHY_RF6052SetOFDMTxPower( static void phy_RF6052_Config_HardCode( - IN struct adapter * Adapter + struct adapter * Adapter ) { @@ -625,7 +625,7 @@ phy_RF6052_Config_HardCode( static int phy_RF6052_Config_ParaFile( - IN struct adapter * Adapter + struct adapter * Adapter ) { u32 u4RegValue; @@ -729,7 +729,7 @@ phy_RF6052_Config_ParaFile_Fail: int PHY_RF6052_Config8188E( - IN struct adapter * Adapter) + struct adapter * Adapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); int rtStatus = _SUCCESS; @@ -781,9 +781,9 @@ PHY_RF6052_Config8188E( *---------------------------------------------------------------------------*/ static u32 PHY_RFShadowRead( - IN struct adapter * Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset) + struct adapter * Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset) { return RF_Shadow[eRFPath][Offset].Value; @@ -792,10 +792,10 @@ PHY_RFShadowRead( static void PHY_RFShadowWrite( - IN struct adapter * Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset, - IN u32 Data) + struct adapter * Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset, + u32 Data) { RF_Shadow[eRFPath][Offset].Value = (Data & bRFRegOffsetMask); RF_Shadow[eRFPath][Offset].Driver_Write = true; @@ -805,9 +805,9 @@ PHY_RFShadowWrite( static bool PHY_RFShadowCompare( - IN struct adapter * Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset) + struct adapter * Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset) { u32 reg; /* Check if we need to check the register */ @@ -831,9 +831,9 @@ PHY_RFShadowCompare( static void PHY_RFShadowRecorver( - IN struct adapter * Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset) + struct adapter * Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset) { /* Check if the address is error */ if (RF_Shadow[eRFPath][Offset].ErrorOrNot == true) @@ -854,7 +854,7 @@ PHY_RFShadowRecorver( static void PHY_RFShadowCompareAll( - IN struct adapter * Adapter) + struct adapter * Adapter) { u32 eRFPath; u32 Offset; @@ -872,7 +872,7 @@ PHY_RFShadowCompareAll( static void PHY_RFShadowRecorverAll( - IN struct adapter * Adapter) + struct adapter * Adapter) { u32 eRFPath; u32 Offset; @@ -890,10 +890,10 @@ PHY_RFShadowRecorverAll( static void PHY_RFShadowCompareFlagSet( - IN struct adapter * Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset, - IN u8 Type) + struct adapter * Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset, + u8 Type) { /* Set True or False!!! */ RF_Shadow[eRFPath][Offset].Compare = Type; @@ -903,10 +903,10 @@ PHY_RFShadowCompareFlagSet( static void PHY_RFShadowRecorverFlagSet( - IN struct adapter * Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset, - IN u8 Type) + struct adapter * Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset, + u8 Type) { /* Set True or False!!! */ RF_Shadow[eRFPath][Offset].Recorver= Type; @@ -916,7 +916,7 @@ PHY_RFShadowRecorverFlagSet( static void PHY_RFShadowCompareFlagSetAll( - IN struct adapter * Adapter) + struct adapter * Adapter) { u32 eRFPath; u32 Offset; @@ -938,7 +938,7 @@ PHY_RFShadowCompareFlagSetAll( static void PHY_RFShadowRecorverFlagSetAll( - IN struct adapter * Adapter) + struct adapter * Adapter) { u32 eRFPath; u32 Offset; @@ -959,7 +959,7 @@ PHY_RFShadowRecorverFlagSetAll( static void PHY_RFShadowRefresh( - IN struct adapter * Adapter) + struct adapter * Adapter) { u32 eRFPath; u32 Offset; diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index c6fd48d..55dbbef 100755 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -44,8 +44,8 @@ static void _ConfigNormalChipOutEP_8188E( - IN struct adapter *pAdapter, - IN u8 NumOutPipe + struct adapter *pAdapter, + u8 NumOutPipe ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -72,9 +72,9 @@ _ConfigNormalChipOutEP_8188E( } static bool HalUsbSetQueuePipeMapping8188EUsb( - IN struct adapter *pAdapter, - IN u8 NumInPipe, - IN u8 NumOutPipe + struct adapter *pAdapter, + u8 NumInPipe, + u8 NumOutPipe ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -281,7 +281,7 @@ static void _InitBTCoexist(struct adapter *padapter) /* */ static void _SetMacID( - IN struct adapter *Adapter, u8* MacID + struct adapter *Adapter, u8* MacID ) { u32 i; @@ -292,7 +292,7 @@ _SetMacID( static void _SetBSSID( - IN struct adapter *Adapter, u8* BSSID + struct adapter *Adapter, u8* BSSID ) { u32 i; @@ -305,7 +305,7 @@ _SetBSSID( /* Shall USB interface init this? */ static void _InitInterrupt( - IN struct adapter *Adapter + struct adapter *Adapter ) { u32 imr,imr_ex; @@ -343,7 +343,7 @@ _InitInterrupt( static void _InitQueueReservedPage( - IN struct adapter *Adapter + struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -392,8 +392,8 @@ _InitQueueReservedPage( static void _InitTxBufferBoundary( - IN struct adapter *Adapter, - IN u8 txpktbuf_bndy + struct adapter *Adapter, + u8 txpktbuf_bndy ) { struct registry_priv *pregistrypriv = &Adapter->registrypriv; @@ -411,7 +411,7 @@ _InitTxBufferBoundary( static void _InitPageBoundary( - IN struct adapter *Adapter + struct adapter *Adapter ) { /* RX Page Boundary */ @@ -424,13 +424,13 @@ _InitPageBoundary( static void _InitNormalChipRegPriority( - IN struct adapter *Adapter, - IN u16 beQ, - IN u16 bkQ, - IN u16 viQ, - IN u16 voQ, - IN u16 mgtQ, - IN u16 hiQ + struct adapter *Adapter, + u16 beQ, + u16 bkQ, + u16 viQ, + u16 voQ, + u16 mgtQ, + u16 hiQ ) { u16 value16 = (rtw_read16(Adapter, REG_TRXDMA_CTRL) & 0x7); @@ -444,7 +444,7 @@ _InitNormalChipRegPriority( static void _InitNormalChipOneOutEpPriority( - IN struct adapter *Adapter + struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -479,7 +479,7 @@ _InitNormalChipOneOutEpPriority( static void _InitNormalChipTwoOutEpPriority( - IN struct adapter *Adapter + struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -532,7 +532,7 @@ _InitNormalChipTwoOutEpPriority( static void _InitNormalChipThreeOutEpPriority( - IN struct adapter *Adapter + struct adapter *Adapter ) { struct registry_priv *pregistrypriv = &Adapter->registrypriv; @@ -559,7 +559,7 @@ _InitNormalChipThreeOutEpPriority( static void _InitQueuePriority( - IN struct adapter *Adapter + struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -587,7 +587,7 @@ _InitQueuePriority( static void _InitHardwareDropIncorrectBulkOut( - IN struct adapter *Adapter + struct adapter *Adapter ) { u32 value32 = rtw_read32(Adapter, REG_TXDMA_OFFSET_CHK); @@ -598,7 +598,7 @@ _InitHardwareDropIncorrectBulkOut( static void _InitNetworkType( - IN struct adapter *Adapter + struct adapter *Adapter ) { u32 value32; @@ -613,7 +613,7 @@ _InitNetworkType( static void _InitTransferPageSize( - IN struct adapter *Adapter + struct adapter *Adapter ) { /* Tx page size is always 128. */ @@ -625,8 +625,8 @@ _InitTransferPageSize( static void _InitDriverInfoSize( - IN struct adapter *Adapter, - IN u8 drvInfoSize + struct adapter *Adapter, + u8 drvInfoSize ) { rtw_write8(Adapter,REG_RX_DRVINFO_SZ, drvInfoSize); @@ -634,7 +634,7 @@ _InitDriverInfoSize( static void _InitWMACSetting( - IN struct adapter *Adapter + struct adapter *Adapter ) { /* u32 value32; */ @@ -676,7 +676,7 @@ _InitWMACSetting( static void _InitAdaptiveCtrl( - IN struct adapter *Adapter + struct adapter *Adapter ) { u16 value16; @@ -703,7 +703,7 @@ _InitAdaptiveCtrl( static void _InitRateFallback( - IN struct adapter *Adapter + struct adapter *Adapter ) { /* Set Data Auto Rate Fallback Retry Count register. */ @@ -717,7 +717,7 @@ _InitRateFallback( static void _InitEDCA( - IN struct adapter *Adapter + struct adapter *Adapter ) { /* Set Spec SIFS (used in NAV) */ @@ -740,8 +740,8 @@ _InitEDCA( static void _InitBeaconMaxError( - IN struct adapter *Adapter, - IN bool InfraMode + struct adapter *Adapter, + bool InfraMode ) { @@ -750,7 +750,7 @@ _InitBeaconMaxError( static void _InitRDGSetting( - IN struct adapter *Adapter + struct adapter *Adapter ) { rtw_write8(Adapter,REG_RD_CTRL,0xFF); @@ -760,7 +760,7 @@ _InitRDGSetting( static void _InitRxSetting( - IN struct adapter *Adapter + struct adapter *Adapter ) { rtw_write32(Adapter, REG_MACID, 0x87654321); @@ -769,7 +769,7 @@ _InitRxSetting( static void _InitRetryFunction( - IN struct adapter *Adapter + struct adapter *Adapter ) { u8 value8; @@ -797,7 +797,7 @@ _InitRetryFunction( *---------------------------------------------------------------------------*/ static void usb_AggSettingTxUpdate( - IN struct adapter * Adapter + struct adapter * Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -834,7 +834,7 @@ usb_AggSettingTxUpdate( *---------------------------------------------------------------------------*/ static void usb_AggSettingRxUpdate( - IN struct adapter * Adapter + struct adapter * Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -918,7 +918,7 @@ usb_AggSettingRxUpdate( static void InitUsbAggregationSetting( - IN struct adapter *Adapter + struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -933,8 +933,8 @@ InitUsbAggregationSetting( pHalData->UsbRxHighSpeedMode = false; } static void HalRxAggr8188EUsb( - IN struct adapter *Adapter, - IN bool Value + struct adapter *Adapter, + bool Value ) { } @@ -959,14 +959,14 @@ static void HalRxAggr8188EUsb( * *---------------------------------------------------------------------------*/ static void USB_AggModeSwitch( - IN struct adapter * Adapter + struct adapter * Adapter ) { } /* USB_AggModeSwitch */ static void _InitOperationMode( - IN struct adapter * Adapter + struct adapter * Adapter ) { } @@ -974,7 +974,7 @@ _InitOperationMode( static void _InitBeaconParameters( - IN struct adapter *Adapter + struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -999,7 +999,7 @@ _InitBeaconParameters( static void _InitRFType( - IN struct adapter *Adapter + struct adapter *Adapter ) { struct registry_priv *pregpriv = &Adapter->registrypriv; @@ -1029,9 +1029,9 @@ _InitRFType( static void _BeaconFunctionEnable( - IN struct adapter * Adapter, - IN bool Enable, - IN bool Linked + struct adapter * Adapter, + bool Enable, + bool Linked ) { rtw_write8(Adapter, REG_BCN_CTRL, (BIT4 | BIT3 | BIT1)); @@ -1044,7 +1044,7 @@ _BeaconFunctionEnable( /* Set CCK and OFDM Block "ON" */ static void _BBTurnOnBlock( - IN struct adapter * Adapter + struct adapter * Adapter ) { #if (DISABLE_BB_RF) @@ -1056,7 +1056,7 @@ static void _BBTurnOnBlock( } static void _RfPowerSave( - IN struct adapter * Adapter + struct adapter * Adapter ) { } @@ -1067,7 +1067,7 @@ enum { }; static void -_InitAntenna_Selection(IN struct adapter *Adapter) +_InitAntenna_Selection(struct adapter *Adapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1095,7 +1095,7 @@ _InitAntenna_Selection(IN struct adapter *Adapter) /* */ static void HalDetectSelectiveSuspendMode( - IN struct adapter * Adapter + struct adapter * Adapter ) { } /* HalDetectSelectiveSuspendMode */ @@ -1116,14 +1116,14 @@ HalDetectSelectiveSuspendMode( *---------------------------------------------------------------------------*/ static void HwSuspendModeEnable_88eu( - IN struct adapter *pAdapter, - IN u8 Type + struct adapter *pAdapter, + u8 Type ) { return; } /* HwSuspendModeEnable92Cu */ -rt_rf_power_state RfOnOffDetect(IN struct adapter *pAdapter ) +rt_rf_power_state RfOnOffDetect(struct adapter *pAdapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); u8 val8; @@ -1546,7 +1546,7 @@ void _ps_open_RF(struct adapter *padapter) { } static void hal_poweroff_rtl8188eu( - IN struct adapter * Adapter + struct adapter * Adapter ) { u8 val8; @@ -1735,9 +1735,9 @@ static unsigned int rtl8188eu_inirp_deinit(struct adapter *Adapter) /* */ static void _ReadIDs( - IN struct adapter *Adapter, - IN u8* PROMContent, - IN bool AutoloadFail + struct adapter *Adapter, + u8* PROMContent, + bool AutoloadFail ) { } @@ -1745,18 +1745,18 @@ _ReadIDs( static void _ReadMACAddress( - IN struct adapter *Adapter, - IN u8* PROMContent, - IN bool AutoloadFail + struct adapter *Adapter, + u8* PROMContent, + bool AutoloadFail ) { } static void _ReadBoardType( - IN struct adapter *Adapter, - IN u8* PROMContent, - IN bool AutoloadFail + struct adapter *Adapter, + u8* PROMContent, + bool AutoloadFail ) { @@ -1765,9 +1765,9 @@ _ReadBoardType( static void _ReadLEDSetting( - IN struct adapter *Adapter, - IN u8* PROMContent, - IN bool AutoloadFail + struct adapter *Adapter, + u8* PROMContent, + bool AutoloadFail ) { struct led_priv *pledpriv = &(Adapter->ledpriv); @@ -1789,36 +1789,36 @@ _ReadLEDSetting( static void _ReadThermalMeter( - IN struct adapter *Adapter, - IN u8* PROMContent, - IN bool AutoloadFail + struct adapter *Adapter, + u8* PROMContent, + bool AutoloadFail ) { } static void _ReadRFSetting( - IN struct adapter *Adapter, - IN u8* PROMContent, - IN bool AutoloadFail + struct adapter *Adapter, + u8* PROMContent, + bool AutoloadFail ) { } static void _ReadPROMVersion( - IN struct adapter *Adapter, - IN u8* PROMContent, - IN bool AutoloadFail + struct adapter *Adapter, + u8* PROMContent, + bool AutoloadFail ) { } static void readAntennaDiversity( - IN struct adapter *pAdapter, - IN u8 *hwinfo, - IN bool AutoLoadFail + struct adapter *pAdapter, + u8 *hwinfo, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -1829,16 +1829,16 @@ readAntennaDiversity( static void hal_InitPGData( - IN struct adapter *pAdapter, - IN OUT u8 *PROMContent + struct adapter *pAdapter, + u8 *PROMContent ) { } static void Hal_EfuseParsePIDVID_8188EU( - IN struct adapter * pAdapter, - IN u8* hwinfo, - IN bool AutoLoadFail + struct adapter * pAdapter, + u8* hwinfo, + bool AutoLoadFail ) { @@ -1868,9 +1868,9 @@ Hal_EfuseParsePIDVID_8188EU( static void Hal_EfuseParseMACAddr_8188EU( - IN struct adapter * padapter, - IN u8* hwinfo, - IN bool AutoLoadFail + struct adapter * padapter, + u8* hwinfo, + bool AutoLoadFail ) { u16 i, usValue; @@ -1901,19 +1901,19 @@ Hal_EfuseParseMACAddr_8188EU( static void Hal_CustomizeByCustomerID_8188EU( - IN struct adapter * padapter + struct adapter * padapter ) { } /* Read HW power down mode selection */ -static void _ReadPSSetting(IN struct adapter *Adapter,IN u8*PROMContent,IN u8 AutoloadFail) +static void _ReadPSSetting(struct adapter *Adapter,u8*PROMContent,u8 AutoloadFail) { } static void readAdapterInfo_8188EU( - IN struct adapter *padapter + struct adapter *padapter ) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); @@ -1943,7 +1943,7 @@ readAdapterInfo_8188EU( } static void _ReadPROMContent( - IN struct adapter * Adapter + struct adapter * Adapter ) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); @@ -1965,7 +1965,7 @@ static void _ReadPROMContent( static void _ReadRFType( - IN struct adapter *Adapter + struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2938,9 +2938,9 @@ static void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) /* Query setting of specified variable. */ /* */ static u8 GetHalDefVar8188EUsb( - IN struct adapter * Adapter, - IN HAL_DEF_VARIABLE eVariable, - IN void * pValue + struct adapter * Adapter, + HAL_DEF_VARIABLE eVariable, + void * pValue ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -3063,9 +3063,9 @@ static u8 GetHalDefVar8188EUsb( /* Change default setting of specified variable. */ /* */ static u8 SetHalDefVar8188EUsb( - IN struct adapter * Adapter, - IN HAL_DEF_VARIABLE eVariable, - IN void * pValue + struct adapter * Adapter, + HAL_DEF_VARIABLE eVariable, + void * pValue ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); diff --git a/include/Hal8188EPhyCfg.h b/include/Hal8188EPhyCfg.h index 70389d3..503022a 100755 --- a/include/Hal8188EPhyCfg.h +++ b/include/Hal8188EPhyCfg.h @@ -211,127 +211,107 @@ typedef struct _R_ANTENNA_SELECT_CCK{ // // BB and RF register read/write // -u32 rtl8188e_PHY_QueryBBReg( IN struct adapter *Adapter, - IN u32 RegAddr, - IN u32 BitMask ); -void rtl8188e_PHY_SetBBReg( IN struct adapter *Adapter, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data ); -u32 rtl8188e_PHY_QueryRFReg( IN struct adapter * Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 RegAddr, - IN u32 BitMask ); -void rtl8188e_PHY_SetRFReg( IN struct adapter * Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data ); +u32 rtl8188e_PHY_QueryBBReg( struct adapter *Adapter, + u32 RegAddr, + u32 BitMask ); +void rtl8188e_PHY_SetBBReg( struct adapter *Adapter, + u32 RegAddr, + u32 BitMask, + u32 Data ); +u32 rtl8188e_PHY_QueryRFReg( struct adapter * Adapter, + RF_RADIO_PATH_E eRFPath, + u32 RegAddr, + u32 BitMask ); +void rtl8188e_PHY_SetRFReg( struct adapter * Adapter, + RF_RADIO_PATH_E eRFPath, + u32 RegAddr, + u32 BitMask, + u32 Data ); // // Initialization related function // /* MAC/BB/RF HAL config */ -int PHY_MACConfig8188E(IN struct adapter *Adapter ); -int PHY_BBConfig8188E(IN struct adapter *Adapter ); -int PHY_RFConfig8188E(IN struct adapter *Adapter ); +int PHY_MACConfig8188E(struct adapter *Adapter ); +int PHY_BBConfig8188E(struct adapter *Adapter ); +int PHY_RFConfig8188E(struct adapter *Adapter ); /* RF config */ -int rtl8188e_PHY_ConfigRFWithParaFile(IN struct adapter *Adapter, IN u8 * pFileName, RF_RADIO_PATH_E eRFPath); -int rtl8188e_PHY_ConfigRFWithHeaderFile( IN struct adapter * Adapter, - IN RF_RADIO_PATH_E eRFPath); +int rtl8188e_PHY_ConfigRFWithParaFile(struct adapter *Adapter, u8 * pFileName, RF_RADIO_PATH_E eRFPath); +int rtl8188e_PHY_ConfigRFWithHeaderFile(struct adapter *Adapter, + RF_RADIO_PATH_E eRFPath); /* Read initi reg value for tx power setting. */ -void rtl8192c_PHY_GetHWRegOriginalValue( IN struct adapter * Adapter ); - -// -// RF Power setting -// -//extern bool PHY_SetRFPowerState(IN struct adapter * Adapter, -// IN RT_RF_POWER_STATE eRFPowerState); +void rtl8192c_PHY_GetHWRegOriginalValue(struct adapter * Adapter ); // // BB TX Power R/W // -void PHY_GetTxPowerLevel8188E( IN struct adapter * Adapter, - OUT u32* powerlevel ); -void PHY_SetTxPowerLevel8188E( IN struct adapter * Adapter, - IN u8 channel ); -bool PHY_UpdateTxPowerDbm8188E( IN struct adapter *Adapter, - IN int powerInDbm ); +void PHY_GetTxPowerLevel8188E(struct adapter *Adapter, u32 *powerlevel); +void PHY_SetTxPowerLevel8188E(struct adapter *Adapter, u8 channel); +bool PHY_UpdateTxPowerDbm8188E(struct adapter *Adapter, int powerInDbm); // void -PHY_ScanOperationBackup8188E(IN struct adapter *Adapter, - IN u8 Operation ); +PHY_ScanOperationBackup8188E(struct adapter *Adapter, u8 Operation); // // Switch bandwidth for 8192S // -//extern void PHY_SetBWModeCallback8192C( IN PRT_TIMER pTimer ); -void PHY_SetBWMode8188E( IN struct adapter * pAdapter, - IN HT_CHANNEL_WIDTH ChnlWidth, - IN unsigned char Offset ); - -// -// Set FW CMD IO for 8192S. -// -//extern bool HalSetIO8192C( IN struct adapter * Adapter, -// IN IO_TYPE IOType); +void PHY_SetBWMode8188E(struct adapter *pAdapter, HT_CHANNEL_WIDTH ChnlWidth, unsigned char Offset); // // Set A2 entry to fw for 8192S // -extern void FillA2Entry8192C( IN struct adapter * Adapter, - IN u8 index, - IN u8* val); +extern void FillA2Entry8192C( struct adapter * Adapter, + u8 index, + u8* val); // // channel switch related funciton // -//extern void PHY_SwChnlCallback8192C( IN PRT_TIMER pTimer ); -void PHY_SwChnl8188E( IN struct adapter * pAdapter, - IN u8 channel ); +void PHY_SwChnl8188E( struct adapter * pAdapter, + u8 channel ); // Call after initialization -void PHY_SwChnlPhy8192C( IN struct adapter * pAdapter, - IN u8 channel ); +void PHY_SwChnlPhy8192C( struct adapter * pAdapter, + u8 channel ); -void ChkFwCmdIoDone( IN struct adapter *Adapter); +void ChkFwCmdIoDone( struct adapter *Adapter); // // BB/MAC/RF other monitor API // -void PHY_SetMonitorMode8192C(IN struct adapter *pAdapter, - IN bool bEnableMonitorMode ); +void PHY_SetMonitorMode8192C(struct adapter *pAdapter, + bool bEnableMonitorMode ); -bool PHY_CheckIsLegalRfPath8192C(IN struct adapter *pAdapter, - IN u32 eRFPath ); +bool PHY_CheckIsLegalRfPath8192C(struct adapter *pAdapter, + u32 eRFPath ); -void PHY_SetRFPathSwitch_8188E(IN struct adapter *pAdapter, IN bool bMain); +void PHY_SetRFPathSwitch_8188E(struct adapter *pAdapter, bool bMain); extern void PHY_SwitchEphyParameter( - IN struct adapter * Adapter + struct adapter * Adapter ); extern void PHY_EnableHostClkReq( - IN struct adapter * Adapter + struct adapter * Adapter ); bool SetAntennaConfig92C( - IN struct adapter *Adapter, - IN u8 DefaultAnt + struct adapter *Adapter, + u8 DefaultAnt ); void storePwrIndexDiffRateOffset( - IN struct adapter *Adapter, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + struct adapter *Adapter, + u32 RegAddr, + u32 BitMask, + u32 Data ); /*--------------------------Exported Function prototype---------------------*/ diff --git a/include/basic_types.h b/include/basic_types.h index 0aefbfa..0e2c2e2 100755 --- a/include/basic_types.h +++ b/include/basic_types.h @@ -27,8 +27,6 @@ #define FAIL (-1) #include - #define IN - #define OUT #define NDIS_OID uint #define NDIS_STATUS uint diff --git a/include/hal_com.h b/include/hal_com.h index 52699d0..235e2f4 100755 --- a/include/hal_com.h +++ b/include/hal_com.h @@ -153,24 +153,24 @@ void dump_chip_info(HAL_VERSION ChipVersion); u8 //return the final channel plan decision hal_com_get_channel_plan( - IN struct adapter *padapter, - IN u8 hw_channel_plan, //channel plan from HW (efuse/eeprom) - IN u8 sw_channel_plan, //channel plan from SW (registry/module param) - IN u8 def_channel_plan, //channel plan used when the former two is invalid - IN bool AutoLoadFail + struct adapter *padapter, + u8 hw_channel_plan, //channel plan from HW (efuse/eeprom) + u8 sw_channel_plan, //channel plan from SW (registry/module param) + u8 def_channel_plan, //channel plan used when the former two is invalid + bool AutoLoadFail ); u8 MRateToHwRate(u8 rate); void HalSetBrateCfg( - IN struct adapter * Adapter, - IN u8 *mBratesOS, - OUT u16 *pBrateCfg); + struct adapter * Adapter, + u8 *mBratesOS, + u16 *pBrateCfg); bool Hal_MappingOutPipe( - IN struct adapter *pAdapter, - IN u8 NumOutPipe + struct adapter *pAdapter, + u8 NumOutPipe ); void hal_init_macaddr(struct adapter *adapter); diff --git a/include/recv_osdep.h b/include/recv_osdep.h index d612513..98ba10c 100755 --- a/include/recv_osdep.h +++ b/include/recv_osdep.h @@ -27,17 +27,17 @@ int rtw_hw_suspend(struct adapter *padapter ); int rtw_hw_resume(struct adapter *padapter); -extern void rtw_dev_unload(struct adapter *padapter); -extern sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter); -extern void _rtw_free_recv_priv (struct recv_priv *precvpriv); +void rtw_dev_unload(struct adapter *padapter); +sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter); +void _rtw_free_recv_priv (struct recv_priv *precvpriv); -extern s32 rtw_recv_entry(union recv_frame *precv_frame); -extern int rtw_recv_indicatepkt(struct adapter *adapter, union recv_frame *precv_frame); -extern void rtw_recv_returnpacket(IN _nic_hdl cnxt, IN _pkt *preturnedpkt); +s32 rtw_recv_entry(union recv_frame *precv_frame); +int rtw_recv_indicatepkt(struct adapter *adapter, union recv_frame *precv_frame); +void rtw_recv_returnpacket(_nic_hdl cnxt, _pkt *preturnedpkt); -extern void rtw_hostapd_mlme_rx(struct adapter *padapter, union recv_frame *precv_frame); -extern void rtw_handle_tkip_mic_err(struct adapter *padapter,u8 bgroup); +void rtw_hostapd_mlme_rx(struct adapter *padapter, union recv_frame *precv_frame); +void rtw_handle_tkip_mic_err(struct adapter *padapter,u8 bgroup); int rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter); diff --git a/include/rtl8188e_dm.h b/include/rtl8188e_dm.h index 7f7a108..c4ad0aa 100755 --- a/include/rtl8188e_dm.h +++ b/include/rtl8188e_dm.h @@ -54,10 +54,10 @@ struct dm_priv }; -void rtl8188e_init_dm_priv(IN struct adapter *Adapter); -void rtl8188e_deinit_dm_priv(IN struct adapter *Adapter); -void rtl8188e_InitHalDm(IN struct adapter *Adapter); -void rtl8188e_HalDmWatchDog(IN struct adapter *Adapter); +void rtl8188e_init_dm_priv(struct adapter *Adapter); +void rtl8188e_deinit_dm_priv(struct adapter *Adapter); +void rtl8188e_InitHalDm(struct adapter *Adapter); +void rtl8188e_HalDmWatchDog(struct adapter *Adapter); void AntDivCompare8188E(struct adapter *Adapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src); u8 AntDivBeforeLink8188E(struct adapter *Adapter ); diff --git a/include/rtl8188e_rf.h b/include/rtl8188e_rf.h index f8c76a5..78bbfad 100755 --- a/include/rtl8188e_rf.h +++ b/include/rtl8188e_rf.h @@ -25,20 +25,20 @@ #define RF6052_MAX_PATH 2 -int PHY_RF6052_Config8188E( IN struct adapter * Adapter ); -void rtl8188e_RF_ChangeTxPath( IN struct adapter *Adapter, - IN u16 DataRate); +int PHY_RF6052_Config8188E( struct adapter * Adapter ); +void rtl8188e_RF_ChangeTxPath( struct adapter *Adapter, + u16 DataRate); void rtl8188e_PHY_RF6052SetBandwidth( - IN struct adapter * Adapter, - IN HT_CHANNEL_WIDTH Bandwidth); + struct adapter * Adapter, + HT_CHANNEL_WIDTH Bandwidth); void rtl8188e_PHY_RF6052SetCckTxPower( - IN struct adapter *Adapter, - IN u8* pPowerlevel); + struct adapter *Adapter, + u8* pPowerlevel); void rtl8188e_PHY_RF6052SetOFDMTxPower( - IN struct adapter *Adapter, - IN u8* pPowerLevelOFDM, - IN u8* pPowerLevelBW20, - IN u8* pPowerLevelBW40, - IN u8 Channel); + struct adapter *Adapter, + u8* pPowerLevelOFDM, + u8* pPowerLevelBW20, + u8* pPowerLevelBW40, + u8 Channel); #endif//__RTL8188E_RF_H__ diff --git a/include/rtw_ioctl.h b/include/rtw_ioctl.h index 2d79236..162589e 100755 --- a/include/rtw_ioctl.h +++ b/include/rtw_ioctl.h @@ -108,21 +108,21 @@ extern struct iw_handler_def rtw_handlers_def; #endif extern NDIS_STATUS drv_query_info( - IN _nic_hdl MiniportAdapterContext, - IN NDIS_OID Oid, - IN void * InformationBuffer, - IN u32 InformationBufferLength, - OUT u32* BytesWritten, - OUT u32* BytesNeeded + _nic_hdl MiniportAdapterContext, + NDIS_OID Oid, + void * InformationBuffer, + u32 InformationBufferLength, + u32* BytesWritten, + u32* BytesNeeded ); extern NDIS_STATUS drv_set_info( - IN _nic_hdl MiniportAdapterContext, - IN NDIS_OID Oid, - IN void * InformationBuffer, - IN u32 InformationBufferLength, - OUT u32* BytesRead, - OUT u32* BytesNeeded + _nic_hdl MiniportAdapterContext, + NDIS_OID Oid, + void * InformationBuffer, + u32 InformationBufferLength, + u32* BytesRead, + u32* BytesNeeded ); #endif // #ifndef __INC_CEINFO_ diff --git a/include/rtw_mp.h b/include/rtw_mp.h index d42c9bd..5bc5a50 100755 --- a/include/rtw_mp.h +++ b/include/rtw_mp.h @@ -165,7 +165,7 @@ struct mp_tx -typedef void (*MPT_WORK_ITEM_HANDLER)(IN void * Adapter); +typedef void (*MPT_WORK_ITEM_HANDLER)(void * Adapter); typedef struct _MPT_CONTEXT { // Indicate if we have started Mass Production Test. diff --git a/include/rtw_pwrctrl.h b/include/rtw_pwrctrl.h index dd4812e..c9e5df7 100755 --- a/include/rtw_pwrctrl.h +++ b/include/rtw_pwrctrl.h @@ -297,7 +297,7 @@ void rtw_ps_processor(struct adapter*padapter); #ifdef CONFIG_AUTOSUSPEND int autoresume_enter(struct adapter* padapter); #endif -rt_rf_power_state RfOnOffDetect(IN struct adapter *pAdapter ); +rt_rf_power_state RfOnOffDetect(struct adapter *pAdapter ); s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms); void LPS_Enter(struct adapter *padapter);