diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index 5bd8f21..c3d39e0 100644 --- 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 PADAPTER pAdapter, - IN u16 Offset, - IN OUT u8 *Value ); + PADAPTER pAdapter, + u16 Offset, + u8 *Value ); bool Efuse_Read1ByteFromFakeContent( - IN PADAPTER pAdapter, - IN u16 Offset, - IN OUT u8 *Value ) + PADAPTER pAdapter, + u16 Offset, + u8 *Value ) { if (Offset >= EFUSE_MAX_HW_SIZE) { @@ -75,14 +75,14 @@ Efuse_Read1ByteFromFakeContent( bool Efuse_Write1ByteToFakeContent( - IN PADAPTER pAdapter, - IN u16 Offset, - IN u8 Value ); + PADAPTER pAdapter, + u16 Offset, + u8 Value ); bool Efuse_Write1ByteToFakeContent( - IN PADAPTER pAdapter, - IN u16 Offset, - IN u8 Value ) + PADAPTER pAdapter, + u16 Offset, + u8 Value ) { if (Offset >= EFUSE_MAX_HW_SIZE) { @@ -117,9 +117,9 @@ Efuse_Write1ByteToFakeContent( *---------------------------------------------------------------------------*/ void Efuse_PowerSwitch( - IN PADAPTER pAdapter, - IN u8 bWrite, - IN u8 PwrState) + PADAPTER pAdapter, + u8 bWrite, + u8 PwrState) { pAdapter->HalFunc.EfusePowerSwitch(pAdapter, bWrite, PwrState); } @@ -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 PADAPTER pAdapter, - IN u8 efuseType, - IN u8 type, - OUT void *pOut, - IN bool bPseudoTest + PADAPTER 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 PADAPTER Adapter, - IN u16 Address) + PADAPTER Adapter, + u16 Address) { u8 data; u8 Bytetemp = {0x00}; @@ -361,14 +361,14 @@ EFUSE_Read1Byte( void EFUSE_Write1Byte( - IN PADAPTER Adapter, - IN u16 Address, - IN u8 Value); + PADAPTER Adapter, + u16 Address, + u8 Value); void EFUSE_Write1Byte( - IN PADAPTER Adapter, - IN u16 Address, - IN u8 Value) + PADAPTER 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 PADAPTER pAdapter, - IN u16 addr, - IN u8 *data, - IN bool bPseudoTest) + PADAPTER 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 PADAPTER pAdapter, - IN u16 addr, - IN u8 data, - IN bool bPseudoTest) + PADAPTER pAdapter, + u16 addr, + u8 data, + bool bPseudoTest) { u8 tmpidx = 0; u8 bResult; @@ -498,10 +498,10 @@ efuse_OneByteWrite( } int -Efuse_PgPacketRead( IN PADAPTER pAdapter, - IN u8 offset, - IN u8 *data, - IN bool bPseudoTest) +Efuse_PgPacketRead( PADAPTER pAdapter, + u8 offset, + u8 *data, + bool bPseudoTest) { int ret=0; @@ -511,11 +511,11 @@ Efuse_PgPacketRead( IN PADAPTER pAdapter, } int -Efuse_PgPacketWrite(IN PADAPTER pAdapter, - IN u8 offset, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +Efuse_PgPacketWrite( PADAPTER pAdapter, + u8 offset, + u8 word_en, + u8 *data, + bool bPseudoTest) { int ret; @@ -526,11 +526,11 @@ Efuse_PgPacketWrite(IN PADAPTER pAdapter, int -Efuse_PgPacketWrite_BT(IN PADAPTER pAdapter, - IN u8 offset, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +Efuse_PgPacketWrite_BT( PADAPTER pAdapter, + u8 offset, + u8 word_en, + u8 *data, + bool bPseudoTest) { int ret; @@ -557,9 +557,9 @@ Efuse_PgPacketWrite_BT(IN PADAPTER 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 PADAPTER pAdapter, - IN u16 efuse_addr, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +Efuse_WordEnableDataWrite( PADAPTER pAdapter, + u16 efuse_addr, + u8 word_en, + u8 *data, + bool bPseudoTest) { u8 ret=0; @@ -916,16 +916,16 @@ exit: *---------------------------------------------------------------------------*/ void Efuse_ReadAllMap( - IN PADAPTER pAdapter, - IN u8 efuseType, - IN OUT u8 *Efuse, - IN bool bPseudoTest); + PADAPTER pAdapter, + u8 efuseType, + u8 *Efuse, + bool bPseudoTest); void Efuse_ReadAllMap( - IN PADAPTER pAdapter, - IN u8 efuseType, - IN OUT u8 *Efuse, - IN bool bPseudoTest) + PADAPTER pAdapter, + u8 efuseType, + u8 *Efuse, + bool bPseudoTest) { u16 mapLen=0; @@ -958,9 +958,9 @@ Efuse_ReadAllMap( *---------------------------------------------------------------------------*/ static void efuse_ShadowRead1Byte( - IN PADAPTER pAdapter, - IN u16 Offset, - IN OUT u8 *Value) + PADAPTER 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 PADAPTER pAdapter, - IN u16 Offset, - IN OUT u16 *Value) + PADAPTER 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 PADAPTER pAdapter, - IN u16 Offset, - IN OUT u32 *Value) + PADAPTER 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 PADAPTER pAdapter, - IN u16 Offset, - IN u8 Value); + PADAPTER pAdapter, + u16 Offset, + u8 Value); #endif //PLATFORM static void efuse_ShadowWrite1Byte( - IN PADAPTER pAdapter, - IN u16 Offset, - IN u8 Value) + PADAPTER 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 PADAPTER pAdapter, - IN u16 Offset, - IN u16 Value) + PADAPTER 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 PADAPTER pAdapter, - IN u16 Offset, - IN u32 Value) + PADAPTER pAdapter, + u16 Offset, + u32 Value) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); @@ -1133,10 +1133,10 @@ void EFUSE_ShadowMapUpdate( *---------------------------------------------------------------------------*/ void EFUSE_ShadowRead( - IN PADAPTER pAdapter, - IN u8 Type, - IN u16 Offset, - IN OUT u32 *Value ) + PADAPTER pAdapter, + u8 Type, + u16 Offset, + u32 *Value ) { if (Type == 1) efuse_ShadowRead1Byte(pAdapter, Offset, (u8 *)Value); @@ -1165,16 +1165,16 @@ EFUSE_ShadowRead( *---------------------------------------------------------------------------*/ void EFUSE_ShadowWrite( - IN PADAPTER pAdapter, - IN u8 Type, - IN u16 Offset, - IN OUT u32 Value); + PADAPTER pAdapter, + u8 Type, + u16 Offset, + u32 Value); void EFUSE_ShadowWrite( - IN PADAPTER pAdapter, - IN u8 Type, - IN u16 Offset, - IN OUT u32 Value) + PADAPTER pAdapter, + u8 Type, + u16 Offset, + u32 Value) { #if (MP_DRIVER == 0) return; @@ -1194,11 +1194,11 @@ EFUSE_ShadowWrite( void Efuse_InitSomeVar( - IN PADAPTER pAdapter + PADAPTER pAdapter ); void Efuse_InitSomeVar( - IN PADAPTER pAdapter + PADAPTER pAdapter ) { u8 i; diff --git a/core/rtw_mp.c b/core/rtw_mp.c index 1cd9321..a2f3d0f 100644 --- a/core/rtw_mp.c +++ b/core/rtw_mp.c @@ -359,8 +359,8 @@ void free_mp_priv(struct mp_priv *pmp_priv) s32 MPT_InitializeAdapter( - IN PADAPTER pAdapter, - IN u8 Channel + PADAPTER pAdapter, + u8 Channel ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -470,7 +470,7 @@ MPT_InitializeAdapter( *---------------------------------------------------------------------------*/ void MPT_DeInitAdapter( - IN PADAPTER pAdapter + PADAPTER pAdapter ) { PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.MptCtx; @@ -719,7 +719,7 @@ end_of_mp_stop_test: * * Overview: Change RF Setting when we siwthc channel/rate/BW for MP. * - * Input: IN PADAPTER pAdapter + * Input: PADAPTER pAdapter * * Output: NONE * diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c index c20cce6..a89672d 100644 --- a/core/rtw_pwrctrl.c +++ b/core/rtw_pwrctrl.c @@ -23,6 +23,7 @@ #include #include #include +#include #ifdef CONFIG_BT_COEXIST #include diff --git a/core/rtw_security.c b/core/rtw_security.c index 5c72348..07f1d4b 100644 --- a/core/rtw_security.c +++ b/core/rtw_security.c @@ -2837,10 +2837,10 @@ int tdls_verify_mic(u8 *kck, u8 trans_seq, #ifdef PLATFORM_WINDOWS void rtw_use_tkipkey_handler ( - IN void * SystemSpecific1, - IN void * FunctionContext, - IN void * SystemSpecific2, - IN void * SystemSpecific3 + void * SystemSpecific1, + void * FunctionContext, + void * SystemSpecific2, + void * SystemSpecific3 ) #endif #ifdef PLATFORM_LINUX diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index df6d240..603f846 100644 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -52,7 +52,7 @@ extern unsigned char RSN_TKIP_CIPHER[4]; #define R2T_PHY_DELAY (0) -//#define WAIT_FOR_BCN_TO_MIN (3000) +//#define WAIT_FOR_BCN_TO_M (3000) #define WAIT_FOR_BCN_TO_MIN (6000) #define WAIT_FOR_BCN_TO_MAX (20000) diff --git a/hal/Hal8188ERateAdaptive.c b/hal/Hal8188ERateAdaptive.c index 8fc9dc8..647279b 100644 --- a/hal/Hal8188ERateAdaptive.c +++ b/hal/Hal8188ERateAdaptive.c @@ -146,9 +146,9 @@ static u2Byte DynamicTxRPTTiming[6]={0x186a, 0x30d4, 0x493e, 0x61a8, 0x7a12 ,0x9 static void odm_SetTxRPTTiming_8188E( - IN PDM_ODM_T pDM_Odm, - IN PODM_RA_INFO_T pRaInfo, - IN u1Byte extend + PDM_ODM_T pDM_Odm, + PODM_RA_INFO_T pRaInfo, + u1Byte extend ) { u1Byte idx = 0; @@ -175,8 +175,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 ) { u1Byte RateID, LowestRate, HighestRate; @@ -248,8 +248,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 ) { u1Byte RateID, HighestRate; @@ -323,8 +323,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 ) { u1Byte RateID = 0, RtyPtID = 0, PenaltyID1 = 0, PenaltyID2 = 0; @@ -415,8 +415,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 u4Byte MaskFromReg; @@ -519,7 +519,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; @@ -579,7 +579,7 @@ odm_PTTryState_8188E( static void odm_PTDecision_8188E( - IN PODM_RA_INFO_T pRaInfo + PODM_RA_INFO_T pRaInfo ) { u1Byte stage_BUF; @@ -622,8 +622,8 @@ odm_PTDecision_8188E( static void odm_RATxRPTTimerSetting( - IN PDM_ODM_T pDM_Odm, - IN u2Byte minRptTime + PDM_ODM_T pDM_Odm, + u2Byte minRptTime ) { ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,(" =====>odm_RATxRPTTimerSetting()\n")); @@ -645,7 +645,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")); @@ -660,8 +660,8 @@ ODM_RASupport_Init( int ODM_RAInfo_Init( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacID + PDM_ODM_T pDM_Odm, + u1Byte MacID ) { PODM_RA_INFO_T pRaInfo = &pDM_Odm->RAInfo[MacID]; @@ -748,8 +748,8 @@ ODM_RAInfo_Init_all( u1Byte ODM_RA_GetShortGI_8188E( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacID + PDM_ODM_T pDM_Odm, + u1Byte MacID ) { if ((NULL == pDM_Odm) || (MacID >= ASSOCIATE_ENTRY_NUM)) @@ -761,8 +761,8 @@ ODM_RA_GetShortGI_8188E( u1Byte ODM_RA_GetDecisionRate_8188E( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacID + PDM_ODM_T pDM_Odm, + u1Byte MacID ) { u1Byte DecisionRate = 0; @@ -777,8 +777,8 @@ ODM_RA_GetDecisionRate_8188E( u1Byte ODM_RA_GetHwPwrStatus_8188E( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacID + PDM_ODM_T pDM_Odm, + u1Byte MacID ) { u1Byte PTStage = 5; @@ -816,9 +816,9 @@ ODM_RA_UpdateRateInfo_8188E( void ODM_RA_SetRSSI_8188E( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacID, - IN u1Byte Rssi + PDM_ODM_T pDM_Odm, + u1Byte MacID, + u1Byte Rssi ) { PODM_RA_INFO_T pRaInfo = NULL; @@ -834,8 +834,8 @@ ODM_RA_SetRSSI_8188E( void ODM_RA_Set_TxRPT_Time( - IN PDM_ODM_T pDM_Odm, - IN u2Byte minRptTime + PDM_ODM_T pDM_Odm, + u2Byte minRptTime ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP)) @@ -847,11 +847,11 @@ ODM_RA_Set_TxRPT_Time( void ODM_RA_TxRPT2Handle_8188E( - IN PDM_ODM_T pDM_Odm, - IN pu1Byte TxRPT_Buf, - IN u2Byte TxRPT_Len, - IN u4Byte MacIDValidEntry0, - IN u4Byte MacIDValidEntry1 + PDM_ODM_T pDM_Odm, + pu1Byte TxRPT_Buf, + u2Byte TxRPT_Len, + u4Byte MacIDValidEntry0, + u4Byte MacIDValidEntry1 ) { PODM_RA_INFO_T pRAInfo = NULL; @@ -982,8 +982,8 @@ ODM_RA_TxRPT2Handle_8188E( static void odm_RATxRPTTimerSetting( - IN PDM_ODM_T pDM_Odm, - IN u2Byte minRptTime + PDM_ODM_T pDM_Odm, + u2Byte minRptTime ) { return; @@ -992,7 +992,7 @@ odm_RATxRPTTimerSetting( void ODM_RASupport_Init( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { return; @@ -1000,8 +1000,8 @@ ODM_RASupport_Init( int ODM_RAInfo_Init( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacID + PDM_ODM_T pDM_Odm, + u1Byte MacID ) { return 0; @@ -1017,8 +1017,8 @@ ODM_RAInfo_Init_all( u1Byte ODM_RA_GetShortGI_8188E( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacID + PDM_ODM_T pDM_Odm, + u1Byte MacID ) { return 0; @@ -1026,16 +1026,16 @@ ODM_RA_GetShortGI_8188E( u1Byte ODM_RA_GetDecisionRate_8188E( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacID + PDM_ODM_T pDM_Odm, + u1Byte MacID ) { return 0; } u1Byte ODM_RA_GetHwPwrStatus_8188E( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacID + PDM_ODM_T pDM_Odm, + u1Byte MacID ) { return 0; @@ -1055,9 +1055,9 @@ ODM_RA_UpdateRateInfo_8188E( void ODM_RA_SetRSSI_8188E( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacID, - IN u1Byte Rssi + PDM_ODM_T pDM_Odm, + u1Byte MacID, + u1Byte Rssi ) { return; @@ -1065,8 +1065,8 @@ ODM_RA_SetRSSI_8188E( void ODM_RA_Set_TxRPT_Time( - IN PDM_ODM_T pDM_Odm, - IN u2Byte minRptTime + PDM_ODM_T pDM_Odm, + u2Byte minRptTime ) { return; @@ -1074,11 +1074,11 @@ ODM_RA_Set_TxRPT_Time( void ODM_RA_TxRPT2Handle_8188E( - IN PDM_ODM_T pDM_Odm, - IN pu1Byte TxRPT_Buf, - IN u2Byte TxRPT_Len, - IN u4Byte MacIDValidEntry0, - IN u4Byte MacIDValidEntry1 + PDM_ODM_T pDM_Odm, + pu1Byte TxRPT_Buf, + u2Byte TxRPT_Len, + u4Byte MacIDValidEntry0, + u4Byte MacIDValidEntry1 ) { return; diff --git a/hal/HalPhyRf.c b/hal/HalPhyRf.c index 87a1a9f..9cabae4 100644 --- a/hal/HalPhyRf.c +++ b/hal/HalPhyRf.c @@ -25,7 +25,7 @@ void phy_PathAStandBy( - IN PADAPTER pAdapter + PADAPTER pAdapter ) { RTPRINT(FINIT, INIT_IQK, ("Path-A standby mode!\n")); @@ -41,8 +41,8 @@ phy_PathAStandBy( u1Byte //bit0 = 1 => Tx OK, bit1 = 1 => Rx OK phy_PathA_IQK_8192C( - IN PADAPTER pAdapter, - IN bool configPathB + PADAPTER pAdapter, + bool configPathB ) { @@ -129,7 +129,7 @@ phy_PathA_IQK_8192C( u1Byte //bit0 = 1 => Tx OK, bit1 = 1 => Rx OK phy_PathB_IQK_8192C( - IN PADAPTER pAdapter + PADAPTER pAdapter ) { u4Byte regEAC, regEB4, regEBC, regEC4, regECC; @@ -178,10 +178,10 @@ phy_PathB_IQK_8192C( void phy_PathAFillIQKMatrix( - IN PADAPTER pAdapter, + PADAPTER pAdapter, IN bool bIQKOK, - IN s4Byte result[][8], - IN u1Byte final_candidate, + s4Byte result[][8], + u1Byte final_candidate, IN bool bTxOnly ) { @@ -245,11 +245,11 @@ phy_PathAFillIQKMatrix( void phy_PathBFillIQKMatrix( - IN PADAPTER pAdapter, + PADAPTER pAdapter, IN bool bIQKOK, - IN s4Byte result[][8], - IN u1Byte final_candidate, - IN bool bTxOnly //do Tx only + s4Byte result[][8], + u1Byte final_candidate, + bool bTxOnly //do Tx only ) { u4Byte Oldval_1, X, TX1_A, reg; @@ -307,10 +307,10 @@ phy_PathBFillIQKMatrix( bool phy_SimularityCompare_92C( - IN PADAPTER pAdapter, - IN s4Byte result[][8], - IN u1Byte c1, - IN u1Byte c2 + PADAPTER pAdapter, + s4Byte result[][8], + u1Byte c1, + u1Byte c2 ) { u4Byte i, j, diff, SimularityBitMap, bound = 0; @@ -379,10 +379,10 @@ return FALSE => do IQK again */ bool phy_SimularityCompare( - IN PADAPTER pAdapter, - IN s4Byte result[][8], - IN u1Byte c1, - IN u1Byte c2 + PADAPTER pAdapter, + s4Byte result[][8], + u1Byte c1, + u1Byte c2 ) { if (IS_HARDWARE_TYPE_8192D(pAdapter)) @@ -394,10 +394,10 @@ phy_SimularityCompare( void phy_IQCalibrate_8192C( - IN PADAPTER pAdapter, - IN s4Byte result[][8], - IN u1Byte t, - IN bool is2T + PADAPTER pAdapter, + s4Byte result[][8], + u1Byte t, + bool is2T ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -650,8 +650,8 @@ phy_IQCalibrate_8192C( void phy_LCCalibrate92C( - IN PADAPTER pAdapter, - IN bool is2T + PADAPTER pAdapter, + bool is2T ) { u1Byte tmpReg; @@ -714,8 +714,8 @@ phy_LCCalibrate92C( void phy_LCCalibrate( - IN PADAPTER pAdapter, - IN bool is2T + PADAPTER pAdapter, + bool is2T ) { if (IS_HARDWARE_TYPE_8192D(pAdapter)) @@ -741,9 +741,9 @@ phy_LCCalibrate( void phy_APCalibrate_8192C( - IN PADAPTER pAdapter, - IN s1Byte delta, - IN bool is2T + PADAPTER pAdapter, + s1Byte delta, + bool is2T ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -1180,8 +1180,8 @@ if (pAdapter->registrypriv.mp_mode == 1) void PHY_IQCalibrate_8192C( - IN PADAPTER pAdapter, - IN bool bReCovery + PADAPTER pAdapter, + bool bReCovery ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -1390,7 +1390,7 @@ if (pAdapter->registrypriv.mp_mode == 1) void PHY_LCCalibrate_8192C( - IN PADAPTER pAdapter + PADAPTER pAdapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -1458,8 +1458,8 @@ if (pAdapter->registrypriv.mp_mode == 1) void PHY_APCalibrate_8192C( - IN PADAPTER pAdapter, - IN s1Byte delta + PADAPTER pAdapter, + s1Byte delta ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); diff --git a/hal/HalPhyRf_8188e.c b/hal/HalPhyRf_8188e.c index dfab66e..dd4a4a9 100644 --- a/hal/HalPhyRf_8188e.c +++ b/hal/HalPhyRf_8188e.c @@ -632,9 +632,9 @@ phy_PathA_IQK_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN bool configPathB + bool configPathB ) { u4Byte regEAC, regE94, regE9C, regEA4; @@ -696,9 +696,9 @@ phy_PathA_RxIQK( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN bool configPathB + bool configPathB ) { u4Byte regEAC, regE94, regE9C, regEA4, u4tmp; @@ -841,7 +841,7 @@ phy_PathB_IQK_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm #else - IN PADAPTER pAdapter + PADAPTER pAdapter #endif ) { @@ -904,11 +904,11 @@ _PHY_PathAFillIQKMatrix( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif IN bool bIQKOK, - IN s4Byte result[][8], - IN u1Byte final_candidate, + s4Byte result[][8], + u1Byte final_candidate, IN bool bTxOnly ) { @@ -979,12 +979,12 @@ _PHY_PathBFillIQKMatrix( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif IN bool bIQKOK, - IN s4Byte result[][8], - IN u1Byte final_candidate, - IN bool bTxOnly //do Tx only + s4Byte result[][8], + u1Byte final_candidate, + bool bTxOnly //do Tx only ) { u4Byte Oldval_1, X, TX1_A, reg; @@ -1048,7 +1048,7 @@ _PHY_PathBFillIQKMatrix( #if !(DM_ODM_SUPPORT_TYPE & ODM_MP) bool ODM_CheckPowerStatus( - IN PADAPTER Adapter) + PADAPTER Adapter) { /* HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1083,11 +1083,11 @@ _PHY_SaveADDARegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN pu4Byte ADDAReg, - IN pu4Byte ADDABackup, - IN u4Byte RegisterNum + pu4Byte ADDAReg, + pu4Byte ADDABackup, + u4Byte RegisterNum ) { u4Byte i; @@ -1116,10 +1116,10 @@ _PHY_SaveMACRegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN pu4Byte MACReg, - IN pu4Byte MACBackup + pu4Byte MACReg, + pu4Byte MACBackup ) { u4Byte i; @@ -1146,11 +1146,11 @@ _PHY_ReloadADDARegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN pu4Byte ADDAReg, - IN pu4Byte ADDABackup, - IN u4Byte RegiesterNum + pu4Byte ADDAReg, + pu4Byte ADDABackup, + u4Byte RegiesterNum ) { u4Byte i; @@ -1176,10 +1176,10 @@ _PHY_ReloadMACRegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN pu4Byte MACReg, - IN pu4Byte MACBackup + pu4Byte MACReg, + pu4Byte MACBackup ) { u4Byte i; @@ -1205,11 +1205,11 @@ _PHY_PathADDAOn( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN pu4Byte ADDAReg, - IN bool isPathAOn, - IN bool is2T + pu4Byte ADDAReg, + bool isPathAOn, + bool is2T ) { u4Byte pathOn; @@ -1245,10 +1245,10 @@ _PHY_MACSettingCalibration( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN pu4Byte MACReg, - IN pu4Byte MACBackup + pu4Byte MACReg, + pu4Byte MACBackup ) { u4Byte i = 0; @@ -1302,9 +1302,9 @@ _PHY_PIModeSwitch( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN bool PIMode + bool PIMode ) { u4Byte mode; @@ -1329,11 +1329,11 @@ phy_SimularityCompare_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN s4Byte result[][8], - IN u1Byte c1, - IN u1Byte c2 + s4Byte result[][8], + u1Byte c1, + u1Byte c2 ) { u4Byte i, j, diff, SimularityBitMap, bound = 0; @@ -1464,11 +1464,11 @@ phy_IQCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN s4Byte result[][8], - IN u1Byte t, - IN bool is2T + s4Byte result[][8], + u1Byte t, + bool is2T ) { #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) @@ -1744,9 +1744,9 @@ phy_LCCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN bool is2T + bool is2T ) { u1Byte tmpReg; @@ -1835,10 +1835,10 @@ phy_APCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN s1Byte delta, - IN bool is2T + s1Byte delta, + bool is2T ) { #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) @@ -2328,9 +2328,9 @@ PHY_IQCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN bool bReCovery + bool bReCovery ) { #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) @@ -2594,7 +2594,7 @@ PHY_LCCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm #else - IN PADAPTER pAdapter + PADAPTER pAdapter #endif ) { @@ -2683,9 +2683,9 @@ PHY_APCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN s1Byte delta + s1Byte delta ) { #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) @@ -2733,10 +2733,10 @@ void phy_SetRFPathSwitch_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN bool bMain, - IN bool is2T + bool bMain, + bool is2T ) { #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) @@ -2782,9 +2782,9 @@ void PHY_SetRFPathSwitch_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN bool bMain + bool bMain ) { #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) @@ -2824,11 +2824,11 @@ void PHY_SetRFPathSwitch_8188E( void phy_DigitalPredistortion( #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) - IN PADAPTER pAdapter, + PADAPTER pAdapter, #else IN PDM_ODM_T pDM_Odm, #endif - IN bool is2T + bool is2T ) { #if ( RT_PLATFORM == PLATFORM_WINDOWS) @@ -3259,7 +3259,7 @@ phy_DigitalPredistortion( void PHY_DigitalPredistortion_8188E( #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) - IN PADAPTER pAdapter + PADAPTER pAdapter #else IN PDM_ODM_T pDM_Odm #endif @@ -3303,9 +3303,9 @@ bool phy_QueryRFPathSwitch_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN bool is2T + bool is2T ) { #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) @@ -3349,7 +3349,7 @@ bool PHY_QueryRFPathSwitch_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm #else - IN PADAPTER pAdapter + PADAPTER pAdapter #endif ) { diff --git a/hal/hal_com.c b/hal/hal_com.c index d06c1ef..07df9ef 100644 --- a/hal/hal_com.c +++ b/hal/hal_com.c @@ -81,11 +81,11 @@ void dump_chip_info(HAL_VERSION ChipVersion) u8 //return the final channel plan decision hal_com_get_channel_plan( - IN PADAPTER 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 + PADAPTER 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; @@ -182,7 +182,7 @@ void HalSetBrateCfg( static void _OneOutPipeMapping( - IN PADAPTER pAdapter + PADAPTER pAdapter ) { struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); @@ -200,8 +200,8 @@ _OneOutPipeMapping( static void _TwoOutPipeMapping( - IN PADAPTER pAdapter, - IN bool bWIFICfg + PADAPTER pAdapter, + bool bWIFICfg ) { struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); @@ -245,8 +245,8 @@ _TwoOutPipeMapping( } static void _ThreeOutPipeMapping( - IN PADAPTER pAdapter, - IN bool bWIFICfg + PADAPTER pAdapter, + bool bWIFICfg ) { struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); @@ -290,8 +290,8 @@ static void _ThreeOutPipeMapping( bool Hal_MappingOutPipe( - IN PADAPTER pAdapter, - IN u8 NumOutPipe + PADAPTER pAdapter, + u8 NumOutPipe ) { struct registry_priv *pregistrypriv = &pAdapter->registrypriv; diff --git a/hal/odm.c b/hal/odm.c index 20cd976..4e7fa6b 100644 --- a/hal/odm.c +++ b/hal/odm.c @@ -280,37 +280,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---------------// @@ -318,39 +318,39 @@ 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 ); //END---------BB POWER SAVE-----------------------// @@ -359,11 +359,11 @@ odm_1R_CCA( //============================================================ // Function predefine. //============================================================ -void odm_PathDiversityInit_92C( IN PADAPTER Adapter); -void odm_2TPathDiversityInit_92C( IN PADAPTER Adapter); -void odm_1TPathDiversityInit_92C( IN PADAPTER Adapter); -bool odm_IsConnected_92C(IN PADAPTER Adapter); -void odm_PathDiversityAfterLink_92C( IN PADAPTER Adapter); +void odm_PathDiversityInit_92C( PADAPTER Adapter); +void odm_2TPathDiversityInit_92C( PADAPTER Adapter); +void odm_1TPathDiversityInit_92C( PADAPTER Adapter); +bool odm_IsConnected_92C( PADAPTER Adapter); +void odm_PathDiversityAfterLink_92C( PADAPTER Adapter); void odm_CCKTXPathDiversityCallback( @@ -385,28 +385,28 @@ odm_PathDivChkAntSwitchWorkitemCallback( IN void * pContext ); -void odm_SetRespPath_92C( IN PADAPTER Adapter, IN u1Byte DefaultRespPath); -void odm_OFDMTXPathDiversity_92C( IN PADAPTER Adapter); -void odm_CCKTXPathDiversity_92C( IN PADAPTER Adapter); -void odm_ResetPathDiversity_92C( IN PADAPTER Adapter); +void odm_SetRespPath_92C( PADAPTER Adapter, u1Byte DefaultRespPath); +void odm_OFDMTXPathDiversity_92C( PADAPTER Adapter); +void odm_CCKTXPathDiversity_92C( PADAPTER Adapter); +void odm_ResetPathDiversity_92C( PADAPTER Adapter); //Start-------------------- RX High Power------------------------// -void odm_RXHPInit( IN PDM_ODM_T pDM_Odm); -void odm_RXHP( IN PDM_ODM_T pDM_Odm); -void odm_Write_RXHP( IN PDM_ODM_T pDM_Odm); +void odm_RXHPInit( PDM_ODM_T pDM_Odm); +void odm_RXHP( PDM_ODM_T pDM_Odm); +void odm_Write_RXHP( PDM_ODM_T pDM_Odm); -void odm_PSD_RXHP( IN PDM_ODM_T pDM_Odm); +void odm_PSD_RXHP( PDM_ODM_T pDM_Odm); void odm_PSD_RXHPCallback( PRT_TIMER pTimer); void odm_PSD_RXHPWorkitemCallback( IN void * pContext); //End--------------------- RX High Power -----------------------// void -odm_PathDivInit( IN PDM_ODM_T pDM_Odm); +odm_PathDivInit( PDM_ODM_T pDM_Odm); void odm_SetRespPath_92C( - IN PADAPTER Adapter, - IN u1Byte DefaultRespPath + PADAPTER Adapter, + u1Byte DefaultRespPath ); #endif @@ -414,113 +414,113 @@ odm_SetRespPath_92C( 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 ); #if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE)) void odm_DynamicTxPowerSavePowerIndex( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_DynamicTxPowerWritePowerIndex( - IN PDM_ODM_T pDM_Odm, - IN u1Byte Value); + PDM_ODM_T pDM_Odm, + u1Byte 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 ); #endif 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 u1Byte Step + PDM_ODM_T pDM_Odm, + u1Byte Step ); void odm_SwAntDivChkAntSwitchNIC( - IN PDM_ODM_T pDM_Odm, - IN u1Byte Step + PDM_ODM_T pDM_Odm, + u1Byte Step ); @@ -543,22 +543,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 ); @@ -569,37 +569,37 @@ 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 ); #if (DM_ODM_SUPPORT_TYPE & (ODM_MP)) void ODM_RateAdaptiveStateApInit( - IN PADAPTER Adapter , - IN PRT_WLAN_STA pEntry + PADAPTER Adapter , + PRT_WLAN_STA pEntry ); void @@ -619,67 +619,67 @@ odm_TXPowerTrackingCallbackThermalMeter92D( void odm_TXPowerTrackingDirectCall92C( - IN PADAPTER Adapter + PADAPTER Adapter ); void odm_TXPowerTrackingThermalMeterCheck( - IN PADAPTER Adapter + PADAPTER Adapter ); #endif 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 ); #if (DM_ODM_SUPPORT_TYPE==ODM_MP) void odm_EdcaTurboCheckMP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); //check if edca turbo is disabled bool odm_IsEdcaTurboDisable( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); //choose edca paramter for special IOT case void ODM_EdcaParaSelByIot( - IN PDM_ODM_T pDM_Odm, - OUT u4Byte *EDCA_BE_UL, + PDM_ODM_T pDM_Odm, + u4Byte *EDCA_BE_UL, OUT u4Byte *EDCA_BE_DL ); //check if it is UL or DL void odm_EdcaChooseTrafficIdx( - IN PDM_ODM_T pDM_Odm, - IN u8Byte cur_tx_bytes, - IN u8Byte cur_rx_bytes, - IN bool bBiasOnRx, + PDM_ODM_T pDM_Odm, + u8Byte cur_tx_bytes, + u8Byte cur_rx_bytes, + bool bBiasOnRx, OUT bool *pbIsCurRDLState ); #elif (DM_ODM_SUPPORT_TYPE==ODM_CE) void odm_EdcaTurboCheckCE( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); #else void odm_IotEngine( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_EdcaParaInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); #endif @@ -705,8 +705,8 @@ odm_StaDefAntSel( void odm_SetRxIdleAnt( - IN PDM_ODM_T pDM_Odm, - IN u1Byte Ant, + PDM_ODM_T pDM_Odm, + u1Byte Ant, IN bool bDualPath ); @@ -714,7 +714,7 @@ odm_SetRxIdleAnt( void odm_HwAntDiv( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); //============================================================ @@ -726,7 +726,7 @@ odm_HwAntDiv( // void ODM_DMInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -782,7 +782,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 @@ -870,9 +870,9 @@ ODM_DMWatchdog( // void ODM_CmnInfoInit( - IN PDM_ODM_T pDM_Odm, - IN ODM_CMNINFO_E CmnInfo, - IN u4Byte Value + PDM_ODM_T pDM_Odm, + ODM_CMNINFO_E CmnInfo, + u4Byte Value ) { //ODM_RT_TRACE(pDM_Odm,); @@ -969,9 +969,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 ) { // @@ -1091,10 +1091,10 @@ ODM_CmnInfoHook( void ODM_CmnInfoPtrArrayHook( - IN PDM_ODM_T pDM_Odm, - IN ODM_CMNINFO_E CmnInfo, - IN u2Byte Index, - IN void * pValue + PDM_ODM_T pDM_Odm, + ODM_CMNINFO_E CmnInfo, + u2Byte Index, + void * pValue ) { // @@ -1122,9 +1122,9 @@ ODM_CmnInfoPtrArrayHook( // void ODM_CmnInfoUpdate( - IN PDM_ODM_T pDM_Odm, - IN u4Byte CmnInfo, - IN u8Byte Value + PDM_ODM_T pDM_Odm, + u4Byte CmnInfo, + u8Byte Value ) { // @@ -1200,7 +1200,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); @@ -1224,7 +1224,7 @@ odm_CommonInfoSelfInit( void odm_CommonInfoSelfUpdate( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u1Byte EntryCnt=0; @@ -1276,7 +1276,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")); @@ -1300,7 +1300,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")); @@ -1333,7 +1333,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")); @@ -1410,7 +1410,7 @@ ODM_FreeAllWorkItems(IN PDM_ODM_T pDM_Odm ) /* void odm_FindMinimumRSSI( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u4Byte i; @@ -1434,7 +1434,7 @@ odm_FindMinimumRSSI( void odm_IsLinked( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u4Byte i; @@ -1475,9 +1475,9 @@ odm_IsLinked( *---------------------------------------------------------------------------*/ void ODM_ChangeDynamicInitGainThresh( - IN PDM_ODM_T pDM_Odm, - IN u4Byte DM_Type, - IN u4Byte DM_Value + PDM_ODM_T pDM_Odm, + u4Byte DM_Type, + u4Byte DM_Value ) { pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; @@ -1539,7 +1539,7 @@ int getIGIForDiff(int value_IGI) void odm_EnableEDCCA( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -1569,7 +1569,7 @@ odm_EnableEDCCA( void odm_DisableEDCCA( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { // Disable EDCCA.. @@ -1584,7 +1584,7 @@ odm_DisableEDCCA( // void odm_DynamicEDCCA( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { PADAPTER pAdapter = pDM_Odm->Adapter; @@ -1622,8 +1622,8 @@ odm_DynamicEDCCA( void ODM_Write_DIG( - IN PDM_ODM_T pDM_Odm, - IN u1Byte CurrentIGI + PDM_ODM_T pDM_Odm, + u1Byte CurrentIGI ) { pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; @@ -1683,7 +1683,7 @@ ODM_Write_DIG( void odm_DIGbyRSSI_LPS( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { PADAPTER pAdapter =pDM_Odm->Adapter; @@ -1746,7 +1746,7 @@ odm_DIGbyRSSI_LPS( void odm_DIGInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; @@ -1792,7 +1792,7 @@ odm_DIGInit( void odm_DIG( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -2283,7 +2283,7 @@ odm_DIG( void odm_FalseAlarmCounterStatistics( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u4Byte ret_value; @@ -2434,7 +2434,7 @@ odm_FalseAlarmCounterStatistics( void odm_CCKPacketDetectionThresh( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -2495,8 +2495,8 @@ odm_CCKPacketDetectionThresh( void ODM_Write_CCK_CCA_Thres( - IN PDM_ODM_T pDM_Odm, - IN u1Byte CurCCK_CCAThres + PDM_ODM_T pDM_Odm, + u1Byte CurCCK_CCAThres ) { pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; @@ -2515,7 +2515,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; @@ -2531,7 +2531,7 @@ odm_DynamicBBPowerSavingInit( void odm_DynamicBBPowerSaving( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE)) @@ -2562,7 +2562,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; @@ -2616,8 +2616,8 @@ odm_1R_CCA( void ODM_RF_Saving( - IN PDM_ODM_T pDM_Odm, - IN u1Byte bForceInNormal + PDM_ODM_T pDM_Odm, + u1Byte bForceInNormal ) { #if (DM_ODM_SUPPORT_TYPE != ODM_AP) @@ -2715,7 +2715,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; @@ -2747,8 +2747,8 @@ odm_RateAdaptiveMaskInit( #if (DM_ODM_SUPPORT_TYPE & ODM_MP) void ODM_RateAdaptiveStateApInit( - IN PADAPTER Adapter , - IN PRT_WLAN_STA pEntry + PADAPTER Adapter , + PRT_WLAN_STA pEntry ) { PRATE_ADAPTIVE pRA = (PRATE_ADAPTIVE)&pEntry->RateAdaptive; @@ -2758,10 +2758,10 @@ ODM_RateAdaptiveStateApInit( #if (DM_ODM_SUPPORT_TYPE == ODM_CE) u4Byte ODM_Get_Rate_Bitmap( - IN PDM_ODM_T pDM_Odm, - IN u4Byte macid, - IN u4Byte ra_mask, - IN u1Byte rssi_level) + PDM_ODM_T pDM_Odm, + u4Byte macid, + u4Byte ra_mask, + u1Byte rssi_level) { PSTA_INFO_T pEntry; u4Byte rate_bitmap = 0x0fffffff; @@ -2877,7 +2877,7 @@ u4Byte 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)) @@ -2907,7 +2907,7 @@ odm_RefreshRateAdaptiveMask( void odm_RefreshRateAdaptiveMaskMP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE == ODM_MP) @@ -3003,7 +3003,7 @@ odm_RefreshRateAdaptiveMaskMP( void odm_RefreshRateAdaptiveMaskCE( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE == ODM_CE) @@ -3042,7 +3042,7 @@ odm_RefreshRateAdaptiveMaskCE( void odm_RefreshRateAdaptiveMaskAPADSL( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -3081,10 +3081,10 @@ odm_RefreshRateAdaptiveMaskAPADSL( // - TRUE: RATRState is changed. bool ODM_RAStateCheck( - IN PDM_ODM_T pDM_Odm, - IN s4Byte RSSI, - IN bool bForceUpdate, - OUT pu1Byte pRATRState + PDM_ODM_T pDM_Odm, + s4Byte RSSI, + bool bForceUpdate, + pu1Byte pRATRState ) { PODM_RATE_ADAPTIVE pRA = &pDM_Odm->RateAdaptive; @@ -3144,7 +3144,7 @@ ODM_RAStateCheck( void odm_DynamicTxPowerInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE == ODM_MP) @@ -3205,7 +3205,7 @@ odm_DynamicTxPowerInit( void odm_DynamicTxPowerSavePowerIndex( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u1Byte index; @@ -3227,7 +3227,7 @@ odm_DynamicTxPowerSavePowerIndex( void odm_DynamicTxPowerRestorePowerIndex( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u1Byte index; @@ -3249,8 +3249,8 @@ odm_DynamicTxPowerRestorePowerIndex( void odm_DynamicTxPowerWritePowerIndex( - IN PDM_ODM_T pDM_Odm, - IN u1Byte Value) + PDM_ODM_T pDM_Odm, + u1Byte Value) { u1Byte index; @@ -3265,7 +3265,7 @@ odm_DynamicTxPowerWritePowerIndex( void odm_DynamicTxPower( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { // @@ -3309,7 +3309,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)) @@ -3339,7 +3339,7 @@ odm_DynamicTxPowerNIC( void odm_DynamicTxPowerAP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -3377,7 +3377,7 @@ odm_DynamicTxPowerAP( void odm_DynamicTxPower_92C( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE == ODM_MP) @@ -3609,7 +3609,7 @@ odm_DynamicTxPower_92C( void odm_DynamicTxPower_92D( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE == ODM_MP) @@ -3925,14 +3925,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 ) { // @@ -3974,7 +3974,7 @@ odm_RSSIMonitorCheck( void odm_RSSIMonitorCheckMP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE == ODM_MP) @@ -4064,14 +4064,14 @@ odm_RSSIMonitorCheckMP( // static void FindMinimumRSSI_Dmsp( - IN PADAPTER pAdapter + PADAPTER pAdapter ) { } static void FindMinimumRSSI( -IN PADAPTER pAdapter + PADAPTER pAdapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -4127,7 +4127,7 @@ IN PADAPTER pAdapter void odm_RSSIMonitorCheckCE( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE == ODM_CE) @@ -4274,7 +4274,7 @@ odm_RSSIMonitorCheckCE( } void odm_RSSIMonitorCheckAP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE == ODM_AP) @@ -4406,7 +4406,7 @@ ODM_ReleaseAllTimers( void odm_TXPowerTrackingInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { odm_TXPowerTrackingThermalMeterInit(pDM_Odm); @@ -4415,7 +4415,7 @@ odm_TXPowerTrackingInit( void odm_TXPowerTrackingThermalMeterInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE == ODM_MP) @@ -4480,7 +4480,7 @@ odm_TXPowerTrackingThermalMeterInit( void ODM_TXPowerTrackingCheck( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { // @@ -4521,7 +4521,7 @@ ODM_TXPowerTrackingCheck( void odm_TXPowerTrackingCheckCE( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE == ODM_CE) @@ -4568,7 +4568,7 @@ odm_TXPowerTrackingCheckCE( void odm_TXPowerTrackingCheckMP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE == ODM_MP) @@ -4589,7 +4589,7 @@ odm_TXPowerTrackingCheckMP( void odm_TXPowerTrackingCheckAP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE == ODM_AP) @@ -4625,7 +4625,7 @@ odm_TXPowerTrackingCheckAP( void odm_TXPowerTrackingThermalMeterCheck( - IN PADAPTER Adapter + PADAPTER Adapter ) { #ifndef AP_BUILD_WORKAROUND @@ -4673,7 +4673,7 @@ odm_TXPowerTrackingThermalMeterCheck( #if (defined(CONFIG_SW_ANTENNA_DIVERSITY)) void odm_SwAntDivInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE)) @@ -4686,7 +4686,7 @@ odm_SwAntDivInit( // Only for 8723A SW ANT DIV INIT--2012--07--17 void odm_SwAntDivInit_NIC_8723A( - IN PDM_ODM_T pDM_Odm) + PDM_ODM_T pDM_Odm) { pSWAT_T pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; PADAPTER Adapter = pDM_Odm->Adapter; @@ -4710,7 +4710,7 @@ odm_SwAntDivInit_NIC_8723A( #endif void odm_SwAntDivInit_NIC( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pSWAT_T pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; @@ -4751,7 +4751,7 @@ odm_SwAntDivInit_NIC( // void ODM_SwAntDivResetBeforeLink( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -4813,8 +4813,8 @@ ODM_SwAntDivChkPerPktRssi( // void odm_SwAntDivChkAntSwitch( - IN PDM_ODM_T pDM_Odm, - IN u1Byte Step + PDM_ODM_T pDM_Odm, + u1Byte Step ) { // @@ -4863,8 +4863,8 @@ odm_SwAntDivChkAntSwitch( void ODM_SetAntenna( - IN PDM_ODM_T pDM_Odm, - IN u1Byte Antenna) + PDM_ODM_T pDM_Odm, + u1Byte Antenna) { ODM_SetBBReg(pDM_Odm, 0x860, BIT8|BIT9, Antenna); } @@ -4874,8 +4874,8 @@ ODM_SetAntenna( //---------------------------------- void odm_SwAntDivChkAntSwitchNIC( - IN PDM_ODM_T pDM_Odm, - IN u1Byte Step + PDM_ODM_T pDM_Odm, + u1Byte Step ) { #if ((RTL8192C_SUPPORT==1)||(RTL8723A_SUPPORT==1)) @@ -5325,7 +5325,7 @@ odm_SwAntDivChkAntSwitchNIC( u1Byte odm_SwAntDivSelectChkChnl( - IN PADAPTER Adapter + PADAPTER Adapter ) { #if (RT_MEM_SIZE_LEVEL != RT_MEM_SIZE_MINIMUM) @@ -5371,8 +5371,8 @@ odm_SwAntDivSelectChkChnl( void odm_SwAntDivConsructChkScanChnl( - IN PADAPTER Adapter, - IN u1Byte ChkChnl + PADAPTER Adapter, + u1Byte ChkChnl ) { @@ -5463,24 +5463,24 @@ void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext) #else //#if (defined(CONFIG_SW_ANTENNA_DIVERSITY)) -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 u1Byte StationID, IN PODM_PHY_INFO_T pPhyInfo ) {} void odm_SwAntDivChkAntSwitch( - IN PDM_ODM_T pDM_Odm, - IN u1Byte Step + PDM_ODM_T pDM_Odm, + u1Byte Step ) {} -void ODM_SwAntDivResetBeforeLink( IN PDM_ODM_T pDM_Odm ){} -void ODM_SwAntDivRestAfterLink( IN PDM_ODM_T pDM_Odm ){} +void ODM_SwAntDivResetBeforeLink( PDM_ODM_T pDM_Odm ){} +void ODM_SwAntDivRestAfterLink( PDM_ODM_T pDM_Odm ){} #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -u1Byte odm_SwAntDivSelectChkChnl( IN PADAPTER Adapter ){ return 0;} +u1Byte odm_SwAntDivSelectChkChnl( PADAPTER Adapter ){ return 0;} void odm_SwAntDivConsructChkScanChnl( - IN PADAPTER Adapter, - IN u1Byte ChkChnl + PADAPTER Adapter, + u1Byte ChkChnl ){} #endif #if (DM_ODM_SUPPORT_TYPE == ODM_MP) @@ -5498,7 +5498,7 @@ void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext){} #if ((defined(CONFIG_SW_ANTENNA_DIVERSITY))||(defined(CONFIG_HW_ANTENNA_DIVERSITY))) bool ODM_SwAntDivCheckBeforeLink8192C( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -5704,7 +5704,7 @@ return FALSE; #else bool ODM_SwAntDivCheckBeforeLink8192C( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -5895,8 +5895,8 @@ odm_StaDefAntSel( void odm_SetRxIdleAnt( - IN PDM_ODM_T pDM_Odm, - IN u1Byte Ant, + PDM_ODM_T pDM_Odm, + u1Byte Ant, IN bool bDualPath ) { @@ -5929,10 +5929,10 @@ odm_SetRxIdleAnt( void ODM_AntselStatistics_88C( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacId, - IN u4Byte PWDBAll, - IN bool isCCKrate + PDM_ODM_T pDM_Odm, + u1Byte MacId, + u4Byte PWDBAll, + bool isCCKrate ) { SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; @@ -5966,9 +5966,9 @@ ODM_AntselStatistics_88C( #if (DM_ODM_SUPPORT_TYPE==ODM_MP) void ODM_SetTxAntByTxInfo_88C_92D( - IN PDM_ODM_T pDM_Odm, - IN pu1Byte pDesc, - IN u1Byte macId + PDM_ODM_T pDM_Odm, + pu1Byte pDesc, + u1Byte macId ) { SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; @@ -5989,7 +5989,7 @@ ODM_SetTxAntByTxInfo_88C_92D( #elif (DM_ODM_SUPPORT_TYPE==ODM_CE) void ODM_SetTxAntByTxInfo_88C_92D( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -5997,7 +5997,7 @@ ODM_SetTxAntByTxInfo_88C_92D( #elif (DM_ODM_SUPPORT_TYPE==ODM_AP) void ODM_SetTxAntByTxInfo_88C_92D( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -6006,7 +6006,7 @@ ODM_SetTxAntByTxInfo_88C_92D( 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; @@ -6125,7 +6125,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)) @@ -6154,8 +6154,8 @@ odm_HwAntDiv( u1Byte ODM_Diversity_AntennaSelect( - IN PDM_ODM_T pDM_Odm, - IN u1Byte *data + PDM_ODM_T pDM_Odm, + u1Byte *data ) { struct rtl8192cd_priv *priv=pDM_Odm->priv; @@ -6243,17 +6243,17 @@ ODM_Diversity_AntennaSelect( #else //#if (defined(CONFIG_HW_ANTENNA_DIVERSITY)) void odm_InitHybridAntDiv( IN PDM_ODM_T pDM_Odm ){} -void odm_HwAntDiv( IN PDM_ODM_T pDM_Odm){} +void odm_HwAntDiv( PDM_ODM_T pDM_Odm){} #if (DM_ODM_SUPPORT_TYPE==ODM_MP) void ODM_SetTxAntByTxInfo_88C_92D( - IN PDM_ODM_T pDM_Odm, - IN pu1Byte pDesc, - IN u1Byte macId + PDM_ODM_T pDM_Odm, + pu1Byte pDesc, + u1Byte macId ){} #elif (DM_ODM_SUPPORT_TYPE==ODM_CE) -void ODM_SetTxAntByTxInfo_88C_92D( IN PDM_ODM_T pDM_Odm){ } +void ODM_SetTxAntByTxInfo_88C_92D( PDM_ODM_T pDM_Odm){ } #elif (DM_ODM_SUPPORT_TYPE==ODM_AP) -void ODM_SetTxAntByTxInfo_88C_92D( IN PDM_ODM_T pDM_Odm){ } +void ODM_SetTxAntByTxInfo_88C_92D( PDM_ODM_T pDM_Odm){ } #endif #endif //#if (defined(CONFIG_HW_ANTENNA_DIVERSITY)) @@ -6303,7 +6303,7 @@ ODM_EdcaTurboInit( void odm_EdcaTurboCheck( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { // @@ -6355,7 +6355,7 @@ odm_EdcaTurboCheck( void odm_EdcaTurboCheckCE( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -6476,7 +6476,7 @@ dm_CheckEdcaTurbo_EXIT: #elif (DM_ODM_SUPPORT_TYPE==ODM_MP) void odm_EdcaTurboCheckMP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -6653,7 +6653,7 @@ dm_CheckEdcaTurbo_EXIT: //check if edca turbo is disabled bool odm_IsEdcaTurboDisable( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { PADAPTER Adapter = pDM_Odm->Adapter; @@ -6734,8 +6734,8 @@ odm_IsEdcaTurboDisable( //add iot case here: for MP/CE void ODM_EdcaParaSelByIot( - IN PDM_ODM_T pDM_Odm, - OUT u4Byte *EDCA_BE_UL, + PDM_ODM_T pDM_Odm, + u4Byte *EDCA_BE_UL, OUT u4Byte *EDCA_BE_DL ) { @@ -6936,10 +6936,10 @@ ODM_EdcaParaSelByIot( void odm_EdcaChooseTrafficIdx( - IN PDM_ODM_T pDM_Odm, - IN u8Byte cur_tx_bytes, - IN u8Byte cur_rx_bytes, - IN bool bBiasOnRx, + PDM_ODM_T pDM_Odm, + u8Byte cur_tx_bytes, + u8Byte cur_rx_bytes, + bool bBiasOnRx, OUT bool *pbIsCurRDLState ) { @@ -6984,7 +6984,7 @@ odm_EdcaChooseTrafficIdx( #if ((DM_ODM_SUPPORT_TYPE==ODM_AP)||(DM_ODM_SUPPORT_TYPE==ODM_ADSL)) void odm_EdcaParaInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { prtl8192cd_priv priv = pDM_Odm->priv; @@ -7083,8 +7083,8 @@ void odm_EdcaParaInit( bool ODM_ChooseIotMainSTA( - IN PDM_ODM_T pDM_Odm, - IN PSTA_INFO_T pstat + PDM_ODM_T pDM_Odm, + PSTA_INFO_T pstat ) { prtl8192cd_priv priv = pDM_Odm->priv; @@ -7151,8 +7151,8 @@ ODM_ChooseIotMainSTA( #ifdef WIFI_WMM void ODM_IotEdcaSwitch( - IN PDM_ODM_T pDM_Odm, - IN unsigned char enable + PDM_ODM_T pDM_Odm, + unsigned char enable ) { prtl8192cd_priv priv = pDM_Odm->priv; @@ -7322,7 +7322,7 @@ ODM_IotEdcaSwitch( void odm_IotEngine( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -7704,7 +7704,7 @@ odm_IotEngine( // bool ODM_CheckPowerStatus( - IN PADAPTER Adapter) + PADAPTER Adapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -7826,7 +7826,7 @@ ConvertTo_dB( #define AFH_PSD 1 //0:normal PSD scan, 1: only do 20 pts PSD #define MODE_40M 0 //0:20M, 1:40M #define PSD_TH2 3 -#define PSD_CHMIN 20 // Minimum channel number for BT AFH +#define PSD_CHM 20 // Minimum channel number for BT AFH #define SIR_STEP_SIZE 3 #define Smooth_Size_1 5 #define Smooth_TH_1 3 @@ -7890,7 +7890,7 @@ odm_PSDMonitorInit( void PatchDCTone( - IN PDM_ODM_T pDM_Odm, + PDM_ODM_T pDM_Odm, pu4Byte PSD_report, u1Byte initial_gain_psd ) @@ -8654,7 +8654,7 @@ odm_PSD_Monitor( // Be Triggered by BT C2H CMD void ODM_PSDGetRSSI( - IN u1Byte RSSI_BT) + u1Byte RSSI_BT) { @@ -8664,7 +8664,7 @@ ODM_PSDGetRSSI( void ODM_PSDMonitor( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -8729,9 +8729,9 @@ odm_PSDMonitorWorkItemCallback( void ODM_PSDDbgControl( - IN PADAPTER Adapter, - IN u4Byte mode, - IN u4Byte btRssi + PADAPTER Adapter, + u4Byte mode, + u4Byte btRssi ) { #if (DEV_BUS_TYPE == RT_PCI_INTERFACE) @@ -8756,7 +8756,7 @@ ODM_PSDDbgControl( //#if (DEV_BUS_TYPE == RT_PCI_INTERFACE)|(DEV_BUS_TYPE == RT_USB_INTERFACE) void odm_RXHPInit( - IN PDM_ODM_T pDM_Odm) + PDM_ODM_T pDM_Odm) { #if (DEV_BUS_TYPE == RT_PCI_INTERFACE)|(DEV_BUS_TYPE == RT_USB_INTERFACE) pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table; @@ -8779,7 +8779,7 @@ void odm_RXHPInit( } void odm_RXHP( - IN PDM_ODM_T pDM_Odm) + PDM_ODM_T pDM_Odm) { #if ( DM_ODM_SUPPORT_TYPE & (ODM_MP)) #if (DEV_BUS_TYPE == RT_PCI_INTERFACE) | (DEV_BUS_TYPE == RT_USB_INTERFACE) @@ -9127,7 +9127,7 @@ void odm_RXHP( } void odm_Write_RXHP( - IN PDM_ODM_T pDM_Odm) + PDM_ODM_T pDM_Odm) { pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table; u4Byte currentIGI; @@ -9163,7 +9163,7 @@ void odm_Write_RXHP( void odm_PSD_RXHP( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table; @@ -9499,7 +9499,7 @@ odm_PSD_RXHPWorkitemCallback( // void odm_GlobalAdapterCheck( - IN void + void ) { @@ -9530,7 +9530,7 @@ odm_GlobalAdapterCheck( #if (DM_ODM_SUPPORT_TYPE == ODM_MP) void odm_OFDMTXPathDiversity_92C( - IN PADAPTER Adapter) + PADAPTER Adapter) { // HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); @@ -9612,7 +9612,7 @@ odm_OFDMTXPathDiversity_92C( bool odm_IsConnected_92C( - IN PADAPTER Adapter + PADAPTER Adapter ) { PRT_WLAN_STA pEntry; @@ -9653,7 +9653,7 @@ odm_IsConnected_92C( void odm_ResetPathDiversity_92C( - IN PADAPTER Adapter + PADAPTER Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -9700,7 +9700,7 @@ odm_ResetPathDiversity_92C( void odm_CCKTXPathDiversity_92C( - IN PADAPTER Adapter + PADAPTER Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -9849,7 +9849,7 @@ odm_CCKTXPathDiversity_92C( void odm_PathDiversityAfterLink_92C( - IN PADAPTER Adapter + PADAPTER Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -10042,8 +10042,8 @@ ODM_CCKPathDiversityChkPerPktRssi( bool ODM_PathDiversityBeforeLink92C( - //IN PADAPTER Adapter - IN PDM_ODM_T pDM_Odm + // PADAPTER Adapter + PDM_ODM_T pDM_Odm ) { #if (RT_MEM_SIZE_LEVEL != RT_MEM_SIZE_MINIMUM) @@ -10297,7 +10297,7 @@ ODM_PathDivChkPerPktRssi( // void ODM_PathDivRestAfterLink( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { PADAPTER Adapter=pDM_Odm->Adapter; @@ -10834,8 +10834,8 @@ odm_PathDivChkAntSwitch( void odm_SetRespPath_92C( - IN PADAPTER Adapter, - IN u1Byte DefaultRespPath + PADAPTER Adapter, + u1Byte DefaultRespPath ) { pPD_T pDM_PDTable = &Adapter->DM_PDTable; @@ -10858,9 +10858,9 @@ odm_SetRespPath_92C( void ODM_FillTXPathInTXDESC( - IN PADAPTER Adapter, - IN PRT_TCB pTcb, - IN pu1Byte pDesc + PADAPTER Adapter, + PRT_TCB pTcb, + pu1Byte pDesc ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -10898,7 +10898,7 @@ ODM_FillTXPathInTXDESC( //Only for MP //Neil Chen--2012--0502-- void odm_PathDivInit( -IN PDM_ODM_T pDM_Odm) + PDM_ODM_T pDM_Odm) { pPATHDIV_PARA pathIQK = &pDM_Odm->pathIQK; @@ -10933,7 +10933,7 @@ IN PDM_ODM_T pDM_Odm) // void ODM_SingleDualAntennaDefaultSetting( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pSWAT_T pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; @@ -10947,10 +10947,10 @@ ODM_SingleDualAntennaDefaultSetting( void odm_PHY_SaveAFERegisters( - IN PDM_ODM_T pDM_Odm, - IN pu4Byte AFEReg, - IN pu4Byte AFEBackup, - IN u4Byte RegisterNum + PDM_ODM_T pDM_Odm, + pu4Byte AFEReg, + pu4Byte AFEBackup, + u4Byte RegisterNum ) { u4Byte i; @@ -10963,10 +10963,10 @@ odm_PHY_SaveAFERegisters( void odm_PHY_ReloadAFERegisters( - IN PDM_ODM_T pDM_Odm, - IN pu4Byte AFEReg, - IN pu4Byte AFEBackup, - IN u4Byte RegiesterNum + PDM_ODM_T pDM_Odm, + pu4Byte AFEReg, + pu4Byte AFEBackup, + u4Byte RegiesterNum ) { u4Byte i; @@ -10989,8 +10989,8 @@ odm_PHY_ReloadAFERegisters( // bool ODM_SingleDualAntennaDetection( - IN PDM_ODM_T pDM_Odm, - IN u1Byte mode + PDM_ODM_T pDM_Odm, + u1Byte mode ) { diff --git a/hal/odm_HWConfig.c b/hal/odm_HWConfig.c index 522a670..c3fe5d6 100644 --- a/hal/odm_HWConfig.c +++ b/hal/odm_HWConfig.c @@ -42,7 +42,7 @@ u1Byte odm_QueryRxPwrPercentage( - IN s1Byte AntPower + s1Byte AntPower ) { if ((AntPower <= -100) || (AntPower >= 20)) @@ -278,7 +278,7 @@ odm_SignalScaleMapping_92CSeries( s4Byte odm_SignalScaleMapping( IN OUT PDM_ODM_T pDM_Odm, - IN s4Byte CurrSig + s4Byte CurrSig ) { if ( (pDM_Odm->SupportPlatform == ODM_MP) && @@ -348,7 +348,7 @@ static u1Byte odm_SQ_process_patch_RT_CID_819x_Lenovo( static u1Byte odm_EVMdbToPercentage( - IN s1Byte Value + s1Byte Value ) { // @@ -379,10 +379,10 @@ odm_EVMdbToPercentage( void odm_RxPhyStatus92CSeries_Parsing( - IN OUT PDM_ODM_T pDM_Odm, - OUT PODM_PHY_INFO_T pPhyInfo, - IN pu1Byte pPhyStatus, - IN PODM_PACKET_INFO_T pPktinfo + PDM_ODM_T pDM_Odm, + PODM_PHY_INFO_T pPhyInfo, + pu1Byte pPhyStatus, + PODM_PACKET_INFO_T pPktinfo ) { SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; @@ -740,7 +740,7 @@ odm_RxPhyStatus92CSeries_Parsing( void odm_Init_RSSIForDM( - IN OUT PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -748,9 +748,9 @@ odm_Init_RSSIForDM( 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 ) { @@ -970,10 +970,10 @@ odm_Process_RSSIForDM( // void ODM_PhyStatusQuery_92CSeries( - IN OUT PDM_ODM_T pDM_Odm, - OUT PODM_PHY_INFO_T pPhyInfo, - IN pu1Byte pPhyStatus, - IN PODM_PACKET_INFO_T pPktinfo + PDM_ODM_T pDM_Odm, + PODM_PHY_INFO_T pPhyInfo, + pu1Byte pPhyStatus, + PODM_PACKET_INFO_T pPktinfo ) { @@ -1000,10 +1000,10 @@ ODM_PhyStatusQuery_92CSeries( // void ODM_PhyStatusQuery_JaguarSeries( - IN OUT PDM_ODM_T pDM_Odm, - OUT PODM_PHY_INFO_T pPhyInfo, - IN pu1Byte pPhyStatus, - IN PODM_PACKET_INFO_T pPktinfo + PDM_ODM_T pDM_Odm, + PODM_PHY_INFO_T pPhyInfo, + pu1Byte pPhyStatus, + PODM_PACKET_INFO_T pPktinfo ) { @@ -1012,10 +1012,10 @@ ODM_PhyStatusQuery_JaguarSeries( void ODM_PhyStatusQuery( - IN OUT PDM_ODM_T pDM_Odm, - OUT PODM_PHY_INFO_T pPhyInfo, - IN pu1Byte pPhyStatus, - IN PODM_PACKET_INFO_T pPktinfo + PDM_ODM_T pDM_Odm, + PODM_PHY_INFO_T pPhyInfo, + pu1Byte pPhyStatus, + PODM_PACKET_INFO_T pPktinfo ) { ODM_PhyStatusQuery_92CSeries(pDM_Odm,pPhyInfo,pPhyStatus,pPktinfo); @@ -1024,12 +1024,12 @@ ODM_PhyStatusQuery( // For future use. void ODM_MacStatusQuery( - IN OUT PDM_ODM_T pDM_Odm, - IN pu1Byte pMacStatus, - IN u1Byte MacID, - IN bool bPacketMatchBSSID, - IN bool bPacketToSelf, - IN bool bPacketBeacon + PDM_ODM_T pDM_Odm, + pu1Byte pMacStatus, + u1Byte MacID, + bool bPacketMatchBSSID, + bool bPacketToSelf, + bool bPacketBeacon ) { // 2011/10/19 Driver team will handle in the future. @@ -1040,9 +1040,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; @@ -1082,8 +1082,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 (RTL8723A_SUPPORT == 1) @@ -1132,7 +1132,7 @@ ODM_ConfigBBWithHeaderFile( HAL_STATUS ODM_ConfigMACWithHeaderFile( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u1Byte result = HAL_STATUS_SUCCESS; diff --git a/hal/odm_RTL8188E.c b/hal/odm_RTL8188E.c index 839740c..7e24841 100644 --- a/hal/odm_RTL8188E.c +++ b/hal/odm_RTL8188E.c @@ -28,7 +28,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; @@ -47,7 +47,7 @@ ODM_DIG_LowerBound_88E( #if (defined(CONFIG_HW_ANTENNA_DIVERSITY)) static void odm_RX_HWAntDivInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u4Byte value32; @@ -85,7 +85,7 @@ odm_RX_HWAntDivInit( static void odm_TRX_HWAntDivInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u4Byte value32; @@ -136,7 +136,7 @@ odm_TRX_HWAntDivInit( static void odm_FastAntTrainingInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u4Byte value32, i; @@ -247,7 +247,7 @@ odm_FastAntTrainingInit( void ODM_AntennaDiversityInit_88E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { /* @@ -340,9 +340,9 @@ odm_UpdateTxAnt_88E(IN PDM_ODM_T pDM_Odm, IN u1Byte Ant, IN u4Byte MacId) #if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE)) void ODM_SetTxAntByTxInfo_88E( - IN PDM_ODM_T pDM_Odm, - IN pu1Byte pDesc, - IN u1Byte macId + PDM_ODM_T pDM_Odm, + pu1Byte pDesc, + u1Byte macId ) { pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; @@ -359,7 +359,7 @@ ODM_SetTxAntByTxInfo_88E( #else// (DM_ODM_SUPPORT_TYPE == ODM_AP) void ODM_SetTxAntByTxInfo_88E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { } @@ -367,10 +367,10 @@ ODM_SetTxAntByTxInfo_88E( void ODM_AntselStatistics_88E( - IN PDM_ODM_T pDM_Odm, - IN u1Byte antsel_tr_mux, - IN u4Byte MacId, - IN u1Byte RxPWDBAll + PDM_ODM_T pDM_Odm, + u1Byte antsel_tr_mux, + u4Byte MacId, + u1Byte RxPWDBAll ) { pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; @@ -409,7 +409,7 @@ ODM_AntselStatistics_88E( #define TX_BY_REG 0 static void odm_HWAntDiv( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u4Byte i, MinRSSI=0xFF, AntDivMaxRSSI=0, MaxRSSI=0, LocalMinRSSI, LocalMaxRSSI; @@ -478,7 +478,7 @@ odm_HWAntDiv( #if (!(DM_ODM_SUPPORT_TYPE == ODM_CE)) void odm_SetNextMACAddrTarget( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; @@ -535,7 +535,7 @@ odm_SetNextMACAddrTarget( void odm_FastAntTraining( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { u4Byte i, MaxRSSI=0; @@ -630,7 +630,7 @@ odm_FastAntTraining( void odm_FastAntTrainingCallback( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { @@ -651,7 +651,7 @@ odm_FastAntTrainingCallback( void odm_FastAntTrainingWorkItemCallback( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { odm_FastAntTraining(pDM_Odm); @@ -660,7 +660,7 @@ odm_FastAntTrainingWorkItemCallback( void ODM_AntennaDiversity_88E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; @@ -791,16 +791,16 @@ void odm_FastAntTrainingCallback(void *FunctionContext) #if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE)) void ODM_SetTxAntByTxInfo_88E( - IN PDM_ODM_T pDM_Odm, - IN pu1Byte pDesc, - IN u1Byte macId + PDM_ODM_T pDM_Odm, + pu1Byte pDesc, + u1Byte macId ) { } #else// (DM_ODM_SUPPORT_TYPE == ODM_AP) void ODM_SetTxAntByTxInfo_88E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { } @@ -812,7 +812,7 @@ ODM_SetTxAntByTxInfo_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; @@ -824,7 +824,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); @@ -834,7 +834,7 @@ ODM_DynamicPrimaryCCA_DupRTS( void odm_DynamicPrimaryCCA( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { PADAPTER Adapter = pDM_Odm->Adapter; // for NIC @@ -1209,18 +1209,18 @@ ODM_UpdateRxIdleAnt_88E(IN PDM_ODM_T pDM_Odm, IN u1Byte Ant) } void odm_PrimaryCCA_Init( - IN PDM_ODM_T pDM_Odm) + PDM_ODM_T pDM_Odm) { } void odm_DynamicPrimaryCCA( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { } bool ODM_DynamicPrimaryCCA_DupRTS( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ) { return FALSE; diff --git a/hal/odm_RegConfig8188E.c b/hal/odm_RegConfig8188E.c index 08c6fed..0e5abc2 100644 --- a/hal/odm_RegConfig8188E.c +++ b/hal/odm_RegConfig8188E.c @@ -24,11 +24,11 @@ void odm_ConfigRFReg_8188E( - IN PDM_ODM_T pDM_Odm, - IN u4Byte Addr, - IN u4Byte Data, + PDM_ODM_T pDM_Odm, + u4Byte Addr, + u4Byte Data, IN ODM_RF_RADIO_PATH_E RF_PATH, - IN u4Byte RegAddr + u4Byte RegAddr ) { if (Addr == 0xffe) @@ -70,9 +70,9 @@ odm_ConfigRFReg_8188E( void odm_ConfigRF_RadioA_8188E( - IN PDM_ODM_T pDM_Odm, - IN u4Byte Addr, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte Addr, + u4Byte Data ) { u4Byte content = 0x1000; // RF_Content: radioa_txt @@ -85,9 +85,9 @@ odm_ConfigRF_RadioA_8188E( void odm_ConfigRF_RadioB_8188E( - IN PDM_ODM_T pDM_Odm, - IN u4Byte Addr, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte Addr, + u4Byte Data ) { u4Byte content = 0x1001; // RF_Content: radiob_txt @@ -101,9 +101,9 @@ odm_ConfigRF_RadioB_8188E( void odm_ConfigMAC_8188E( - IN PDM_ODM_T pDM_Odm, - IN u4Byte Addr, - IN u1Byte Data + PDM_ODM_T pDM_Odm, + u4Byte Addr, + u1Byte Data ) { ODM_Write1Byte(pDM_Odm, Addr, Data); @@ -112,10 +112,10 @@ odm_ConfigMAC_8188E( void odm_ConfigBB_AGC_8188E( - IN PDM_ODM_T pDM_Odm, - IN u4Byte Addr, - IN u4Byte Bitmask, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte Addr, + u4Byte Bitmask, + u4Byte Data ) { ODM_SetBBReg(pDM_Odm, Addr, Bitmask, Data); @@ -127,10 +127,10 @@ odm_ConfigBB_AGC_8188E( void odm_ConfigBB_PHY_REG_PG_8188E( - IN PDM_ODM_T pDM_Odm, - IN u4Byte Addr, - IN u4Byte Bitmask, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte Addr, + u4Byte Bitmask, + u4Byte Data ) { if (Addr == 0xfe){ @@ -167,10 +167,10 @@ odm_ConfigBB_PHY_REG_PG_8188E( void odm_ConfigBB_PHY_8188E( - IN PDM_ODM_T pDM_Odm, - IN u4Byte Addr, - IN u4Byte Bitmask, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte Addr, + u4Byte Bitmask, + u4Byte Data ) { if (Addr == 0xfe){ diff --git a/hal/odm_debug.c b/hal/odm_debug.c index 7f91958..c72c96d 100644 --- 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_interface.c b/hal/odm_interface.c index 7e4b80f..d735de4 100644 --- a/hal/odm_interface.c +++ b/hal/odm_interface.c @@ -29,8 +29,8 @@ u1Byte ODM_Read1Byte( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr + PDM_ODM_T pDM_Odm, + u4Byte RegAddr ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -49,8 +49,8 @@ ODM_Read1Byte( u2Byte ODM_Read2Byte( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr + PDM_ODM_T pDM_Odm, + u4Byte RegAddr ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -69,8 +69,8 @@ ODM_Read2Byte( u4Byte ODM_Read4Byte( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr + PDM_ODM_T pDM_Odm, + u4Byte RegAddr ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -89,9 +89,9 @@ ODM_Read4Byte( void ODM_Write1Byte( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr, - IN u1Byte Data + PDM_ODM_T pDM_Odm, + u4Byte RegAddr, + u1Byte Data ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -110,9 +110,9 @@ ODM_Write1Byte( void ODM_Write2Byte( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr, - IN u2Byte Data + PDM_ODM_T pDM_Odm, + u4Byte RegAddr, + u2Byte Data ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -131,9 +131,9 @@ ODM_Write2Byte( void ODM_Write4Byte( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte RegAddr, + u4Byte Data ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -152,10 +152,10 @@ ODM_Write4Byte( void ODM_SetMACReg( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr, - IN u4Byte BitMask, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte RegAddr, + u4Byte BitMask, + u4Byte Data ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -169,9 +169,9 @@ ODM_SetMACReg( u4Byte ODM_GetMACReg( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr, - IN u4Byte BitMask + PDM_ODM_T pDM_Odm, + u4Byte RegAddr, + u4Byte BitMask ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -185,10 +185,10 @@ ODM_GetMACReg( void ODM_SetBBReg( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr, - IN u4Byte BitMask, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte RegAddr, + u4Byte BitMask, + u4Byte Data ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -202,9 +202,9 @@ ODM_SetBBReg( u4Byte ODM_GetBBReg( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr, - IN u4Byte BitMask + PDM_ODM_T pDM_Odm, + u4Byte RegAddr, + u4Byte BitMask ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -218,11 +218,11 @@ ODM_GetBBReg( void ODM_SetRFReg( - IN PDM_ODM_T pDM_Odm, - IN ODM_RF_RADIO_PATH_E eRFPath, - IN u4Byte RegAddr, - IN u4Byte BitMask, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + ODM_RF_RADIO_PATH_E eRFPath, + u4Byte RegAddr, + u4Byte BitMask, + u4Byte Data ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -236,10 +236,10 @@ ODM_SetRFReg( u4Byte ODM_GetRFReg( - IN PDM_ODM_T pDM_Odm, - IN ODM_RF_RADIO_PATH_E eRFPath, - IN u4Byte RegAddr, - IN u4Byte BitMask + PDM_ODM_T pDM_Odm, + ODM_RF_RADIO_PATH_E eRFPath, + u4Byte RegAddr, + u4Byte BitMask ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -258,9 +258,9 @@ ODM_GetRFReg( // void ODM_AllocateMemory( - IN PDM_ODM_T pDM_Odm, - OUT void * *pPtr, - IN u4Byte length + PDM_ODM_T pDM_Odm, + void * *pPtr, + u4Byte length ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -276,9 +276,9 @@ ODM_AllocateMemory( // length could be ignored, used to detect memory leakage. void ODM_FreeMemory( - IN PDM_ODM_T pDM_Odm, - OUT void * pPtr, - IN u4Byte length + PDM_ODM_T pDM_Odm, + void * pPtr, + u4Byte length ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -291,10 +291,10 @@ ODM_FreeMemory( #endif } s4Byte ODM_CompareMemory( - IN PDM_ODM_T pDM_Odm, - IN void * pBuf1, - IN void * pBuf2, - IN u4Byte length + PDM_ODM_T pDM_Odm, + void * pBuf1, + void * pBuf2, + u4Byte length ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -313,8 +313,8 @@ s4Byte 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 ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -328,8 +328,8 @@ ODM_AcquireSpinLock( } void ODM_ReleaseSpinLock( - IN PDM_ODM_T pDM_Odm, - IN RT_SPINLOCK_TYPE type + PDM_ODM_T pDM_Odm, + RT_SPINLOCK_TYPE type ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -347,11 +347,11 @@ 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 ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -367,7 +367,7 @@ ODM_InitializeWorkItem( void ODM_StartWorkItem( - IN PRT_WORK_ITEM pRtWorkItem + PRT_WORK_ITEM pRtWorkItem ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -382,7 +382,7 @@ ODM_StartWorkItem( void ODM_StopWorkItem( - IN PRT_WORK_ITEM pRtWorkItem + PRT_WORK_ITEM pRtWorkItem ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -397,7 +397,7 @@ ODM_StopWorkItem( void ODM_FreeWorkItem( - IN PRT_WORK_ITEM pRtWorkItem + PRT_WORK_ITEM pRtWorkItem ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -412,7 +412,7 @@ ODM_FreeWorkItem( void ODM_ScheduleWorkItem( - IN PRT_WORK_ITEM pRtWorkItem + PRT_WORK_ITEM pRtWorkItem ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -427,7 +427,7 @@ ODM_ScheduleWorkItem( void ODM_IsWorkItemScheduled( - IN PRT_WORK_ITEM pRtWorkItem + PRT_WORK_ITEM pRtWorkItem ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -446,7 +446,7 @@ ODM_IsWorkItemScheduled( // void ODM_StallExecution( - IN u4Byte usDelay + u4Byte usDelay ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -506,9 +506,9 @@ ODM_sleep_us(IN u4Byte us) void ODM_SetTimer( - IN PDM_ODM_T pDM_Odm, - IN PRT_TIMER pTimer, - IN u4Byte msDelay + PDM_ODM_T pDM_Odm, + PRT_TIMER pTimer, + u4Byte msDelay ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -524,11 +524,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 ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -547,8 +547,8 @@ ODM_InitializeTimer( void ODM_CancelTimer( - IN PDM_ODM_T pDM_Odm, - IN PRT_TIMER pTimer + PDM_ODM_T pDM_Odm, + PRT_TIMER pTimer ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -564,8 +564,8 @@ ODM_CancelTimer( void ODM_ReleaseTimer( - IN PDM_ODM_T pDM_Odm, - IN PRT_TIMER pTimer + PDM_ODM_T pDM_Odm, + PRT_TIMER pTimer ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -595,10 +595,10 @@ ODM_ReleaseTimer( #if (DM_ODM_SUPPORT_TYPE & ODM_MP) void ODM_FillH2CCmd( - IN PADAPTER Adapter, - IN u1Byte ElementID, - IN u4Byte CmdLen, - IN pu1Byte pCmdBuffer + PADAPTER Adapter, + u1Byte ElementID, + u4Byte CmdLen, + pu1Byte pCmdBuffer ) { if (IS_HARDWARE_TYPE_JAGUAR(Adapter)) @@ -638,13 +638,13 @@ ODM_FillH2CCmd( #else u4Byte ODM_FillH2CCmd( - IN pu1Byte pH2CBuffer, - IN u4Byte H2CBufferLen, - IN u4Byte CmdNum, - IN pu4Byte pElementID, - IN pu4Byte pCmdLen, - IN pu1Byte* pCmbBuffer, - IN pu1Byte CmdStartSeq + pu1Byte pH2CBuffer, + u4Byte H2CBufferLen, + u4Byte CmdNum, + pu4Byte pElementID, + pu4Byte pCmdLen, + pu1Byte* pCmbBuffer, + pu1Byte CmdStartSeq ) { #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c index 5fa50ef..5024901 100644 --- a/hal/rtl8188e_cmd.c +++ b/hal/rtl8188e_cmd.c @@ -629,7 +629,7 @@ void ConstructProbeRsp(_adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr // 2010.06.23. Added by tynli. void CheckFwRsvdPageContent( - IN PADAPTER Adapter + PADAPTER Adapter ) { HAL_DATA_TYPE* pHalData = GET_HAL_DATA(Adapter); diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c index 03d6680..a75782b 100644 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -42,14 +42,14 @@ static void dm_CheckProtection( - IN PADAPTER Adapter + PADAPTER Adapter ) { } static void dm_CheckStatistics( - IN PADAPTER Adapter + PADAPTER Adapter ) { } @@ -134,7 +134,7 @@ static void dm_CheckPbcGPIO(_adapter *padapter) // void dm_InterruptMigration( - IN PADAPTER Adapter + PADAPTER Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -212,7 +212,7 @@ dm_InterruptMigration( // static void dm_InitGPIOSetting( - IN PADAPTER Adapter + PADAPTER Adapter ) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); @@ -373,7 +373,7 @@ static void Update_ODM_ComInfo_88E(PADAPTER Adapter) void rtl8188e_InitHalDm( - IN PADAPTER Adapter + PADAPTER Adapter ) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); @@ -398,7 +398,7 @@ rtl8188e_InitHalDm( void rtl8188e_HalDmWatchDog( - IN PADAPTER Adapter + PADAPTER Adapter ) { bool bFwCurrentInPSMode = _FALSE; diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c index 31ec344..c6f1618 100644 --- a/hal/rtl8188e_hal_init.c +++ b/hal/rtl8188e_hal_init.c @@ -536,8 +536,8 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter,int data_len) static void _FWDownloadEnable( - IN PADAPTER padapter, - IN bool enable + PADAPTER padapter, + bool enable ) { u8 tmp; @@ -566,9 +566,9 @@ _FWDownloadEnable( #define MAX_REG_BOLCK_SIZE 196 static int _BlockWrite( - IN PADAPTER padapter, - IN void * buffer, - IN u32 buffSize + PADAPTER padapter, + void * buffer, + u32 buffSize ) { int ret = _SUCCESS; @@ -679,10 +679,10 @@ exit: static int _PageWrite( - IN PADAPTER padapter, - IN u32 page, - IN void * buffer, - IN u32 size + PADAPTER padapter, + u32 page, + void * buffer, + u32 size ) { u8 value8; @@ -716,9 +716,9 @@ _FillDummy( static int _WriteFW( - IN PADAPTER padapter, - IN void * buffer, - IN u32 size + PADAPTER padapter, + void * buffer, + u32 size ) { // Since we need dynamic decide method of dwonload fw, so we call this function to get chip version. @@ -1018,8 +1018,8 @@ void rtl8188e_InitializeFirmwareVars(PADAPTER padapter) // void SetFwRelatedForWoWLAN8188ES( - IN PADAPTER padapter, - IN u8 bHostIsGoingtoSleep + PADAPTER padapter, + u8 bHostIsGoingtoSleep ) { int status=_FAIL; @@ -1076,31 +1076,31 @@ enum{ static bool hal_EfusePgPacketWrite2ByteHeader( - IN PADAPTER pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest); + PADAPTER pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest); static bool hal_EfusePgPacketWrite1ByteHeader( - IN PADAPTER pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest); + PADAPTER pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest); static bool hal_EfusePgPacketWriteData( - IN PADAPTER pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest); + PADAPTER pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest); static void hal_EfusePowerSwitch_RTL8188E( - IN PADAPTER pAdapter, - IN u8 bWrite, - IN u8 PwrState) + PADAPTER pAdapter, + u8 bWrite, + u8 PwrState) { u8 tempval; u16 tmpV16; @@ -1152,9 +1152,9 @@ hal_EfusePowerSwitch_RTL8188E( static void rtl8188e_EfusePowerSwitch( - IN PADAPTER pAdapter, - IN u8 bWrite, - IN u8 PwrState) + PADAPTER pAdapter, + u8 bWrite, + u8 PwrState) { hal_EfusePowerSwitch_RTL8188E(pAdapter, bWrite, PwrState); } @@ -1208,7 +1208,7 @@ Hal_EfuseReadEFuse88E( u16 _offset, u16 _size_byte, u8 *pbuf, - IN bool bPseudoTest + bool bPseudoTest ) { //u8 efuseTbl[EFUSE_MAP_LEN_88E]; @@ -1399,9 +1399,9 @@ exit: static bool Hal_EfuseSwitchToBank( - IN PADAPTER pAdapter, - IN u8 bank, - IN bool bPseudoTest + PADAPTER pAdapter, + u8 bank, + bool bPseudoTest ) { bool bRet = _FALSE; @@ -1528,7 +1528,7 @@ rtl8188e_ReadEFuse( u16 _offset, u16 _size_byte, u8 *pbuf, - IN bool bPseudoTest + bool bPseudoTest ) { if (bPseudoTest) @@ -1544,10 +1544,10 @@ rtl8188e_ReadEFuse( //Do not support BT void Hal_EFUSEGetEfuseDefinition88E( - IN PADAPTER pAdapter, - IN u1Byte efuseType, - IN u1Byte type, - OUT void * pOut + PADAPTER pAdapter, + u1Byte efuseType, + u1Byte type, + void * pOut ) { switch (type) @@ -1612,10 +1612,10 @@ Hal_EFUSEGetEfuseDefinition88E( } void Hal_EFUSEGetEfuseDefinition_Pseudo88E( - IN PADAPTER pAdapter, - IN u8 efuseType, - IN u8 type, - OUT void * pOut + PADAPTER pAdapter, + u8 efuseType, + u8 type, + void * pOut ) { switch (type) @@ -1682,11 +1682,11 @@ Hal_EFUSEGetEfuseDefinition_Pseudo88E( static void rtl8188e_EFUSE_GetEfuseDefinition( - IN PADAPTER pAdapter, - IN u8 efuseType, - IN u8 type, - OUT void *pOut, - IN bool bPseudoTest + PADAPTER pAdapter, + u8 efuseType, + u8 type, + void *pOut, + bool bPseudoTest ) { if (bPseudoTest) @@ -1700,11 +1700,11 @@ rtl8188e_EFUSE_GetEfuseDefinition( } static u8 -Hal_EfuseWordEnableDataWrite( IN PADAPTER pAdapter, - IN u16 efuse_addr, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +Hal_EfuseWordEnableDataWrite( PADAPTER pAdapter, + u16 efuse_addr, + u8 word_en, + u8 *data, + bool bPseudoTest) { u16 tmpaddr = 0; u16 start_addr = efuse_addr; @@ -1766,11 +1766,11 @@ Hal_EfuseWordEnableDataWrite( IN PADAPTER pAdapter, } static u8 -Hal_EfuseWordEnableDataWrite_Pseudo ( IN PADAPTER pAdapter, - IN u16 efuse_addr, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +Hal_EfuseWordEnableDataWrite_Pseudo ( PADAPTER pAdapter, + u16 efuse_addr, + u8 word_en, + u8 *data, + bool bPseudoTest) { u8 ret=0; @@ -1780,11 +1780,11 @@ Hal_EfuseWordEnableDataWrite_Pseudo ( IN PADAPTER pAdapter, } static u8 -rtl8188e_Efuse_WordEnableDataWrite( IN PADAPTER pAdapter, - IN u16 efuse_addr, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +rtl8188e_Efuse_WordEnableDataWrite( PADAPTER pAdapter, + u16 efuse_addr, + u8 word_en, + u8 *data, + bool bPseudoTest) { u8 ret=0; @@ -1802,8 +1802,8 @@ rtl8188e_Efuse_WordEnableDataWrite( IN PADAPTER pAdapter, static u16 -hal_EfuseGetCurrentSize_8188e(IN PADAPTER pAdapter, - IN bool bPseudoTest) +hal_EfuseGetCurrentSize_8188e( PADAPTER pAdapter, + bool bPseudoTest) { int bContinual = _TRUE; @@ -1873,8 +1873,8 @@ hal_EfuseGetCurrentSize_8188e(IN PADAPTER pAdapter, } static u16 -Hal_EfuseGetCurrentSize_Pseudo (IN PADAPTER pAdapter, - IN bool bPseudoTest) +Hal_EfuseGetCurrentSize_Pseudo ( PADAPTER pAdapter, + bool bPseudoTest) { u16 ret=0; @@ -1886,9 +1886,9 @@ Hal_EfuseGetCurrentSize_Pseudo (IN PADAPTER pAdapter, static u16 rtl8188e_EfuseGetCurrentSize( - IN PADAPTER pAdapter, - IN u8 efuseType, - IN bool bPseudoTest) + PADAPTER pAdapter, + u8 efuseType, + bool bPseudoTest) { u16 ret=0; @@ -1908,10 +1908,10 @@ rtl8188e_EfuseGetCurrentSize( static int hal_EfusePgPacketRead_8188e( - IN PADAPTER pAdapter, - IN u8 offset, - IN u8 *data, - IN bool bPseudoTest) + PADAPTER pAdapter, + u8 offset, + u8 *data, + bool bPseudoTest) { u8 ReadState = PG_STATE_HEADER; @@ -2023,10 +2023,10 @@ hal_EfusePgPacketRead_8188e( } static int -Hal_EfusePgPacketRead( IN PADAPTER pAdapter, - IN u8 offset, - IN u8 *data, - IN bool bPseudoTest) +Hal_EfusePgPacketRead( PADAPTER pAdapter, + u8 offset, + u8 *data, + bool bPseudoTest) { int ret=0; @@ -2037,10 +2037,10 @@ Hal_EfusePgPacketRead( IN PADAPTER pAdapter, } static int -Hal_EfusePgPacketRead_Pseudo ( IN PADAPTER pAdapter, - IN u8 offset, - IN u8 *data, - IN bool bPseudoTest) +Hal_EfusePgPacketRead_Pseudo ( PADAPTER pAdapter, + u8 offset, + u8 *data, + bool bPseudoTest) { int ret=0; @@ -2050,10 +2050,10 @@ Hal_EfusePgPacketRead_Pseudo ( IN PADAPTER pAdapter, } static int -rtl8188e_Efuse_PgPacketRead( IN PADAPTER pAdapter, - IN u8 offset, - IN u8 *data, - IN bool bPseudoTest) +rtl8188e_Efuse_PgPacketRead( PADAPTER pAdapter, + u8 offset, + u8 *data, + bool bPseudoTest) { int ret=0; @@ -2071,11 +2071,11 @@ rtl8188e_Efuse_PgPacketRead( IN PADAPTER pAdapter, static bool hal_EfuseFixHeaderProcess( - IN PADAPTER pAdapter, - IN u8 efuseType, - IN PPGPKT_STRUCT pFixPkt, - IN u16 *pAddr, - IN bool bPseudoTest + PADAPTER pAdapter, + u8 efuseType, + PPGPKT_STRUCT pFixPkt, + u16 *pAddr, + bool bPseudoTest ) { u8 originaldata[8], badworden=0; @@ -2112,11 +2112,11 @@ hal_EfuseFixHeaderProcess( static bool hal_EfusePgPacketWrite2ByteHeader( - IN PADAPTER pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest) + PADAPTER pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest) { bool bRet=_FALSE, bContinual=_TRUE; u16 efuse_addr=*pAddr, efuse_max_available_len=0; @@ -2209,11 +2209,11 @@ hal_EfusePgPacketWrite2ByteHeader( static bool hal_EfusePgPacketWrite1ByteHeader( - IN PADAPTER pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest) + PADAPTER pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest) { bool bRet=_FALSE; u8 pg_header=0, tmp_header=0; @@ -2257,11 +2257,11 @@ hal_EfusePgPacketWrite1ByteHeader( static bool hal_EfusePgPacketWriteData( - IN PADAPTER pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest) + PADAPTER pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest) { bool bRet=_FALSE; u16 efuse_addr=*pAddr; @@ -2294,11 +2294,11 @@ hal_EfusePgPacketWriteData( static bool hal_EfusePgPacketWriteHeader( - IN PADAPTER pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest) + PADAPTER pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest) { bool bRet=_FALSE; @@ -2316,9 +2316,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 @@ -2356,10 +2356,10 @@ wordEnMatched( static bool hal_EfuseCheckIfDatafollowed( - IN PADAPTER pAdapter, - IN u8 word_cnts, - IN u16 startAddr, - IN bool bPseudoTest + PADAPTER pAdapter, + u8 word_cnts, + u16 startAddr, + bool bPseudoTest ) { bool bRet=_FALSE; @@ -2376,11 +2376,11 @@ hal_EfuseCheckIfDatafollowed( static bool hal_EfusePartialWriteCheck( - IN PADAPTER pAdapter, - IN u8 efuseType, - IN u16 *pAddr, - IN PPGPKT_STRUCT pTargetPkt, - IN bool bPseudoTest + PADAPTER pAdapter, + u8 efuseType, + u16 *pAddr, + PPGPKT_STRUCT pTargetPkt, + bool bPseudoTest ) { bool bRet=_FALSE; @@ -2501,9 +2501,9 @@ hal_EfusePartialWriteCheck( static bool hal_EfusePgCheckAvailableAddr( - IN PADAPTER pAdapter, - IN u8 efuseType, - IN bool bPseudoTest + PADAPTER pAdapter, + u8 efuseType, + bool bPseudoTest ) { u16 efuse_max_available_len=0; @@ -2524,10 +2524,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 ) { @@ -2542,11 +2542,11 @@ hal_EfuseConstructPGPkt( static bool hal_EfusePgPacketWrite_BT( - IN PADAPTER pAdapter, - IN u8 offset, - IN u8 word_en, - IN u8 *pData, - IN bool bPseudoTest + PADAPTER pAdapter, + u8 offset, + u8 word_en, + u8 *pData, + bool bPseudoTest ) { PGPKT_STRUCT targetPkt; @@ -2572,11 +2572,11 @@ hal_EfusePgPacketWrite_BT( static bool hal_EfusePgPacketWrite_8188e( - IN PADAPTER pAdapter, - IN u8 offset, - IN u8 word_en, - IN u8 *pData, - IN bool bPseudoTest + PADAPTER pAdapter, + u8 offset, + u8 word_en, + u8 *pData, + bool bPseudoTest ) { PGPKT_STRUCT targetPkt; @@ -2602,11 +2602,11 @@ hal_EfusePgPacketWrite_8188e( static int -Hal_EfusePgPacketWrite_Pseudo (IN PADAPTER pAdapter, - IN u8 offset, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +Hal_EfusePgPacketWrite_Pseudo ( PADAPTER pAdapter, + u8 offset, + u8 word_en, + u8 *data, + bool bPseudoTest) { int ret; @@ -2616,11 +2616,11 @@ Hal_EfusePgPacketWrite_Pseudo (IN PADAPTER pAdapter, } static int -Hal_EfusePgPacketWrite(IN PADAPTER pAdapter, - IN u8 offset, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +Hal_EfusePgPacketWrite( PADAPTER pAdapter, + u8 offset, + u8 word_en, + u8 *data, + bool bPseudoTest) { int ret=0; ret = hal_EfusePgPacketWrite_8188e(pAdapter, offset, word_en, data, bPseudoTest); @@ -2630,11 +2630,11 @@ Hal_EfusePgPacketWrite(IN PADAPTER pAdapter, } static int -rtl8188e_Efuse_PgPacketWrite(IN PADAPTER pAdapter, - IN u8 offset, - IN u8 word_en, - IN u8 *data, - IN bool bPseudoTest) +rtl8188e_Efuse_PgPacketWrite( PADAPTER pAdapter, + u8 offset, + u8 word_en, + u8 *data, + bool bPseudoTest) { int ret; @@ -2651,7 +2651,7 @@ rtl8188e_Efuse_PgPacketWrite(IN PADAPTER pAdapter, static HAL_VERSION ReadChipVersion8188E( - IN PADAPTER padapter + PADAPTER padapter ) { u32 value32; @@ -3063,8 +3063,8 @@ Hal_InitPGData88E(PADAPTER padapter) void Hal_EfuseParseIDCode88E( - IN PADAPTER padapter, - IN u8 *hwinfo + PADAPTER padapter, + u8 *hwinfo ) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); @@ -3089,9 +3089,9 @@ Hal_EfuseParseIDCode88E( static void Hal_EEValueCheck( - IN u8 EEType, - IN void * pInValue, - OUT void * pOutValue + u8 EEType, + void * pInValue, + void * pOutValue ) { switch (EEType) @@ -3120,9 +3120,9 @@ Hal_EEValueCheck( static void Hal_ReadPowerValueFromPROM_8188E( - IN PTxPowerInfo24G pwrInfo24G, - IN u8* PROMContent, - IN bool AutoLoadFail + PTxPowerInfo24G pwrInfo24G, + u8* PROMContent, + bool AutoLoadFail ) { u32 rfPath, eeAddr=EEPROM_TX_PWR_INX_88E, group,TxCount=0; @@ -3254,7 +3254,7 @@ Hal_ReadPowerValueFromPROM_8188E( static u8 Hal_GetChnlGroup( - IN u8 chnl + u8 chnl ) { u8 group=0; @@ -3270,7 +3270,7 @@ Hal_GetChnlGroup( } static u8 Hal_GetChnlGroup88E( - IN u8 chnl, + u8 chnl, OUT u8* pGroup ) { @@ -3339,8 +3339,8 @@ Hal_GetChnlGroup88E( void Hal_ReadPowerSavingMode88E( PADAPTER padapter, - IN u8* hwinfo, - IN bool AutoLoadFail + u8* hwinfo, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -3380,9 +3380,9 @@ void Hal_ReadPowerSavingMode88E( void Hal_ReadTxPowerInfo88E( - IN PADAPTER padapter, - IN u8* PROMContent, - IN bool AutoLoadFail + PADAPTER padapter, + u8* PROMContent, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -3455,9 +3455,9 @@ Hal_ReadTxPowerInfo88E( void Hal_EfuseParseXtal_8188E( - IN PADAPTER pAdapter, - IN u8* hwinfo, - IN bool AutoLoadFail + PADAPTER pAdapter, + u8* hwinfo, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -3477,9 +3477,9 @@ Hal_EfuseParseXtal_8188E( void Hal_EfuseParseBoardType88E( - IN PADAPTER pAdapter, - IN u8* hwinfo, - IN bool AutoLoadFail + PADAPTER pAdapter, + u8* hwinfo, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -3493,9 +3493,9 @@ Hal_EfuseParseBoardType88E( void Hal_EfuseParseEEPROMVer88E( - IN PADAPTER padapter, - IN u8* hwinfo, - IN bool AutoLoadFail + PADAPTER padapter, + u8* hwinfo, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -3514,9 +3514,9 @@ Hal_EfuseParseEEPROMVer88E( void rtl8188e_EfuseParseChnlPlan( - IN PADAPTER padapter, - IN u8* hwinfo, - IN bool AutoLoadFail + PADAPTER padapter, + u8* hwinfo, + bool AutoLoadFail ) { padapter->mlmepriv.ChannelPlan = hal_com_get_channel_plan( @@ -3532,9 +3532,9 @@ rtl8188e_EfuseParseChnlPlan( void Hal_EfuseParseCustomerID88E( - IN PADAPTER padapter, - IN u8* hwinfo, - IN bool AutoLoadFail + PADAPTER padapter, + u8* hwinfo, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -3556,9 +3556,9 @@ Hal_EfuseParseCustomerID88E( void Hal_ReadAntennaDiversity88E( - IN PADAPTER pAdapter, - IN u8* PROMContent, - IN bool AutoLoadFail + PADAPTER pAdapter, + u8* PROMContent, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -3604,9 +3604,9 @@ Hal_ReadAntennaDiversity88E( void Hal_ReadThermalMeter_88E( - IN PADAPTER Adapter, - IN u8* PROMContent, - IN bool AutoloadFail + PADAPTER Adapter, + u8* PROMContent, + bool AutoloadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -3635,7 +3635,7 @@ Hal_ReadThermalMeter_88E( void Hal_InitChannelPlan( - IN PADAPTER padapter + PADAPTER padapter ) { } @@ -3673,9 +3673,9 @@ void Hal_DetectWoWMode(PADAPTER pAdapter) #ifdef CONFIG_RF_GAIN_OFFSET void Hal_ReadRFGainOffset( - IN PADAPTER Adapter, - IN u8* PROMContent, - IN bool AutoloadFail) + PADAPTER Adapter, + u8* PROMContent, + bool AutoloadFail) { u8 buff[EFUSE_MAX_SIZE]; u32 res; diff --git a/hal/rtl8188e_mp.c b/hal/rtl8188e_mp.c index 3cfea90..63c8ba5 100644 --- a/hal/rtl8188e_mp.c +++ b/hal/rtl8188e_mp.c @@ -97,7 +97,7 @@ static void Hal_disable_dm(PADAPTER padapter) * * Overview: Change RF Setting when we siwthc channel/rate/BW for MP. * - * Input: IN PADAPTER pAdapter + * Input: PADAPTER pAdapter * * Output: NONE * diff --git a/hal/rtl8188e_phycfg.c b/hal/rtl8188e_phycfg.c index 35c5f49..efc403e 100644 --- a/hal/rtl8188e_phycfg.c +++ b/hal/rtl8188e_phycfg.c @@ -85,7 +85,7 @@ phy_CalculateBitShift( #if (SIC_ENABLE == 1) static bool sic_IsSICReady( - IN PADAPTER Adapter + PADAPTER Adapter ) { bool bRet=_FALSE; @@ -240,10 +240,10 @@ sic_Write4Byte( //============================================================ static void SIC_SetBBReg( - IN PADAPTER Adapter, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + PADAPTER Adapter, + u32 RegAddr, + u32 BitMask, + u32 Data ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -285,9 +285,9 @@ SIC_SetBBReg( static u32 SIC_QueryBBReg( - IN PADAPTER Adapter, - IN u32 RegAddr, - IN u32 BitMask + PADAPTER Adapter, + u32 RegAddr, + u32 BitMask ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -323,7 +323,7 @@ SIC_QueryBBReg( void SIC_Init( - IN PADAPTER Adapter + PADAPTER Adapter ) { // Here we need to write 0x1b8~0x1bf = 0 after fw is downloaded @@ -349,7 +349,7 @@ SIC_Init( static bool SIC_LedOff( - IN PADAPTER Adapter + PADAPTER Adapter ) { // When SIC is enabled, led pin will be used as debug pin, @@ -374,9 +374,9 @@ SIC_LedOff( */ u32 rtl8188e_PHY_QueryBBReg( - IN PADAPTER Adapter, - IN u32 RegAddr, - IN u32 BitMask + PADAPTER Adapter, + u32 RegAddr, + u32 BitMask ) { u32 ReturnValue = 0, OriginalValue, BitShift; @@ -424,10 +424,10 @@ rtl8188e_PHY_QueryBBReg( void rtl8188e_PHY_SetBBReg( - IN PADAPTER Adapter, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + PADAPTER Adapter, + u32 RegAddr, + u32 BitMask, + u32 Data ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -483,9 +483,9 @@ rtl8188e_PHY_SetBBReg( */ static u32 phy_RFSerialRead( - IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset + PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset ) { u32 retValue = 0; @@ -599,10 +599,10 @@ phy_RFSerialRead( */ static void phy_RFSerialWrite( - IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset, - IN u32 Data + PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset, + u32 Data ) { u32 DataAndAddr = 0; @@ -663,10 +663,10 @@ phy_RFSerialWrite( */ u32 rtl8188e_PHY_QueryRFReg( - IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 RegAddr, - IN u32 BitMask + PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 RegAddr, + u32 BitMask ) { u32 Original_Value, Readback_Value, BitShift; @@ -726,11 +726,11 @@ rtl8188e_PHY_QueryRFReg( */ void rtl8188e_PHY_SetRFReg( - IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 RegAddr, + u32 BitMask, + u32 Data ) { @@ -802,8 +802,8 @@ rtl8188e_PHY_SetRFReg( *---------------------------------------------------------------------------*/ static int phy_ConfigMACWithParaFile( - IN PADAPTER Adapter, - IN u8* pFileName + PADAPTER Adapter, + u8* pFileName ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -832,7 +832,7 @@ phy_ConfigMACWithParaFile( #ifndef CONFIG_PHY_SETTING_WITH_ODM static int phy_ConfigMACWithHeaderFile( - IN PADAPTER Adapter + PADAPTER Adapter ) { u32 i = 0; @@ -934,7 +934,7 @@ s32 PHY_MACConfig8188E(PADAPTER Adapter) */ static void phy_InitBBRFRegisterDefinition( - IN PADAPTER Adapter + PADAPTER Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1058,8 +1058,8 @@ phy_InitBBRFRegisterDefinition( *---------------------------------------------------------------------------*/ static int phy_ConfigBBWithParaFile( - IN PADAPTER Adapter, - IN u8* pFileName + PADAPTER Adapter, + u8* pFileName ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1076,7 +1076,7 @@ phy_ConfigBBWithParaFile( //**************************************** void phy_ConfigBBExternalPA( - IN PADAPTER Adapter + PADAPTER Adapter ) { #ifdef CONFIG_USB_HCI @@ -1110,8 +1110,8 @@ phy_ConfigBBExternalPA( #ifndef CONFIG_PHY_SETTING_WITH_ODM static int phy_ConfigBBWithHeaderFile( - IN PADAPTER Adapter, - IN u8 ConfigType + PADAPTER Adapter, + u8 ConfigType ) { int i; @@ -1240,10 +1240,10 @@ exit: void storePwrIndexDiffRateOffset( - IN PADAPTER Adapter, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + PADAPTER Adapter, + u32 RegAddr, + u32 BitMask, + u32 Data ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1370,8 +1370,8 @@ storePwrIndexDiffRateOffset( *---------------------------------------------------------------------------*/ static int phy_ConfigBBWithPgParaFile( - IN PADAPTER Adapter, - IN u8* pFileName) + PADAPTER Adapter, + u8* pFileName) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1401,8 +1401,8 @@ phy_ConfigBBWithPgParaFile( *---------------------------------------------------------------------------*/ static int phy_ConfigBBWithPgHeaderFile( - IN PADAPTER Adapter, - IN u8 ConfigType) + PADAPTER Adapter, + u8 ConfigType) { int i; u32* Rtl819XPHY_REGArray_Table_PG; @@ -1458,7 +1458,7 @@ phy_BB8192C_Config_1T( // Now it is just for 8256. static int phy_BB8190_Config_HardCode( - IN PADAPTER Adapter + PADAPTER Adapter ) { //RT_ASSERT(FALSE, ("This function is not implement yet!!\n")); @@ -1467,7 +1467,7 @@ phy_BB8190_Config_HardCode( static int phy_BB8188E_Config_ParaFile( - IN PADAPTER Adapter + PADAPTER Adapter ) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); @@ -1573,7 +1573,7 @@ phy_BB8190_Config_ParaFile_Fail: int PHY_BBConfig8188E( - IN PADAPTER Adapter + PADAPTER Adapter ) { int rtStatus = _SUCCESS; @@ -1632,7 +1632,7 @@ PHY_BBConfig8188E( int PHY_RFConfig8188E( - IN PADAPTER Adapter + PADAPTER Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1663,8 +1663,8 @@ PHY_RFConfig8188E( *---------------------------------------------------------------------------*/ int rtl8188e_PHY_ConfigRFWithParaFile( - IN PADAPTER Adapter, - IN u8* pFileName, + PADAPTER Adapter, + u8* pFileName, RF_RADIO_PATH_E eRFPath ) { @@ -1698,7 +1698,7 @@ u32 Rtl8192S_HighPower_RadioA_Array[HighPowerRadioAArrayLen] = { int PHY_ConfigRFExternalPA( - IN PADAPTER Adapter, + PADAPTER Adapter, RF_RADIO_PATH_E eRFPath ) { @@ -1734,7 +1734,7 @@ PHY_ConfigRFExternalPA( #ifndef CONFIG_PHY_SETTING_WITH_ODM int rtl8188e_PHY_ConfigRFWithHeaderFile( - IN PADAPTER Adapter, + PADAPTER Adapter, RF_RADIO_PATH_E eRFPath ) { @@ -1919,9 +1919,9 @@ exit: *---------------------------------------------------------------------------*/ int PHY_CheckBBAndRFOK( - IN PADAPTER Adapter, - IN HW90_BLOCK_E CheckBlock, - IN RF_RADIO_PATH_E eRFPath + PADAPTER Adapter, + HW90_BLOCK_E CheckBlock, + RF_RADIO_PATH_E eRFPath ) { int rtStatus = _SUCCESS; @@ -1994,7 +1994,7 @@ PHY_CheckBBAndRFOK( void rtl8192c_PHY_GetHWRegOriginalValue( - IN PADAPTER Adapter + PADAPTER Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2026,9 +2026,9 @@ rtl8192c_PHY_GetHWRegOriginalValue( // static u8 phy_DbmToTxPwrIdx( - IN PADAPTER Adapter, - IN WIRELESS_MODE WirelessMode, - IN int PowerInDbm + PADAPTER Adapter, + WIRELESS_MODE WirelessMode, + int PowerInDbm ) { u8 TxPwrIdx = 0; @@ -2082,9 +2082,9 @@ phy_DbmToTxPwrIdx( // int phy_TxPwrIdxToDbm( - IN PADAPTER Adapter, - IN WIRELESS_MODE WirelessMode, - IN u8 TxPwrIdx + PADAPTER Adapter, + WIRELESS_MODE WirelessMode, + u8 TxPwrIdx ) { int Offset = 0; @@ -2131,7 +2131,7 @@ phy_TxPwrIdxToDbm( *---------------------------------------------------------------------------*/ void PHY_GetTxPowerLevel8188E( - IN PADAPTER Adapter, + PADAPTER Adapter, OUT u32* powerlevel ) { @@ -2166,8 +2166,8 @@ PHY_GetTxPowerLevel8188E( } void getTxPowerIndex88E( - IN PADAPTER Adapter, - IN u8 channel, + PADAPTER Adapter, + u8 channel, IN OUT u8* cckPowerLevel, IN OUT u8* ofdmPowerLevel, IN OUT u8* BW20PowerLevel, @@ -2258,8 +2258,8 @@ void getTxPowerIndex88E( } void phy_PowerIndexCheck88E( - IN PADAPTER Adapter, - IN u8 channel, + PADAPTER Adapter, + u8 channel, IN OUT u8 * cckPowerLevel, IN OUT u8 * ofdmPowerLevel, IN OUT u8 * BW20PowerLevel, @@ -2294,8 +2294,8 @@ void phy_PowerIndexCheck88E( *---------------------------------------------------------------------------*/ void PHY_SetTxPowerLevel8188E( - IN PADAPTER Adapter, - IN u8 channel + PADAPTER Adapter, + u8 channel ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2336,8 +2336,8 @@ PHY_SetTxPowerLevel8188E( // bool PHY_UpdateTxPowerDbm8188E( - IN PADAPTER Adapter, - IN int powerInDbm + PADAPTER Adapter, + int powerInDbm ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2382,8 +2382,8 @@ PHY_UpdateTxPowerDbm8188E( void rtl8192c_PHY_SetBeaconHwReg( - IN PADAPTER Adapter, - IN u16 BeaconInterval + PADAPTER Adapter, + u16 BeaconInterval ) { @@ -2392,8 +2392,8 @@ rtl8192c_PHY_SetBeaconHwReg( void PHY_ScanOperationBackup8188E( - IN PADAPTER Adapter, - IN u8 Operation + PADAPTER Adapter, + u8 Operation ) { } @@ -2415,7 +2415,7 @@ PHY_ScanOperationBackup8188E( *---------------------------------------------------------------------------*/ static void _PHY_SetBWMode92C( - IN PADAPTER Adapter + PADAPTER Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2558,9 +2558,9 @@ _PHY_SetBWMode92C( *---------------------------------------------------------------------------*/ void PHY_SetBWMode8188E( - IN PADAPTER Adapter, - IN HT_CHANNEL_WIDTH Bandwidth, // 20M or 40M - IN unsigned char Offset // Upper, Lower, or Don't care + PADAPTER 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); @@ -2633,8 +2633,8 @@ static void _PHY_SwChnl8192C(PADAPTER Adapter, u8 channel) void PHY_SwChnl8188E( // Call after initialization - IN PADAPTER Adapter, - IN u8 channel + PADAPTER Adapter, + u8 channel ) { //PADAPTER Adapter = ADJUST_TO_ADAPTIVE_ADAPTER(pAdapter, _TRUE); @@ -2707,10 +2707,10 @@ PHY_SwChnl8188E( // Call after initialization static bool phy_SwChnlStepByStep( - IN PADAPTER Adapter, - IN u8 channel, - IN u8 *stage, - IN u8 *step, + PADAPTER Adapter, + u8 channel, + u8 *stage, + u8 *step, OUT u32 *delay ) { @@ -2748,8 +2748,8 @@ phy_SetSwChnlCmdArray( static void phy_FinishSwChnlNow( // We should not call this function directly - IN PADAPTER Adapter, - IN u8 channel + PADAPTER Adapter, + u8 channel ) { } @@ -2765,8 +2765,8 @@ phy_FinishSwChnlNow( // We should not call this function directly // void PHY_SwChnlPhy8192C( // Only called during initialize - IN PADAPTER Adapter, - IN u8 channel + PADAPTER Adapter, + u8 channel ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2811,8 +2811,8 @@ PHY_SwChnlPhy8192C( // Only called during initialize // void PHY_SetMonitorMode8192C( - IN PADAPTER pAdapter, - IN bool bEnableMonitorMode + PADAPTER pAdapter, + bool bEnableMonitorMode ) { } @@ -2837,8 +2837,8 @@ PHY_SetMonitorMode8192C( *---------------------------------------------------------------------------*/ bool PHY_CheckIsLegalRfPath8192C( - IN PADAPTER pAdapter, - IN u32 eRFPath) + PADAPTER pAdapter, + u32 eRFPath) { // HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); bool rtValue = _TRUE; @@ -2849,9 +2849,9 @@ PHY_CheckIsLegalRfPath8192C( } /* PHY_CheckIsLegalRfPath8192C */ static void _PHY_SetRFPathSwitch( - IN PADAPTER pAdapter, - IN bool bMain, - IN bool is2T + PADAPTER pAdapter, + bool bMain, + bool is2T ) { u8 u1bTmp; @@ -2885,8 +2885,8 @@ static void _PHY_SetRFPathSwitch( //return value TRUE => Main; FALSE => Aux static bool _PHY_QueryRFPathSwitch( - IN PADAPTER pAdapter, - IN bool is2T + PADAPTER pAdapter, + bool is2T ) { // if (is2T) @@ -2916,7 +2916,7 @@ static bool _PHY_QueryRFPathSwitch( static void -_PHY_DumpRFReg(IN PADAPTER pAdapter) +_PHY_DumpRFReg( PADAPTER pAdapter) { u32 rfRegValue,rfRegOffset; @@ -2943,7 +2943,7 @@ _PHY_DumpRFReg(IN PADAPTER pAdapter) // void DumpBBDbgPort_92CU( - IN PADAPTER Adapter + PADAPTER Adapter ) { diff --git a/hal/rtl8188e_rf6052.c b/hal/rtl8188e_rf6052.c index 2c07a56..71b6b0d 100644 --- 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 PADAPTER Adapter, - IN u16 DataRate) +void rtl8188e_RF_ChangeTxPath( PADAPTER 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 PADAPTER Adapter, *---------------------------------------------------------------------------*/ void rtl8188e_PHY_RF6052SetBandwidth( - IN PADAPTER Adapter, - IN HT_CHANNEL_WIDTH Bandwidth) //20M or 40M + PADAPTER Adapter, + HT_CHANNEL_WIDTH Bandwidth) //20M or 40M { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -159,8 +159,8 @@ rtl8188e_PHY_RF6052SetBandwidth( void rtl8188e_PHY_RF6052SetCckTxPower( - IN PADAPTER Adapter, - IN u8* pPowerlevel) + PADAPTER Adapter, + u8* pPowerlevel) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; @@ -283,11 +283,11 @@ rtl8188e_PHY_RF6052SetCckTxPower( // powerbase1 for HT MCS rates // void getPowerBase88E( - IN PADAPTER Adapter, - IN u8* pPowerLevelOFDM, - IN u8* pPowerLevelBW20, - IN u8* pPowerLevelBW40, - IN u8 Channel, + PADAPTER Adapter, + u8* pPowerLevelOFDM, + u8* pPowerLevelBW20, + u8* pPowerLevelBW40, + u8 Channel, IN OUT u32* OfdmBase, IN OUT u32* MCSBase ) @@ -326,12 +326,12 @@ void getPowerBase88E( } void getTxPowerWriteValByRegulatory88E( - IN PADAPTER Adapter, - IN u8 Channel, - IN u8 index, - IN u32* powerBase0, - IN u32* powerBase1, - OUT u32* pOutWriteVal + PADAPTER Adapter, + u8 Channel, + u8 index, + u32* powerBase0, + u32* powerBase1, + u32* pOutWriteVal ) { @@ -496,9 +496,9 @@ void getTxPowerWriteValByRegulatory88E( } static void writeOFDMPowerReg88E( - IN PADAPTER Adapter, - IN u8 index, - IN u32* pValue + PADAPTER Adapter, + u8 index, + u32* pValue ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -580,11 +580,11 @@ static void writeOFDMPowerReg88E( void rtl8188e_PHY_RF6052SetOFDMTxPower( - IN PADAPTER Adapter, - IN u8* pPowerLevelOFDM, - IN u8* pPowerLevelBW20, - IN u8* pPowerLevelBW40, - IN u8 Channel) + PADAPTER 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; @@ -625,7 +625,7 @@ rtl8188e_PHY_RF6052SetOFDMTxPower( static void phy_RF6052_Config_HardCode( - IN PADAPTER Adapter + PADAPTER Adapter ) { @@ -638,7 +638,7 @@ phy_RF6052_Config_HardCode( static int phy_RF6052_Config_ParaFile( - IN PADAPTER Adapter + PADAPTER Adapter ) { u32 u4RegValue; @@ -758,7 +758,7 @@ phy_RF6052_Config_ParaFile_Fail: int PHY_RF6052_Config8188E( - IN PADAPTER Adapter) + PADAPTER Adapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); int rtStatus = _SUCCESS; @@ -810,9 +810,9 @@ PHY_RF6052_Config8188E( *---------------------------------------------------------------------------*/ u32 PHY_RFShadowRead( - IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset) + PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset) { return RF_Shadow[eRFPath][Offset].Value; @@ -821,10 +821,10 @@ PHY_RFShadowRead( void PHY_RFShadowWrite( - IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset, - IN u32 Data) + PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset, + u32 Data) { RF_Shadow[eRFPath][Offset].Value = (Data & bRFRegOffsetMask); RF_Shadow[eRFPath][Offset].Driver_Write = _TRUE; @@ -834,9 +834,9 @@ PHY_RFShadowWrite( bool PHY_RFShadowCompare( - IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset) + PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset) { u32 reg; // Check if we need to check the register @@ -860,9 +860,9 @@ PHY_RFShadowCompare( void PHY_RFShadowRecorver( - IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset) + PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset) { // Check if the address is error if (RF_Shadow[eRFPath][Offset].ErrorOrNot == _TRUE) @@ -883,7 +883,7 @@ PHY_RFShadowRecorver( void PHY_RFShadowCompareAll( - IN PADAPTER Adapter) + PADAPTER Adapter) { u32 eRFPath; u32 Offset; @@ -901,7 +901,7 @@ PHY_RFShadowCompareAll( void PHY_RFShadowRecorverAll( - IN PADAPTER Adapter) + PADAPTER Adapter) { u32 eRFPath; u32 Offset; @@ -919,10 +919,10 @@ PHY_RFShadowRecorverAll( void PHY_RFShadowCompareFlagSet( - IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset, - IN u8 Type) + PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset, + u8 Type) { // Set True or False!!! RF_Shadow[eRFPath][Offset].Compare = Type; @@ -932,10 +932,10 @@ PHY_RFShadowCompareFlagSet( void PHY_RFShadowRecorverFlagSet( - IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 Offset, - IN u8 Type) + PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 Offset, + u8 Type) { // Set True or False!!! RF_Shadow[eRFPath][Offset].Recorver= Type; @@ -945,7 +945,7 @@ PHY_RFShadowRecorverFlagSet( void PHY_RFShadowCompareFlagSetAll( - IN PADAPTER Adapter) + PADAPTER Adapter) { u32 eRFPath; u32 Offset; @@ -967,7 +967,7 @@ PHY_RFShadowCompareFlagSetAll( void PHY_RFShadowRecorverFlagSetAll( - IN PADAPTER Adapter) + PADAPTER Adapter) { u32 eRFPath; u32 Offset; @@ -988,7 +988,7 @@ PHY_RFShadowRecorverFlagSetAll( void PHY_RFShadowRefresh( - IN PADAPTER Adapter) + PADAPTER Adapter) { u32 eRFPath; u32 Offset; diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index 1b58a8d..39a6893 100644 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -65,8 +65,8 @@ static void _ConfigNormalChipOutEP_8188E( - IN PADAPTER pAdapter, - IN u8 NumOutPipe + PADAPTER pAdapter, + u8 NumOutPipe ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -93,9 +93,9 @@ _ConfigNormalChipOutEP_8188E( } static bool HalUsbSetQueuePipeMapping8188EUsb( - IN PADAPTER pAdapter, - IN u8 NumInPipe, - IN u8 NumOutPipe + PADAPTER pAdapter, + u8 NumInPipe, + u8 NumOutPipe ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -460,13 +460,13 @@ _InitPageBoundary( static void _InitNormalChipRegPriority( - IN PADAPTER Adapter, - IN u16 beQ, - IN u16 bkQ, - IN u16 viQ, - IN u16 voQ, - IN u16 mgtQ, - IN u16 hiQ + PADAPTER Adapter, + u16 beQ, + u16 bkQ, + u16 viQ, + u16 voQ, + u16 mgtQ, + u16 hiQ ) { u16 value16 = (rtw_read16(Adapter, REG_TRXDMA_CTRL) & 0x7); @@ -480,7 +480,7 @@ _InitNormalChipRegPriority( static void _InitNormalChipOneOutEpPriority( - IN PADAPTER Adapter + PADAPTER Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -515,7 +515,7 @@ _InitNormalChipOneOutEpPriority( static void _InitNormalChipTwoOutEpPriority( - IN PADAPTER Adapter + PADAPTER Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -568,7 +568,7 @@ _InitNormalChipTwoOutEpPriority( static void _InitNormalChipThreeOutEpPriority( - IN PADAPTER Adapter + PADAPTER Adapter ) { struct registry_priv *pregistrypriv = &Adapter->registrypriv; @@ -595,7 +595,7 @@ _InitNormalChipThreeOutEpPriority( static void _InitQueuePriority( - IN PADAPTER Adapter + PADAPTER Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -661,7 +661,7 @@ _InitTransferPageSize( static void _InitDriverInfoSize( IN PADAPTER Adapter, - IN u8 drvInfoSize + u8 drvInfoSize ) { rtw_write8(Adapter,REG_RX_DRVINFO_SZ, drvInfoSize); @@ -778,7 +778,7 @@ _InitEDCA( static void _InitBeaconMaxError( IN PADAPTER Adapter, - IN bool InfraMode + bool InfraMode ) { @@ -802,7 +802,7 @@ static void _InitHWLed(PADAPTER Adapter) static void _InitRDGSetting( - IN PADAPTER Adapter + PADAPTER Adapter ) { rtw_write8(Adapter,REG_RD_CTRL,0xFF); @@ -812,7 +812,7 @@ _InitRDGSetting( static void _InitRxSetting( - IN PADAPTER Adapter + PADAPTER Adapter ) { rtw_write32(Adapter, REG_MACID, 0x87654321); @@ -851,7 +851,7 @@ _InitRetryFunction( *---------------------------------------------------------------------------*/ static void usb_AggSettingTxUpdate( - IN PADAPTER Adapter + PADAPTER Adapter ) { #ifdef CONFIG_USB_TX_AGGREGATION @@ -891,7 +891,7 @@ usb_AggSettingTxUpdate( *---------------------------------------------------------------------------*/ static void usb_AggSettingRxUpdate( - IN PADAPTER Adapter + PADAPTER Adapter ) { #ifdef CONFIG_USB_RX_AGGREGATION @@ -1020,14 +1020,14 @@ HalRxAggr8188EUsb( *---------------------------------------------------------------------------*/ void USB_AggModeSwitch( - IN PADAPTER Adapter + PADAPTER Adapter ) { } // USB_AggModeSwitch static void _InitOperationMode( - IN PADAPTER Adapter + PADAPTER Adapter ) { } @@ -1060,7 +1060,7 @@ _InitBeaconParameters( static void _InitRFType( - IN PADAPTER Adapter + PADAPTER Adapter ) { struct registry_priv *pregpriv = &Adapter->registrypriv; @@ -1090,9 +1090,9 @@ _InitRFType( static void _BeaconFunctionEnable( - IN PADAPTER Adapter, - IN bool Enable, - IN bool Linked + PADAPTER Adapter, + bool Enable, + bool Linked ) { rtw_write8(Adapter, REG_BCN_CTRL, (BIT4 | BIT3 | BIT1)); @@ -1105,7 +1105,7 @@ _BeaconFunctionEnable( // Set CCK and OFDM Block "ON" static void _BBTurnOnBlock( - IN PADAPTER Adapter + PADAPTER Adapter ) { #if (DISABLE_BB_RF) @@ -1117,7 +1117,7 @@ static void _BBTurnOnBlock( } static void _RfPowerSave( - IN PADAPTER Adapter + PADAPTER Adapter ) { } @@ -1128,7 +1128,7 @@ enum { }; static void -_InitAntenna_Selection(IN PADAPTER Adapter) +_InitAntenna_Selection( PADAPTER Adapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1177,8 +1177,8 @@ HalDetectSelectiveSuspendMode( *---------------------------------------------------------------------------*/ static void HwSuspendModeEnable_88eu( - IN PADAPTER pAdapter, - IN u8 Type + PADAPTER pAdapter, + u8 Type ) { //PRT_USB_DEVICE pDevice = GET_RT_USB_DEVICE(pAdapter); @@ -1217,7 +1217,7 @@ HwSuspendModeEnable_88eu( } } // HwSuspendModeEnable92Cu -rt_rf_power_state RfOnOffDetect(IN PADAPTER pAdapter ) +rt_rf_power_state RfOnOffDetect( PADAPTER pAdapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); u8 val8; @@ -1749,7 +1749,7 @@ void _ps_close_RF(_adapter *padapter){ void CardDisableRTL8188EU( - IN PADAPTER Adapter + PADAPTER Adapter ) { // PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); @@ -1941,9 +1941,9 @@ static void _ReadIDs(PADAPTER Adapter, u8 *PROMContent, bool AutoloadFail) static void _ReadBoardType( - IN PADAPTER Adapter, - IN u8* PROMContent, - IN bool AutoloadFail + PADAPTER Adapter, + u8* PROMContent, + bool AutoloadFail ) { @@ -1952,9 +1952,9 @@ _ReadBoardType( static void _ReadLEDSetting( - IN PADAPTER Adapter, - IN u8* PROMContent, - IN bool AutoloadFail + PADAPTER Adapter, + u8* PROMContent, + bool AutoloadFail ) { struct led_priv *pledpriv = &(Adapter->ledpriv); @@ -1976,36 +1976,36 @@ _ReadLEDSetting( static void _ReadThermalMeter( - IN PADAPTER Adapter, - IN u8* PROMContent, - IN bool AutoloadFail + PADAPTER Adapter, + u8* PROMContent, + bool AutoloadFail ) { } static void _ReadRFSetting( - IN PADAPTER Adapter, - IN u8* PROMContent, - IN bool AutoloadFail + PADAPTER Adapter, + u8* PROMContent, + bool AutoloadFail ) { } static void _ReadPROMVersion( - IN PADAPTER Adapter, - IN u8* PROMContent, - IN bool AutoloadFail + PADAPTER Adapter, + u8* PROMContent, + bool AutoloadFail ) { } static void readAntennaDiversity( - IN PADAPTER pAdapter, - IN u8 *hwinfo, - IN bool AutoLoadFail + PADAPTER pAdapter, + u8 *hwinfo, + bool AutoLoadFail ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -2016,16 +2016,16 @@ readAntennaDiversity( static void hal_InitPGData( - IN PADAPTER pAdapter, - IN OUT u8 *PROMContent + PADAPTER pAdapter, + u8 *PROMContent ) { } static void Hal_EfuseParsePIDVID_8188EU( - IN PADAPTER pAdapter, - IN u8* hwinfo, - IN bool AutoLoadFail + PADAPTER pAdapter, + u8* hwinfo, + bool AutoLoadFail ) { @@ -2059,9 +2059,9 @@ Hal_EfuseParsePIDVID_8188EU( static void Hal_EfuseParseMACAddr_8188EU( - IN PADAPTER padapter, - IN u8* hwinfo, - IN bool AutoLoadFail + PADAPTER padapter, + u8* hwinfo, + bool AutoLoadFail ) { u16 i, usValue; @@ -2092,7 +2092,7 @@ Hal_EfuseParseMACAddr_8188EU( static void Hal_CustomizeByCustomerID_8188EU( - IN PADAPTER padapter + PADAPTER padapter ) { } @@ -2217,7 +2217,7 @@ Hal_ReadMACAddrFromFile_8188EU( static void readAdapterInfo_8188EU( - IN PADAPTER padapter + PADAPTER padapter ) { #if 1 @@ -2299,7 +2299,7 @@ static void _ReadPROMContent( static void _ReadRFType( - IN PADAPTER Adapter + PADAPTER Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -3893,9 +3893,9 @@ _func_exit_; // u8 GetHalDefVar8188EUsb( - IN PADAPTER Adapter, - IN HAL_DEF_VARIABLE eVariable, - IN void * pValue + PADAPTER Adapter, + HAL_DEF_VARIABLE eVariable, + void * pValue ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -4028,9 +4028,9 @@ GetHalDefVar8188EUsb( // u8 SetHalDefVar8188EUsb( - IN PADAPTER Adapter, - IN HAL_DEF_VARIABLE eVariable, - IN void * pValue + PADAPTER 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 0ef3faf..4b94b9f 100644 --- a/include/Hal8188EPhyCfg.h +++ b/include/Hal8188EPhyCfg.h @@ -214,128 +214,128 @@ typedef struct _R_ANTENNA_SELECT_CCK{ // // BB and RF register read/write // -u32 rtl8188e_PHY_QueryBBReg( IN PADAPTER Adapter, - IN u32 RegAddr, - IN u32 BitMask ); -void rtl8188e_PHY_SetBBReg( IN PADAPTER Adapter, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data ); -u32 rtl8188e_PHY_QueryRFReg( IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 RegAddr, - IN u32 BitMask ); -void rtl8188e_PHY_SetRFReg( IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data ); +u32 rtl8188e_PHY_QueryBBReg( PADAPTER Adapter, + u32 RegAddr, + u32 BitMask ); +void rtl8188e_PHY_SetBBReg( PADAPTER Adapter, + u32 RegAddr, + u32 BitMask, + u32 Data ); +u32 rtl8188e_PHY_QueryRFReg( PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 RegAddr, + u32 BitMask ); +void rtl8188e_PHY_SetRFReg( PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 RegAddr, + u32 BitMask, + u32 Data ); // // Initialization related function // /* MAC/BB/RF HAL config */ -int PHY_MACConfig8188E(IN PADAPTER Adapter ); -int PHY_BBConfig8188E(IN PADAPTER Adapter ); -int PHY_RFConfig8188E(IN PADAPTER Adapter ); +int PHY_MACConfig8188E( PADAPTER Adapter ); +int PHY_BBConfig8188E( PADAPTER Adapter ); +int PHY_RFConfig8188E( PADAPTER Adapter ); /* RF config */ int rtl8188e_PHY_ConfigRFWithParaFile(IN PADAPTER Adapter, IN u8 * pFileName, RF_RADIO_PATH_E eRFPath); -int rtl8188e_PHY_ConfigRFWithHeaderFile( IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath); +int rtl8188e_PHY_ConfigRFWithHeaderFile( PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath); /* Read initi reg value for tx power setting. */ -void rtl8192c_PHY_GetHWRegOriginalValue( IN PADAPTER Adapter ); +void rtl8192c_PHY_GetHWRegOriginalValue( PADAPTER Adapter ); // // RF Power setting // -//extern bool PHY_SetRFPowerState(IN PADAPTER Adapter, -// IN RT_RF_POWER_STATE eRFPowerState); +//extern bool PHY_SetRFPowerState( PADAPTER Adapter, +// RT_RF_POWER_STATE eRFPowerState); // // BB TX Power R/W // -void PHY_GetTxPowerLevel8188E( IN PADAPTER Adapter, +void PHY_GetTxPowerLevel8188E( PADAPTER Adapter, OUT u32* powerlevel ); -void PHY_SetTxPowerLevel8188E( IN PADAPTER Adapter, - IN u8 channel ); -bool PHY_UpdateTxPowerDbm8188E( IN PADAPTER Adapter, - IN int powerInDbm ); +void PHY_SetTxPowerLevel8188E( PADAPTER Adapter, + u8 channel ); +bool PHY_UpdateTxPowerDbm8188E( PADAPTER Adapter, + int powerInDbm ); // void -PHY_ScanOperationBackup8188E(IN PADAPTER Adapter, - IN u8 Operation ); +PHY_ScanOperationBackup8188E( PADAPTER Adapter, + u8 Operation ); // // Switch bandwidth for 8192S // -//extern void PHY_SetBWModeCallback8192C( IN PRT_TIMER pTimer ); -void PHY_SetBWMode8188E( IN PADAPTER pAdapter, - IN HT_CHANNEL_WIDTH ChnlWidth, - IN unsigned char Offset ); +//extern void PHY_SetBWModeCallback8192C( PRT_TIMER pTimer ); +void PHY_SetBWMode8188E( PADAPTER pAdapter, + HT_CHANNEL_WIDTH ChnlWidth, + unsigned char Offset ); // // Set FW CMD IO for 8192S. // -//extern bool HalSetIO8192C( IN PADAPTER Adapter, -// IN IO_TYPE IOType); +//extern bool HalSetIO8192C( PADAPTER Adapter, +// IO_TYPE IOType); // // Set A2 entry to fw for 8192S // -extern void FillA2Entry8192C( IN PADAPTER Adapter, - IN u8 index, - IN u8* val); +extern void FillA2Entry8192C( PADAPTER Adapter, + u8 index, + u8* val); // // channel switch related funciton // -//extern void PHY_SwChnlCallback8192C( IN PRT_TIMER pTimer ); -void PHY_SwChnl8188E( IN PADAPTER pAdapter, - IN u8 channel ); +//extern void PHY_SwChnlCallback8192C( PRT_TIMER pTimer ); +void PHY_SwChnl8188E( PADAPTER pAdapter, + u8 channel ); // Call after initialization -void PHY_SwChnlPhy8192C( IN PADAPTER pAdapter, - IN u8 channel ); +void PHY_SwChnlPhy8192C( PADAPTER pAdapter, + u8 channel ); -void ChkFwCmdIoDone( IN PADAPTER Adapter); +void ChkFwCmdIoDone( PADAPTER Adapter); // // BB/MAC/RF other monitor API // -void PHY_SetMonitorMode8192C(IN PADAPTER pAdapter, - IN bool bEnableMonitorMode ); +void PHY_SetMonitorMode8192C( PADAPTER pAdapter, + bool bEnableMonitorMode ); -bool PHY_CheckIsLegalRfPath8192C(IN PADAPTER pAdapter, - IN u32 eRFPath ); +bool PHY_CheckIsLegalRfPath8192C( PADAPTER pAdapter, + u32 eRFPath ); -void PHY_SetRFPathSwitch_8188E(IN PADAPTER pAdapter, IN bool bMain); +void PHY_SetRFPathSwitch_8188E( PADAPTER pAdapter, bool bMain); extern void PHY_SwitchEphyParameter( - IN PADAPTER Adapter + PADAPTER Adapter ); extern void PHY_EnableHostClkReq( - IN PADAPTER Adapter + PADAPTER Adapter ); bool SetAntennaConfig92C( - IN PADAPTER Adapter, - IN u8 DefaultAnt + PADAPTER Adapter, + u8 DefaultAnt ); #ifdef CONFIG_PHY_SETTING_WITH_ODM void storePwrIndexDiffRateOffset( - IN PADAPTER Adapter, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data + PADAPTER Adapter, + u32 RegAddr, + u32 BitMask, + u32 Data ); #endif //CONFIG_PHY_SETTING_WITH_ODM /*--------------------------Exported Function prototype---------------------*/ diff --git a/include/Hal8188ERateAdaptive.h b/include/Hal8188ERateAdaptive.h index b8c9cf1..6c1e34e 100644 --- a/include/Hal8188ERateAdaptive.h +++ b/include/Hal8188ERateAdaptive.h @@ -42,7 +42,7 @@ Major Change History: void ODM_RASupport_Init( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); int @@ -52,26 +52,26 @@ ODM_RAInfo_Init_all( int ODM_RAInfo_Init( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacID + PDM_ODM_T pDM_Odm, + u1Byte MacID ); u1Byte ODM_RA_GetShortGI_8188E( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacID + PDM_ODM_T pDM_Odm, + u1Byte MacID ); u1Byte ODM_RA_GetDecisionRate_8188E( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacID + PDM_ODM_T pDM_Odm, + u1Byte MacID ); u1Byte ODM_RA_GetHwPwrStatus_8188E( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacID + PDM_ODM_T pDM_Odm, + u1Byte MacID ); void ODM_RA_UpdateRateInfo_8188E( @@ -84,24 +84,24 @@ ODM_RA_UpdateRateInfo_8188E( void ODM_RA_SetRSSI_8188E( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacID, - IN u1Byte Rssi + PDM_ODM_T pDM_Odm, + u1Byte MacID, + u1Byte Rssi ); void ODM_RA_TxRPT2Handle_8188E( - IN PDM_ODM_T pDM_Odm, - IN pu1Byte TxRPT_Buf, - IN u2Byte TxRPT_Len, - IN u4Byte MacIDValidEntry0, - IN u4Byte MacIDValidEntry1 + PDM_ODM_T pDM_Odm, + pu1Byte TxRPT_Buf, + u2Byte TxRPT_Len, + u4Byte MacIDValidEntry0, + u4Byte MacIDValidEntry1 ); void ODM_RA_Set_TxRPT_Time( - IN PDM_ODM_T pDM_Odm, - IN u2Byte minRptTime + PDM_ODM_T pDM_Odm, + u2Byte minRptTime ); #endif diff --git a/include/Hal8192CPhyCfg.h b/include/Hal8192CPhyCfg.h index 90e530a..f961a56 100644 --- a/include/Hal8192CPhyCfg.h +++ b/include/Hal8192CPhyCfg.h @@ -250,133 +250,133 @@ typedef struct _R_ANTENNA_SELECT_CCK{ // // BB and RF register read/write // -u32 rtl8192c_PHY_QueryBBReg( IN PADAPTER Adapter, - IN u32 RegAddr, - IN u32 BitMask ); -void rtl8192c_PHY_SetBBReg( IN PADAPTER Adapter, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data ); -u32 rtl8192c_PHY_QueryRFReg( IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 RegAddr, - IN u32 BitMask ); -void rtl8192c_PHY_SetRFReg( IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data ); +u32 rtl8192c_PHY_QueryBBReg( PADAPTER Adapter, + u32 RegAddr, + u32 BitMask ); +void rtl8192c_PHY_SetBBReg( PADAPTER Adapter, + u32 RegAddr, + u32 BitMask, + u32 Data ); +u32 rtl8192c_PHY_QueryRFReg( PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 RegAddr, + u32 BitMask ); +void rtl8192c_PHY_SetRFReg( PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 RegAddr, + u32 BitMask, + u32 Data ); // // Initialization related function // /* MAC/BB/RF HAL config */ -int PHY_MACConfig8192C( IN PADAPTER Adapter ); -int PHY_BBConfig8192C( IN PADAPTER Adapter ); -int PHY_RFConfig8192C( IN PADAPTER Adapter ); +int PHY_MACConfig8192C( PADAPTER Adapter ); +int PHY_BBConfig8192C( PADAPTER Adapter ); +int PHY_RFConfig8192C( PADAPTER Adapter ); /* RF config */ -int rtl8192c_PHY_ConfigRFWithParaFile( IN PADAPTER Adapter, - IN u8* pFileName, - IN RF_RADIO_PATH_E eRFPath); -int rtl8192c_PHY_ConfigRFWithHeaderFile( IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath); +int rtl8192c_PHY_ConfigRFWithParaFile( PADAPTER Adapter, + u8* pFileName, + RF_RADIO_PATH_E eRFPath); +int rtl8192c_PHY_ConfigRFWithHeaderFile( PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath); /* BB/RF readback check for making sure init OK */ -int rtl8192c_PHY_CheckBBAndRFOK( IN PADAPTER Adapter, - IN HW90_BLOCK_E CheckBlock, - IN RF_RADIO_PATH_E eRFPath ); +int rtl8192c_PHY_CheckBBAndRFOK( PADAPTER Adapter, + HW90_BLOCK_E CheckBlock, + RF_RADIO_PATH_E eRFPath ); /* Read initi reg value for tx power setting. */ -void rtl8192c_PHY_GetHWRegOriginalValue( IN PADAPTER Adapter ); +void rtl8192c_PHY_GetHWRegOriginalValue( PADAPTER Adapter ); // // RF Power setting // -//extern bool PHY_SetRFPowerState(IN PADAPTER Adapter, -// IN RT_RF_POWER_STATE eRFPowerState); +//extern bool PHY_SetRFPowerState( PADAPTER Adapter, +// RT_RF_POWER_STATE eRFPowerState); // // BB TX Power R/W // -void PHY_GetTxPowerLevel8192C( IN PADAPTER Adapter, +void PHY_GetTxPowerLevel8192C( PADAPTER Adapter, OUT u32* powerlevel ); -void PHY_SetTxPowerLevel8192C( IN PADAPTER Adapter, - IN u8 channel ); -bool PHY_UpdateTxPowerDbm8192C( IN PADAPTER Adapter, - IN int powerInDbm ); +void PHY_SetTxPowerLevel8192C( PADAPTER Adapter, + u8 channel ); +bool PHY_UpdateTxPowerDbm8192C( PADAPTER Adapter, + int powerInDbm ); // void -PHY_ScanOperationBackup8192C(IN PADAPTER Adapter, - IN u8 Operation ); +PHY_ScanOperationBackup8192C( PADAPTER Adapter, + u8 Operation ); // // Switch bandwidth for 8192S // -//extern void PHY_SetBWModeCallback8192C( IN PRT_TIMER pTimer ); -void PHY_SetBWMode8192C( IN PADAPTER pAdapter, - IN HT_CHANNEL_WIDTH ChnlWidth, - IN unsigned char Offset ); +//extern void PHY_SetBWModeCallback8192C( PRT_TIMER pTimer ); +void PHY_SetBWMode8192C( PADAPTER pAdapter, + HT_CHANNEL_WIDTH ChnlWidth, + unsigned char Offset ); // // Set FW CMD IO for 8192S. // -//extern bool HalSetIO8192C( IN PADAPTER Adapter, -// IN IO_TYPE IOType); +//extern bool HalSetIO8192C( PADAPTER Adapter, +// IO_TYPE IOType); // // Set A2 entry to fw for 8192S // -extern void FillA2Entry8192C( IN PADAPTER Adapter, - IN u8 index, - IN u8* val); +extern void FillA2Entry8192C( PADAPTER Adapter, + u8 index, + u8* val); // // channel switch related funciton // -//extern void PHY_SwChnlCallback8192C( IN PRT_TIMER pTimer ); -void PHY_SwChnl8192C( IN PADAPTER pAdapter, - IN u8 channel ); +//extern void PHY_SwChnlCallback8192C( PRT_TIMER pTimer ); +void PHY_SwChnl8192C( PADAPTER pAdapter, + u8 channel ); // Call after initialization -void PHY_SwChnlPhy8192C( IN PADAPTER pAdapter, - IN u8 channel ); +void PHY_SwChnlPhy8192C( PADAPTER pAdapter, + u8 channel ); -void ChkFwCmdIoDone( IN PADAPTER Adapter); +void ChkFwCmdIoDone( PADAPTER Adapter); // // BB/MAC/RF other monitor API // -void PHY_SetMonitorMode8192C(IN PADAPTER pAdapter, - IN bool bEnableMonitorMode ); +void PHY_SetMonitorMode8192C( PADAPTER pAdapter, + bool bEnableMonitorMode ); -bool PHY_CheckIsLegalRfPath8192C(IN PADAPTER pAdapter, - IN u32 eRFPath ); +bool PHY_CheckIsLegalRfPath8192C( PADAPTER pAdapter, + u32 eRFPath ); -void rtl8192c_PHY_SetRFPathSwitch(IN PADAPTER pAdapter, IN bool bMain); +void rtl8192c_PHY_SetRFPathSwitch( PADAPTER pAdapter, bool bMain); // // Modify the value of the hw register when beacon interval be changed. // void -rtl8192c_PHY_SetBeaconHwReg( IN PADAPTER Adapter, - IN u16 BeaconInterval ); +rtl8192c_PHY_SetBeaconHwReg( PADAPTER Adapter, + u16 BeaconInterval ); extern void PHY_SwitchEphyParameter( - IN PADAPTER Adapter + PADAPTER Adapter ); extern void PHY_EnableHostClkReq( - IN PADAPTER Adapter + PADAPTER Adapter ); bool SetAntennaConfig92C( - IN PADAPTER Adapter, - IN u8 DefaultAnt + PADAPTER Adapter, + u8 DefaultAnt ); #ifdef RTL8192C_RECONFIG_TO_1T1R diff --git a/include/Hal8192DPhyCfg.h b/include/Hal8192DPhyCfg.h index e59c438..d6c8acc 100644 --- a/include/Hal8192DPhyCfg.h +++ b/include/Hal8192DPhyCfg.h @@ -299,136 +299,136 @@ typedef struct _R_ANTENNA_SELECT_CCK{ // // BB and RF register read/write // -void rtl8192d_PHY_SetBBReg1Byte( IN PADAPTER Adapter, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data ); -u32 rtl8192d_PHY_QueryBBReg( IN PADAPTER Adapter, - IN u32 RegAddr, - IN u32 BitMask ); -void rtl8192d_PHY_SetBBReg( IN PADAPTER Adapter, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data ); -u32 rtl8192d_PHY_QueryRFReg( IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 RegAddr, - IN u32 BitMask ); -void rtl8192d_PHY_SetRFReg( IN PADAPTER Adapter, - IN RF_RADIO_PATH_E eRFPath, - IN u32 RegAddr, - IN u32 BitMask, - IN u32 Data ); +void rtl8192d_PHY_SetBBReg1Byte( PADAPTER Adapter, + u32 RegAddr, + u32 BitMask, + u32 Data ); +u32 rtl8192d_PHY_QueryBBReg( PADAPTER Adapter, + u32 RegAddr, + u32 BitMask ); +void rtl8192d_PHY_SetBBReg( PADAPTER Adapter, + u32 RegAddr, + u32 BitMask, + u32 Data ); +u32 rtl8192d_PHY_QueryRFReg( PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 RegAddr, + u32 BitMask ); +void rtl8192d_PHY_SetRFReg( PADAPTER Adapter, + RF_RADIO_PATH_E eRFPath, + u32 RegAddr, + u32 BitMask, + u32 Data ); // // Initialization related function // /* MAC/BB/RF HAL config */ -extern int PHY_MACConfig8192D( IN PADAPTER Adapter ); -extern int PHY_BBConfig8192D( IN PADAPTER Adapter ); -extern int PHY_RFConfig8192D( IN PADAPTER Adapter ); +extern int PHY_MACConfig8192D( PADAPTER Adapter ); +extern int PHY_BBConfig8192D( PADAPTER Adapter ); +extern int PHY_RFConfig8192D( PADAPTER Adapter ); /* RF config */ -int rtl8192d_PHY_ConfigRFWithParaFile( IN PADAPTER Adapter, - IN u8* pFileName, - IN RF_RADIO_PATH_E eRFPath); -int rtl8192d_PHY_ConfigRFWithHeaderFile( IN PADAPTER Adapter, - IN RF_CONTENT Content, - IN RF_RADIO_PATH_E eRFPath); +int rtl8192d_PHY_ConfigRFWithParaFile( PADAPTER Adapter, + u8* pFileName, + RF_RADIO_PATH_E eRFPath); +int rtl8192d_PHY_ConfigRFWithHeaderFile( PADAPTER Adapter, + RF_CONTENT Content, + RF_RADIO_PATH_E eRFPath); /* BB/RF readback check for making sure init OK */ -int rtl8192d_PHY_CheckBBAndRFOK( IN PADAPTER Adapter, - IN HW90_BLOCK_E CheckBlock, - IN RF_RADIO_PATH_E eRFPath ); +int rtl8192d_PHY_CheckBBAndRFOK( PADAPTER Adapter, + HW90_BLOCK_E CheckBlock, + RF_RADIO_PATH_E eRFPath ); /* Read initi reg value for tx power setting. */ -void rtl8192d_PHY_GetHWRegOriginalValue( IN PADAPTER Adapter ); +void rtl8192d_PHY_GetHWRegOriginalValue( PADAPTER Adapter ); // // RF Power setting // -//extern bool PHY_SetRFPowerState(IN PADAPTER Adapter, -// IN RT_RF_POWER_STATE eRFPowerState); +//extern bool PHY_SetRFPowerState( PADAPTER Adapter, +// RT_RF_POWER_STATE eRFPowerState); // // BB TX Power R/W // -void PHY_GetTxPowerLevel8192D( IN PADAPTER Adapter, +void PHY_GetTxPowerLevel8192D( PADAPTER Adapter, OUT u32* powerlevel ); -void PHY_SetTxPowerLevel8192D( IN PADAPTER Adapter, - IN u8 channel ); -bool PHY_UpdateTxPowerDbm8192D( IN PADAPTER Adapter, - IN int powerInDbm ); +void PHY_SetTxPowerLevel8192D( PADAPTER Adapter, + u8 channel ); +bool PHY_UpdateTxPowerDbm8192D( PADAPTER Adapter, + int powerInDbm ); // void -PHY_ScanOperationBackup8192D(IN PADAPTER Adapter, - IN u8 Operation ); +PHY_ScanOperationBackup8192D( PADAPTER Adapter, + u8 Operation ); // // Switch bandwidth for 8192S // -//void PHY_SetBWModeCallback8192C( IN PRT_TIMER pTimer ); -void PHY_SetBWMode8192D( IN PADAPTER pAdapter, - IN HT_CHANNEL_WIDTH ChnlWidth, - IN unsigned char Offset ); +//void PHY_SetBWModeCallback8192C( PRT_TIMER pTimer ); +void PHY_SetBWMode8192D( PADAPTER pAdapter, + HT_CHANNEL_WIDTH ChnlWidth, + unsigned char Offset ); // // Set FW CMD IO for 8192S. // -//extern bool HalSetIO8192C( IN PADAPTER Adapter, -// IN IO_TYPE IOType); +//extern bool HalSetIO8192C( PADAPTER Adapter, +// IO_TYPE IOType); // // Set A2 entry to fw for 8192S // -extern void FillA2Entry8192C( IN PADAPTER Adapter, - IN u8 index, - IN u8* val); +extern void FillA2Entry8192C( PADAPTER Adapter, + u8 index, + u8* val); // // channel switch related funciton // -//extern void PHY_SwChnlCallback8192C( IN PRT_TIMER pTimer ); -void PHY_SwChnl8192D( IN PADAPTER pAdapter, - IN u8 channel ); +//extern void PHY_SwChnlCallback8192C( PRT_TIMER pTimer ); +void PHY_SwChnl8192D( PADAPTER pAdapter, + u8 channel ); // Call after initialization -void PHY_SwChnlPhy8192D( IN PADAPTER pAdapter, - IN u8 channel ); +void PHY_SwChnlPhy8192D( PADAPTER pAdapter, + u8 channel ); -extern void ChkFwCmdIoDone( IN PADAPTER Adapter); +extern void ChkFwCmdIoDone( PADAPTER Adapter); // // BB/MAC/RF other monitor API // -void PHY_SetMonitorMode8192D(IN PADAPTER pAdapter, - IN bool bEnableMonitorMode ); +void PHY_SetMonitorMode8192D( PADAPTER pAdapter, + bool bEnableMonitorMode ); -bool PHY_CheckIsLegalRfPath8192D(IN PADAPTER pAdapter, - IN u32 eRFPath ); +bool PHY_CheckIsLegalRfPath8192D( PADAPTER pAdapter, + u32 eRFPath ); // // Modify the value of the hw register when beacon interval be changed. // void -rtl8192d_PHY_SetBeaconHwReg( IN PADAPTER Adapter, - IN u16 BeaconInterval ); +rtl8192d_PHY_SetBeaconHwReg( PADAPTER Adapter, + u16 BeaconInterval ); extern void PHY_SwitchEphyParameter( - IN PADAPTER Adapter + PADAPTER Adapter ); extern void PHY_EnableHostClkReq( - IN PADAPTER Adapter + PADAPTER Adapter ); bool SetAntennaConfig92C( - IN PADAPTER Adapter, - IN u8 DefaultAnt + PADAPTER Adapter, + u8 DefaultAnt ); void @@ -456,21 +456,21 @@ void PHY_ConfigMacCoexist_RFPage92D( void rtl8192d_PHY_InitRxSetting( - IN PADAPTER Adapter + PADAPTER Adapter ); void -rtl8192d_PHY_SetRFPathSwitch(IN PADAPTER pAdapter, IN bool bMain); +rtl8192d_PHY_SetRFPathSwitch( PADAPTER pAdapter, bool bMain); void HalChangeCCKStatus8192D( - IN PADAPTER Adapter, - IN bool bCCKDisable + PADAPTER Adapter, + bool bCCKDisable ); void -PHY_InitPABias92D(IN PADAPTER Adapter); +PHY_InitPABias92D( PADAPTER Adapter); /*--------------------------Exported Function prototype---------------------*/ diff --git a/include/Hal8723APhyCfg.h b/include/Hal8723APhyCfg.h index 7126ec1..d361e21 100644 --- a/include/Hal8723APhyCfg.h +++ b/include/Hal8723APhyCfg.h @@ -22,8 +22,8 @@ #include /* MAC/BB/RF HAL config */ -int PHY_BBConfig8723A( IN PADAPTER Adapter ); -int PHY_RFConfig8723A( IN PADAPTER Adapter ); +int PHY_BBConfig8723A( PADAPTER Adapter ); +int PHY_RFConfig8723A( PADAPTER Adapter ); s32 PHY_MACConfig8723A(PADAPTER padapter); #endif diff --git a/include/HalPhyRf.h b/include/HalPhyRf.h index 4dba2e6..df224e5 100644 --- a/include/HalPhyRf.h +++ b/include/HalPhyRf.h @@ -29,28 +29,28 @@ // BB/MAC/RF other monitor API // -void PHY_SetMonitorMode8192C(IN PADAPTER pAdapter, - IN bool bEnableMonitorMode ); +void PHY_SetMonitorMode8192C( PADAPTER pAdapter, + bool bEnableMonitorMode ); // // IQ calibrate // void -PHY_IQCalibrate_8192C( IN PADAPTER pAdapter, - IN bool bReCovery); +PHY_IQCalibrate_8192C( PADAPTER pAdapter, + bool bReCovery); // // LC calibrate // void -PHY_LCCalibrate_8192C( IN PADAPTER pAdapter); +PHY_LCCalibrate_8192C( PADAPTER pAdapter); // // AP calibrate // void -PHY_APCalibrate_8192C( IN PADAPTER pAdapter, - IN s1Byte delta); +PHY_APCalibrate_8192C( PADAPTER pAdapter, + s1Byte delta); #endif #define ODM_TARGET_CHNL_NUM_2G_5G 59 diff --git a/include/HalPhyRf_8188e.h b/include/HalPhyRf_8188e.h index faac5a8..56fd164 100644 --- a/include/HalPhyRf_8188e.h +++ b/include/HalPhyRf_8188e.h @@ -55,7 +55,7 @@ PHY_IQCalibrate_8188E( #else IN PADAPTER Adapter, #endif - IN bool bReCovery); + bool bReCovery); // @@ -66,7 +66,7 @@ PHY_LCCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm #else - IN PADAPTER pAdapter + PADAPTER pAdapter #endif ); @@ -78,11 +78,11 @@ PHY_APCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN s1Byte delta); + s1Byte delta); void -PHY_DigitalPredistortion_8188E( IN PADAPTER pAdapter); +PHY_DigitalPredistortion_8188E( PADAPTER pAdapter); void @@ -90,11 +90,11 @@ _PHY_SaveADDARegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN pu4Byte ADDAReg, - IN pu4Byte ADDABackup, - IN u4Byte RegisterNum + pu4Byte ADDAReg, + pu4Byte ADDABackup, + u4Byte RegisterNum ); void @@ -102,11 +102,11 @@ _PHY_PathADDAOn( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN pu4Byte ADDAReg, - IN bool isPathAOn, - IN bool is2T + pu4Byte ADDAReg, + bool isPathAOn, + bool is2T ); void @@ -114,10 +114,10 @@ _PHY_MACSettingCalibration( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + PADAPTER pAdapter, #endif - IN pu4Byte MACReg, - IN pu4Byte MACBackup + pu4Byte MACReg, + pu4Byte MACBackup ); @@ -126,7 +126,7 @@ _PHY_PathAStandBy( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm #else - IN PADAPTER pAdapter + PADAPTER pAdapter #endif ); diff --git a/include/hal_com.h b/include/hal_com.h index aaa6ce2..c40d84b 100644 --- a/include/hal_com.h +++ b/include/hal_com.h @@ -140,9 +140,9 @@ #define DESC_RATEMCS15_SG 0x1c #define DESC_RATEMCS32 0x20 -#define REG_P2P_CTWIN 0x0572 // 1 Byte long (in unit of TU) -#define REG_NOA_DESC_SEL 0x05CF -#define REG_NOA_DESC_DURATION 0x05E0 +#define REG_P2P_CTWIN 0x0572 // 1 Byte long (in unit of TU) +#define REG_NOA_DESC_SEL 0x05CF +#define REG_NOA_DESC_DURATION 0x05E0 #define REG_NOA_DESC_INTERVAL 0x05E4 #define REG_NOA_DESC_START 0x05E8 #define REG_NOA_DESC_COUNT 0x05EC @@ -153,11 +153,11 @@ void dump_chip_info(HAL_VERSION ChipVersion); u8 //return the final channel plan decision hal_com_get_channel_plan( - IN PADAPTER 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 + PADAPTER 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); @@ -169,8 +169,8 @@ void HalSetBrateCfg( bool Hal_MappingOutPipe( - IN PADAPTER pAdapter, - IN u8 NumOutPipe + PADAPTER pAdapter, + u8 NumOutPipe ); void hal_init_macaddr(_adapter *adapter); diff --git a/include/mp_custom_oid.h b/include/mp_custom_oid.h index 7d52831..2bfeb7b 100644 --- a/include/mp_custom_oid.h +++ b/include/mp_custom_oid.h @@ -206,7 +206,7 @@ #define OID_CE_USB_READ_REGISTRY 0xFF0111C2 -#define OID_RT_PRO_SET_INITIAL_GAIN 0xFF0111C3 +#define OID_RT_PRO_SET_INITIAL_GA 0xFF0111C3 #define OID_RT_PRO_SET_BB_RF_STANDBY_MODE 0xFF0111C4 #define OID_RT_PRO_SET_BB_RF_SHUTDOWN_MODE 0xFF0111C5 #define OID_RT_PRO_SET_TX_CHARGE_PUMP 0xFF0111C6 diff --git a/include/odm.h b/include/odm.h index d831f83..771c63f 100644 --- a/include/odm.h +++ b/include/odm.h @@ -75,7 +75,7 @@ #define AFH_PSD 1 //0:normal PSD scan, 1: only do 20 pts PSD #define MODE_40M 0 //0:20M, 1:40M #define PSD_TH2 3 -#define PSD_CHMIN 20 // Minimum channel number for BT AFH +#define PSD_CHM 20 // Minimum channel number for BT AFH #define SIR_STEP_SIZE 3 #define Smooth_Size_1 5 #define Smooth_TH_1 3 @@ -627,7 +627,7 @@ typedef enum _ODM_Support_Ability_Definition ODM_BB_CCK_PD = BIT5, ODM_BB_ANT_DIV = BIT6, ODM_BB_PWR_SAVE = BIT7, - ODM_BB_PWR_TRAIN = BIT8, + ODM_BB_PWR_TRA = BIT8, ODM_BB_RATE_ADAPTIVE = BIT9, ODM_BB_PATH_DIV = BIT10, ODM_BB_PSD = BIT11, @@ -1556,34 +1556,34 @@ extern u1Byte CCKSwingTable_Ch14 [CCK_TABLE_SIZE][8]; #define SWAW_STEP_PEAK 0 #define SWAW_STEP_DETERMINE 1 -void ODM_Write_DIG(IN PDM_ODM_T pDM_Odm, IN u1Byte CurrentIGI); -void ODM_Write_CCK_CCA_Thres(IN PDM_ODM_T pDM_Odm, IN u1Byte CurCCK_CCAThres); +void ODM_Write_DIG( PDM_ODM_T pDM_Odm, u1Byte CurrentIGI); +void ODM_Write_CCK_CCA_Thres( PDM_ODM_T pDM_Odm, u1Byte CurCCK_CCAThres); void ODM_SetAntenna( - IN PDM_ODM_T pDM_Odm, - IN u1Byte Antenna); + PDM_ODM_T pDM_Odm, + u1Byte Antenna); #define dm_RF_Saving ODM_RF_Saving -void ODM_RF_Saving( IN PDM_ODM_T pDM_Odm, - IN u1Byte bForceInNormal ); +void ODM_RF_Saving( PDM_ODM_T pDM_Odm, + u1Byte bForceInNormal ); #define SwAntDivRestAfterLink ODM_SwAntDivRestAfterLink -void ODM_SwAntDivRestAfterLink( IN PDM_ODM_T pDM_Odm); +void ODM_SwAntDivRestAfterLink( PDM_ODM_T pDM_Odm); #define dm_CheckTXPowerTracking ODM_TXPowerTrackingCheck void ODM_TXPowerTrackingCheck( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); bool ODM_RAStateCheck( - IN PDM_ODM_T pDM_Odm, - IN s4Byte RSSI, - IN bool bForceUpdate, - OUT pu1Byte pRATRState + PDM_ODM_T pDM_Odm, + s4Byte RSSI, + bool bForceUpdate, + pu1Byte pRATRState ); #if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_AP|ODM_ADSL)) @@ -1591,27 +1591,27 @@ ODM_RAStateCheck( // function prototype //============================================================ //#define DM_ChangeDynamicInitGainThresh ODM_ChangeDynamicInitGainThresh -//void ODM_ChangeDynamicInitGainThresh(IN PADAPTER pAdapter, -// IN INT32 DM_Type, -// IN INT32 DM_Value); +//void ODM_ChangeDynamicInitGainThresh( PADAPTER pAdapter, +// INT32 DM_Type, +// INT32 DM_Value); void ODM_ChangeDynamicInitGainThresh( - IN PDM_ODM_T pDM_Odm, - IN u4Byte DM_Type, - IN u4Byte DM_Value + PDM_ODM_T pDM_Odm, + u4Byte DM_Type, + u4Byte DM_Value ); bool ODM_CheckPowerStatus( - IN PADAPTER Adapter + PADAPTER Adapter ); #if (DM_ODM_SUPPORT_TYPE != ODM_ADSL) void ODM_RateAdaptiveStateApInit( - IN PADAPTER Adapter , - IN PRT_WLAN_STA pEntry + PADAPTER Adapter , + PRT_WLAN_STA pEntry ); #endif #define AP_InitRateAdaptiveState ODM_RateAdaptiveStateApInit @@ -1621,15 +1621,15 @@ ODM_RateAdaptiveStateApInit( #ifdef WIFI_WMM void ODM_IotEdcaSwitch( - IN PDM_ODM_T pDM_Odm, - IN unsigned char enable + PDM_ODM_T pDM_Odm, + unsigned char enable ); #endif bool ODM_ChooseIotMainSTA( - IN PDM_ODM_T pDM_Odm, - IN PSTA_INFO_T pstat + PDM_ODM_T pDM_Odm, + PSTA_INFO_T pstat ); #endif @@ -1637,20 +1637,20 @@ ODM_ChooseIotMainSTA( #ifdef HW_ANT_SWITCH u1Byte ODM_Diversity_AntennaSelect( - IN PDM_ODM_T pDM_Odm, - IN u1Byte *data + PDM_ODM_T pDM_Odm, + u1Byte *data ); #endif #endif #define SwAntDivResetBeforeLink ODM_SwAntDivResetBeforeLink -void ODM_SwAntDivResetBeforeLink(IN PDM_ODM_T pDM_Odm); +void ODM_SwAntDivResetBeforeLink( PDM_ODM_T pDM_Odm); //#define SwAntDivCheckBeforeLink8192C ODM_SwAntDivCheckBeforeLink8192C #define SwAntDivCheckBeforeLink ODM_SwAntDivCheckBeforeLink8192C bool ODM_SwAntDivCheckBeforeLink8192C( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); @@ -1679,14 +1679,14 @@ GetPSDData( void odm_DIGbyRSSI_LPS( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); u4Byte ODM_Get_Rate_Bitmap( - IN PDM_ODM_T pDM_Odm, - IN u4Byte macid, - IN u4Byte ra_mask, - IN u1Byte rssi_level); + PDM_ODM_T pDM_Odm, + u4Byte macid, + u4Byte ra_mask, + u1Byte rssi_level); #endif @@ -1702,62 +1702,62 @@ odm_PSDMonitorWorkItemCallback( void PatchDCTone( - IN PDM_ODM_T pDM_Odm, + PDM_ODM_T pDM_Odm, pu4Byte PSD_report, u1Byte initial_gain_psd ); void ODM_PSDMonitor( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_PSD_Monitor(PDM_ODM_T pDM_Odm); void odm_PSDMonitorInit(PDM_ODM_T pDM_Odm); void ODM_PSDDbgControl( - IN PADAPTER Adapter, - IN u4Byte mode, - IN u4Byte btRssi + PADAPTER Adapter, + u4Byte mode, + u4Byte btRssi ); #endif // DM_ODM_SUPPORT_TYPE -void ODM_DMInit( IN PDM_ODM_T pDM_Odm); +void ODM_DMInit( PDM_ODM_T pDM_Odm); void ODM_DMWatchdog( - IN PDM_ODM_T pDM_Odm // For common use in the future + PDM_ODM_T pDM_Odm // For common use in the future ); void ODM_CmnInfoInit( - IN PDM_ODM_T pDM_Odm, - IN ODM_CMNINFO_E CmnInfo, - IN u4Byte Value + PDM_ODM_T pDM_Odm, + ODM_CMNINFO_E CmnInfo, + u4Byte Value ); 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 ); void ODM_CmnInfoPtrArrayHook( - IN PDM_ODM_T pDM_Odm, - IN ODM_CMNINFO_E CmnInfo, - IN u2Byte Index, - IN void * pValue + PDM_ODM_T pDM_Odm, + ODM_CMNINFO_E CmnInfo, + u2Byte Index, + void * pValue ); void ODM_CmnInfoUpdate( - IN PDM_ODM_T pDM_Odm, - IN u4Byte CmnInfo, - IN u8Byte Value + PDM_ODM_T pDM_Odm, + u4Byte CmnInfo, + u8Byte Value ); void @@ -1787,7 +1787,7 @@ void ODM_FreeAllWorkItems(IN PDM_ODM_T pDM_Odm ); void odm_PathDivChkAntSwitch(PDM_ODM_T pDM_Odm); void ODM_PathDivRestAfterLink( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); @@ -1806,7 +1806,7 @@ void ODM_PathDivRestAfterLink( //void odm_PathDivChkAntSwitch(PADAPTER Adapter,u1Byte Step); void ODM_PathDivRestAfterLink( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); #define dm_PathDiv_RSSI_Check ODM_PathDivChkPerPktRssi @@ -1838,14 +1838,14 @@ PlatformDivision64( #define PathDivCheckBeforeLink8192C ODM_PathDiversityBeforeLink92C bool ODM_PathDiversityBeforeLink92C( - //IN PADAPTER Adapter - IN PDM_ODM_T pDM_Odm + // PADAPTER Adapter + PDM_ODM_T pDM_Odm ); #define DM_ChangeDynamicInitGainThresh ODM_ChangeDynamicInitGainThresh -//void ODM_ChangeDynamicInitGainThresh(IN PADAPTER pAdapter, -// IN INT32 DM_Type, -// IN INT32 DM_Value); +//void ODM_ChangeDynamicInitGainThresh( PADAPTER pAdapter, +// INT32 DM_Type, +// INT32 DM_Value); // @@ -1873,9 +1873,9 @@ typedef enum tag_DIG_Connect_Definition void ODM_FillTXPathInTXDESC( - IN PADAPTER Adapter, - IN PRT_TCB pTcb, - IN pu1Byte pDesc + PADAPTER Adapter, + PRT_TCB pTcb, + pu1Byte pDesc ); @@ -1902,30 +1902,30 @@ ODM_FillTXPathInTXDESC( void ODM_SetTxAntByTxInfo_88C_92D( - IN PDM_ODM_T pDM_Odm, - IN pu1Byte pDesc, - IN u1Byte macId + PDM_ODM_T pDM_Odm, + pu1Byte pDesc, + u1Byte macId ); #endif // #if (DM_ODM_SUPPORT_TYPE == ODM_MP) void ODM_AntselStatistics_88C( - IN PDM_ODM_T pDM_Odm, - IN u1Byte MacId, - IN u4Byte PWDBAll, - IN bool isCCKrate + PDM_ODM_T pDM_Odm, + u1Byte MacId, + u4Byte PWDBAll, + bool isCCKrate ); #if ( DM_ODM_SUPPORT_TYPE & (ODM_MP |ODM_CE)) void ODM_SingleDualAntennaDefaultSetting( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); bool ODM_SingleDualAntennaDetection( - IN PDM_ODM_T pDM_Odm, - IN u1Byte mode + PDM_ODM_T pDM_Odm, + u1Byte mode ); #endif // #if ((DM_ODM_SUPPORT_TYPE==ODM_MP)||(DM_ODM_SUPPORT_TYPE==ODM_CE)) diff --git a/include/odm_HWConfig.h b/include/odm_HWConfig.h index 89e5602..8f39d3e 100644 --- a/include/odm_HWConfig.h +++ b/include/odm_HWConfig.h @@ -150,43 +150,43 @@ typedef struct _Phy_Status_Rpt_8195 void odm_Init_RSSIForDM( - IN OUT PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void ODM_PhyStatusQuery( - IN OUT PDM_ODM_T pDM_Odm, - OUT PODM_PHY_INFO_T pPhyInfo, - IN pu1Byte pPhyStatus, - IN PODM_PACKET_INFO_T pPktinfo + PDM_ODM_T pDM_Odm, + PODM_PHY_INFO_T pPhyInfo, + pu1Byte pPhyStatus, + PODM_PACKET_INFO_T pPktinfo ); void ODM_MacStatusQuery( - IN OUT PDM_ODM_T pDM_Odm, - IN pu1Byte pMacStatus, - IN u1Byte MacID, - IN bool bPacketMatchBSSID, - IN bool bPacketToSelf, - IN bool bPacketBeacon + PDM_ODM_T pDM_Odm, + pu1Byte pMacStatus, + u1Byte MacID, + bool bPacketMatchBSSID, + bool bPacketToSelf, + bool bPacketBeacon ); #if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE|ODM_AP)) 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 ); 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 ); HAL_STATUS ODM_ConfigMACWithHeaderFile( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); #endif diff --git a/include/odm_RTL8188E.h b/include/odm_RTL8188E.h index 3a80f0f..f80f316 100644 --- a/include/odm_RTL8188E.h +++ b/include/odm_RTL8188E.h @@ -29,37 +29,37 @@ void ODM_DIG_LowerBound_88E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); #if ( !(DM_ODM_SUPPORT_TYPE == ODM_CE)) void odm_FastAntTrainingInit( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); #endif void ODM_AntennaDiversityInit_88E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void ODM_AntennaDiversity_88E ( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); #if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE)) void ODM_SetTxAntByTxInfo_88E( - IN PDM_ODM_T pDM_Odm, - IN pu1Byte pDesc, - IN u1Byte macId + PDM_ODM_T pDM_Odm, + pu1Byte pDesc, + u1Byte macId ); #else// (DM_ODM_SUPPORT_TYPE == ODM_AP) void ODM_SetTxAntByTxInfo_88E( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); #endif @@ -71,38 +71,38 @@ ODM_UpdateRxIdleAnt_88E( void ODM_AntselStatistics_88E( - IN PDM_ODM_T pDM_Odm, - IN u1Byte antsel_tr_mux, - IN u4Byte MacId, - IN u1Byte RxPWDBAll + PDM_ODM_T pDM_Odm, + u1Byte antsel_tr_mux, + u4Byte MacId, + u1Byte RxPWDBAll ); #if ( !(DM_ODM_SUPPORT_TYPE == ODM_CE)) void odm_FastAntTraining( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_FastAntTrainingCallback( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); void odm_FastAntTrainingWorkItemCallback( - IN PDM_ODM_T pDM_Odm + PDM_ODM_T pDM_Odm ); #endif void odm_PrimaryCCA_Init( - IN PDM_ODM_T pDM_Odm); + PDM_ODM_T pDM_Odm); bool ODM_DynamicPrimaryCCA_DupRTS( - IN PDM_ODM_T pDM_Odm); + PDM_ODM_T pDM_Odm); void odm_DynamicPrimaryCCA( - IN PDM_ODM_T pDM_Odm); + PDM_ODM_T pDM_Odm); #endif diff --git a/include/odm_RegConfig8188E.h b/include/odm_RegConfig8188E.h index f71fc19..29b2b43 100644 --- a/include/odm_RegConfig8188E.h +++ b/include/odm_RegConfig8188E.h @@ -24,56 +24,56 @@ void odm_ConfigRFReg_8188E( - IN PDM_ODM_T pDM_Odm, - IN u4Byte Addr, - IN u4Byte Data, + PDM_ODM_T pDM_Odm, + u4Byte Addr, + u4Byte Data, IN ODM_RF_RADIO_PATH_E RF_PATH, - IN u4Byte RegAddr + u4Byte RegAddr ); void odm_ConfigRF_RadioA_8188E( - IN PDM_ODM_T pDM_Odm, - IN u4Byte Addr, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte Addr, + u4Byte Data ); void odm_ConfigRF_RadioB_8188E( - IN PDM_ODM_T pDM_Odm, - IN u4Byte Addr, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte Addr, + u4Byte Data ); void odm_ConfigMAC_8188E( - IN PDM_ODM_T pDM_Odm, - IN u4Byte Addr, - IN u1Byte Data + PDM_ODM_T pDM_Odm, + u4Byte Addr, + u1Byte Data ); void odm_ConfigBB_AGC_8188E( - IN PDM_ODM_T pDM_Odm, - IN u4Byte Addr, - IN u4Byte Bitmask, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte Addr, + u4Byte Bitmask, + u4Byte Data ); void odm_ConfigBB_PHY_REG_PG_8188E( - IN PDM_ODM_T pDM_Odm, - IN u4Byte Addr, - IN u4Byte Bitmask, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte Addr, + u4Byte Bitmask, + u4Byte Data ); void odm_ConfigBB_PHY_8188E( - IN PDM_ODM_T pDM_Odm, - IN u4Byte Addr, - IN u4Byte Bitmask, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte Addr, + u4Byte Bitmask, + u4Byte Data ); #endif #endif // end of SUPPORT diff --git a/include/odm_debug.h b/include/odm_debug.h index efd84a5..f7c5db2 100644 --- a/include/odm_debug.h +++ b/include/odm_debug.h @@ -78,7 +78,7 @@ #define ODM_COMP_CCK_PD BIT5 #define ODM_COMP_ANT_DIV BIT6 #define ODM_COMP_PWR_SAVE BIT7 -#define ODM_COMP_PWR_TRAIN BIT8 +#define ODM_COMP_PWR_TRA BIT8 #define ODM_COMP_RATE_ADAPTIVE BIT9 #define ODM_COMP_PATH_DIV BIT10 #define ODM_COMP_PSD BIT11 diff --git a/include/odm_interface.h b/include/odm_interface.h index 5d13d38..958e462 100644 --- a/include/odm_interface.h +++ b/include/odm_interface.h @@ -99,88 +99,88 @@ typedef void (*RT_WORKITEM_CALL_BACK)(void * pContext); u1Byte ODM_Read1Byte( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr + PDM_ODM_T pDM_Odm, + u4Byte RegAddr ); u2Byte ODM_Read2Byte( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr + PDM_ODM_T pDM_Odm, + u4Byte RegAddr ); u4Byte ODM_Read4Byte( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr + PDM_ODM_T pDM_Odm, + u4Byte RegAddr ); void ODM_Write1Byte( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr, - IN u1Byte Data + PDM_ODM_T pDM_Odm, + u4Byte RegAddr, + u1Byte Data ); void ODM_Write2Byte( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr, - IN u2Byte Data + PDM_ODM_T pDM_Odm, + u4Byte RegAddr, + u2Byte Data ); void ODM_Write4Byte( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte RegAddr, + u4Byte Data ); void ODM_SetMACReg( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr, - IN u4Byte BitMask, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte RegAddr, + u4Byte BitMask, + u4Byte Data ); u4Byte ODM_GetMACReg( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr, - IN u4Byte BitMask + PDM_ODM_T pDM_Odm, + u4Byte RegAddr, + u4Byte BitMask ); void ODM_SetBBReg( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr, - IN u4Byte BitMask, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + u4Byte RegAddr, + u4Byte BitMask, + u4Byte Data ); u4Byte ODM_GetBBReg( - IN PDM_ODM_T pDM_Odm, - IN u4Byte RegAddr, - IN u4Byte BitMask + PDM_ODM_T pDM_Odm, + u4Byte RegAddr, + u4Byte BitMask ); void ODM_SetRFReg( - IN PDM_ODM_T pDM_Odm, - IN ODM_RF_RADIO_PATH_E eRFPath, - IN u4Byte RegAddr, - IN u4Byte BitMask, - IN u4Byte Data + PDM_ODM_T pDM_Odm, + ODM_RF_RADIO_PATH_E eRFPath, + u4Byte RegAddr, + u4Byte BitMask, + u4Byte Data ); u4Byte ODM_GetRFReg( - IN PDM_ODM_T pDM_Odm, - IN ODM_RF_RADIO_PATH_E eRFPath, - IN u4Byte RegAddr, - IN u4Byte BitMask + PDM_ODM_T pDM_Odm, + ODM_RF_RADIO_PATH_E eRFPath, + u4Byte RegAddr, + u4Byte BitMask ); @@ -189,22 +189,22 @@ ODM_GetRFReg( // void ODM_AllocateMemory( - IN PDM_ODM_T pDM_Odm, - OUT void * *pPtr, - IN u4Byte length + PDM_ODM_T pDM_Odm, + void * *pPtr, + u4Byte length ); void ODM_FreeMemory( - IN PDM_ODM_T pDM_Odm, - OUT void * pPtr, - IN u4Byte length + PDM_ODM_T pDM_Odm, + void * pPtr, + u4Byte length ); s4Byte ODM_CompareMemory( - IN PDM_ODM_T pDM_Odm, - IN void * pBuf1, - IN void * pBuf2, - IN u4Byte length + PDM_ODM_T pDM_Odm, + void * pBuf1, + void * pBuf2, + u4Byte length ); // @@ -212,14 +212,14 @@ s4Byte 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 ); @@ -228,36 +228,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 ); // @@ -265,7 +265,7 @@ ODM_IsWorkItemScheduled( // void ODM_StallExecution( - IN u4Byte usDelay + u4Byte usDelay ); void @@ -283,30 +283,30 @@ ODM_sleep_us(IN u4Byte us); void ODM_SetTimer( - IN PDM_ODM_T pDM_Odm, - IN PRT_TIMER pTimer, - IN u4Byte msDelay + PDM_ODM_T pDM_Odm, + PRT_TIMER pTimer, + u4Byte 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 ); @@ -316,21 +316,21 @@ ODM_ReleaseTimer( #if (DM_ODM_SUPPORT_TYPE & ODM_MP) void ODM_FillH2CCmd( - IN PADAPTER Adapter, - IN u1Byte ElementID, - IN u4Byte CmdLen, - IN pu1Byte pCmdBuffer + PADAPTER Adapter, + u1Byte ElementID, + u4Byte CmdLen, + pu1Byte pCmdBuffer ); #else u4Byte ODM_FillH2CCmd( - IN pu1Byte pH2CBuffer, - IN u4Byte H2CBufferLen, - IN u4Byte CmdNum, - IN pu4Byte pElementID, - IN pu4Byte pCmdLen, - IN pu1Byte* pCmbBuffer, - IN pu1Byte CmdStartSeq + pu1Byte pH2CBuffer, + u4Byte H2CBufferLen, + u4Byte CmdNum, + pu4Byte pElementID, + pu4Byte pCmdLen, + pu1Byte* pCmbBuffer, + pu1Byte CmdStartSeq ); #endif #endif // __ODM_INTERFACE_H__ diff --git a/include/rtl8188e_hal.h b/include/rtl8188e_hal.h index 1219142..fd14fc8 100644 --- a/include/rtl8188e_hal.h +++ b/include/rtl8188e_hal.h @@ -275,7 +275,7 @@ enum ChannelPlan CHPL_FCC = 0, CHPL_IC = 1, CHPL_ETSI = 2, - CHPL_SPAIN = 3, + CHPL_SPA = 3, CHPL_FRANCE = 4, CHPL_MKK = 5, CHPL_MKK1 = 6, diff --git a/include/rtl8188e_rf.h b/include/rtl8188e_rf.h index dbe5c5a..2d3bb9a 100644 --- a/include/rtl8188e_rf.h +++ b/include/rtl8188e_rf.h @@ -25,20 +25,20 @@ #define RF6052_MAX_PATH 2 -int PHY_RF6052_Config8188E( IN PADAPTER Adapter ); -void rtl8188e_RF_ChangeTxPath( IN PADAPTER Adapter, - IN u16 DataRate); +int PHY_RF6052_Config8188E( PADAPTER Adapter ); +void rtl8188e_RF_ChangeTxPath( PADAPTER Adapter, + u16 DataRate); void rtl8188e_PHY_RF6052SetBandwidth( - IN PADAPTER Adapter, - IN HT_CHANNEL_WIDTH Bandwidth); + PADAPTER Adapter, + HT_CHANNEL_WIDTH Bandwidth); void rtl8188e_PHY_RF6052SetCckTxPower( - IN PADAPTER Adapter, - IN u8* pPowerlevel); + PADAPTER Adapter, + u8* pPowerlevel); void rtl8188e_PHY_RF6052SetOFDMTxPower( - IN PADAPTER Adapter, - IN u8* pPowerLevelOFDM, - IN u8* pPowerLevelBW20, - IN u8* pPowerLevelBW40, - IN u8 Channel); + PADAPTER Adapter, + u8* pPowerLevelOFDM, + u8* pPowerLevelBW20, + u8* pPowerLevelBW40, + u8 Channel); #endif//__RTL8188E_RF_H__ diff --git a/include/rtl8188e_spec.h b/include/rtl8188e_spec.h index f17d48c..4e715c9 100644 --- a/include/rtl8188e_spec.h +++ b/include/rtl8188e_spec.h @@ -1419,7 +1419,7 @@ Current IOREG MAP #define SDIO_HISR_HSISR_IND BIT20 #define SDIO_HISR_GTINT3_IND BIT21 #define SDIO_HISR_GTINT4_IND BIT22 -#define SDIO_HISR_PSTIMEOUT BIT23 +#define SDIO_HISR_PSTIME BIT23 #define SDIO_HISR_OCPINT BIT24 #define SDIO_HISR_ATIMEND BIT25 #define SDIO_HISR_ATIMEND_E BIT26 @@ -1623,13 +1623,13 @@ Current IOREG MAP #define EEPROM_CHANNEL_PLAN_FCC 0x0 #define EEPROM_CHANNEL_PLAN_IC 0x1 #define EEPROM_CHANNEL_PLAN_ETSI 0x2 -#define EEPROM_CHANNEL_PLAN_SPAIN 0x3 +#define EEPROM_CHANNEL_PLAN_SPA 0x3 #define EEPROM_CHANNEL_PLAN_FRANCE 0x4 #define EEPROM_CHANNEL_PLAN_MKK 0x5 #define EEPROM_CHANNEL_PLAN_MKK1 0x6 #define EEPROM_CHANNEL_PLAN_ISRAEL 0x7 #define EEPROM_CHANNEL_PLAN_TELEC 0x8 -#define EEPROM_CHANNEL_PLAN_GLOBAL_DOMAIN 0x9 +#define EEPROM_CHANNEL_PLAN_GLOBAL_DOMA 0x9 #define EEPROM_CHANNEL_PLAN_WORLD_WIDE_13 0xA #define EEPROM_CHANNEL_PLAN_NCC 0xB #define EEPROM_USB_OPTIONAL1 0xE diff --git a/include/rtl8192c_dm.h b/include/rtl8192c_dm.h index 089f1f6..64b7e4d 100644 --- a/include/rtl8192c_dm.h +++ b/include/rtl8192c_dm.h @@ -256,7 +256,7 @@ void rtl8192c_issue_delete_ba(_adapter *padapter, u8 dir); void rtl8192c_init_dm_priv(IN PADAPTER Adapter); void rtl8192c_deinit_dm_priv(IN PADAPTER Adapter); -void rtl8192c_InitHalDm( IN PADAPTER Adapter); +void rtl8192c_InitHalDm( PADAPTER Adapter); void rtl8192c_HalDmWatchDog(IN PADAPTER Adapter); #endif //__HAL8190PCIDM_H__ diff --git a/include/rtl8192c_hal.h b/include/rtl8192c_hal.h index 3e5e408..389d060 100644 --- a/include/rtl8192c_hal.h +++ b/include/rtl8192c_hal.h @@ -355,7 +355,7 @@ enum ChannelPlan{ CHPL_FCC = 0, CHPL_IC = 1, CHPL_ETSI = 2, - CHPL_SPAIN = 3, + CHPL_SPA = 3, CHPL_FRANCE = 4, CHPL_MKK = 5, CHPL_MKK1 = 6, diff --git a/include/rtl8192c_rf.h b/include/rtl8192c_rf.h index 676e9ea..2090888 100644 --- a/include/rtl8192c_rf.h +++ b/include/rtl8192c_rf.h @@ -71,19 +71,19 @@ // // RF RL6052 Series API // -void rtl8192c_RF_ChangeTxPath( IN PADAPTER Adapter, - IN u16 DataRate); +void rtl8192c_RF_ChangeTxPath( PADAPTER Adapter, + u16 DataRate); void rtl8192c_PHY_RF6052SetBandwidth( - IN PADAPTER Adapter, - IN HT_CHANNEL_WIDTH Bandwidth); + PADAPTER Adapter, + HT_CHANNEL_WIDTH Bandwidth); void rtl8192c_PHY_RF6052SetCckTxPower( - IN PADAPTER Adapter, - IN u8* pPowerlevel); + PADAPTER Adapter, + u8* pPowerlevel); void rtl8192c_PHY_RF6052SetOFDMTxPower( - IN PADAPTER Adapter, - IN u8* pPowerLevel, - IN u8 Channel); -int PHY_RF6052_Config8192C( IN PADAPTER Adapter ); + PADAPTER Adapter, + u8* pPowerLevel, + u8 Channel); +int PHY_RF6052_Config8192C( PADAPTER Adapter ); /*--------------------------Exported Function prototype---------------------*/ diff --git a/include/rtl8192c_spec.h b/include/rtl8192c_spec.h index 4ba134c..23b4661 100644 --- a/include/rtl8192c_spec.h +++ b/include/rtl8192c_spec.h @@ -474,8 +474,8 @@ //---------------------------------------------------------------------------- // 8192C GPIO PIN Control Register (offset 0x44, 4 byte) //---------------------------------------------------------------------------- -#define GPIO_IN REG_GPIO_PIN_CTRL // GPIO pins input value -#define GPIO_OUT (REG_GPIO_PIN_CTRL+1) // GPIO pins output value +#define GPIO_ REG_GPIO_PIN_CTRL // GPIO pins input value +#define GPIO_ (REG_GPIO_PIN_CTRL+1) // GPIO pins output value #define GPIO_IO_SEL (REG_GPIO_PIN_CTRL+2) // GPIO pins output enable when a bit is set to "1"; otherwise, input is configured. #define GPIO_MOD (REG_GPIO_PIN_CTRL+3) @@ -593,7 +593,7 @@ Default: 00b. #define IMR_TIMEOUT2 BIT17 // Timeout interrupt 2 #define IMR_TIMEOUT1 BIT16 // Timeout interrupt 1 #define IMR_TXFOVW BIT15 // Transmit FIFO Overflow -#define IMR_PSTIMEOUT BIT14 // Power save time out interrupt +#define IMR_PSTIME BIT14 // Power save time out interrupt #define IMR_BcnInt BIT13 // Beacon DMA Interrupt 0 #define IMR_RXFOVW BIT12 // Receive FIFO Overflow #define IMR_RDU BIT11 // Receive Descriptor Unavailable @@ -666,13 +666,13 @@ Default: 00b. #define EEPROM_CHANNEL_PLAN_FCC 0x0 #define EEPROM_CHANNEL_PLAN_IC 0x1 #define EEPROM_CHANNEL_PLAN_ETSI 0x2 -#define EEPROM_CHANNEL_PLAN_SPAIN 0x3 +#define EEPROM_CHANNEL_PLAN_SPA 0x3 #define EEPROM_CHANNEL_PLAN_FRANCE 0x4 #define EEPROM_CHANNEL_PLAN_MKK 0x5 #define EEPROM_CHANNEL_PLAN_MKK1 0x6 #define EEPROM_CHANNEL_PLAN_ISRAEL 0x7 #define EEPROM_CHANNEL_PLAN_TELEC 0x8 -#define EEPROM_CHANNEL_PLAN_GLOBAL_DOMAIN 0x9 +#define EEPROM_CHANNEL_PLAN_GLOBAL_DOMA 0x9 #define EEPROM_CHANNEL_PLAN_WORLD_WIDE_13 0xA #define EEPROM_CHANNEL_PLAN_NCC 0xB #define EEPROM_USB_OPTIONAL1 0xE @@ -1755,8 +1755,8 @@ Current IOREG MAP //---------------------------------------------------------------------------- // 8192C GPIO PIN Control Register (offset 0x44, 4 byte) //---------------------------------------------------------------------------- -#define GPIO_IN REG_GPIO_PIN_CTRL // GPIO pins input value -#define GPIO_OUT (REG_GPIO_PIN_CTRL+1) // GPIO pins output value +#define GPIO_ REG_GPIO_PIN_CTRL // GPIO pins input value +#define GPIO_ (REG_GPIO_PIN_CTRL+1) // GPIO pins output value #define GPIO_IO_SEL (REG_GPIO_PIN_CTRL+2) // GPIO pins output enable when a bit is set to "1"; otherwise, input is configured. #define GPIO_MOD (REG_GPIO_PIN_CTRL+3) diff --git a/include/rtl8192d_hal.h b/include/rtl8192d_hal.h index 37945a8..27225b0 100644 --- a/include/rtl8192d_hal.h +++ b/include/rtl8192d_hal.h @@ -378,7 +378,7 @@ enum ChannelPlan{ CHPL_FCC = 0, CHPL_IC = 1, CHPL_ETSI = 2, - CHPL_SPAIN = 3, + CHPL_SPA = 3, CHPL_FRANCE = 4, CHPL_MKK = 5, CHPL_MKK1 = 6, diff --git a/include/rtl8192d_rf.h b/include/rtl8192d_rf.h index c00acba..67b1bd9 100644 --- a/include/rtl8192d_rf.h +++ b/include/rtl8192d_rf.h @@ -71,21 +71,21 @@ // // RF RL6052 Series API // -void rtl8192d_RF_ChangeTxPath( IN PADAPTER Adapter, - IN u16 DataRate); +void rtl8192d_RF_ChangeTxPath( PADAPTER Adapter, + u16 DataRate); void rtl8192d_PHY_RF6052SetBandwidth( - IN PADAPTER Adapter, - IN HT_CHANNEL_WIDTH Bandwidth); + PADAPTER Adapter, + HT_CHANNEL_WIDTH Bandwidth); void rtl8192d_PHY_RF6052SetCckTxPower( - IN PADAPTER Adapter, - IN u8* pPowerlevel); + PADAPTER Adapter, + u8* pPowerlevel); void rtl8192d_PHY_RF6052SetOFDMTxPower( - IN PADAPTER Adapter, - IN u8* pPowerLevel, - IN u8 Channel); -int PHY_RF6052_Config8192D( IN PADAPTER Adapter ); + PADAPTER Adapter, + u8* pPowerLevel, + u8 Channel); +int PHY_RF6052_Config8192D( PADAPTER Adapter ); -bool rtl8192d_PHY_EnableAnotherPHY(IN PADAPTER Adapter, IN bool bMac0); +bool rtl8192d_PHY_EnableAnotherPHY( PADAPTER Adapter, bool bMac0); void rtl8192d_PHY_PowerDownAnotherPHY(IN PADAPTER Adapter, IN bool bMac0); diff --git a/include/rtl8192d_spec.h b/include/rtl8192d_spec.h index e3067ec..0c99e12 100644 --- a/include/rtl8192d_spec.h +++ b/include/rtl8192d_spec.h @@ -489,8 +489,8 @@ //---------------------------------------------------------------------------- // 8192C GPIO PIN Control Register (offset 0x44, 4 byte) //---------------------------------------------------------------------------- -#define GPIO_IN REG_GPIO_PIN_CTRL // GPIO pins input value -#define GPIO_OUT (REG_GPIO_PIN_CTRL+1) // GPIO pins output value +#define GPIO_ REG_GPIO_PIN_CTRL // GPIO pins input value +#define GPIO_ (REG_GPIO_PIN_CTRL+1) // GPIO pins output value #define GPIO_IO_SEL (REG_GPIO_PIN_CTRL+2) // GPIO pins output enable when a bit is set to "1"; otherwise, input is configured. #define GPIO_MOD (REG_GPIO_PIN_CTRL+3) @@ -611,7 +611,7 @@ Default: 00b. #define IMR_TIMEOUT2 BIT17 // Timeout interrupt 2 #define IMR_TIMEOUT1 BIT16 // Timeout interrupt 1 #define IMR_TXFOVW BIT15 // Transmit FIFO Overflow -#define IMR_PSTIMEOUT BIT14 // Power save time out interrupt +#define IMR_PSTIME BIT14 // Power save time out interrupt #define IMR_BcnInt BIT13 // Beacon DMA Interrupt 0 #define IMR_RXFOVW BIT12 // Receive FIFO Overflow #define IMR_RDU BIT11 // Receive Descriptor Unavailable @@ -692,13 +692,13 @@ Default: 00b. #define EEPROM_CHANNEL_PLAN_FCC 0x0 #define EEPROM_CHANNEL_PLAN_IC 0x1 #define EEPROM_CHANNEL_PLAN_ETSI 0x2 -#define EEPROM_CHANNEL_PLAN_SPAIN 0x3 +#define EEPROM_CHANNEL_PLAN_SPA 0x3 #define EEPROM_CHANNEL_PLAN_FRANCE 0x4 #define EEPROM_CHANNEL_PLAN_MKK 0x5 #define EEPROM_CHANNEL_PLAN_MKK1 0x6 #define EEPROM_CHANNEL_PLAN_ISRAEL 0x7 #define EEPROM_CHANNEL_PLAN_TELEC 0x8 -#define EEPROM_CHANNEL_PLAN_GLOBAL_DOMAIN 0x9 +#define EEPROM_CHANNEL_PLAN_GLOBAL_DOMA 0x9 #define EEPROM_CHANNEL_PLAN_WORLD_WIDE_13 0xA #define EEPROM_CHANNEL_PLAN_NCC 0xB #define EEPROM_CHANNEL_PLAN_BY_HW_MASK 0x80 diff --git a/include/rtl8723a_bt-coexist.h b/include/rtl8723a_bt-coexist.h index 85ea4cb..37a1fc9 100644 --- a/include/rtl8723a_bt-coexist.h +++ b/include/rtl8723a_bt-coexist.h @@ -167,11 +167,11 @@ typedef enum _HCI_STATUS HCI_STATUS_UNKNOW_HCI_CMD =0x01, //Unknown HCI Command HCI_STATUS_UNKNOW_CONNECT_ID =0X02, //Unknown Connection Identifier HCI_STATUS_HW_FAIL =0X03, //Hardware Failure - HCI_STATUS_PAGE_TIMEOUT =0X04, //Page Timeout + HCI_STATUS_PAGE_TIME =0X04, //Page Timeout HCI_STATUS_AUTH_FAIL =0X05, //Authentication Failure HCI_STATUS_PIN_OR_KEY_MISSING =0X06, //PIN or Key Missing HCI_STATUS_MEM_CAP_EXCEED =0X07, //Memory Capacity Exceeded - HCI_STATUS_CONNECT_TIMEOUT =0X08, //Connection Timeout + HCI_STATUS_CONNECT_TIME =0X08, //Connection Timeout HCI_STATUS_CONNECT_LIMIT =0X09, //Connection Limit Exceeded HCI_STATUS_SYN_CONNECT_LIMIT =0X0a, //Synchronous Connection Limit To A Device Exceeded HCI_STATUS_ACL_CONNECT_EXISTS =0X0b, //ACL Connection Already Exists @@ -179,7 +179,7 @@ typedef enum _HCI_STATUS HCI_STATUS_CONNECT_RJT_LIMIT_RESOURCE =0X0d, //Connection Rejected due to Limited Resources HCI_STATUS_CONNECT_RJT_SEC_REASON =0X0e, //Connection Rejected Due To Security Reasons HCI_STATUS_CONNECT_RJT_UNACCEPT_BD_ADDR =0X0f, //Connection Rejected due to Unacceptable BD_ADDR - HCI_STATUS_CONNECT_ACCEPT_TIMEOUT =0X10, //Connection Accept Timeout Exceeded + HCI_STATUS_CONNECT_ACCEPT_TIME =0X10, //Connection Accept Timeout Exceeded HCI_STATUS_UNSUPPORT_FEATURE_PARA_VALUE =0X11, //Unsupported Feature or Parameter Value HCI_STATUS_INVALID_HCI_CMD_PARA_VALUE =0X12, //Invalid HCI Command Parameters HCI_STATUS_REMOTE_USER_TERMINATE_CONNECT =0X13, //Remote User Terminated Connection @@ -197,7 +197,7 @@ typedef enum _HCI_STATUS HCI_STATUS_UNSPECIFIC_ERROR =0X1f, //Unspecified Error HCI_STATUS_UNSUPPORT_LMP_PARA_VALUE =0X20, //Unsupported LMP Parameter Value HCI_STATUS_ROLE_CHANGE_NOT_ALLOW =0X21, //Role Change Not Allowed - HCI_STATUS_LMP_RESPONSE_TIMEOUT =0X22, //LMP Response Timeout + HCI_STATUS_LMP_RESPONSE_TIME =0X22, //LMP Response Timeout HCI_STATUS_LMP_ERROR_TRANSACTION_COLLISION =0X23, //LMP Error Transaction Collision HCI_STATUS_LMP_PDU_NOT_ALLOW =0X24, //LMP PDU Not Allowed HCI_STATUS_ENCRYPTION_MODE_NOT_ALLOW =0X25, //Encryption Mode Not Acceptable @@ -318,10 +318,10 @@ typedef enum _SET_EVENT_MASK_COMMAND HCI_DELETE_STORED_LINK_KEY =0x0012, HCI_WRITE_LOCAL_NAME =0x0013, HCI_READ_LOCAL_NAME =0x0014, - HCI_READ_CONNECTION_ACCEPT_TIMEOUT =0x0015, - HCI_WRITE_CONNECTION_ACCEPT_TIMEOUT =0x0016, - HCI_READ_PAGE_TIMEOUT =0x0017, - HCI_WRITE_PAGE_TIMEOUT =0x0018, + HCI_READ_CONNECTION_ACCEPT_TIME =0x0015, + HCI_WRITE_CONNECTION_ACCEPT_TIME =0x0016, + HCI_READ_PAGE_TIME =0x0017, + HCI_WRITE_PAGE_TIME =0x0018, HCI_READ_SCAN_ENABLE =0x0019, HCI_WRITE_SCAN_ENABLE =0x001a, HCI_READ_PAGE_SCAN_ACTIVITY =0x001b, @@ -334,8 +334,8 @@ typedef enum _SET_EVENT_MASK_COMMAND HCI_WRITE_CLASS_OF_DEVICE =0x0024, HCI_READ_VOICE_SETTING =0x0025, HCI_WRITE_VOICE_SETTING =0x0026, - HCI_READ_AUTOMATIC_FLUSH_TIMEOUT =0x0027, - HCI_WRITE_AUTOMATIC_FLUSH_TIMEOUT =0x0028, + HCI_READ_AUTOMATIC_FLUSH_TIME =0x0027, + HCI_WRITE_AUTOMATIC_FLUSH_TIME =0x0028, HCI_READ_NUM_BROADCAST_RETRANSMISSIONS =0x0029, HCI_WRITE_NUM_BROADCAST_RETRANSMISSIONS =0x002a, HCI_READ_HOLD_MODE_ACTIVITY =0x002b, @@ -345,8 +345,8 @@ typedef enum _SET_EVENT_MASK_COMMAND HCI_SET_CONTROLLER_TO_HOST_FLOW_CONTROL =0x0031, HCI_HOST_BUFFER_SIZE =0x0033, HCI_HOST_NUMBER_OF_COMPLETED_PACKETS =0x0035, - HCI_READ_LINK_SUPERVISION_TIMEOUT =0x0036, - HCI_WRITE_LINK_SUPERVISION_TIMEOUT =0x0037, + HCI_READ_LINK_SUPERVISION_TIME =0x0036, + HCI_WRITE_LINK_SUPERVISION_TIME =0x0037, HCI_READ_NUMBER_OF_SUPPORTED_IAC =0x0038, HCI_READ_CURRENT_IAC_LAP =0x0039, HCI_WRITE_CURRENT_IAC_LAP =0x003a, @@ -373,16 +373,16 @@ typedef enum _SET_EVENT_MASK_COMMAND HCI_WRITE_DEFAULT_ERRONEOUS_DATA_REPORTING =0x005b, HCI_ENHANCED_FLUSH =0x005f, HCI_SEND_KEYPRESS_NOTIFICATION =0x0060, - HCI_READ_LOGICAL_LINK_ACCEPT_TIMEOUT =0x0061, - HCI_WRITE_LOGICAL_LINK_ACCEPT_TIMEOUT =0x0062, + HCI_READ_LOGICAL_LINK_ACCEPT_TIME =0x0061, + HCI_WRITE_LOGICAL_LINK_ACCEPT_TIME =0x0062, HCI_SET_EVENT_MASK_PAGE_2 =0x0063, HCI_READ_LOCATION_DATA =0x0064, HCI_WRITE_LOCATION_DATA =0x0065, HCI_READ_FLOW_CONTROL_MODE =0x0066, HCI_WRITE_FLOW_CONTROL_MODE =0x0067, HCI_READ_ENHANCE_TRANSMIT_POWER_LEVEL =0x0068, - HCI_READ_BEST_EFFORT_FLUSH_TIMEOUT =0x0069, - HCI_WRITE_BEST_EFFORT_FLUSH_TIMEOUT =0x006a, + HCI_READ_BEST_EFFORT_FLUSH_TIME =0x0069, + HCI_WRITE_BEST_EFFORT_FLUSH_TIME =0x006a, HCI_SHORT_RANGE_MODE =0x006b }SET_EVENT_MASK_COMMAND,*PSET_EVENT_MASK_COMMAND; diff --git a/include/rtl8723a_hal.h b/include/rtl8723a_hal.h index fa1789a..65be360 100644 --- a/include/rtl8723a_hal.h +++ b/include/rtl8723a_hal.h @@ -316,7 +316,7 @@ enum ChannelPlan CHPL_FCC = 0, CHPL_IC = 1, CHPL_ETSI = 2, - CHPL_SPAIN = 3, + CHPL_SPA = 3, CHPL_FRANCE = 4, CHPL_MKK = 5, CHPL_MKK1 = 6, diff --git a/include/rtl8723a_rf.h b/include/rtl8723a_rf.h index 72dc5f3..6f3f9ba 100644 --- a/include/rtl8723a_rf.h +++ b/include/rtl8723a_rf.h @@ -21,6 +21,6 @@ #define __RTL8723A_RF_H__ #include "rtl8192c_rf.h" -int PHY_RF6052_Config8723A( IN PADAPTER Adapter ); +int PHY_RF6052_Config8723A( PADAPTER Adapter ); #endif diff --git a/include/rtl8723a_spec.h b/include/rtl8723a_spec.h index 6c08f46..d433a1e 100644 --- a/include/rtl8723a_spec.h +++ b/include/rtl8723a_spec.h @@ -411,7 +411,7 @@ #define SDIO_HISR_HSISR_IND BIT20 #define SDIO_HISR_GTINT3_IND BIT21 #define SDIO_HISR_GTINT4_IND BIT22 -#define SDIO_HISR_PSTIMEOUT BIT23 +#define SDIO_HISR_PSTIME BIT23 #define SDIO_HISR_OCPINT BIT24 #define SDIO_HISR_ATIMEND BIT25 #define SDIO_HISR_ATIMEND_E BIT26 @@ -459,7 +459,7 @@ //----------------------------------------------------------------------------- #define UHIMR_TIMEOUT2 BIT31 #define UHIMR_TIMEOUT1 BIT30 -#define UHIMR_PSTIMEOUT BIT29 +#define UHIMR_PSTIME BIT29 #define UHIMR_GTINT4 BIT28 #define UHIMR_GTINT3 BIT27 #define UHIMR_TXBCNERR BIT26 diff --git a/include/rtw_bt_mp.h b/include/rtw_bt_mp.h index f1c6b39..480c0f8 100644 --- a/include/rtw_bt_mp.h +++ b/include/rtw_bt_mp.h @@ -112,7 +112,7 @@ typedef enum _BT_CTRL_STATUS{ BT_STATUS_SUCCESS = 0x00, // Success BT_STATUS_BT_OP_SUCCESS = 0x01, // bt fw op execution success BT_STATUS_H2C_SUCCESS = 0x02, // H2c success - BT_STATUS_H2C_TIMTOUT = 0x03, // H2c timeout + BT_STATUS_H2C_TIMT = 0x03, // H2c timeout BT_STATUS_H2C_BT_NO_RSP = 0x04, // H2c sent, bt no rsp BT_STATUS_C2H_SUCCESS = 0x05, // C2h success BT_STATUS_C2H_REQNUM_MISMATCH = 0x06, // bt fw wrong rsp @@ -182,20 +182,20 @@ typedef enum _BT_REPORT_TYPE{ void MPTBT_Test( - IN PADAPTER Adapter, - IN u1Byte opCode, - IN u1Byte byte1, - IN u1Byte byte2, - IN u1Byte byte3 + PADAPTER Adapter, + u1Byte opCode, + u1Byte byte1, + u1Byte byte2, + u1Byte byte3 ); NDIS_STATUS MPTBT_SendOidBT( - IN PADAPTER pAdapter, - IN void * InformationBuffer, - IN ULONG InformationBufferLength, - OUT PULONG BytesRead, - OUT PULONG BytesNeeded + PADAPTER pAdapter, + void * InformationBuffer, + ULONG InformationBufferLength, + PULONG BytesRead, + PULONG BytesNeeded ); void @@ -264,7 +264,7 @@ typedef enum _BT_CTRL_OPCODE_LOWER{ BT_LO_OP_RESET = 0x01, BT_LO_OP_TEST_CTRL = 0x02, BT_LO_OP_SET_BT_MODE = 0x03, - BT_LO_OP_SET_CHNL_TX_GAIN = 0x04, + BT_LO_OP_SET_CHNL_TX_GA = 0x04, BT_LO_OP_SET_PKT_TYPE_LEN = 0x05, BT_LO_OP_SET_PKT_CNT_L_PL_TYPE = 0x06, BT_LO_OP_SET_PKT_CNT_H_PKT_INTV = 0x07, diff --git a/include/rtw_eeprom.h b/include/rtw_eeprom.h index 6325193..899a7b4 100644 --- a/include/rtw_eeprom.h +++ b/include/rtw_eeprom.h @@ -56,8 +56,8 @@ #define EEPROM_CID_CAMEO 0X8 #define EEPROM_CID_SITECOM 0x9 #define EEPROM_CID_COREGA 0xB -#define EEPROM_CID_EDIMAX_BELKIN 0xC -#define EEPROM_CID_SERCOMM_BELKIN 0xE +#define EEPROM_CID_EDIMAX_BELK 0xC +#define EEPROM_CID_SERCOMM_BELK 0xE #define EEPROM_CID_CAMEO1 0xF #define EEPROM_CID_WNC_COREGA 0x12 #define EEPROM_CID_CLEVO 0x13 diff --git a/include/rtw_ioctl.h b/include/rtw_ioctl.h index d9bf027..cd8910a 100644 --- a/include/rtw_ioctl.h +++ b/include/rtw_ioctl.h @@ -248,21 +248,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_mlme.h b/include/rtw_mlme.h index a187abb..4f73a35 100644 --- a/include/rtw_mlme.h +++ b/include/rtw_mlme.h @@ -31,8 +31,8 @@ #endif #define MAX_BSS_CNT 128 -//#define MAX_JOIN_TIMEOUT 2000 -//#define MAX_JOIN_TIMEOUT 2500 +//#define MAX_JOIN_TIME 2000 +//#define MAX_JOIN_TIME 2500 #define MAX_JOIN_TIMEOUT 6500 // Commented by Albert 20101105 @@ -601,17 +601,17 @@ void rtw_indicate_wx_disassoc_event(_adapter *padapter); extern thread_return event_thread(void *context); extern void rtw_join_timeout_handler ( - IN void * SystemSpecific1, - IN void * FunctionContext, - IN void * SystemSpecific2, - IN void * SystemSpecific3 + void * SystemSpecific1, + void * FunctionContext, + void * SystemSpecific2, + void * SystemSpecific3 ); extern void _rtw_scan_timeout_handler ( - IN void * SystemSpecific1, - IN void * FunctionContext, - IN void * SystemSpecific2, - IN void * SystemSpecific3 + void * SystemSpecific1, + void * FunctionContext, + void * SystemSpecific2, + void * SystemSpecific3 ); #endif diff --git a/include/rtw_mlme_ext.h b/include/rtw_mlme_ext.h index 4d4cc83..548bd22 100644 --- a/include/rtw_mlme_ext.h +++ b/include/rtw_mlme_ext.h @@ -72,7 +72,7 @@ #define DYNAMIC_BB_CCK_PD BIT(5) #define DYNAMIC_BB_ANT_DIV BIT(6) #define DYNAMIC_BB_PWR_SAVE BIT(7) -#define DYNAMIC_BB_PWR_TRAIN BIT(8) +#define DYNAMIC_BB_PWR_TRA BIT(8) #define DYNAMIC_BB_RATE_ADAPTIVE BIT(9) #define DYNAMIC_BB_PATH_DIV BIT(10) #define DYNAMIC_BB_PSD BIT(11) diff --git a/include/rtw_pwrctrl.h b/include/rtw_pwrctrl.h index 81074ad..e78e650 100644 --- a/include/rtw_pwrctrl.h +++ b/include/rtw_pwrctrl.h @@ -52,17 +52,17 @@ enum Power_Mgnt { - PS_MODE_ACTIVE = 0 , - PS_MODE_MIN , - PS_MODE_MAX , - PS_MODE_DTIM , - PS_MODE_VOIP , - PS_MODE_UAPSD_WMM , - PS_MODE_UAPSD , - PS_MODE_IBSS , - PS_MODE_WWLAN , - PM_Radio_Off , - PM_Card_Disable , + PS_MODE_ACTIVE = 0, + PS_MODE_MIN, + PS_MODE_MAX, + PS_MODE_DTIM, + PS_MODE_VOIP, + PS_MODE_UAPSD_WMM, + PS_MODE_UAPSD, + PS_MODE_IBSS, + PS_MODE_WWLAN, + PM_Radio_Off, + PM_Card_Disable , PS_MODE_NUM }; @@ -342,7 +342,7 @@ void rtw_ps_processor(_adapter*padapter); int autoresume_enter(_adapter* padapter); #endif #ifdef SUPPORT_HW_RFOFF_DETECTED -rt_rf_power_state RfOnOffDetect(IN PADAPTER pAdapter ); +rt_rf_power_state RfOnOffDetect( PADAPTER pAdapter ); #endif diff --git a/include/rtw_security.h b/include/rtw_security.h index bd16946..3e51ce9 100644 --- a/include/rtw_security.h +++ b/include/rtw_security.h @@ -430,10 +430,10 @@ int tdls_verify_mic(u8 *kck, u8 trans_seq, #ifdef PLATFORM_WINDOWS void rtw_use_tkipkey_handler ( - IN void * SystemSpecific1, - IN void * FunctionContext, - IN void * SystemSpecific2, - IN void * SystemSpecific3 + void * SystemSpecific1, + void * FunctionContext, + void * SystemSpecific2, + void * SystemSpecific3 ); #endif #ifdef PLATFORM_LINUX diff --git a/include/rtw_tdls.h b/include/rtw_tdls.h index aa88599..f67d16d 100644 --- a/include/rtw_tdls.h +++ b/include/rtw_tdls.h @@ -39,7 +39,7 @@ #define TPK_RESEND_COUNT 301 #define CH_SWITCH_TIME 10 -#define CH_SWITCH_TIMEOUT 30 +#define CH_SWITCH_TIME 30 #define TDLS_STAY_TIME 500 #define TDLS_SIGNAL_THRESH 0x20 #define TDLS_WATCHDOG_PERIOD 10 //Periodically sending tdls discovery request in TDLS_WATCHDOG_PERIOD * 2 sec diff --git a/include/usb_ops_linux.h b/include/usb_ops_linux.h index d3a5507..5a51ce6 100644 --- a/include/usb_ops_linux.h +++ b/include/usb_ops_linux.h @@ -32,7 +32,7 @@ #define MAX_USBCTRL_VENDORREQ_TIMES 1 #endif -#define RTW_USB_BULKOUT_TIMEOUT 5000//ms +#define RTW_USB_BULKOUT_TIME 5000//ms #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) || (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)) #define _usbctrl_vendorreq_async_callback(urb, regs) _usbctrl_vendorreq_async_callback(urb) diff --git a/include/wifi.h b/include/wifi.h index f0568ea..a77bc56 100644 --- a/include/wifi.h +++ b/include/wifi.h @@ -229,7 +229,7 @@ enum WIFI_REG_DOMAIN { DOMAIN_FCC = 1, DOMAIN_IC = 2, DOMAIN_ETSI = 3, - DOMAIN_SPAIN = 4, + DOMAIN_SPA = 4, DOMAIN_FRANCE = 5, DOMAIN_MKK = 6, DOMAIN_ISRAEL = 7, @@ -993,7 +993,7 @@ typedef enum _HT_CAP_AMPDU_FACTOR { #define WPS_PDT_SCID_RTK_DMP WPS_PDT_SCID_MEDIA_SERVER // Value of Device Password ID -#define WPS_DPID_PIN 0x0000 +#define WPS_DPID_P 0x0000 #define WPS_DPID_USER_SPEC 0x0001 #define WPS_DPID_MACHINE_SPEC 0x0002 #define WPS_DPID_REKEY 0x0003 @@ -1111,12 +1111,12 @@ typedef enum _HT_CAP_AMPDU_FACTOR { #define P2P_FINDPHASE_EX_SOCIAL_LAST P2P_FINDPHASE_EX_MAX #define P2P_PROVISION_TIMEOUT 5000 // 5 seconds timeout for sending the provision discovery request -#define P2P_CONCURRENT_PROVISION_TIMEOUT 3000 // 3 seconds timeout for sending the provision discovery request under concurrent mode +#define P2P_CONCURRENT_PROVISION_TIME 3000 // 3 seconds timeout for sending the provision discovery request under concurrent mode #define P2P_GO_NEGO_TIMEOUT 5000 // 5 seconds timeout for receiving the group negotation response -#define P2P_CONCURRENT_GO_NEGO_TIMEOUT 3000 // 3 seconds timeout for sending the negotiation request under concurrent mode +#define P2P_CONCURRENT_GO_NEGO_TIME 3000 // 3 seconds timeout for sending the negotiation request under concurrent mode #define P2P_TX_PRESCAN_TIMEOUT 100 // 100ms #define P2P_INVITE_TIMEOUT 5000 // 5 seconds timeout for sending the invitation request -#define P2P_CONCURRENT_INVITE_TIMEOUT 3000 // 3 seconds timeout for sending the invitation request under concurrent mode +#define P2P_CONCURRENT_INVITE_TIME 3000 // 3 seconds timeout for sending the invitation request under concurrent mode #define P2P_RESET_SCAN_CH 25000 // 25 seconds timeout to reset the scan channel ( based on channel plan ) #define P2P_MAX_INTENT 15 @@ -1133,8 +1133,8 @@ typedef enum _HT_CAP_AMPDU_FACTOR { #define WPS_CM_KEYPAD 0x0100 #define WPS_CM_SW_PUHS_BUTTON 0x0280 #define WPS_CM_HW_PUHS_BUTTON 0x0480 -#define WPS_CM_SW_DISPLAY_PIN 0x2008 -#define WPS_CM_LCD_DISPLAY_PIN 0x4008 +#define WPS_CM_SW_DISPLAY_P 0x2008 +#define WPS_CM_LCD_DISPLAY_P 0x4008 enum P2P_ROLE { P2P_ROLE_DISABLE = 0, diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index f61526a..86603fb 100644 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -26,11 +26,7 @@ #include #include #include -#ifndef CONFIG_USB_HCI - -#error "CONFIG_USB_HCI shall be on!\n" - -#endif +#include #include #include