diff --git a/core/rtw_eeprom.c b/core/rtw_eeprom.c index 2af9b6e..23a2f12 100755 --- a/core/rtw_eeprom.c +++ b/core/rtw_eeprom.c @@ -366,7 +366,7 @@ _func_exit_; -VOID read_eeprom_content(_adapter * padapter) +void read_eeprom_content(_adapter * padapter) { _func_enter_; diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index 174febc..20e5c95 100755 --- a/core/rtw_efuse.c +++ b/core/rtw_efuse.c @@ -115,7 +115,7 @@ Efuse_Write1ByteToFakeContent( * 11/17/2008 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -VOID +void Efuse_PowerSwitch( IN struct adapter *pAdapter, IN u8 bWrite, @@ -176,7 +176,7 @@ Efuse_CalculateWordCnts(IN u8 word_en) // // Created by Roger, 2008.10.21. // -VOID +void ReadEFuseByte( struct adapter *Adapter, u16 _offset, @@ -244,7 +244,7 @@ ReadEFuseByte( // write addr must be after sec5. // -VOID +void efuse_ReadEFuse( struct adapter *Adapter, u8 efuseType, @@ -253,7 +253,7 @@ efuse_ReadEFuse( u8 *pbuf, IN BOOLEAN bPseudoTest ); -VOID +void efuse_ReadEFuse( struct adapter *Adapter, u8 efuseType, @@ -266,7 +266,7 @@ efuse_ReadEFuse( Adapter->HalFunc.ReadEFuse(Adapter, efuseType, _offset, _size_byte, pbuf, bPseudoTest); } -VOID +void EFUSE_GetEfuseDefinition( IN struct adapter *pAdapter, IN u8 efuseType, @@ -305,7 +305,7 @@ EFUSE_Read1Byte( u32 k=0; u16 contentLen=0; - EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI , TYPE_EFUSE_REAL_CONTENT_LEN, (PVOID)&contentLen, _FALSE); + EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI , TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&contentLen, _FALSE); if (Address < contentLen) //E-fuse 512Byte { @@ -376,7 +376,7 @@ EFUSE_Write1Byte( u16 contentLen=0; //RT_TRACE(COMP_EFUSE, DBG_LOUD, ("Addr=%x Data =%x\n", Address, Value)); - EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI , TYPE_EFUSE_REAL_CONTENT_LEN, (PVOID)&contentLen, _FALSE); + EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI , TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&contentLen, _FALSE); if( Address < contentLen) //E-fuse 512Byte { @@ -618,8 +618,8 @@ u8 rtw_efuse_access(struct adapter *padapter, u8 bWrite, u16 start_addr, u16 cnt u8 res = _FAIL ; u8 (*rw8)(struct adapter *, u16, u8*); - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (PVOID)&real_content_len, _FALSE); - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&real_content_len, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); if (start_addr > real_content_len) return _FAIL; @@ -652,7 +652,7 @@ u8 rtw_efuse_access(struct adapter *padapter, u8 bWrite, u16 start_addr, u16 cnt u16 efuse_GetMaxSize(struct adapter *padapter) { u16 max_size; - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_size, _FALSE); return max_size; } //------------------------------------------------------------------------------ @@ -669,7 +669,7 @@ u8 rtw_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) { u16 mapLen=0; - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, _FALSE); if ((addr + cnts) > mapLen) return _FAIL; @@ -687,7 +687,7 @@ u8 rtw_BT_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) { u16 mapLen=0; - EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, _FALSE); if ((addr + cnts) > mapLen) return _FAIL; @@ -710,7 +710,7 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) u8 ret = _SUCCESS; u16 mapLen=0; - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, _FALSE); if ((addr + cnts) > mapLen) return _FAIL; @@ -808,7 +808,7 @@ u8 rtw_BT_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data u8 ret = _SUCCESS; u16 mapLen=0; - EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, _FALSE); if ((addr + cnts) > mapLen) return _FAIL; @@ -914,13 +914,13 @@ exit: * 11/11/2008 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -VOID +void Efuse_ReadAllMap( IN struct adapter *pAdapter, IN u8 efuseType, IN OUT u8 *Efuse, IN BOOLEAN bPseudoTest); -VOID +void Efuse_ReadAllMap( IN struct adapter *pAdapter, IN u8 efuseType, @@ -931,7 +931,7 @@ Efuse_ReadAllMap( Efuse_PowerSwitch(pAdapter,_FALSE, _TRUE); - EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, bPseudoTest); + EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, bPseudoTest); efuse_ReadEFuse(pAdapter, efuseType, 0, mapLen, Efuse, bPseudoTest); @@ -956,7 +956,7 @@ Efuse_ReadAllMap( * 11/12/2008 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -static VOID +static void efuse_ShadowRead1Byte( IN struct adapter *pAdapter, IN u16 Offset, @@ -969,7 +969,7 @@ efuse_ShadowRead1Byte( } // EFUSE_ShadowRead1Byte //---------------Read Two Bytes -static VOID +static void efuse_ShadowRead2Byte( IN struct adapter *pAdapter, IN u16 Offset, @@ -983,7 +983,7 @@ efuse_ShadowRead2Byte( } // EFUSE_ShadowRead2Byte //---------------Read Four Bytes -static VOID +static void efuse_ShadowRead4Byte( IN struct adapter *pAdapter, IN u16 Offset, @@ -1018,13 +1018,13 @@ efuse_ShadowRead4Byte( * *---------------------------------------------------------------------------*/ #ifdef PLATFORM -static VOID +static void efuse_ShadowWrite1Byte( IN struct adapter *pAdapter, IN u16 Offset, IN u8 Value); #endif //PLATFORM -static VOID +static void efuse_ShadowWrite1Byte( IN struct adapter *pAdapter, IN u16 Offset, @@ -1037,7 +1037,7 @@ efuse_ShadowWrite1Byte( } // efuse_ShadowWrite1Byte //---------------Write Two Bytes -static VOID +static void efuse_ShadowWrite2Byte( IN struct adapter *pAdapter, IN u16 Offset, @@ -1051,7 +1051,7 @@ efuse_ShadowWrite2Byte( } // efuse_ShadowWrite1Byte //---------------Write Four Bytes -static VOID +static void efuse_ShadowWrite4Byte( IN struct adapter *pAdapter, IN u16 Offset, @@ -1090,7 +1090,7 @@ void EFUSE_ShadowMapUpdate( EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); u16 mapLen=0; - EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, bPseudoTest); + EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, bPseudoTest); if (pEEPROM->bautoload_fail_flag == _TRUE) { @@ -1110,8 +1110,8 @@ void EFUSE_ShadowMapUpdate( #endif } - //PlatformMoveMemory((PVOID)&pHalData->EfuseMap[EFUSE_MODIFY_MAP][0], - //(PVOID)&pHalData->EfuseMap[EFUSE_INIT_MAP][0], mapLen); + //PlatformMoveMemory((void *)&pHalData->EfuseMap[EFUSE_MODIFY_MAP][0], + //(void *)&pHalData->EfuseMap[EFUSE_INIT_MAP][0], mapLen); }// EFUSE_ShadowMapUpdate @@ -1163,13 +1163,13 @@ EFUSE_ShadowRead( * 11/12/2008 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -VOID +void EFUSE_ShadowWrite( IN struct adapter *pAdapter, IN u8 Type, IN u16 Offset, IN OUT u32 Value); -VOID +void EFUSE_ShadowWrite( IN struct adapter *pAdapter, IN u8 Type, @@ -1192,34 +1192,34 @@ EFUSE_ShadowWrite( } // EFUSE_ShadowWrite -VOID +void Efuse_InitSomeVar( IN struct adapter *pAdapter ); -VOID +void Efuse_InitSomeVar( IN struct adapter *pAdapter ) { u8 i; - _rtw_memset((PVOID)&fakeEfuseContent[0], 0xff, EFUSE_MAX_HW_SIZE); - _rtw_memset((PVOID)&fakeEfuseInitMap[0], 0xff, EFUSE_MAX_MAP_LEN); - _rtw_memset((PVOID)&fakeEfuseModifiedMap[0], 0xff, EFUSE_MAX_MAP_LEN); + _rtw_memset((void *)&fakeEfuseContent[0], 0xff, EFUSE_MAX_HW_SIZE); + _rtw_memset((void *)&fakeEfuseInitMap[0], 0xff, EFUSE_MAX_MAP_LEN); + _rtw_memset((void *)&fakeEfuseModifiedMap[0], 0xff, EFUSE_MAX_MAP_LEN); for(i=0; iinformation_buf_len, addr, cnts)); - EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); if ((addr + cnts) > max_available_size) { RT_TRACE(_module_mp_, _drv_err_, ("!oid_rt_pro_read_efuse_hdl: parameter error!\n")); @@ -1203,7 +1203,7 @@ _func_enter_; ("+oid_rt_pro_write_efuse_hdl: buf_len=%d addr=0x%04x cnts=%d\n", poid_par_priv->information_buf_len, addr, cnts)); - EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); if ((addr + cnts) > max_available_size) { RT_TRACE(_module_mp_, _drv_err_, ("!oid_rt_pro_write_efuse_hdl: parameter error")); @@ -1357,7 +1357,7 @@ _func_enter_; RT_TRACE(_module_mp_, _drv_notice_, ("+oid_rt_pro_efuse_map_hdl\n")); - EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, _FALSE); + EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, _FALSE); *poid_par_priv->bytes_rw = 0; diff --git a/hal/Hal8188ERateAdaptive.c b/hal/Hal8188ERateAdaptive.c index 48c77c6..90934cf 100755 --- a/hal/Hal8188ERateAdaptive.c +++ b/hal/Hal8188ERateAdaptive.c @@ -619,7 +619,7 @@ odm_PTDecision_8188E( } #endif -static VOID +static void odm_RATxRPTTimerSetting( IN PDM_ODM_T pDM_Odm, IN u2Byte minRptTime @@ -642,7 +642,7 @@ odm_RATxRPTTimerSetting( } -VOID +void ODM_RASupport_Init( IN PDM_ODM_T pDM_Odm ) @@ -790,7 +790,7 @@ ODM_RA_GetHwPwrStatus_8188E( return PTStage; } -VOID +void ODM_RA_UpdateRateInfo_8188E( IN PDM_ODM_T pDM_Odm, IN u1Byte MacID, @@ -814,7 +814,7 @@ ODM_RA_UpdateRateInfo_8188E( odm_ARFBRefresh_8188E(pDM_Odm, pRaInfo); } -VOID +void ODM_RA_SetRSSI_8188E( IN PDM_ODM_T pDM_Odm, IN u1Byte MacID, @@ -832,7 +832,7 @@ ODM_RA_SetRSSI_8188E( pRaInfo->RssiStaRA = Rssi; } -VOID +void ODM_RA_Set_TxRPT_Time( IN PDM_ODM_T pDM_Odm, IN u2Byte minRptTime @@ -845,7 +845,7 @@ ODM_RA_Set_TxRPT_Time( } -VOID +void ODM_RA_TxRPT2Handle_8188E( IN PDM_ODM_T pDM_Odm, IN pu1Byte TxRPT_Buf, @@ -982,7 +982,7 @@ ODM_RA_TxRPT2Handle_8188E( #else -static VOID +static void odm_RATxRPTTimerSetting( IN PDM_ODM_T pDM_Odm, IN u2Byte minRptTime @@ -992,7 +992,7 @@ odm_RATxRPTTimerSetting( } -VOID +void ODM_RASupport_Init( IN PDM_ODM_T pDM_Odm ) @@ -1043,7 +1043,7 @@ ODM_RA_GetHwPwrStatus_8188E( return 0; } -VOID +void ODM_RA_UpdateRateInfo_8188E( IN PDM_ODM_T pDM_Odm, IN u1Byte MacID, @@ -1055,7 +1055,7 @@ ODM_RA_UpdateRateInfo_8188E( return; } -VOID +void ODM_RA_SetRSSI_8188E( IN PDM_ODM_T pDM_Odm, IN u1Byte MacID, @@ -1065,7 +1065,7 @@ ODM_RA_SetRSSI_8188E( return; } -VOID +void ODM_RA_Set_TxRPT_Time( IN PDM_ODM_T pDM_Odm, IN u2Byte minRptTime @@ -1074,7 +1074,7 @@ ODM_RA_Set_TxRPT_Time( return; } -VOID +void ODM_RA_TxRPT2Handle_8188E( IN PDM_ODM_T pDM_Odm, IN pu1Byte TxRPT_Buf, diff --git a/hal/Hal8188ERateAdaptive.h b/hal/Hal8188ERateAdaptive.h index e7c1e12..77fa524 100755 --- a/hal/Hal8188ERateAdaptive.h +++ b/hal/Hal8188ERateAdaptive.h @@ -40,7 +40,7 @@ Major Change History: // End rate adaptive define -VOID +void ODM_RASupport_Init( IN PDM_ODM_T pDM_Odm ); @@ -73,7 +73,7 @@ ODM_RA_GetHwPwrStatus_8188E( IN PDM_ODM_T pDM_Odm, IN u1Byte MacID ); -VOID +void ODM_RA_UpdateRateInfo_8188E( IN PDM_ODM_T pDM_Odm, IN u1Byte MacID, @@ -82,14 +82,14 @@ ODM_RA_UpdateRateInfo_8188E( IN u1Byte SGIEnable ); -VOID +void ODM_RA_SetRSSI_8188E( IN PDM_ODM_T pDM_Odm, IN u1Byte MacID, IN u1Byte Rssi ); -VOID +void ODM_RA_TxRPT2Handle_8188E( IN PDM_ODM_T pDM_Odm, IN pu1Byte TxRPT_Buf, @@ -99,7 +99,7 @@ ODM_RA_TxRPT2Handle_8188E( ); -VOID +void ODM_RA_Set_TxRPT_Time( IN PDM_ODM_T pDM_Odm, IN u2Byte minRptTime diff --git a/hal/HalPhyRf.c b/hal/HalPhyRf.c index c748945..3420e17 100755 --- a/hal/HalPhyRf.c +++ b/hal/HalPhyRf.c @@ -23,7 +23,7 @@ #if(DM_ODM_SUPPORT_TYPE & ODM_MP) #include "Mp_Precomp.h" -VOID +void phy_PathAStandBy( IN struct adapter *pAdapter ) @@ -176,7 +176,7 @@ phy_PathB_IQK_8192C( } -VOID +void phy_PathAFillIQKMatrix( IN struct adapter *pAdapter, IN BOOLEAN bIQKOK, @@ -243,7 +243,7 @@ phy_PathAFillIQKMatrix( } } -VOID +void phy_PathBFillIQKMatrix( IN struct adapter *pAdapter, IN BOOLEAN bIQKOK, @@ -392,7 +392,7 @@ phy_SimularityCompare( } -VOID +void phy_IQCalibrate_8192C( IN struct adapter *pAdapter, IN s4Byte result[][8], @@ -648,7 +648,7 @@ phy_IQCalibrate_8192C( } -VOID +void phy_LCCalibrate92C( IN struct adapter *pAdapter, IN BOOLEAN is2T @@ -712,7 +712,7 @@ phy_LCCalibrate92C( } -VOID +void phy_LCCalibrate( IN struct adapter *pAdapter, IN BOOLEAN is2T @@ -739,7 +739,7 @@ phy_LCCalibrate( #define APK_CURVE_REG_NUM 4 #define PATH_NUM 2 -VOID +void phy_APCalibrate_8192C( IN struct adapter *pAdapter, IN s1Byte delta, @@ -1178,7 +1178,7 @@ if (pAdapter->registrypriv.mp_mode == 1) } -VOID +void PHY_IQCalibrate_8192C( IN struct adapter *pAdapter, IN BOOLEAN bReCovery @@ -1388,7 +1388,7 @@ if (pAdapter->registrypriv.mp_mode == 1) } -VOID +void PHY_LCCalibrate_8192C( IN struct adapter *pAdapter ) @@ -1456,7 +1456,7 @@ if (pAdapter->registrypriv.mp_mode == 1) } -VOID +void PHY_APCalibrate_8192C( IN struct adapter *pAdapter, IN s1Byte delta @@ -1496,7 +1496,7 @@ PHY_APCalibrate_8192C( //3 IQ Calibration //3============================================================ -VOID +void ODM_ResetIQKResult( IN PDM_ODM_T pDM_Odm ) diff --git a/hal/HalPhyRf.h b/hal/HalPhyRf.h index 0b11dc4..9c59c5a 100755 --- a/hal/HalPhyRf.h +++ b/hal/HalPhyRf.h @@ -56,7 +56,7 @@ PHY_APCalibrate_8192C( IN PADAPTER pAdapter, #define ODM_TARGET_CHNL_NUM_2G_5G 59 -VOID +void ODM_ResetIQKResult( IN PDM_ODM_T pDM_Odm ); diff --git a/hal/HalPhyRf_8188e.c b/hal/HalPhyRf_8188e.c index 8293498..e4e6c7f 100755 --- a/hal/HalPhyRf_8188e.c +++ b/hal/HalPhyRf_8188e.c @@ -193,7 +193,7 @@ void doIQK( * 04/23/2012 MHC Adjust TX agc directly not throughput BB digital. * *---------------------------------------------------------------------------*/ -VOID +void ODM_TxPwrTrackAdjust88E( PDM_ODM_T pDM_Odm, u1Byte Type, // 0 = OFDM, 1 = CCK @@ -276,7 +276,7 @@ ODM_TxPwrTrackAdjust88E( * 04/23/2012 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -VOID +void odm_TxPwrTrackSetPwr88E( PDM_ODM_T pDM_Odm, PWRTRACK_METHOD Method, @@ -379,7 +379,7 @@ odm_TxPwrTrackSetPwr88E( } // odm_TxPwrTrackSetPwr88E -VOID +void odm_TXPowerTrackingCallback_ThermalMeter_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm @@ -913,7 +913,7 @@ phy_PathB_IQK_8188E( } -VOID +void _PHY_PathAFillIQKMatrix( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -988,7 +988,7 @@ _PHY_PathAFillIQKMatrix( } } -VOID +void _PHY_PathBFillIQKMatrix( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1092,7 +1092,7 @@ ODM_CheckPowerStatus( } #endif -VOID +void _PHY_SaveADDARegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1125,7 +1125,7 @@ _PHY_SaveADDARegisters( } -VOID +void _PHY_SaveMACRegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1155,7 +1155,7 @@ _PHY_SaveMACRegisters( } -VOID +void _PHY_ReloadADDARegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1185,7 +1185,7 @@ _PHY_ReloadADDARegisters( } } -VOID +void _PHY_ReloadMACRegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1214,7 +1214,7 @@ _PHY_ReloadMACRegisters( } -VOID +void _PHY_PathADDAOn( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1254,7 +1254,7 @@ _PHY_PathADDAOn( } -VOID +void _PHY_MACSettingCalibration( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1286,7 +1286,7 @@ _PHY_MACSettingCalibration( } -VOID +void _PHY_PathAStandBy( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm @@ -1311,7 +1311,7 @@ _PHY_PathAStandBy( ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, bMaskDWord, 0x80800000); } -VOID +void _PHY_PIModeSwitch( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1473,7 +1473,7 @@ phy_SimularityCompare_8188E( -VOID +void phy_IQCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1757,7 +1757,7 @@ else } -VOID +void phy_LCCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1848,7 +1848,7 @@ phy_LCCalibrate_8188E( #define APK_CURVE_REG_NUM 4 #define PATH_NUM 2 -VOID +void phy_APCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -2341,7 +2341,7 @@ if (*(pDM_Odm->mp_mode) != 1) -VOID +void PHY_IQCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -2610,7 +2610,7 @@ if (*(pDM_Odm->mp_mode) == 1) ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("IQK finished\n")); } -VOID +void PHY_LCCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm @@ -2699,7 +2699,7 @@ if (*(pDM_Odm->mp_mode) == 1) } -VOID +void PHY_APCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -2750,7 +2750,7 @@ PHY_APCalibrate_8188E( #endif } } -VOID phy_SetRFPathSwitch_8188E( +void phy_SetRFPathSwitch_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else @@ -2799,7 +2799,7 @@ VOID phy_SetRFPathSwitch_8188E( ODM_SetBBReg(pDM_Odm, rFPGA0_XA_RFInterfaceOE, BIT8|BIT9, 0x1); //Aux } } -VOID PHY_SetRFPathSwitch_8188E( +void PHY_SetRFPathSwitch_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else @@ -2842,7 +2842,7 @@ VOID PHY_SetRFPathSwitch_8188E( #if (DM_ODM_SUPPORT_TYPE == ODM_MP) //digital predistortion -VOID +void phy_DigitalPredistortion( #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) IN struct adapter *pAdapter, @@ -2854,7 +2854,7 @@ phy_DigitalPredistortion( { } -VOID +void PHY_DigitalPredistortion_8188E( #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) IN struct adapter *pAdapter diff --git a/hal/HalPhyRf_8188e.h b/hal/HalPhyRf_8188e.h index 8e2cea7..9f26041 100755 --- a/hal/HalPhyRf_8188e.h +++ b/hal/HalPhyRf_8188e.h @@ -33,7 +33,7 @@ typedef enum _PWRTRACK_CONTROL_METHOD { } PWRTRACK_METHOD; -VOID +void ODM_TxPwrTrackAdjust88E( PDM_ODM_T pDM_Odm, u1Byte Type, // 0 = OFDM, 1 = CCK @@ -42,7 +42,7 @@ ODM_TxPwrTrackAdjust88E( ); -VOID +void odm_TXPowerTrackingCallback_ThermalMeter_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm @@ -91,7 +91,7 @@ void PHY_DigitalPredistortion_8188E( IN struct adapter * pAdapter); -VOID +void _PHY_SaveADDARegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -103,7 +103,7 @@ _PHY_SaveADDARegisters( IN u4Byte RegisterNum ); -VOID +void _PHY_PathADDAOn( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -115,7 +115,7 @@ _PHY_PathADDAOn( IN BOOLEAN is2T ); -VOID +void _PHY_MACSettingCalibration( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -127,7 +127,7 @@ _PHY_MACSettingCalibration( ); -VOID +void _PHY_PathAStandBy( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm diff --git a/hal/hal_com.c b/hal/hal_com.c index 261ba37..321616a 100755 --- a/hal/hal_com.c +++ b/hal/hal_com.c @@ -173,7 +173,7 @@ void HalSetBrateCfg( } } -static VOID +static void _OneOutPipeMapping( IN struct adapter *pAdapter ) @@ -191,7 +191,7 @@ _OneOutPipeMapping( pdvobjpriv->Queue2Pipe[7] = pdvobjpriv->RtOutPipe[0];//TXCMD } -static VOID +static void _TwoOutPipeMapping( IN struct adapter *pAdapter, IN BOOLEAN bWIFICfg @@ -237,7 +237,7 @@ _TwoOutPipeMapping( } -static VOID _ThreeOutPipeMapping( +static void _ThreeOutPipeMapping( IN struct adapter *pAdapter, IN BOOLEAN bWIFICfg ) diff --git a/hal/hal_intf.c b/hal/hal_intf.c index 407f1b0..9b55dd4 100755 --- a/hal/hal_intf.c +++ b/hal/hal_intf.c @@ -203,25 +203,25 @@ void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val) padapter->HalFunc.GetHwRegHandler(padapter, variable, val); } -u8 rtw_hal_set_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue) +u8 rtw_hal_set_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue) { if(padapter->HalFunc.SetHalDefVarHandler) return padapter->HalFunc.SetHalDefVarHandler(padapter,eVariable,pValue); return _FAIL; } -u8 rtw_hal_get_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue) +u8 rtw_hal_get_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue) { if(padapter->HalFunc.GetHalDefVarHandler) return padapter->HalFunc.GetHalDefVarHandler(padapter,eVariable,pValue); return _FAIL; } -void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet) +void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet) { if(padapter->HalFunc.SetHalODMVarHandler) padapter->HalFunc.SetHalODMVarHandler(padapter,eVariable,pValue1,bSet); } -void rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet) +void rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet) { if(padapter->HalFunc.GetHalODMVarHandler) padapter->HalFunc.GetHalODMVarHandler(padapter,eVariable,pValue1,bSet); diff --git a/hal/odm.c b/hal/odm.c index 8e1876b..4e24fd6 100755 --- a/hal/odm.c +++ b/hal/odm.c @@ -278,37 +278,37 @@ unsigned int TxPwrTrk_OFDM_SwingTbl[TxPwrTrk_OFDM_SwingTbl_Len] = { //============================================================ //START------------COMMON INFO RELATED---------------// -VOID +void odm_CommonInfoSelfInit( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_CommonInfoSelfUpdate( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_CmnInfoInit_Debug( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_CmnInfoHook_Debug( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_CmnInfoUpdate_Debug( IN PDM_ODM_T pDM_Odm ); /* -VOID +void odm_FindMinimumRSSI( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_IsLinked( IN PDM_ODM_T pDM_Odm ); @@ -316,48 +316,48 @@ odm_IsLinked( //END------------COMMON INFO RELATED---------------// //START---------------DIG---------------------------// -VOID +void odm_FalseAlarmCounterStatistics( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_DIGInit( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_DIG( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_CCKPacketDetectionThresh( IN PDM_ODM_T pDM_Odm ); //END---------------DIG---------------------------// //START-------BB POWER SAVE-----------------------// -VOID +void odm_DynamicBBPowerSavingInit( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_DynamicBBPowerSaving( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_1R_CCA( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_AdaptivityInit( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_Adaptivity( IN PDM_ODM_T pDM_Odm, IN u1Byte IGI @@ -369,51 +369,51 @@ odm_Adaptivity( //============================================================ // Function predefine. //============================================================ -VOID odm_PathDiversityInit_92C( IN struct adapter *Adapter); -VOID odm_2TPathDiversityInit_92C( IN struct adapter *Adapter); -VOID odm_1TPathDiversityInit_92C( IN struct adapter *Adapter); +void odm_PathDiversityInit_92C( IN struct adapter *Adapter); +void odm_2TPathDiversityInit_92C( IN struct adapter *Adapter); +void odm_1TPathDiversityInit_92C( IN struct adapter *Adapter); BOOLEAN odm_IsConnected_92C(IN struct adapter *Adapter); -VOID odm_PathDiversityAfterLink_92C( IN struct adapter *Adapter); +void odm_PathDiversityAfterLink_92C( IN struct adapter *Adapter); -VOID +void odm_CCKTXPathDiversityCallback( PRT_TIMER pTimer ); -VOID +void odm_CCKTXPathDiversityWorkItemCallback( - IN PVOID pContext + IN void * pContext ); -VOID +void odm_PathDivChkAntSwitchCallback( PRT_TIMER pTimer ); -VOID +void odm_PathDivChkAntSwitchWorkitemCallback( - IN PVOID pContext + IN void * pContext ); -VOID odm_SetRespPath_92C( IN struct adapter *Adapter, IN u1Byte DefaultRespPath); -VOID odm_OFDMTXPathDiversity_92C( IN struct adapter *Adapter); -VOID odm_CCKTXPathDiversity_92C( IN struct adapter *Adapter); -VOID odm_ResetPathDiversity_92C( IN struct adapter *Adapter); +void odm_SetRespPath_92C( IN struct adapter *Adapter, IN u1Byte DefaultRespPath); +void odm_OFDMTXPathDiversity_92C( IN struct adapter *Adapter); +void odm_CCKTXPathDiversity_92C( IN struct adapter *Adapter); +void odm_ResetPathDiversity_92C( IN struct adapter *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( 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_PSD_RXHP( IN PDM_ODM_T pDM_Odm); -VOID odm_PSD_RXHPCallback( PRT_TIMER pTimer); -VOID odm_PSD_RXHPWorkitemCallback( IN PVOID pContext); +void odm_PSD_RXHP( IN PDM_ODM_T pDM_Odm); +void odm_PSD_RXHPCallback( PRT_TIMER pTimer); +void odm_PSD_RXHPWorkitemCallback( IN void * pContext); //End--------------------- RX High Power -----------------------// -VOID +void odm_PathDivInit( IN PDM_ODM_T pDM_Odm); -VOID +void odm_SetRespPath_92C( IN struct adapter *Adapter, IN u1Byte DefaultRespPath @@ -422,112 +422,112 @@ odm_SetRespPath_92C( #endif //END-------------------PSD-----------------------// -VOID +void odm_RefreshRateAdaptiveMaskMP( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_RefreshRateAdaptiveMaskCE( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_RefreshRateAdaptiveMaskAPADSL( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_DynamicTxPowerInit( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_DynamicTxPowerRestorePowerIndex( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_DynamicTxPowerNIC( IN PDM_ODM_T pDM_Odm ); #if(DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE)) -VOID +void odm_DynamicTxPowerSavePowerIndex( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_DynamicTxPowerWritePowerIndex( IN PDM_ODM_T pDM_Odm, IN u1Byte Value); -VOID +void odm_DynamicTxPower_92C( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_DynamicTxPower_92D( IN PDM_ODM_T pDM_Odm ); #endif -VOID +void odm_RSSIMonitorInit( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_RSSIMonitorCheckMP( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_RSSIMonitorCheckCE( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_RSSIMonitorCheckAP( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_RSSIMonitorCheck( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_DynamicTxPower( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_DynamicTxPowerAP( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_SwAntDivInit( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_SwAntDivInit_NIC( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_SwAntDivChkAntSwitch( IN PDM_ODM_T pDM_Odm, IN u1Byte Step ); -VOID +void odm_SwAntDivChkAntSwitchNIC( IN PDM_ODM_T pDM_Odm, IN u1Byte Step @@ -535,38 +535,38 @@ odm_SwAntDivChkAntSwitchNIC( #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -VOID +void odm_SwAntDivChkAntSwitchCallback( PRT_TIMER pTimer ); -VOID +void odm_SwAntDivChkAntSwitchWorkitemCallback( - IN PVOID pContext + IN void * pContext ); #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) -VOID odm_SwAntDivChkAntSwitchCallback(void *FunctionContext); +void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext); #elif (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) -VOID odm_SwAntDivChkAntSwitchCallback(void *FunctionContext); +void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext); #endif -VOID +void odm_GlobalAdapterCheck( - IN VOID + IN void ); -VOID +void odm_RefreshRateAdaptiveMask( IN PDM_ODM_T pDM_Odm ); -VOID +void ODM_TXPowerTrackingCheck( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_TXPowerTrackingCheckAP( IN PDM_ODM_T pDM_Odm ); @@ -577,79 +577,79 @@ odm_TXPowerTrackingCheckAP( -VOID +void odm_RateAdaptiveMaskInit( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_TXPowerTrackingThermalMeterInit( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_TXPowerTrackingInit( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_TXPowerTrackingCheckMP( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_TXPowerTrackingCheckCE( IN PDM_ODM_T pDM_Odm ); #if(DM_ODM_SUPPORT_TYPE & (ODM_MP)) -VOID +void ODM_RateAdaptiveStateApInit( IN struct adapter *Adapter , IN PRT_WLAN_STA pEntry ); -VOID +void odm_TXPowerTrackingCallbackThermalMeter92C( IN struct adapter *Adapter ); -VOID +void odm_TXPowerTrackingCallbackRXGainThermalMeter92D( IN struct adapter * Adapter ); -VOID +void odm_TXPowerTrackingCallbackThermalMeter92D( IN struct adapter *Adapter ); -VOID +void odm_TXPowerTrackingDirectCall92C( IN struct adapter * Adapter ); -VOID +void odm_TXPowerTrackingThermalMeterCheck( IN struct adapter * Adapter ); #endif -VOID +void odm_EdcaTurboCheck( IN PDM_ODM_T pDM_Odm ); -VOID +void ODM_EdcaTurboInit( IN PDM_ODM_T pDM_Odm ); #if(DM_ODM_SUPPORT_TYPE==ODM_MP) -VOID +void odm_EdcaTurboCheckMP( IN PDM_ODM_T pDM_Odm ); @@ -660,14 +660,14 @@ odm_IsEdcaTurboDisable( IN PDM_ODM_T pDM_Odm ); //choose edca paramter for special IOT case -VOID +void ODM_EdcaParaSelByIot( IN PDM_ODM_T pDM_Odm, OUT u4Byte *EDCA_BE_UL, OUT u4Byte *EDCA_BE_DL ); //check if it is UL or DL -VOID +void odm_EdcaChooseTrafficIdx( IN PDM_ODM_T pDM_Odm, IN u8Byte cur_tx_bytes, @@ -677,17 +677,17 @@ odm_EdcaChooseTrafficIdx( ); #elif (DM_ODM_SUPPORT_TYPE==ODM_CE) -VOID +void odm_EdcaTurboCheckCE( IN PDM_ODM_T pDM_Odm ); #else -VOID +void odm_IotEngine( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_EdcaParaInit( IN PDM_ODM_T pDM_Odm ); @@ -698,7 +698,7 @@ odm_EdcaParaInit( #define RxDefaultAnt1 0x65a9 #define RxDefaultAnt2 0x569a -VOID +void odm_InitHybridAntDiv( IN PDM_ODM_T pDM_Odm ); @@ -713,7 +713,7 @@ odm_StaDefAntSel( OUT u1Byte *pDefAnt ); -VOID +void odm_SetRxIdleAnt( IN PDM_ODM_T pDM_Odm, IN u1Byte Ant, @@ -722,7 +722,7 @@ odm_SetRxIdleAnt( -VOID +void odm_HwAntDiv( IN PDM_ODM_T pDM_Odm ); @@ -734,7 +734,7 @@ odm_HwAntDiv( // // 2011/09/21 MH Add to describe different team necessary resource allocate?? // -VOID +void ODM_DMInit( IN PDM_ODM_T pDM_Odm ) @@ -791,7 +791,7 @@ ODM_DMInit( // You can not add any dummy function here, be care, you can only use DM structure // to perform any new ODM_DM. // -VOID +void ODM_DMWatchdog( IN PDM_ODM_T pDM_Odm ) @@ -881,7 +881,7 @@ ODM_DMWatchdog( // // Init /.. Fixed HW value. Only init time. // -VOID +void ODM_CmnInfoInit( IN PDM_ODM_T pDM_Odm, IN ODM_CMNINFO_E CmnInfo, @@ -973,11 +973,11 @@ ODM_CmnInfoInit( } -VOID +void ODM_CmnInfoHook( IN PDM_ODM_T pDM_Odm, IN ODM_CMNINFO_E CmnInfo, - IN PVOID pValue + IN void * pValue ) { // @@ -1095,12 +1095,12 @@ ODM_CmnInfoHook( } -VOID +void ODM_CmnInfoPtrArrayHook( IN PDM_ODM_T pDM_Odm, IN ODM_CMNINFO_E CmnInfo, IN u2Byte Index, - IN PVOID pValue + IN void * pValue ) { // @@ -1126,7 +1126,7 @@ ODM_CmnInfoPtrArrayHook( // // Update Band/CHannel/.. The values are dynamic but non-per-packet. // -VOID +void ODM_CmnInfoUpdate( IN PDM_ODM_T pDM_Odm, IN u4Byte CmnInfo, @@ -1206,7 +1206,7 @@ ODM_CmnInfoUpdate( } -VOID +void odm_CommonInfoSelfInit( IN PDM_ODM_T pDM_Odm ) @@ -1230,7 +1230,7 @@ odm_CommonInfoSelfInit( ODM_InitDebugSetting(pDM_Odm); } -VOID +void odm_CommonInfoSelfUpdate( IN PDM_ODM_T pDM_Odm ) @@ -1282,7 +1282,7 @@ odm_CommonInfoSelfUpdate( pDM_Odm->bOneEntryOnly = FALSE; } -VOID +void odm_CmnInfoInit_Debug( IN PDM_ODM_T pDM_Odm ) @@ -1306,7 +1306,7 @@ odm_CmnInfoInit_Debug( } -VOID +void odm_CmnInfoHook_Debug( IN PDM_ODM_T pDM_Odm ) @@ -1339,7 +1339,7 @@ odm_CmnInfoHook_Debug( ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("pOnePathCCA=%d\n",*(pDM_Odm->pOnePathCCA)) ); } -VOID +void odm_CmnInfoUpdate_Debug( IN PDM_ODM_T pDM_Odm ) @@ -1352,7 +1352,7 @@ odm_CmnInfoUpdate_Debug( } #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -VOID +void ODM_InitAllWorkItems(IN PDM_ODM_T pDM_Odm ) { #if USE_WORKITEM @@ -1361,7 +1361,7 @@ ODM_InitAllWorkItems(IN PDM_ODM_T pDM_Odm ) ODM_InitializeWorkItem( pDM_Odm, &pDM_Odm->DM_SWAT_Table.SwAntennaSwitchWorkitem, (RT_WORKITEM_CALL_BACK)odm_SwAntDivChkAntSwitchWorkitemCallback, - (PVOID)pAdapter, + (void *)pAdapter, "AntennaSwitchWorkitem" ); @@ -1369,14 +1369,14 @@ ODM_InitAllWorkItems(IN PDM_ODM_T pDM_Odm ) pDM_Odm, &(pDM_Odm->PathDivSwitchWorkitem), (RT_WORKITEM_CALL_BACK)odm_PathDivChkAntSwitchWorkitemCallback, - (PVOID)pAdapter, + (void *)pAdapter, "SWAS_WorkItem"); ODM_InitializeWorkItem( pDM_Odm, &(pDM_Odm->CCKPathDiversityWorkitem), (RT_WORKITEM_CALL_BACK)odm_CCKTXPathDiversityWorkItemCallback, - (PVOID)pAdapter, + (void *)pAdapter, "CCKTXPathDiversityWorkItem"); #if(defined(CONFIG_HW_ANTENNA_DIVERSITY)) #if (RTL8188E_SUPPORT == 1) @@ -1384,7 +1384,7 @@ ODM_InitAllWorkItems(IN PDM_ODM_T pDM_Odm ) pDM_Odm, &(pDM_Odm->FastAntTrainingWorkitem), (RT_WORKITEM_CALL_BACK)odm_FastAntTrainingWorkItemCallback, - (PVOID)pAdapter, + (void *)pAdapter, "FastAntTrainingWorkitem"); #endif #endif @@ -1392,12 +1392,12 @@ ODM_InitAllWorkItems(IN PDM_ODM_T pDM_Odm ) pDM_Odm, &(pDM_Odm->DM_RXHP_Table.PSDTimeWorkitem), (RT_WORKITEM_CALL_BACK)odm_PSD_RXHPWorkitemCallback, - (PVOID)pAdapter, + (void *)pAdapter, "PSDRXHP_WorkItem"); #endif } -VOID +void ODM_FreeAllWorkItems(IN PDM_ODM_T pDM_Odm ) { #if USE_WORKITEM @@ -1416,7 +1416,7 @@ ODM_FreeAllWorkItems(IN PDM_ODM_T pDM_Odm ) #endif /* -VOID +void odm_FindMinimumRSSI( IN PDM_ODM_T pDM_Odm ) @@ -1440,7 +1440,7 @@ odm_FindMinimumRSSI( } -VOID +void odm_IsLinked( IN PDM_ODM_T pDM_Odm ) @@ -1481,7 +1481,7 @@ odm_IsLinked( * When Who Remark * *---------------------------------------------------------------------------*/ -VOID +void ODM_ChangeDynamicInitGainThresh( IN PDM_ODM_T pDM_Odm, IN u4Byte DM_Type, @@ -1545,7 +1545,7 @@ int getIGIForDiff(int value_IGI) // Add by Neil Chen to enable edcca to MP Platform #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -VOID +void odm_EnableEDCCA( IN PDM_ODM_T pDM_Odm ) @@ -1575,7 +1575,7 @@ odm_EnableEDCCA( //PlatformEFIOWrite1Byte(Adapter, rOFDM0_ECCAThreshold+2, 0x00); } -VOID +void odm_DisableEDCCA( IN PDM_ODM_T pDM_Odm ) @@ -1590,7 +1590,7 @@ odm_DisableEDCCA( // // Suggested by SD3 Wilson. Added by tynli. 2011.11.25. // -VOID +void odm_DynamicEDCCA( IN PDM_ODM_T pDM_Odm ) @@ -1628,7 +1628,7 @@ odm_DynamicEDCCA( #endif // end MP platform support -VOID +void ODM_Write_DIG( IN PDM_ODM_T pDM_Odm, IN u1Byte CurrentIGI @@ -1689,7 +1689,7 @@ ODM_Write_DIG( //8723AS/8189ES #if (DM_ODM_SUPPORT_TYPE == ODM_CE) -VOID +void odm_DIGbyRSSI_LPS( IN PDM_ODM_T pDM_Odm ) @@ -1747,7 +1747,7 @@ odm_DIGbyRSSI_LPS( } #endif -VOID +void odm_AdaptivityInit( IN PDM_ODM_T pDM_Odm ) @@ -1777,7 +1777,7 @@ IN PDM_ODM_T pDM_Odm } -VOID +void odm_Adaptivity( IN PDM_ODM_T pDM_Odm, IN u1Byte IGI @@ -1892,7 +1892,7 @@ odm_Adaptivity( } #if 1 -VOID +void odm_DIGInit( IN PDM_ODM_T pDM_Odm ) @@ -1940,7 +1940,7 @@ odm_DIGInit( } -VOID +void odm_DigForBtHsMode( IN PDM_ODM_T pDM_Odm ) @@ -1980,7 +1980,7 @@ odm_DigForBtHsMode( #endif } -VOID +void odm_DIG( IN PDM_ODM_T pDM_Odm ) @@ -2612,7 +2612,7 @@ odm_DigAbort( #else -VOID +void odm_DIGInit( IN PDM_ODM_T pDM_Odm ) @@ -2658,7 +2658,7 @@ odm_DIGInit( } -VOID +void odm_DIG( IN PDM_ODM_T pDM_Odm ) @@ -3149,7 +3149,7 @@ odm_DIG( //3 FASLE ALARM CHECK //3============================================================ -VOID +void odm_FalseAlarmCounterStatistics( IN PDM_ODM_T pDM_Odm ) @@ -3300,7 +3300,7 @@ odm_FalseAlarmCounterStatistics( //3 CCK Packet Detect Threshold //3============================================================ -VOID +void odm_CCKPacketDetectionThresh( IN PDM_ODM_T pDM_Odm ) @@ -3361,7 +3361,7 @@ odm_CCKPacketDetectionThresh( ODM_Write_CCK_CCA_Thres(pDM_Odm, CurCCK_CCAThres); } -VOID +void ODM_Write_CCK_CCA_Thres( IN PDM_ODM_T pDM_Odm, IN u1Byte CurCCK_CCAThres @@ -3381,7 +3381,7 @@ ODM_Write_CCK_CCA_Thres( //3============================================================ //3 BB Power Save //3============================================================ -VOID +void odm_DynamicBBPowerSavingInit( IN PDM_ODM_T pDM_Odm ) @@ -3397,7 +3397,7 @@ odm_DynamicBBPowerSavingInit( } -VOID +void odm_DynamicBBPowerSaving( IN PDM_ODM_T pDM_Odm ) @@ -3428,7 +3428,7 @@ odm_DynamicBBPowerSaving( } -VOID +void odm_1R_CCA( IN PDM_ODM_T pDM_Odm ) @@ -3581,7 +3581,7 @@ ODM_RF_Saving( //3 Rate Adaptive //3============================================================ -VOID +void odm_RateAdaptiveMaskInit( IN PDM_ODM_T pDM_Odm ) @@ -3613,7 +3613,7 @@ odm_RateAdaptiveMaskInit( } #if (DM_ODM_SUPPORT_TYPE & ODM_MP) -VOID +void ODM_RateAdaptiveStateApInit( IN struct adapter *Adapter , IN PRT_WLAN_STA pEntry @@ -3744,7 +3744,7 @@ u4Byte ODM_Get_Rate_Bitmap( * 05/27/2009 hpfan Create Version 0. * *---------------------------------------------------------------------------*/ -VOID +void odm_RefreshRateAdaptiveMask( IN PDM_ODM_T pDM_Odm ) @@ -3774,7 +3774,7 @@ odm_RefreshRateAdaptiveMask( } -VOID +void odm_RefreshRateAdaptiveMaskMP( IN PDM_ODM_T pDM_Odm ) @@ -3870,7 +3870,7 @@ odm_RefreshRateAdaptiveMaskMP( } -VOID +void odm_RefreshRateAdaptiveMaskCE( IN PDM_ODM_T pDM_Odm ) @@ -3911,7 +3911,7 @@ odm_RefreshRateAdaptiveMaskCE( #endif } -VOID +void odm_RefreshRateAdaptiveMaskAPADSL( IN PDM_ODM_T pDM_Odm ) @@ -4006,7 +4006,7 @@ ODM_RAStateCheck( //3 Dynamic Tx Power //3============================================================ -VOID +void odm_DynamicTxPowerInit( IN PDM_ODM_T pDM_Odm ) @@ -4063,7 +4063,7 @@ odm_DynamicTxPowerInit( } -VOID +void odm_DynamicTxPowerSavePowerIndex( IN PDM_ODM_T pDM_Odm ) @@ -4085,7 +4085,7 @@ odm_DynamicTxPowerSavePowerIndex( #endif } -VOID +void odm_DynamicTxPowerRestorePowerIndex( IN PDM_ODM_T pDM_Odm ) @@ -4107,7 +4107,7 @@ odm_DynamicTxPowerRestorePowerIndex( #endif } -VOID +void odm_DynamicTxPowerWritePowerIndex( IN PDM_ODM_T pDM_Odm, IN u1Byte Value) @@ -4123,7 +4123,7 @@ odm_DynamicTxPowerWritePowerIndex( } -VOID +void odm_DynamicTxPower( IN PDM_ODM_T pDM_Odm ) @@ -4167,7 +4167,7 @@ odm_DynamicTxPower( } -VOID +void odm_DynamicTxPowerNIC( IN PDM_ODM_T pDM_Odm ) @@ -4197,7 +4197,7 @@ odm_DynamicTxPowerNIC( #endif } -VOID +void odm_DynamicTxPowerAP( IN PDM_ODM_T pDM_Odm @@ -4235,7 +4235,7 @@ odm_DynamicTxPowerAP( } -VOID +void odm_DynamicTxPower_92C( IN PDM_ODM_T pDM_Odm ) @@ -4467,7 +4467,7 @@ odm_DynamicTxPower_92C( } -VOID +void odm_DynamicTxPower_92D( IN PDM_ODM_T pDM_Odm ) @@ -4782,14 +4782,14 @@ odm_DynamicTxPower_92D( //3 RSSI Monitor //3============================================================ -VOID +void odm_RSSIMonitorInit( IN PDM_ODM_T pDM_Odm ) { } -VOID +void odm_RSSIMonitorCheck( IN PDM_ODM_T pDM_Odm ) @@ -4831,7 +4831,7 @@ odm_RSSIMonitorCheck( } // odm_RSSIMonitorCheck -VOID +void odm_RSSIMonitorCheckMP( IN PDM_ODM_T pDM_Odm ) @@ -4921,7 +4921,7 @@ odm_RSSIMonitorCheckMP( // //sherry move from DUSC to here 20110517 // -static VOID +static void FindMinimumRSSI_Dmsp( IN struct adapter *pAdapter ) @@ -4947,7 +4947,7 @@ IN struct adapter *pAdapter } #endif -VOID +void odm_RSSIMonitorCheckCE( IN PDM_ODM_T pDM_Odm ) @@ -5091,7 +5091,7 @@ odm_RSSIMonitorCheckCE( //ODM_CmnInfoUpdate(&pHalData->odmpriv ,ODM_CMNINFO_RSSI_MIN, pdmpriv->MinUndecoratedPWDBForDM); #endif//if (DM_ODM_SUPPORT_TYPE == ODM_CE) } -VOID +void odm_RSSIMonitorCheckAP( IN PDM_ODM_T pDM_Odm ) @@ -5100,7 +5100,7 @@ odm_RSSIMonitorCheckAP( -VOID +void ODM_InitAllTimers( IN PDM_ODM_T pDM_Odm ) @@ -5135,7 +5135,7 @@ ODM_InitAllTimers( #endif } -VOID +void ODM_CancelAllTimers( IN PDM_ODM_T pDM_Odm ) @@ -5169,7 +5169,7 @@ ODM_CancelAllTimers( } -VOID +void ODM_ReleaseAllTimers( IN PDM_ODM_T pDM_Odm ) @@ -5202,7 +5202,7 @@ ODM_ReleaseAllTimers( //3 Tx Power Tracking //3============================================================ -VOID +void odm_TXPowerTrackingInit( IN PDM_ODM_T pDM_Odm ) @@ -5211,7 +5211,7 @@ odm_TXPowerTrackingInit( } -VOID +void odm_TXPowerTrackingThermalMeterInit( IN PDM_ODM_T pDM_Odm ) @@ -5269,7 +5269,7 @@ odm_TXPowerTrackingThermalMeterInit( } -VOID +void ODM_TXPowerTrackingCheck( IN PDM_ODM_T pDM_Odm ) @@ -5310,7 +5310,7 @@ ODM_TXPowerTrackingCheck( } -VOID +void odm_TXPowerTrackingCheckCE( IN PDM_ODM_T pDM_Odm ) @@ -5357,7 +5357,7 @@ odm_TXPowerTrackingCheckCE( #endif } -VOID +void odm_TXPowerTrackingCheckMP( IN PDM_ODM_T pDM_Odm ) @@ -5378,7 +5378,7 @@ odm_TXPowerTrackingCheckMP( } -VOID +void odm_TXPowerTrackingCheckAP( IN PDM_ODM_T pDM_Odm ) @@ -5403,7 +5403,7 @@ odm_TXPowerTrackingCheckAP( #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -VOID +void odm_TXPowerTrackingThermalMeterCheck( IN struct adapter * Adapter ) @@ -5451,7 +5451,7 @@ odm_TXPowerTrackingThermalMeterCheck( //3 SW Antenna Diversity //3============================================================ #if(defined(CONFIG_SW_ANTENNA_DIVERSITY)) -VOID +void odm_SwAntDivInit( IN PDM_ODM_T pDM_Odm ) @@ -5464,7 +5464,7 @@ odm_SwAntDivInit( } #if (RTL8723A_SUPPORT==1) // Only for 8723A SW ANT DIV INIT--2012--07--17 -VOID +void odm_SwAntDivInit_NIC_8723A( IN PDM_ODM_T pDM_Odm) { @@ -5488,7 +5488,7 @@ odm_SwAntDivInit_NIC_8723A( } #endif -VOID +void odm_SwAntDivInit_NIC( IN PDM_ODM_T pDM_Odm ) @@ -5529,7 +5529,7 @@ odm_SwAntDivInit_NIC( // 20100514 Joseph: // Add new function to reset the state of antenna diversity before link. // -VOID +void ODM_SwAntDivResetBeforeLink( IN PDM_ODM_T pDM_Odm ) @@ -5545,7 +5545,7 @@ ODM_SwAntDivResetBeforeLink( // 20100514 Luke/Joseph: // Add new function to reset antenna diversity state after link. // -VOID +void ODM_SwAntDivRestAfterLink( IN PDM_ODM_T pDM_Odm ) @@ -5560,7 +5560,7 @@ ODM_SwAntDivRestAfterLink( pDM_SWAT_Table->SelectAntennaMap=0xAA; } -VOID +void ODM_SwAntDivChkPerPktRssi( IN PDM_ODM_T pDM_Odm, IN u1Byte StationID, @@ -5591,7 +5591,7 @@ ODM_SwAntDivChkPerPktRssi( } // -VOID +void odm_SwAntDivChkAntSwitch( IN PDM_ODM_T pDM_Odm, IN u1Byte Step @@ -5641,7 +5641,7 @@ odm_SwAntDivChkAntSwitch( // penalty to get next try. -VOID +void ODM_SetAntenna( IN PDM_ODM_T pDM_Odm, IN u1Byte Antenna) @@ -5652,7 +5652,7 @@ ODM_SetAntenna( //Note: Antenna_Main--> Antenna_A // Antenna_Aux---> Antenna_B //---------------------------------- -VOID +void odm_SwAntDivChkAntSwitchNIC( IN PDM_ODM_T pDM_Odm, IN u1Byte Step @@ -6149,7 +6149,7 @@ odm_SwAntDivSelectChkChnl( } -VOID +void odm_SwAntDivConsructChkScanChnl( IN struct adapter *Adapter, IN u1Byte ChkChnl @@ -6192,7 +6192,7 @@ odm_SwAntDivConsructChkScanChnl( // Callback function for 500ms antenna test trying. // #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -VOID +void odm_SwAntDivChkAntSwitchCallback( PRT_TIMER pTimer ) @@ -6212,9 +6212,9 @@ odm_SwAntDivChkAntSwitchCallback( #endif } -VOID +void odm_SwAntDivChkAntSwitchWorkitemCallback( - IN PVOID pContext + IN void * pContext ) { @@ -6225,7 +6225,7 @@ odm_SwAntDivChkAntSwitchWorkitemCallback( } #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) -VOID odm_SwAntDivChkAntSwitchCallback(void *FunctionContext) +void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext) { PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext; struct adapter *padapter = pDM_Odm->Adapter; @@ -6234,7 +6234,7 @@ VOID odm_SwAntDivChkAntSwitchCallback(void *FunctionContext) odm_SwAntDivChkAntSwitch(pDM_Odm, SWAW_STEP_DETERMINE); } #elif (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) -VOID odm_SwAntDivChkAntSwitchCallback(void *FunctionContext) +void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext) { PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext; odm_SwAntDivChkAntSwitch(pDM_Odm, SWAW_STEP_DETERMINE); @@ -6243,33 +6243,33 @@ VOID odm_SwAntDivChkAntSwitchCallback(void *FunctionContext) #else //#if(defined(CONFIG_SW_ANTENNA_DIVERSITY)) -VOID odm_SwAntDivInit( IN PDM_ODM_T pDM_Odm ) {} -VOID ODM_SwAntDivChkPerPktRssi( +void odm_SwAntDivInit( IN 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( +void odm_SwAntDivChkAntSwitch( IN PDM_ODM_T pDM_Odm, IN u1Byte Step ) {} -VOID ODM_SwAntDivResetBeforeLink( IN PDM_ODM_T pDM_Odm ){} -VOID ODM_SwAntDivRestAfterLink( IN PDM_ODM_T pDM_Odm ){} +void ODM_SwAntDivResetBeforeLink( IN PDM_ODM_T pDM_Odm ){} +void ODM_SwAntDivRestAfterLink( IN PDM_ODM_T pDM_Odm ){} #if (DM_ODM_SUPPORT_TYPE == ODM_MP) u1Byte odm_SwAntDivSelectChkChnl( IN struct adapter *Adapter ){ return 0;} -VOID +void odm_SwAntDivConsructChkScanChnl( IN struct adapter *Adapter, IN u1Byte ChkChnl ){} #endif #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -VOID odm_SwAntDivChkAntSwitchCallback( PRT_TIMER pTimer){} -VOID odm_SwAntDivChkAntSwitchWorkitemCallback( IN PVOID pContext ){} +void odm_SwAntDivChkAntSwitchCallback( PRT_TIMER pTimer){} +void odm_SwAntDivChkAntSwitchWorkitemCallback( IN void * pContext ){} #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) -VOID odm_SwAntDivChkAntSwitchCallback(void *FunctionContext){} +void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext){} #elif (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) -VOID odm_SwAntDivChkAntSwitchCallback(void *FunctionContext){} +void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext){} #endif #endif //#if(defined(CONFIG_SW_ANTENNA_DIVERSITY)) @@ -6360,7 +6360,7 @@ return FALSE; // Copy Current Scan list. Adapter->MgntInfo.tmpNumBssDesc = pMgntInfo->NumBssDesc; - PlatformMoveMemory((PVOID)Adapter->MgntInfo.tmpbssDesc, (PVOID)pMgntInfo->bssDesc, sizeof(RT_WLAN_BSS)*MAX_BSS_DESC); + PlatformMoveMemory((void *)Adapter->MgntInfo.tmpbssDesc, (void *)pMgntInfo->bssDesc, sizeof(RT_WLAN_BSS)*MAX_BSS_DESC); if(pDM_Odm->SupportICType == ODM_RTL8188E) { @@ -6500,7 +6500,7 @@ ODM_SwAntDivCheckBeforeLink8192C( //3============================================================ #if(defined(CONFIG_HW_ANTENNA_DIVERSITY)) -VOID +void odm_InitHybridAntDiv_88C_92D( IN PDM_ODM_T pDM_Odm ) @@ -6585,7 +6585,7 @@ odm_InitHybridAntDiv_88C_92D( } -VOID +void odm_InitHybridAntDiv( IN PDM_ODM_T pDM_Odm ) @@ -6673,7 +6673,7 @@ odm_StaDefAntSel( } -VOID +void odm_SetRxIdleAnt( IN PDM_ODM_T pDM_Odm, IN u1Byte Ant, @@ -6707,7 +6707,7 @@ odm_SetRxIdleAnt( } -VOID +void ODM_AntselStatistics_88C( IN PDM_ODM_T pDM_Odm, IN u1Byte MacId, @@ -6744,7 +6744,7 @@ ODM_AntselStatistics_88C( #if(DM_ODM_SUPPORT_TYPE==ODM_MP) -VOID +void ODM_SetTxAntByTxInfo_88C_92D( IN PDM_ODM_T pDM_Odm, IN pu1Byte pDesc, @@ -6767,7 +6767,7 @@ ODM_SetTxAntByTxInfo_88C_92D( //ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV,ODM_DBG_LOUD,("SET_TX_DESC_ANTSEL_A_92C=%d\n", pDM_SWAT_Table->TxAnt[macId])); } #elif(DM_ODM_SUPPORT_TYPE==ODM_CE) -VOID +void ODM_SetTxAntByTxInfo_88C_92D( IN PDM_ODM_T pDM_Odm ) @@ -6775,7 +6775,7 @@ ODM_SetTxAntByTxInfo_88C_92D( } #elif(DM_ODM_SUPPORT_TYPE==ODM_AP) -VOID +void ODM_SetTxAntByTxInfo_88C_92D( IN PDM_ODM_T pDM_Odm ) @@ -6784,7 +6784,7 @@ ODM_SetTxAntByTxInfo_88C_92D( } #endif -VOID +void odm_HwAntDiv_92C_92D( IN PDM_ODM_T pDM_Odm ) @@ -6903,7 +6903,7 @@ odm_HwAntDiv_92C_92D( } -VOID +void odm_HwAntDiv( IN PDM_ODM_T pDM_Odm ) @@ -7020,18 +7020,18 @@ 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_InitHybridAntDiv( IN PDM_ODM_T pDM_Odm ){} +void odm_HwAntDiv( IN PDM_ODM_T pDM_Odm){} #if(DM_ODM_SUPPORT_TYPE==ODM_MP) -VOID ODM_SetTxAntByTxInfo_88C_92D( +void ODM_SetTxAntByTxInfo_88C_92D( IN PDM_ODM_T pDM_Odm, IN pu1Byte pDesc, IN 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( IN 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( IN PDM_ODM_T pDM_Odm){ } #endif #endif //#if(defined(CONFIG_HW_ANTENNA_DIVERSITY)) @@ -7041,7 +7041,7 @@ VOID ODM_SetTxAntByTxInfo_88C_92D( IN PDM_ODM_T pDM_Odm){ } //============================================================ //EDCA Turbo //============================================================ -VOID +void ODM_EdcaTurboInit( IN PDM_ODM_T pDM_Odm) { @@ -7079,7 +7079,7 @@ ODM_EdcaTurboInit( } // ODM_InitEdcaTurbo -VOID +void odm_EdcaTurboCheck( IN PDM_ODM_T pDM_Odm ) @@ -7131,7 +7131,7 @@ odm_EdcaTurboCheck( #if(DM_ODM_SUPPORT_TYPE==ODM_CE) -VOID +void odm_EdcaTurboCheckCE( IN PDM_ODM_T pDM_Odm ) @@ -7243,7 +7243,7 @@ dm_CheckEdcaTurbo_EXIT: #elif(DM_ODM_SUPPORT_TYPE==ODM_MP) -VOID +void odm_EdcaTurboCheckMP( IN PDM_ODM_T pDM_Odm ) @@ -7501,7 +7501,7 @@ odm_IsEdcaTurboDisable( } //add iot case here: for MP/CE -VOID +void ODM_EdcaParaSelByIot( IN PDM_ODM_T pDM_Odm, OUT u4Byte *EDCA_BE_UL, @@ -7703,7 +7703,7 @@ ODM_EdcaParaSelByIot( } -VOID +void odm_EdcaChooseTrafficIdx( IN PDM_ODM_T pDM_Odm, IN u8Byte cur_tx_bytes, @@ -7918,7 +7918,7 @@ ODM_ChooseIotMainSTA( #ifdef WIFI_WMM -VOID +void ODM_IotEdcaSwitch( IN PDM_ODM_T pDM_Odm, IN unsigned char enable @@ -8084,7 +8084,7 @@ ODM_IotEdcaSwitch( } #endif -VOID +void odm_IotEngine( IN PDM_ODM_T pDM_Odm ) @@ -8602,7 +8602,7 @@ ConvertTo_dB( #define Low_TP_Mode 2 -VOID +void odm_PSDMonitorInit( IN PDM_ODM_T pDM_Odm) { @@ -8628,7 +8628,7 @@ odm_PSDMonitorInit( #endif } -VOID +void PatchDCTone( IN PDM_ODM_T pDM_Odm, pu4Byte PSD_report, @@ -8706,7 +8706,7 @@ PatchDCTone( } -VOID +void GoodChannelDecision( PDM_ODM_T pDM_Odm, ps4Byte PSD_report, @@ -8910,7 +8910,7 @@ GoodChannelDecision( -VOID +void odm_PSD_Monitor( PDM_ODM_T pDM_Odm ) @@ -9400,7 +9400,7 @@ odm_PSD_Monitor( /* //Neil for Get BT RSSI // Be Triggered by BT C2H CMD -VOID +void ODM_PSDGetRSSI( IN u1Byte RSSI_BT) { @@ -9410,7 +9410,7 @@ ODM_PSDGetRSSI( */ -VOID +void ODM_PSDMonitor( IN PDM_ODM_T pDM_Odm ) @@ -9441,7 +9441,7 @@ ODM_PSDMonitor( } } -VOID +void odm_PSDMonitorCallback( PRT_TIMER pTimer ) @@ -9458,9 +9458,9 @@ odm_PSDMonitorCallback( #endif } -VOID +void odm_PSDMonitorWorkItemCallback( - IN PVOID pContext + IN void * pContext ) { struct adapter *Adapter = (PADAPTER)pContext; @@ -9475,7 +9475,7 @@ odm_PSDMonitorWorkItemCallback( //cosa debug tool need to modify -VOID +void ODM_PSDDbgControl( IN struct adapter *Adapter, IN u4Byte mode, @@ -9909,7 +9909,7 @@ void odm_Write_RXHP( } -VOID +void odm_PSD_RXHP( IN PDM_ODM_T pDM_Odm ) @@ -10206,7 +10206,7 @@ odm_PSD_RXHP( } } -VOID +void odm_PSD_RXHPCallback( PRT_TIMER pTimer ) @@ -10228,9 +10228,9 @@ odm_PSD_RXHPCallback( } -VOID +void odm_PSD_RXHPWorkitemCallback( - IN PVOID pContext + IN void * pContext ) { struct adapter *pAdapter = (PADAPTER)pContext; @@ -10245,9 +10245,9 @@ odm_PSD_RXHPWorkitemCallback( // // 2011/09/22 MH Add for 92D global spin lock utilization. // -VOID +void odm_GlobalAdapterCheck( - IN VOID + IN void ) { @@ -10276,7 +10276,7 @@ odm_GlobalAdapterCheck( // 2011/12/02 MH Copy from MP oursrc for temporarily test. // #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -VOID +void odm_OFDMTXPathDiversity_92C( IN struct adapter *Adapter) { @@ -10399,7 +10399,7 @@ odm_IsConnected_92C( } -VOID +void odm_ResetPathDiversity_92C( IN struct adapter *Adapter ) @@ -10446,7 +10446,7 @@ odm_ResetPathDiversity_92C( } -VOID +void odm_CCKTXPathDiversity_92C( IN struct adapter *Adapter ) @@ -10595,7 +10595,7 @@ odm_CCKTXPathDiversity_92C( -VOID +void odm_PathDiversityAfterLink_92C( IN struct adapter *Adapter ) @@ -10687,7 +10687,7 @@ odm_PathDiversityAfterLink_92C( -VOID +void odm_CCKTXPathDiversityCallback( PRT_TIMER pTimer ) @@ -10713,9 +10713,9 @@ odm_CCKTXPathDiversityCallback( } -VOID +void odm_CCKTXPathDiversityWorkItemCallback( - IN PVOID pContext + IN void * pContext ) { struct adapter *Adapter = (PADAPTER)pContext; @@ -10724,7 +10724,7 @@ odm_CCKTXPathDiversityWorkItemCallback( } -VOID +void ODM_CCKPathDiversityChkPerPktRssi( struct adapter * Adapter, BOOLEAN bIsDefPort, @@ -10857,7 +10857,7 @@ ODM_PathDiversityBeforeLink92C( // Copy Current Scan list. Adapter->MgntInfo.tmpNumBssDesc = pMgntInfo->NumBssDesc; - PlatformMoveMemory((PVOID)Adapter->MgntInfo.tmpbssDesc, (PVOID)pMgntInfo->bssDesc, sizeof(RT_WLAN_BSS)*MAX_BSS_DESC); + PlatformMoveMemory((void *)Adapter->MgntInfo.tmpbssDesc, (void *)pMgntInfo->bssDesc, sizeof(RT_WLAN_BSS)*MAX_BSS_DESC); // Switch Antenna to another one. if(pDM_PDTable->DefaultRespPath == 0) @@ -11000,7 +11000,7 @@ ODM_PathDiversityBeforeLink92C( // This function is used to gather the RSSI information for antenna testing. // It selects the RSSI of the peer STA that we want to know. // -VOID +void ODM_PathDivChkPerPktRssi( struct adapter * Adapter, BOOLEAN bIsDefPort, @@ -11042,7 +11042,7 @@ ODM_PathDivChkPerPktRssi( // 20100514 Luke/Joseph: // Add new function to reset antenna diversity state after link. // -VOID +void ODM_PathDivRestAfterLink( IN PDM_ODM_T pDM_Odm ) @@ -11065,7 +11065,7 @@ ODM_PathDivRestAfterLink( // 20100514 Luke/Joseph: // Callback function for 500ms antenna test trying. // -VOID +void odm_PathDivChkAntSwitchCallback( PRT_TIMER pTimer ) @@ -11090,9 +11090,9 @@ odm_PathDivChkAntSwitchCallback( } -VOID +void odm_PathDivChkAntSwitchWorkitemCallback( - IN PVOID pContext + IN void * pContext ) { struct adapter *pAdapter = (PADAPTER)pContext; @@ -11110,7 +11110,7 @@ odm_PathDivChkAntSwitchWorkitemCallback( // 92D Path Diversity Main function // refer to 88C software antenna diversity // -VOID +void odm_PathDivChkAntSwitch( PDM_ODM_T pDM_Odm //struct adapter * Adapter, @@ -11579,7 +11579,7 @@ odm_PathDivChkAntSwitch( //3 PathDiv End //================================================== -VOID +void odm_SetRespPath_92C( IN struct adapter *Adapter, IN u1Byte DefaultRespPath @@ -11603,7 +11603,7 @@ odm_SetRespPath_92C( } -VOID +void ODM_FillTXPathInTXDESC( IN struct adapter *Adapter, IN PRT_TCB pTcb, @@ -11643,7 +11643,7 @@ ODM_FillTXPathInTXDESC( } //Only for MP //Neil Chen--2012--0502-- -VOID +void odm_PathDivInit( IN PDM_ODM_T pDM_Odm) { @@ -11678,7 +11678,7 @@ IN PDM_ODM_T pDM_Odm) // // Added by Joseph, 2012.03.22 // -VOID +void ODM_SingleDualAntennaDefaultSetting( IN PDM_ODM_T pDM_Odm ) @@ -11692,7 +11692,7 @@ ODM_SingleDualAntennaDefaultSetting( //2 8723A ANT DETECT -VOID +void odm_PHY_SaveAFERegisters( IN PDM_ODM_T pDM_Odm, IN pu4Byte AFEReg, @@ -11708,7 +11708,7 @@ odm_PHY_SaveAFERegisters( } } -VOID +void odm_PHY_ReloadAFERegisters( IN PDM_ODM_T pDM_Odm, IN pu4Byte AFEReg, diff --git a/hal/odm.h b/hal/odm.h index 8a8cf4b..7f1c0b6 100755 --- a/hal/odm.h +++ b/hal/odm.h @@ -1622,10 +1622,10 @@ 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(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 +void ODM_SetAntenna( IN PDM_ODM_T pDM_Odm, IN u1Byte Antenna); @@ -1636,10 +1636,10 @@ void ODM_RF_Saving( IN PDM_ODM_T pDM_Odm, IN u1Byte bForceInNormal ); #define SwAntDivRestAfterLink ODM_SwAntDivRestAfterLink -VOID ODM_SwAntDivRestAfterLink( IN PDM_ODM_T pDM_Odm); +void ODM_SwAntDivRestAfterLink( IN PDM_ODM_T pDM_Odm); #define dm_CheckTXPowerTracking ODM_TXPowerTrackingCheck -VOID +void ODM_TXPowerTrackingCheck( IN PDM_ODM_T pDM_Odm ); @@ -1660,7 +1660,7 @@ ODM_RAStateCheck( //void ODM_ChangeDynamicInitGainThresh(IN struct adapter * pAdapter, // IN INT32 DM_Type, // IN INT32 DM_Value); -VOID +void ODM_ChangeDynamicInitGainThresh( IN PDM_ODM_T pDM_Odm, IN u4Byte DM_Type, @@ -1674,7 +1674,7 @@ ODM_CheckPowerStatus( #if (DM_ODM_SUPPORT_TYPE != ODM_ADSL) -VOID +void ODM_RateAdaptiveStateApInit( IN struct adapter * Adapter , IN PRT_WLAN_STA pEntry @@ -1685,7 +1685,7 @@ ODM_RateAdaptiveStateApInit( #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) #ifdef WIFI_WMM -VOID +void ODM_IotEdcaSwitch( IN PDM_ODM_T pDM_Odm, IN unsigned char enable @@ -1710,7 +1710,7 @@ ODM_Diversity_AntennaSelect( #endif #define SwAntDivResetBeforeLink ODM_SwAntDivResetBeforeLink -VOID ODM_SwAntDivResetBeforeLink(IN PDM_ODM_T pDM_Odm); +void ODM_SwAntDivResetBeforeLink(IN PDM_ODM_T pDM_Odm); //#define SwAntDivCheckBeforeLink8192C ODM_SwAntDivCheckBeforeLink8192C #define SwAntDivCheckBeforeLink ODM_SwAntDivCheckBeforeLink8192C @@ -1723,7 +1723,7 @@ ODM_SwAntDivCheckBeforeLink8192C( #endif #define dm_SWAW_RSSI_Check ODM_SwAntDivChkPerPktRssi -VOID ODM_SwAntDivChkPerPktRssi( +void ODM_SwAntDivChkPerPktRssi( IN PDM_ODM_T pDM_Odm, IN u1Byte StationID, IN PODM_PHY_INFO_T pPhyInfo @@ -1743,7 +1743,7 @@ GetPSDData( #if (DM_ODM_SUPPORT_TYPE == ODM_CE) -VOID +void odm_DIGbyRSSI_LPS( IN PDM_ODM_T pDM_Odm ); @@ -1758,28 +1758,28 @@ u4Byte ODM_Get_Rate_Bitmap( #if(DM_ODM_SUPPORT_TYPE & (ODM_MP)) #define dm_PSDMonitorCallback odm_PSDMonitorCallback -VOID odm_PSDMonitorCallback(PRT_TIMER pTimer); +void odm_PSDMonitorCallback(PRT_TIMER pTimer); -VOID +void odm_PSDMonitorWorkItemCallback( - IN PVOID pContext + IN void * pContext ); -VOID +void PatchDCTone( IN PDM_ODM_T pDM_Odm, pu4Byte PSD_report, u1Byte initial_gain_psd ); -VOID +void ODM_PSDMonitor( IN PDM_ODM_T pDM_Odm ); -VOID odm_PSD_Monitor(PDM_ODM_T pDM_Odm); -VOID odm_PSDMonitorInit(PDM_ODM_T pDM_Odm); +void odm_PSD_Monitor(PDM_ODM_T pDM_Odm); +void odm_PSDMonitorInit(PDM_ODM_T pDM_Odm); -VOID +void ODM_PSDDbgControl( IN struct adapter * Adapter, IN u4Byte mode, @@ -1790,69 +1790,69 @@ ODM_PSDDbgControl( -VOID ODM_DMInit( IN PDM_ODM_T pDM_Odm); +void ODM_DMInit( IN PDM_ODM_T pDM_Odm); -VOID +void ODM_DMWatchdog( IN PDM_ODM_T pDM_Odm // For common use in the future ); -VOID +void ODM_CmnInfoInit( IN PDM_ODM_T pDM_Odm, IN ODM_CMNINFO_E CmnInfo, IN u4Byte Value ); -VOID +void ODM_CmnInfoHook( IN PDM_ODM_T pDM_Odm, IN ODM_CMNINFO_E CmnInfo, - IN PVOID pValue + IN void * pValue ); -VOID +void ODM_CmnInfoPtrArrayHook( IN PDM_ODM_T pDM_Odm, IN ODM_CMNINFO_E CmnInfo, IN u2Byte Index, - IN PVOID pValue + IN void * pValue ); -VOID +void ODM_CmnInfoUpdate( IN PDM_ODM_T pDM_Odm, IN u4Byte CmnInfo, IN u8Byte Value ); -VOID +void ODM_InitAllTimers( IN PDM_ODM_T pDM_Odm ); -VOID +void ODM_CancelAllTimers( IN PDM_ODM_T pDM_Odm ); -VOID +void ODM_ReleaseAllTimers( IN PDM_ODM_T pDM_Odm ); -VOID +void ODM_ResetIQKResult( IN PDM_ODM_T pDM_Odm ); #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -VOID ODM_InitAllWorkItems(IN PDM_ODM_T pDM_Odm ); -VOID ODM_FreeAllWorkItems(IN PDM_ODM_T pDM_Odm ); +void ODM_InitAllWorkItems(IN PDM_ODM_T pDM_Odm ); +void ODM_FreeAllWorkItems(IN PDM_ODM_T pDM_Odm ); -VOID odm_PathDivChkAntSwitch(PDM_ODM_T pDM_Odm); -VOID ODM_PathDivRestAfterLink( +void odm_PathDivChkAntSwitch(PDM_ODM_T pDM_Odm); +void ODM_PathDivRestAfterLink( IN PDM_ODM_T pDM_Odm ); @@ -1870,13 +1870,13 @@ VOID ODM_PathDivRestAfterLink( //#define PATHDIV_ENABLE 1 -//VOID odm_PathDivChkAntSwitch(struct adapter * Adapter,u1Byte Step); -VOID ODM_PathDivRestAfterLink( +//void odm_PathDivChkAntSwitch(struct adapter * Adapter,u1Byte Step); +void ODM_PathDivRestAfterLink( IN PDM_ODM_T pDM_Odm ); #define dm_PathDiv_RSSI_Check ODM_PathDivChkPerPktRssi -VOID ODM_PathDivChkPerPktRssi(struct adapter * Adapter, +void ODM_PathDivChkPerPktRssi(struct adapter * Adapter, BOOLEAN bIsDefPort, BOOLEAN bMatchBSSID, PRT_WLAN_STA pEntry, @@ -1915,7 +1915,7 @@ ODM_PathDiversityBeforeLink92C( // -VOID +void ODM_CCKPathDiversityChkPerPktRssi( struct adapter * Adapter, BOOLEAN bIsDefPort, @@ -1937,7 +1937,7 @@ typedef enum tag_DIG_Connect_Definition }DM_DIG_CONNECT_E; -VOID +void ODM_FillTXPathInTXDESC( IN struct adapter * Adapter, IN PRT_TCB pTcb, @@ -1966,14 +1966,14 @@ ODM_FillTXPathInTXDESC( IS_HARDWARE_TYPE_8723A(_Adapter) ? odm_TXPowerTrackingCallback_ThermalMeter_8723A(_Adapter) :\ odm_TXPowerTrackingCallback_ThermalMeter_8188E(_Adapter) -VOID +void ODM_SetTxAntByTxInfo_88C_92D( IN PDM_ODM_T pDM_Odm, IN pu1Byte pDesc, IN u1Byte macId ); #endif // #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -VOID +void ODM_AntselStatistics_88C( IN PDM_ODM_T pDM_Odm, IN u1Byte MacId, @@ -1983,7 +1983,7 @@ ODM_AntselStatistics_88C( #if( DM_ODM_SUPPORT_TYPE & (ODM_MP |ODM_CE)) -VOID +void ODM_SingleDualAntennaDefaultSetting( IN PDM_ODM_T pDM_Odm ); diff --git a/hal/odm_HWConfig.c b/hal/odm_HWConfig.c index 503c159..70b9686 100755 --- a/hal/odm_HWConfig.c +++ b/hal/odm_HWConfig.c @@ -377,7 +377,7 @@ odm_EVMdbToPercentage( -VOID +void odm_RxPhyStatus92CSeries_Parsing( IN OUT PDM_ODM_T pDM_Odm, OUT PODM_PHY_INFO_T pPhyInfo, @@ -738,7 +738,7 @@ odm_RxPhyStatus92CSeries_Parsing( #endif } -VOID +void odm_Init_RSSIForDM( IN OUT PDM_ODM_T pDM_Odm ) @@ -746,7 +746,7 @@ odm_Init_RSSIForDM( } -VOID +void odm_Process_RSSIForDM( IN OUT PDM_ODM_T pDM_Odm, IN PODM_PHY_INFO_T pPhyInfo, @@ -975,7 +975,7 @@ odm_Process_RSSIForDM( // // Endianness before calling this API // -VOID +void ODM_PhyStatusQuery_92CSeries( IN OUT PDM_ODM_T pDM_Odm, OUT PODM_PHY_INFO_T pPhyInfo, @@ -1003,7 +1003,7 @@ ODM_PhyStatusQuery_92CSeries( // // Endianness before calling this API // -VOID +void ODM_PhyStatusQuery_JaguarSeries( IN OUT PDM_ODM_T pDM_Odm, OUT PODM_PHY_INFO_T pPhyInfo, @@ -1015,7 +1015,7 @@ ODM_PhyStatusQuery_JaguarSeries( } -VOID +void ODM_PhyStatusQuery( IN OUT PDM_ODM_T pDM_Odm, OUT PODM_PHY_INFO_T pPhyInfo, @@ -1027,7 +1027,7 @@ ODM_PhyStatusQuery( } // For future use. -VOID +void ODM_MacStatusQuery( IN OUT PDM_ODM_T pDM_Odm, IN pu1Byte pMacStatus, diff --git a/hal/odm_HWConfig.h b/hal/odm_HWConfig.h index 9b53a8a..f90ee93 100755 --- a/hal/odm_HWConfig.h +++ b/hal/odm_HWConfig.h @@ -148,12 +148,12 @@ typedef struct _Phy_Status_Rpt_8195 } PHY_STATUS_RPT_8195_T,*pPHY_STATUS_RPT_8195_T; -VOID +void odm_Init_RSSIForDM( IN OUT PDM_ODM_T pDM_Odm ); -VOID +void ODM_PhyStatusQuery( IN OUT PDM_ODM_T pDM_Odm, OUT PODM_PHY_INFO_T pPhyInfo, @@ -161,7 +161,7 @@ ODM_PhyStatusQuery( IN PODM_PACKET_INFO_T pPktinfo ); -VOID +void ODM_MacStatusQuery( IN OUT PDM_ODM_T pDM_Odm, IN pu1Byte pMacStatus, diff --git a/hal/odm_RTL8188E.c b/hal/odm_RTL8188E.c index d3646e4..182287f 100755 --- a/hal/odm_RTL8188E.c +++ b/hal/odm_RTL8188E.c @@ -26,7 +26,7 @@ #if (RTL8188E_SUPPORT == 1) -VOID +void ODM_DIG_LowerBound_88E( IN PDM_ODM_T pDM_Odm ) @@ -45,7 +45,7 @@ ODM_DIG_LowerBound_88E( } #if(defined(CONFIG_HW_ANTENNA_DIVERSITY)) -VOID +void odm_RX_HWAntDivInit( IN PDM_ODM_T pDM_Odm ) @@ -83,7 +83,7 @@ odm_RX_HWAntDivInit( //ODM_SetBBReg(pDM_Odm, 0xa00 , BIT15, 1); //Enable CCK AntDiv } -VOID +void odm_TRX_HWAntDivInit( IN PDM_ODM_T pDM_Odm ) @@ -134,7 +134,7 @@ odm_TRX_HWAntDivInit( //ODM_SetBBReg(pDM_Odm, 0xa00 , BIT15, 1); //Enable CCK AntDiv } -VOID +void odm_FastAntTrainingInit( IN PDM_ODM_T pDM_Odm ) @@ -245,7 +245,7 @@ odm_FastAntTrainingInit( //PHY_SetBBReg(Adapter, 0x860 , BIT8, 0); } -VOID +void ODM_AntennaDiversityInit_88E( IN PDM_ODM_T pDM_Odm ) @@ -276,7 +276,7 @@ ODM_AntennaDiversityInit_88E( } -VOID +void ODM_UpdateRxIdleAnt_88E(IN PDM_ODM_T pDM_Odm, IN u1Byte Ant) { pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; @@ -316,7 +316,7 @@ ODM_UpdateRxIdleAnt_88E(IN PDM_ODM_T pDM_Odm, IN u1Byte Ant) } -VOID +void odm_UpdateTxAnt_88E(IN PDM_ODM_T pDM_Odm, IN u1Byte Ant, IN u4Byte MacId) { pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; @@ -338,7 +338,7 @@ 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 +void ODM_SetTxAntByTxInfo_88E( IN PDM_ODM_T pDM_Odm, IN pu1Byte pDesc, @@ -357,7 +357,7 @@ ODM_SetTxAntByTxInfo_88E( } } #else// (DM_ODM_SUPPORT_TYPE == ODM_AP) -VOID +void ODM_SetTxAntByTxInfo_88E( IN PDM_ODM_T pDM_Odm ) @@ -365,7 +365,7 @@ ODM_SetTxAntByTxInfo_88E( } #endif -VOID +void ODM_AntselStatistics_88E( IN PDM_ODM_T pDM_Odm, IN u1Byte antsel_tr_mux, @@ -407,7 +407,7 @@ ODM_AntselStatistics_88E( } #define TX_BY_REG 0 -VOID +void odm_HWAntDiv( IN PDM_ODM_T pDM_Odm ) @@ -476,7 +476,7 @@ odm_HWAntDiv( #if (!(DM_ODM_SUPPORT_TYPE == ODM_CE)) -VOID +void odm_SetNextMACAddrTarget( IN PDM_ODM_T pDM_Odm ) @@ -530,7 +530,7 @@ odm_SetNextMACAddrTarget( } } -VOID +void odm_FastAntTraining( IN PDM_ODM_T pDM_Odm ) @@ -623,7 +623,7 @@ odm_FastAntTraining( } -VOID +void odm_FastAntTrainingCallback( IN PDM_ODM_T pDM_Odm ) @@ -644,7 +644,7 @@ odm_FastAntTrainingCallback( #endif } -VOID +void odm_FastAntTrainingWorkItemCallback( IN PDM_ODM_T pDM_Odm ) @@ -653,7 +653,7 @@ odm_FastAntTrainingWorkItemCallback( } #endif -VOID +void ODM_AntennaDiversity_88E( IN PDM_ODM_T pDM_Odm ) @@ -744,7 +744,7 @@ ODM_AntennaDiversity_88E( /* #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -VOID +void odm_FastAntTrainingCallback( PRT_TIMER pTimer ) @@ -764,7 +764,7 @@ odm_FastAntTrainingCallback( } #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) -VOID odm_FastAntTrainingCallback(void *FunctionContext) +void odm_FastAntTrainingCallback(void *FunctionContext) { PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext; struct adapter *padapter = pDM_Odm->Adapter; @@ -773,7 +773,7 @@ VOID odm_FastAntTrainingCallback(void *FunctionContext) odm_FastAntTraining(pDM_Odm); } #elif (DM_ODM_SUPPORT_TYPE == ODM_AP) -VOID odm_FastAntTrainingCallback(void *FunctionContext) +void odm_FastAntTrainingCallback(void *FunctionContext) { PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext; odm_FastAntTraining(pDM_Odm); @@ -784,7 +784,7 @@ VOID odm_FastAntTrainingCallback(void *FunctionContext) #else //#if(defined(CONFIG_HW_ANTENNA_DIVERSITY)) #if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE)) -VOID +void ODM_SetTxAntByTxInfo_88E( IN PDM_ODM_T pDM_Odm, IN pu1Byte pDesc, @@ -793,7 +793,7 @@ ODM_SetTxAntByTxInfo_88E( { } #else// (DM_ODM_SUPPORT_TYPE == ODM_AP) -VOID +void ODM_SetTxAntByTxInfo_88E( IN PDM_ODM_T pDM_Odm ) @@ -805,7 +805,7 @@ ODM_SetTxAntByTxInfo_88E( //3 Dynamic Primary CCA //3============================================================ -VOID +void odm_PrimaryCCA_Init( IN PDM_ODM_T pDM_Odm) { @@ -827,7 +827,7 @@ ODM_DynamicPrimaryCCA_DupRTS( return PrimaryCCA->DupRTS_flag; } -VOID +void odm_DynamicPrimaryCCA( IN PDM_ODM_T pDM_Odm ) @@ -1198,16 +1198,16 @@ odm_DynamicPrimaryCCA( Client_40MHz_pre = Client_40MHz; } #else //#if (RTL8188E_SUPPORT == 1) -VOID +void ODM_UpdateRxIdleAnt_88E(IN PDM_ODM_T pDM_Odm, IN u1Byte Ant) { } -VOID +void odm_PrimaryCCA_Init( IN PDM_ODM_T pDM_Odm) { } -VOID +void odm_DynamicPrimaryCCA( IN PDM_ODM_T pDM_Odm ) diff --git a/hal/odm_RTL8188E.h b/hal/odm_RTL8188E.h index ac0e006..8c5ba64 100755 --- a/hal/odm_RTL8188E.h +++ b/hal/odm_RTL8188E.h @@ -27,49 +27,49 @@ #define MAIN_ANT_CGCS_RX 0 #define AUX_ANT_CGCS_RX 1 -VOID +void ODM_DIG_LowerBound_88E( IN PDM_ODM_T pDM_Odm ); #if ( !(DM_ODM_SUPPORT_TYPE == ODM_CE)) -VOID +void odm_FastAntTrainingInit( IN PDM_ODM_T pDM_Odm ); #endif -VOID +void ODM_AntennaDiversityInit_88E( IN PDM_ODM_T pDM_Odm ); -VOID +void ODM_AntennaDiversity_88E ( IN PDM_ODM_T pDM_Odm ); #if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE)) -VOID +void ODM_SetTxAntByTxInfo_88E( IN PDM_ODM_T pDM_Odm, IN pu1Byte pDesc, IN u1Byte macId ); #else// (DM_ODM_SUPPORT_TYPE == ODM_AP) -VOID +void ODM_SetTxAntByTxInfo_88E( IN PDM_ODM_T pDM_Odm ); #endif -VOID +void ODM_UpdateRxIdleAnt_88E( IN PDM_ODM_T pDM_Odm, IN u1Byte Ant ); -VOID +void ODM_AntselStatistics_88E( IN PDM_ODM_T pDM_Odm, IN u1Byte antsel_tr_mux, @@ -78,22 +78,22 @@ ODM_AntselStatistics_88E( ); #if ( !(DM_ODM_SUPPORT_TYPE == ODM_CE)) -VOID +void odm_FastAntTraining( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_FastAntTrainingCallback( IN PDM_ODM_T pDM_Odm ); -VOID +void odm_FastAntTrainingWorkItemCallback( IN PDM_ODM_T pDM_Odm ); #endif -VOID +void odm_PrimaryCCA_Init( IN PDM_ODM_T pDM_Odm); @@ -101,7 +101,7 @@ BOOLEAN ODM_DynamicPrimaryCCA_DupRTS( IN PDM_ODM_T pDM_Odm); -VOID +void odm_DynamicPrimaryCCA( IN PDM_ODM_T pDM_Odm); diff --git a/hal/odm_debug.c b/hal/odm_debug.c index 377c78b..9a5f40d 100755 --- a/hal/odm_debug.c +++ b/hal/odm_debug.c @@ -24,7 +24,7 @@ #include "odm_precomp.h" -VOID +void ODM_InitDebugSetting( IN PDM_ODM_T pDM_Odm ) diff --git a/hal/odm_debug.h b/hal/odm_debug.h index a1d8ac6..4c32f40 100755 --- a/hal/odm_debug.h +++ b/hal/odm_debug.h @@ -169,7 +169,7 @@ #endif -VOID +void ODM_InitDebugSetting( IN PDM_ODM_T pDM_Odm ); diff --git a/hal/odm_interface.c b/hal/odm_interface.c index d0ab8f1..8916490 100755 --- a/hal/odm_interface.c +++ b/hal/odm_interface.c @@ -87,7 +87,7 @@ ODM_Read4Byte( } -VOID +void ODM_Write1Byte( IN PDM_ODM_T pDM_Odm, IN u4Byte RegAddr, @@ -108,7 +108,7 @@ ODM_Write1Byte( } -VOID +void ODM_Write2Byte( IN PDM_ODM_T pDM_Odm, IN u4Byte RegAddr, @@ -129,7 +129,7 @@ ODM_Write2Byte( } -VOID +void ODM_Write4Byte( IN PDM_ODM_T pDM_Odm, IN u4Byte RegAddr, @@ -150,7 +150,7 @@ ODM_Write4Byte( } -VOID +void ODM_SetMACReg( IN PDM_ODM_T pDM_Odm, IN u4Byte RegAddr, @@ -183,7 +183,7 @@ ODM_GetMACReg( } -VOID +void ODM_SetBBReg( IN PDM_ODM_T pDM_Odm, IN u4Byte RegAddr, @@ -216,7 +216,7 @@ ODM_GetBBReg( } -VOID +void ODM_SetRFReg( IN PDM_ODM_T pDM_Odm, IN ODM_RF_RADIO_PATH_E eRFPath, @@ -256,10 +256,10 @@ ODM_GetRFReg( // // ODM Memory relative API. // -VOID +void ODM_AllocateMemory( IN PDM_ODM_T pDM_Odm, - OUT PVOID *pPtr, + OUT void * *pPtr, IN u4Byte length ) { @@ -274,10 +274,10 @@ ODM_AllocateMemory( } // length could be ignored, used to detect memory leakage. -VOID +void ODM_FreeMemory( IN PDM_ODM_T pDM_Odm, - OUT PVOID pPtr, + OUT void * pPtr, IN u4Byte length ) { @@ -292,8 +292,8 @@ ODM_FreeMemory( } s4Byte ODM_CompareMemory( IN PDM_ODM_T pDM_Odm, - IN PVOID pBuf1, - IN PVOID pBuf2, + IN void * pBuf1, + IN void * pBuf2, IN u4Byte length ) { @@ -311,7 +311,7 @@ s4Byte ODM_CompareMemory( // // ODM MISC relative API. // -VOID +void ODM_AcquireSpinLock( IN PDM_ODM_T pDM_Odm, IN RT_SPINLOCK_TYPE type @@ -326,7 +326,7 @@ ODM_AcquireSpinLock( PlatformAcquireSpinLock(Adapter, type); #endif } -VOID +void ODM_ReleaseSpinLock( IN PDM_ODM_T pDM_Odm, IN RT_SPINLOCK_TYPE type @@ -345,12 +345,12 @@ ODM_ReleaseSpinLock( // // Work item relative API. FOr MP driver only~! // -VOID +void ODM_InitializeWorkItem( IN PDM_ODM_T pDM_Odm, IN PRT_WORK_ITEM pRtWorkItem, IN RT_WORKITEM_CALL_BACK RtWorkItemCallback, - IN PVOID pContext, + IN void * pContext, IN const char* szID ) { @@ -365,7 +365,7 @@ ODM_InitializeWorkItem( } -VOID +void ODM_StartWorkItem( IN PRT_WORK_ITEM pRtWorkItem ) @@ -380,7 +380,7 @@ ODM_StartWorkItem( } -VOID +void ODM_StopWorkItem( IN PRT_WORK_ITEM pRtWorkItem ) @@ -395,7 +395,7 @@ ODM_StopWorkItem( } -VOID +void ODM_FreeWorkItem( IN PRT_WORK_ITEM pRtWorkItem ) @@ -410,7 +410,7 @@ ODM_FreeWorkItem( } -VOID +void ODM_ScheduleWorkItem( IN PRT_WORK_ITEM pRtWorkItem ) @@ -425,7 +425,7 @@ ODM_ScheduleWorkItem( } -VOID +void ODM_IsWorkItemScheduled( IN PRT_WORK_ITEM pRtWorkItem ) @@ -444,7 +444,7 @@ ODM_IsWorkItemScheduled( // // ODM Timer relative API. // -VOID +void ODM_StallExecution( IN u4Byte usDelay ) @@ -458,7 +458,7 @@ ODM_StallExecution( #endif } -VOID +void ODM_delay_ms(IN u4Byte ms) { #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -470,7 +470,7 @@ ODM_delay_ms(IN u4Byte ms) #endif } -VOID +void ODM_delay_us(IN u4Byte us) { #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -482,7 +482,7 @@ ODM_delay_us(IN u4Byte us) #endif } -VOID +void ODM_sleep_ms(IN u4Byte ms) { #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -493,7 +493,7 @@ ODM_sleep_ms(IN u4Byte ms) #endif } -VOID +void ODM_sleep_us(IN u4Byte us) { #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) @@ -504,7 +504,7 @@ ODM_sleep_us(IN u4Byte us) #endif } -VOID +void ODM_SetTimer( IN PDM_ODM_T pDM_Odm, IN PRT_TIMER pTimer, @@ -522,12 +522,12 @@ ODM_SetTimer( } -VOID +void ODM_InitializeTimer( IN PDM_ODM_T pDM_Odm, IN PRT_TIMER pTimer, IN RT_TIMER_CALL_BACK CallBackFunc, - IN PVOID pContext, + IN void * pContext, IN const char* szID ) { @@ -545,7 +545,7 @@ ODM_InitializeTimer( } -VOID +void ODM_CancelTimer( IN PDM_ODM_T pDM_Odm, IN PRT_TIMER pTimer @@ -562,7 +562,7 @@ ODM_CancelTimer( } -VOID +void ODM_ReleaseTimer( IN PDM_ODM_T pDM_Odm, IN PRT_TIMER pTimer @@ -593,7 +593,7 @@ ODM_ReleaseTimer( // ODM FW relative API. // #if (DM_ODM_SUPPORT_TYPE & ODM_MP) -VOID +void ODM_FillH2CCmd( IN struct adapter * Adapter, IN u1Byte ElementID, diff --git a/hal/odm_interface.h b/hal/odm_interface.h index a0eaa6d..4148aa9 100755 --- a/hal/odm_interface.h +++ b/hal/odm_interface.h @@ -80,7 +80,7 @@ typedef enum _ODM_H2C_CMD #if (DM_ODM_SUPPORT_TYPE != ODM_MP) typedef void *PRT_WORK_ITEM ; typedef void RT_WORKITEM_HANDLE,*PRT_WORKITEM_HANDLE; -typedef VOID (*RT_WORKITEM_CALL_BACK)(PVOID pContext); +typedef void (*RT_WORKITEM_CALL_BACK)(void * pContext); #endif // @@ -111,28 +111,28 @@ ODM_Read4Byte( IN u4Byte RegAddr ); -VOID +void ODM_Write1Byte( IN PDM_ODM_T pDM_Odm, IN u4Byte RegAddr, IN u1Byte Data ); -VOID +void ODM_Write2Byte( IN PDM_ODM_T pDM_Odm, IN u4Byte RegAddr, IN u2Byte Data ); -VOID +void ODM_Write4Byte( IN PDM_ODM_T pDM_Odm, IN u4Byte RegAddr, IN u4Byte Data ); -VOID +void ODM_SetMACReg( IN PDM_ODM_T pDM_Odm, IN u4Byte RegAddr, @@ -147,7 +147,7 @@ ODM_GetMACReg( IN u4Byte BitMask ); -VOID +void ODM_SetBBReg( IN PDM_ODM_T pDM_Odm, IN u4Byte RegAddr, @@ -162,7 +162,7 @@ ODM_GetBBReg( IN u4Byte BitMask ); -VOID +void ODM_SetRFReg( IN PDM_ODM_T pDM_Odm, IN ODM_RF_RADIO_PATH_E eRFPath, @@ -183,36 +183,36 @@ ODM_GetRFReg( // // Memory Relative Function. // -VOID +void ODM_AllocateMemory( IN PDM_ODM_T pDM_Odm, - OUT PVOID *pPtr, + OUT void * *pPtr, IN u4Byte length ); -VOID +void ODM_FreeMemory( IN PDM_ODM_T pDM_Odm, - OUT PVOID pPtr, + OUT void * pPtr, IN u4Byte length ); s4Byte ODM_CompareMemory( IN PDM_ODM_T pDM_Odm, - IN PVOID pBuf1, - IN PVOID pBuf2, + IN void * pBuf1, + IN void * pBuf2, IN u4Byte length ); // // ODM MISC-spin lock relative API. // -VOID +void ODM_AcquireSpinLock( IN PDM_ODM_T pDM_Odm, IN RT_SPINLOCK_TYPE type ); -VOID +void ODM_ReleaseSpinLock( IN PDM_ODM_T pDM_Odm, IN RT_SPINLOCK_TYPE type @@ -222,36 +222,36 @@ ODM_ReleaseSpinLock( // // ODM MISC-workitem relative API. // -VOID +void ODM_InitializeWorkItem( IN PDM_ODM_T pDM_Odm, IN PRT_WORK_ITEM pRtWorkItem, IN RT_WORKITEM_CALL_BACK RtWorkItemCallback, - IN PVOID pContext, + IN void * pContext, IN const char* szID ); -VOID +void ODM_StartWorkItem( IN PRT_WORK_ITEM pRtWorkItem ); -VOID +void ODM_StopWorkItem( IN PRT_WORK_ITEM pRtWorkItem ); -VOID +void ODM_FreeWorkItem( IN PRT_WORK_ITEM pRtWorkItem ); -VOID +void ODM_ScheduleWorkItem( IN PRT_WORK_ITEM pRtWorkItem ); -VOID +void ODM_IsWorkItemScheduled( IN PRT_WORK_ITEM pRtWorkItem ); @@ -259,47 +259,47 @@ ODM_IsWorkItemScheduled( // // ODM Timer relative API. // -VOID +void ODM_StallExecution( IN u4Byte usDelay ); -VOID +void ODM_delay_ms(IN u4Byte ms); -VOID +void ODM_delay_us(IN u4Byte us); -VOID +void ODM_sleep_ms(IN u4Byte ms); -VOID +void ODM_sleep_us(IN u4Byte us); -VOID +void ODM_SetTimer( IN PDM_ODM_T pDM_Odm, IN PRT_TIMER pTimer, IN u4Byte msDelay ); -VOID +void ODM_InitializeTimer( IN PDM_ODM_T pDM_Odm, IN PRT_TIMER pTimer, IN RT_TIMER_CALL_BACK CallBackFunc, - IN PVOID pContext, + IN void * pContext, IN const char* szID ); -VOID +void ODM_CancelTimer( IN PDM_ODM_T pDM_Odm, IN PRT_TIMER pTimer ); -VOID +void ODM_ReleaseTimer( IN PDM_ODM_T pDM_Odm, IN PRT_TIMER pTimer @@ -310,7 +310,7 @@ ODM_ReleaseTimer( // ODM FW relative API. // #if (DM_ODM_SUPPORT_TYPE & ODM_MP) -VOID +void ODM_FillH2CCmd( IN PADAPTER Adapter, IN u1Byte ElementID, diff --git a/hal/odm_types.h b/hal/odm_types.h index e1d0f4d..c831ed0 100755 --- a/hal/odm_types.h +++ b/hal/odm_types.h @@ -121,7 +121,7 @@ typedef enum _RT_SPINLOCK_TYPE{ #ifdef AP_BUILD_WORKAROUND #include "../typedef.h" #else - typedef void VOID,*PVOID; + typedef void void,*void *; typedef unsigned char BOOLEAN,*PBOOLEAN; typedef unsigned char u1Byte,*pu1Byte; typedef unsigned short u2Byte,*pu2Byte; diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c index ef91d4d..78e429d 100755 --- a/hal/rtl8188e_cmd.c +++ b/hal/rtl8188e_cmd.c @@ -811,7 +811,7 @@ void rtl8188e_set_FwRsvdPage_cmd(struct adapter *padapter, PRSVDPAGE_LOC rsvdpag // To check if reserved page content is destroyed by beacon beacuse beacon is too large. // 2010.06.23. Added by tynli. -VOID +void CheckFwRsvdPageContent( IN struct adapter * Adapter ) diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c index 46d6542..257fff4 100755 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -41,14 +41,14 @@ //============================================================ -static VOID +static void dm_CheckProtection( IN struct adapter *Adapter ) { } -static VOID +static void dm_CheckStatistics( IN struct adapter *Adapter ) @@ -305,7 +305,7 @@ rtl8188e_InitHalDm( } -VOID +void rtl8188e_HalDmWatchDog( IN struct adapter *Adapter ) diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c index c85ca86..2ac4003 100755 --- a/hal/rtl8188e_hal_init.c +++ b/hal/rtl8188e_hal_init.c @@ -104,7 +104,7 @@ static s32 iol_InitLLTTable( return rst; } -static VOID +static void efuse_phymap_to_logical(u8 * phymap, u16 _offset, u16 _size_byte, u8 *pbuf) { u8 *efuseTbl = NULL; @@ -533,7 +533,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter,int data_len) #endif /* defined(CONFIG_IOL) */ -static VOID +static void _FWDownloadEnable( IN struct adapter * padapter, IN BOOLEAN enable @@ -566,7 +566,7 @@ _FWDownloadEnable( static int _BlockWrite( IN struct adapter * padapter, - IN PVOID buffer, + IN void * buffer, IN u32 buffSize ) { @@ -647,7 +647,7 @@ static int _PageWrite( IN struct adapter *padapter, IN u32 page, - IN PVOID buffer, + IN void * buffer, IN u32 size ) { @@ -660,7 +660,7 @@ _PageWrite( return _BlockWrite(padapter,buffer,size); } -static VOID +static void _FillDummy( u8* pFwBuf, u32* pFwLen @@ -683,7 +683,7 @@ _FillDummy( static int _WriteFW( IN struct adapter * padapter, - IN PVOID buffer, + IN void * buffer, IN u32 size ) { @@ -992,7 +992,7 @@ void rtl8188e_InitializeFirmwareVars(struct adapter *padapter) // // 2011.04.12 by tynli. // -VOID +void SetFwRelatedForWoWLAN8188ES( IN struct adapter * padapter, IN u8 bHostIsGoingtoSleep @@ -1075,7 +1075,7 @@ hal_EfusePgPacketWriteData( IN PPGPKT_STRUCT pTargetPkt, IN BOOLEAN bPseudoTest); -static VOID +static void hal_EfusePowerSwitch_RTL8188E( IN struct adapter *pAdapter, IN u8 bWrite, @@ -1129,7 +1129,7 @@ hal_EfusePowerSwitch_RTL8188E( } } -static VOID +static void rtl8188e_EfusePowerSwitch( IN struct adapter *pAdapter, IN u8 bWrite, @@ -1181,7 +1181,7 @@ static bool efuse_read_phymap( } -static VOID +static void Hal_EfuseReadEFuse88E( struct adapter * Adapter, u16 _offset, @@ -1428,7 +1428,7 @@ Hal_EfuseSwitchToBank( -static VOID +static void ReadEFuseByIC( struct adapter *Adapter, u8 efuseType, @@ -1487,7 +1487,7 @@ exit: return; } -static VOID +static void ReadEFuse_Pseudo( struct adapter *Adapter, u8 efuseType, @@ -1500,7 +1500,7 @@ ReadEFuse_Pseudo( Hal_EfuseReadEFuse88E(Adapter, _offset, _size_byte, pbuf, bPseudoTest); } -static VOID +static void rtl8188e_ReadEFuse( struct adapter *Adapter, u8 efuseType, @@ -1521,12 +1521,12 @@ rtl8188e_ReadEFuse( } //Do not support BT -VOID +void Hal_EFUSEGetEfuseDefinition88E( IN struct adapter *pAdapter, IN u1Byte efuseType, IN u1Byte type, - OUT PVOID pOut + OUT void * pOut ) { switch(type) @@ -1589,12 +1589,12 @@ Hal_EFUSEGetEfuseDefinition88E( break; } } -VOID +void Hal_EFUSEGetEfuseDefinition_Pseudo88E( IN struct adapter *pAdapter, IN u8 efuseType, IN u8 type, - OUT PVOID pOut + OUT void * pOut ) { switch(type) @@ -1659,7 +1659,7 @@ Hal_EFUSEGetEfuseDefinition_Pseudo88E( } -static VOID +static void rtl8188e_EFUSE_GetEfuseDefinition( IN struct adapter *pAdapter, IN u8 efuseType, @@ -1690,7 +1690,7 @@ Hal_EfuseWordEnableDataWrite( IN struct adapter *pAdapter, u8 badworden = 0x0F; u8 tmpdata[8]; - _rtw_memset((PVOID)tmpdata, 0xff, PGPKT_DATA_SIZE); + _rtw_memset((void *)tmpdata, 0xff, PGPKT_DATA_SIZE); //RT_TRACE(COMP_EFUSE, DBG_LOUD, ("word_en = %x efuse_addr=%x\n", word_en, efuse_addr)); if(!(word_en&BIT0)) @@ -1905,15 +1905,15 @@ hal_EfusePgPacketRead_8188e( u8 max_section = 0; u8 tmp_header = 0; - EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAX_SECTION, (PVOID)&max_section, bPseudoTest); + EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAX_SECTION, (void *)&max_section, bPseudoTest); if(data==NULL) return _FALSE; if(offset>max_section) return _FALSE; - _rtw_memset((PVOID)data, 0xff, sizeof(u8)*PGPKT_DATA_SIZE); - _rtw_memset((PVOID)tmpdata, 0xff, sizeof(u8)*PGPKT_DATA_SIZE); + _rtw_memset((void *)data, 0xff, sizeof(u8)*PGPKT_DATA_SIZE); + _rtw_memset((void *)tmpdata, 0xff, sizeof(u8)*PGPKT_DATA_SIZE); // @@ -2061,7 +2061,7 @@ hal_EfuseFixHeaderProcess( u16 efuse_addr=*pAddr; u32 PgWriteSuccess=0; - _rtw_memset((PVOID)originaldata, 0xff, 8); + _rtw_memset((void *)originaldata, 0xff, 8); if(Efuse_PgPacketRead(pAdapter, pFixPkt->offset, originaldata, bPseudoTest)) { //check if data exist @@ -2103,7 +2103,7 @@ hal_EfusePgPacketWrite2ByteHeader( u8 repeatcnt=0; //RTPRINT(FEEPROM, EFUSE_PG, ("Wirte 2byte header\n")); - EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, (PVOID)&efuse_max_available_len, bPseudoTest); + EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, (void *)&efuse_max_available_len, bPseudoTest); while(efuse_addr < efuse_max_available_len) { @@ -2368,8 +2368,8 @@ hal_EfusePartialWriteCheck( u16 startAddr=0, efuse_max_available_len=0, efuse_max=0; PGPKT_STRUCT curPkt; - EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, (PVOID)&efuse_max_available_len, bPseudoTest); - EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_REAL_CONTENT_LEN, (PVOID)&efuse_max, bPseudoTest); + EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, (void *)&efuse_max_available_len, bPseudoTest); + EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&efuse_max, bPseudoTest); if(efuseType == EFUSE_WIFI) { @@ -2488,9 +2488,9 @@ hal_EfusePgCheckAvailableAddr( u16 efuse_max_available_len=0; //Change to check TYPE_EFUSE_MAP_LEN ,beacuse 8188E raw 256,logic map over 256. - EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&efuse_max_available_len, _FALSE); + EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&efuse_max_available_len, _FALSE); - //EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&efuse_max_available_len, bPseudoTest); + //EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&efuse_max_available_len, bPseudoTest); //RTPRINT(FEEPROM, EFUSE_PG, ("efuse_max_available_len = %d\n", efuse_max_available_len)); if(Efuse_GetCurrentSize(pAdapter, efuseType, bPseudoTest) >= efuse_max_available_len) @@ -2501,7 +2501,7 @@ hal_EfusePgCheckAvailableAddr( return _TRUE; } -static VOID +static void hal_EfuseConstructPGPkt( IN u8 offset, IN u8 word_en, @@ -2510,7 +2510,7 @@ hal_EfuseConstructPGPkt( ) { - _rtw_memset((PVOID)pTargetPkt->data, 0xFF, sizeof(u8)*8); + _rtw_memset((void *)pTargetPkt->data, 0xFF, sizeof(u8)*8); pTargetPkt->offset = offset; pTargetPkt->word_en= word_en; efuse_WordEnableDataRead(word_en, pData, pTargetPkt->data); @@ -2687,7 +2687,7 @@ static void rtl8188e_read_chip_version(struct adapter *padapter) void rtl8188e_GetHalODMVar( struct adapter * Adapter, HAL_ODM_VARIABLE eVariable, - PVOID pValue1, + void * pValue1, BOOLEAN bSet) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2702,7 +2702,7 @@ void rtl8188e_GetHalODMVar( void rtl8188e_SetHalODMVar( struct adapter * Adapter, HAL_ODM_VARIABLE eVariable, - PVOID pValue1, + void * pValue1, BOOLEAN bSet) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -3018,8 +3018,8 @@ Hal_EfuseParseIDCode88E( static void Hal_EEValueCheck( IN u8 EEType, - IN PVOID pInValue, - OUT PVOID pOutValue + IN void * pInValue, + OUT void * pOutValue ) { switch(EEType) @@ -3390,7 +3390,7 @@ Hal_ReadTxPowerInfo88E( } -VOID +void Hal_EfuseParseXtal_8188E( IN struct adapter * pAdapter, IN u8* hwinfo, diff --git a/hal/rtl8188e_phycfg.c b/hal/rtl8188e_phycfg.c index fbae822..095c43e 100755 --- a/hal/rtl8188e_phycfg.c +++ b/hal/rtl8188e_phycfg.c @@ -142,7 +142,7 @@ sic_CalculateBitShift( static u32 sic_Read4Byte( - PVOID Adapter, + void * Adapter, u32 offset ) { @@ -193,9 +193,9 @@ sic_Read4Byte( return u4ret; } -static VOID +static void sic_Write4Byte( - PVOID Adapter, + void * Adapter, u32 offset, u32 data ) @@ -239,7 +239,7 @@ sic_Write4Byte( //============================================================ // extern function //============================================================ -static VOID +static void SIC_SetBBReg( IN struct adapter *Adapter, IN u32 RegAddr, @@ -322,7 +322,7 @@ SIC_QueryBBReg( return (ReturnValue); } -VOID +void SIC_Init( IN struct adapter *Adapter ) @@ -423,7 +423,7 @@ rtl8188e_PHY_QueryBBReg( * Note: This function is equal to "PutRegSetting" in PHY programming guide */ -VOID +void rtl8188e_PHY_SetBBReg( IN struct adapter *Adapter, IN u32 RegAddr, @@ -599,7 +599,7 @@ phy_RFSerialRead( * * */ -static VOID +static void phy_RFSerialWrite( IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, @@ -689,7 +689,7 @@ rtl8188e_PHY_QueryRFReg( * Return: None * Note: This function is equal to "PutRFRegSetting" in PHY programming guide */ -VOID +void rtl8188e_PHY_SetRFReg( IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, @@ -872,7 +872,7 @@ s32 PHY_MACConfig8188E(struct adapter *Adapter) * Return: None * Note: The initialization value is constant and it should never be changes */ -static VOID +static void phy_InitBBRFRegisterDefinition( IN struct adapter * Adapter ) @@ -1014,7 +1014,7 @@ phy_ConfigBBWithParaFile( //**************************************** // The following is for High Power PA //**************************************** -VOID +void phy_ConfigBBExternalPA( IN struct adapter * Adapter ) @@ -1167,7 +1167,7 @@ exit: } #endif //#ifndef CONFIG_PHY_SETTING_WITH_ODM -VOID +void storePwrIndexDiffRateOffset( IN struct adapter *Adapter, IN u32 RegAddr, @@ -1360,7 +1360,7 @@ phy_ConfigBBWithPgHeaderFile( -static VOID +static void phy_BB8192C_Config_1T( IN struct adapter *Adapter ) @@ -1898,7 +1898,7 @@ PHY_CheckBBAndRFOK( } -VOID +void rtl8192c_PHY_GetHWRegOriginalValue( IN struct adapter * Adapter ) @@ -2035,7 +2035,7 @@ phy_TxPwrIdxToDbm( * Return: NONE * *---------------------------------------------------------------------------*/ -VOID +void PHY_GetTxPowerLevel8188E( IN struct adapter * Adapter, OUT u32* powerlevel @@ -2204,7 +2204,7 @@ void phy_PowerIndexCheck88E( * 2009/01/21 MHC Support new EEPROM format from SD3 requirement. * *---------------------------------------------------------------------------*/ -VOID +void PHY_SetTxPowerLevel8188E( IN struct adapter * Adapter, IN u8 channel @@ -2302,7 +2302,7 @@ rtl8192c_PHY_SetBeaconHwReg( } -VOID +void PHY_ScanOperationBackup8188E( IN struct adapter *Adapter, IN u8 Operation @@ -2325,7 +2325,7 @@ PHY_ScanOperationBackup8188E( * (2) Will two workitem of "switch channel" and "switch channel bandwidth" run * concurrently? *---------------------------------------------------------------------------*/ -static VOID +static void _PHY_SetBWMode92C( IN struct adapter *Adapter ) @@ -2488,7 +2488,7 @@ _PHY_SetBWMode92C( * * Note: We do not take j mode into consideration now *---------------------------------------------------------------------------*/ -VOID +void PHY_SetBWMode8188E( IN struct adapter * Adapter, IN HT_CHANNEL_WIDTH Bandwidth, // 20M or 40M @@ -2582,7 +2582,7 @@ phy_SpurCalibration_8188E( } } -VOID +void PHY_SwChnl8188E( // Call after initialization IN struct adapter *Adapter, IN u8 channel @@ -2735,7 +2735,7 @@ phy_FinishSwChnlNow( // We should not call this function directly // However, this procedure is performed synchronously which should be running under // passive level. // -VOID +void PHY_SwChnlPhy8192C( // Only called during initialize IN struct adapter *Adapter, IN u8 channel @@ -2781,7 +2781,7 @@ PHY_SwChnlPhy8192C( // Only called during initialize // Note, because we possibly need to configure BB and RF in this function, // so caller should in PASSIVE_LEVEL. 080118, by rcnjko. // -VOID +void PHY_SetMonitorMode8192C( IN struct adapter * pAdapter, IN BOOLEAN bEnableMonitorMode @@ -2819,7 +2819,7 @@ PHY_CheckIsLegalRfPath8192C( } /* PHY_CheckIsLegalRfPath8192C */ -static VOID _PHY_SetRFPathSwitch( +static void _PHY_SetRFPathSwitch( IN struct adapter *pAdapter, IN BOOLEAN bMain, IN BOOLEAN is2T @@ -2886,7 +2886,7 @@ static BOOLEAN _PHY_QueryRFPathSwitch( } -static VOID +static void _PHY_DumpRFReg(IN struct adapter *pAdapter) { u32 rfRegValue,rfRegOffset; @@ -2911,7 +2911,7 @@ _PHY_DumpRFReg(IN struct adapter *pAdapter) // To dump all Tx FIFO LLT related link-list table. // Added by Roger, 2009.03.10. // -VOID +void DumpBBDbgPort_92CU( IN struct adapter * Adapter ) diff --git a/hal/rtl8188e_rf6052.c b/hal/rtl8188e_rf6052.c index 1ce8c1f..2503972 100755 --- a/hal/rtl8188e_rf6052.c +++ b/hal/rtl8188e_rf6052.c @@ -114,7 +114,7 @@ void rtl8188e_RF_ChangeTxPath( IN struct adapter *Adapter, * * Note: For RF type 0222D *---------------------------------------------------------------------------*/ -VOID +void rtl8188e_PHY_RF6052SetBandwidth( IN struct adapter * Adapter, IN HT_CHANNEL_WIDTH Bandwidth) //20M or 40M @@ -158,7 +158,7 @@ rtl8188e_PHY_RF6052SetBandwidth( * *---------------------------------------------------------------------------*/ -VOID +void rtl8188e_PHY_RF6052SetCckTxPower( IN struct adapter * Adapter, IN u8* pPowerlevel) @@ -585,7 +585,7 @@ static void writeOFDMPowerReg88E( * *---------------------------------------------------------------------------*/ -VOID +void rtl8188e_PHY_RF6052SetOFDMTxPower( IN struct adapter *Adapter, IN u8* pPowerLevelOFDM, @@ -630,7 +630,7 @@ rtl8188e_PHY_RF6052SetOFDMTxPower( } -static VOID +static void phy_RF6052_Config_HardCode( IN struct adapter * Adapter ) @@ -826,7 +826,7 @@ PHY_RFShadowRead( } /* PHY_RFShadowRead */ -VOID +void PHY_RFShadowWrite( IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, @@ -865,7 +865,7 @@ PHY_RFShadowCompare( } /* PHY_RFShadowCompare */ -VOID +void PHY_RFShadowRecorver( IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, @@ -888,7 +888,7 @@ PHY_RFShadowRecorver( } /* PHY_RFShadowRecorver */ -VOID +void PHY_RFShadowCompareAll( IN struct adapter * Adapter) { @@ -906,7 +906,7 @@ PHY_RFShadowCompareAll( } /* PHY_RFShadowCompareAll */ -VOID +void PHY_RFShadowRecorverAll( IN struct adapter * Adapter) { @@ -924,7 +924,7 @@ PHY_RFShadowRecorverAll( } /* PHY_RFShadowRecorverAll */ -VOID +void PHY_RFShadowCompareFlagSet( IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, @@ -937,7 +937,7 @@ PHY_RFShadowCompareFlagSet( } /* PHY_RFShadowCompareFlagSet */ -VOID +void PHY_RFShadowRecorverFlagSet( IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, @@ -950,7 +950,7 @@ PHY_RFShadowRecorverFlagSet( } /* PHY_RFShadowRecorverFlagSet */ -VOID +void PHY_RFShadowCompareFlagSetAll( IN struct adapter * Adapter) { @@ -972,7 +972,7 @@ PHY_RFShadowCompareFlagSetAll( } /* PHY_RFShadowCompareFlagSetAll */ -VOID +void PHY_RFShadowRecorverFlagSetAll( IN struct adapter * Adapter) { @@ -993,7 +993,7 @@ PHY_RFShadowRecorverFlagSetAll( } /* PHY_RFShadowCompareFlagSetAll */ -VOID +void PHY_RFShadowRefresh( IN struct adapter * Adapter) { diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index b3cc92a..b591a75 100755 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -51,7 +51,7 @@ #endif -static VOID +static void _ConfigNormalChipOutEP_8188E( IN struct adapter *pAdapter, IN u8 NumOutPipe @@ -292,7 +292,7 @@ static void _InitBTCoexist(struct adapter *padapter) // MAC init functions // //--------------------------------------------------------------- -static VOID +static void _SetMacID( IN struct adapter *Adapter, u8* MacID ) @@ -308,7 +308,7 @@ _SetMacID( } } -static VOID +static void _SetBSSID( IN struct adapter *Adapter, u8* BSSID ) @@ -326,7 +326,7 @@ _SetBSSID( // Shall USB interface init this? -static VOID +static void _InitInterrupt( IN struct adapter *Adapter ) @@ -369,7 +369,7 @@ _InitInterrupt( } -static VOID +static void _InitQueueReservedPage( IN struct adapter *Adapter ) @@ -418,7 +418,7 @@ _InitQueueReservedPage( } } -static VOID +static void _InitTxBufferBoundary( IN struct adapter *Adapter, IN u8 txpktbuf_bndy @@ -437,7 +437,7 @@ _InitTxBufferBoundary( } -static VOID +static void _InitPageBoundary( IN struct adapter *Adapter ) @@ -450,7 +450,7 @@ _InitPageBoundary( } -static VOID +static void _InitNormalChipRegPriority( IN struct adapter *Adapter, IN u16 beQ, @@ -470,7 +470,7 @@ _InitNormalChipRegPriority( rtw_write16(Adapter, REG_TRXDMA_CTRL, value16); } -static VOID +static void _InitNormalChipOneOutEpPriority( IN struct adapter *Adapter ) @@ -505,7 +505,7 @@ _InitNormalChipOneOutEpPriority( } -static VOID +static void _InitNormalChipTwoOutEpPriority( IN struct adapter *Adapter ) @@ -558,7 +558,7 @@ _InitNormalChipTwoOutEpPriority( } -static VOID +static void _InitNormalChipThreeOutEpPriority( IN struct adapter *Adapter ) @@ -585,7 +585,7 @@ _InitNormalChipThreeOutEpPriority( _InitNormalChipRegPriority(Adapter,beQ,bkQ,viQ,voQ,mgtQ,hiQ); } -static VOID +static void _InitQueuePriority( IN struct adapter *Adapter ) @@ -613,7 +613,7 @@ _InitQueuePriority( -static VOID +static void _InitHardwareDropIncorrectBulkOut( IN struct adapter *Adapter ) @@ -625,7 +625,7 @@ _InitHardwareDropIncorrectBulkOut( #endif } -static VOID +static void _InitNetworkType( IN struct adapter *Adapter ) @@ -640,7 +640,7 @@ _InitNetworkType( // RASSERT(pIoBase->rtw_read8(REG_CR + 2) == 0x2); } -static VOID +static void _InitTransferPageSize( IN struct adapter *Adapter ) @@ -652,7 +652,7 @@ _InitTransferPageSize( rtw_write8(Adapter, REG_PBP, value8); } -static VOID +static void _InitDriverInfoSize( IN struct adapter *Adapter, IN u8 drvInfoSize @@ -661,7 +661,7 @@ _InitDriverInfoSize( rtw_write8(Adapter,REG_RX_DRVINFO_SZ, drvInfoSize); } -static VOID +static void _InitWMACSetting( IN struct adapter *Adapter ) @@ -707,7 +707,7 @@ _InitWMACSetting( } -static VOID +static void _InitAdaptiveCtrl( IN struct adapter *Adapter ) @@ -734,7 +734,7 @@ _InitAdaptiveCtrl( } -static VOID +static void _InitRateFallback( IN struct adapter *Adapter ) @@ -748,7 +748,7 @@ _InitRateFallback( } -static VOID +static void _InitEDCA( IN struct adapter *Adapter ) @@ -771,7 +771,7 @@ _InitEDCA( } -static VOID +static void _InitBeaconMaxError( IN struct adapter *Adapter, IN BOOLEAN InfraMode @@ -796,7 +796,7 @@ static void _InitHWLed(struct adapter *Adapter) } #endif //CONFIG_LED -static VOID +static void _InitRDGSetting( IN struct adapter *Adapter ) @@ -806,7 +806,7 @@ _InitRDGSetting( rtw_write8(Adapter,REG_RD_RESP_PKT_TH,0x05); } -static VOID +static void _InitRxSetting( IN struct adapter *Adapter ) @@ -815,7 +815,7 @@ _InitRxSetting( rtw_write32(Adapter, 0x0700, 0x87654321); } -static VOID +static void _InitRetryFunction( IN struct adapter *Adapter ) @@ -843,7 +843,7 @@ _InitRetryFunction( * 12/10/2010 MHC Seperate to smaller function. * *---------------------------------------------------------------------------*/ -static VOID +static void usb_AggSettingTxUpdate( IN struct adapter * Adapter ) @@ -883,7 +883,7 @@ usb_AggSettingTxUpdate( * 12/10/2010 MHC Seperate to smaller function. * *---------------------------------------------------------------------------*/ -static VOID +static void usb_AggSettingRxUpdate( IN struct adapter * Adapter ) @@ -969,7 +969,7 @@ usb_AggSettingRxUpdate( #endif } // usb_AggSettingRxUpdate -static VOID +static void InitUsbAggregationSetting( IN struct adapter *Adapter ) @@ -985,7 +985,7 @@ InitUsbAggregationSetting( // 201/12/10 MH Add for USB agg mode dynamic switch. pHalData->UsbRxHighSpeedMode = _FALSE; } -VOID +void HalRxAggr8188EUsb( IN struct adapter *Adapter, IN BOOLEAN Value @@ -1012,14 +1012,14 @@ HalRxAggr8188EUsb( * 12/10/2010 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -VOID +void USB_AggModeSwitch( IN struct adapter * Adapter ) { } // USB_AggModeSwitch -static VOID +static void _InitOperationMode( IN struct adapter * Adapter ) @@ -1027,7 +1027,7 @@ _InitOperationMode( } - static VOID + static void _InitBeaconParameters( IN struct adapter *Adapter ) @@ -1052,7 +1052,7 @@ _InitBeaconParameters( pHalData->RegCR_1 = rtw_read8(Adapter, REG_CR+1); } -static VOID +static void _InitRFType( IN struct adapter *Adapter ) @@ -1082,7 +1082,7 @@ _InitRFType( } -static VOID +static void _BeaconFunctionEnable( IN struct adapter * Adapter, IN BOOLEAN Enable, @@ -1098,7 +1098,7 @@ _BeaconFunctionEnable( // Set CCK and OFDM Block "ON" -static VOID _BBTurnOnBlock( +static void _BBTurnOnBlock( IN struct adapter * Adapter ) { @@ -1110,7 +1110,7 @@ static VOID _BBTurnOnBlock( PHY_SetBBReg(Adapter, rFPGA0_RFMOD, bOFDMEn, 0x1); } -static VOID _RfPowerSave( +static void _RfPowerSave( IN struct adapter * Adapter ) { @@ -1121,7 +1121,7 @@ enum { Antenna_Right = 2, }; -static VOID +static void _InitAntenna_Selection(IN struct adapter *Adapter) { @@ -1148,7 +1148,7 @@ _InitAntenna_Selection(IN struct adapter *Adapter) // If Efuse 0x0e bit1 is not enabled, we can not support selective suspend for Minicard and // slim card. // -static VOID +static void HalDetectSelectiveSuspendMode( IN struct adapter * Adapter ) @@ -1169,7 +1169,7 @@ HalDetectSelectiveSuspendMode( * When Who Remark * 08/23/2010 MHC HW suspend mode switch test.. *---------------------------------------------------------------------------*/ -static VOID +static void HwSuspendModeEnable_88eu( IN struct adapter *pAdapter, IN u8 Type @@ -1746,7 +1746,7 @@ void _ps_close_RF(struct adapter *padapter){ } -VOID hal_poweroff_rtl8188eu( +void hal_poweroff_rtl8188eu( IN struct adapter * Adapter ) { @@ -1960,7 +1960,7 @@ _ReadIDs( } -static VOID +static void _ReadMACAddress( IN struct adapter *Adapter, IN u8* PROMContent, @@ -1969,7 +1969,7 @@ _ReadMACAddress( { } -static VOID +static void _ReadBoardType( IN struct adapter *Adapter, IN u8* PROMContent, @@ -1980,7 +1980,7 @@ _ReadBoardType( } -static VOID +static void _ReadLEDSetting( IN struct adapter *Adapter, IN u8* PROMContent, @@ -2004,7 +2004,7 @@ _ReadLEDSetting( #endif //CONFIG_SW_LED } -static VOID +static void _ReadThermalMeter( IN struct adapter *Adapter, IN u8* PROMContent, @@ -2013,7 +2013,7 @@ _ReadThermalMeter( { } -static VOID +static void _ReadRFSetting( IN struct adapter *Adapter, IN u8* PROMContent, @@ -2031,7 +2031,7 @@ _ReadPROMVersion( { } -static VOID +static void readAntennaDiversity( IN struct adapter *pAdapter, IN u8 *hwinfo, @@ -2044,7 +2044,7 @@ readAntennaDiversity( pHalData->AntDivCfg = registry_par->antdiv_cfg ; // 0:OFF , 1:ON, } -static VOID +static void hal_InitPGData( IN struct adapter *pAdapter, IN OUT u8 *PROMContent @@ -2245,7 +2245,7 @@ Hal_ReadMACAddrFromFile_8188EU( } #endif //CONFIG_EFUSE_CONFIG_FILE -static VOID +static void readAdapterInfo_8188EU( IN struct adapter *padapter ) @@ -2307,7 +2307,7 @@ static void _ReadPROMContent( -static VOID +static void _ReadRFType( IN struct adapter *Adapter ) @@ -3935,7 +3935,7 @@ u8 GetHalDefVar8188EUsb( IN struct adapter * Adapter, IN HAL_DEF_VARIABLE eVariable, - IN PVOID pValue + IN void * pValue ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -4082,7 +4082,7 @@ u8 SetHalDefVar8188EUsb( IN struct adapter * Adapter, IN HAL_DEF_VARIABLE eVariable, - IN PVOID pValue + IN void * pValue ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); diff --git a/include/Hal8188EPhyCfg.h b/include/Hal8188EPhyCfg.h index d47bb25..2ddaea4 100755 --- a/include/Hal8188EPhyCfg.h +++ b/include/Hal8188EPhyCfg.h @@ -261,7 +261,7 @@ BOOLEAN PHY_UpdateTxPowerDbm8188E( IN struct adapter *Adapter, IN int powerInDbm ); // -VOID +void PHY_ScanOperationBackup8188E(IN struct adapter *Adapter, IN u8 Operation ); @@ -308,14 +308,14 @@ void PHY_SetMonitorMode8192C(IN struct adapter *pAdapter, BOOLEAN PHY_CheckIsLegalRfPath8192C(IN struct adapter *pAdapter, IN u32 eRFPath ); -VOID PHY_SetRFPathSwitch_8188E(IN struct adapter *pAdapter, IN BOOLEAN bMain); +void PHY_SetRFPathSwitch_8188E(IN struct adapter *pAdapter, IN BOOLEAN bMain); -extern VOID +extern void PHY_SwitchEphyParameter( IN struct adapter * Adapter ); -extern VOID +extern void PHY_EnableHostClkReq( IN struct adapter * Adapter ); @@ -327,7 +327,7 @@ SetAntennaConfig92C( ); #ifdef CONFIG_PHY_SETTING_WITH_ODM -VOID +void storePwrIndexDiffRateOffset( IN struct adapter *Adapter, IN u32 RegAddr, @@ -417,7 +417,7 @@ storePwrIndexDiffRateOffset( #endif #if(SIC_ENABLE == 1) -VOID SIC_Init(IN struct adapter *Adapter); +void SIC_Init(IN struct adapter *Adapter); #endif diff --git a/include/Hal8192CPhyCfg.h b/include/Hal8192CPhyCfg.h index fc62213..3cf4f7c 100755 --- a/include/Hal8192CPhyCfg.h +++ b/include/Hal8192CPhyCfg.h @@ -278,7 +278,7 @@ BOOLEAN PHY_UpdateTxPowerDbm8192C( IN struct adapter *Adapter, IN int powerInDbm ); // -VOID +void PHY_ScanOperationBackup8192C(IN struct adapter *Adapter, IN u8 Operation ); @@ -326,7 +326,7 @@ BOOLEAN PHY_CheckIsLegalRfPath8192C(IN struct adapter *pAdapter, IN u32 eRFPath ); -VOID rtl8192c_PHY_SetRFPathSwitch(IN struct adapter *pAdapter, IN BOOLEAN bMain); +void rtl8192c_PHY_SetRFPathSwitch(IN struct adapter *pAdapter, IN BOOLEAN bMain); // // Modify the value of the hw register when beacon interval be changed. @@ -336,12 +336,12 @@ rtl8192c_PHY_SetBeaconHwReg( IN struct adapter * Adapter, IN u16 BeaconInterval ); -extern VOID +extern void PHY_SwitchEphyParameter( IN struct adapter * Adapter ); -extern VOID +extern void PHY_EnableHostClkReq( IN struct adapter * Adapter ); diff --git a/include/Hal8192DPhyCfg.h b/include/Hal8192DPhyCfg.h index a41430c..a52a4d4 100755 --- a/include/Hal8192DPhyCfg.h +++ b/include/Hal8192DPhyCfg.h @@ -335,7 +335,7 @@ BOOLEAN PHY_UpdateTxPowerDbm8192D( IN struct adapter *Adapter, IN int powerInDbm ); // -VOID +void PHY_ScanOperationBackup8192D(IN struct adapter *Adapter, IN u8 Operation ); @@ -392,12 +392,12 @@ rtl8192d_PHY_SetBeaconHwReg( IN struct adapter * Adapter, IN u16 BeaconInterval ); -extern VOID +extern void PHY_SwitchEphyParameter( IN struct adapter * Adapter ); -extern VOID +extern void PHY_EnableHostClkReq( IN struct adapter * Adapter ); @@ -408,45 +408,45 @@ SetAntennaConfig92C( IN u8 DefaultAnt ); -VOID +void PHY_UpdateBBRFConfiguration8192D( IN struct adapter *Adapter, IN BOOLEAN bisBandSwitch ); -VOID PHY_ReadMacPhyMode92D( +void PHY_ReadMacPhyMode92D( IN struct adapter *Adapter, IN BOOLEAN AutoloadFail ); -VOID PHY_ConfigMacPhyMode92D( +void PHY_ConfigMacPhyMode92D( IN struct adapter *Adapter ); -VOID PHY_ConfigMacPhyModeInfo92D( +void PHY_ConfigMacPhyModeInfo92D( IN struct adapter *Adapter ); -VOID PHY_ConfigMacCoexist_RFPage92D( +void PHY_ConfigMacCoexist_RFPage92D( IN struct adapter *Adapter ); -VOID +void rtl8192d_PHY_InitRxSetting( IN struct adapter *Adapter ); -VOID +void rtl8192d_PHY_SetRFPathSwitch(IN struct adapter *pAdapter, IN BOOLEAN bMain); -VOID +void HalChangeCCKStatus8192D( IN struct adapter *Adapter, IN BOOLEAN bCCKDisable ); -VOID +void PHY_InitPABias92D(IN struct adapter *Adapter); /*--------------------------Exported Function prototype---------------------*/ diff --git a/include/basic_types.h b/include/basic_types.h index afd72f4..d1e4c9f 100755 --- a/include/basic_types.h +++ b/include/basic_types.h @@ -41,17 +41,11 @@ #include #define IN #define OUT - #define VOID void #define NDIS_OID uint #define NDIS_STATUS uint typedef signed int sint; - #ifndef PVOID - typedef void * PVOID; - //#define PVOID (void *) - #endif - #define UCHAR u8 #define USHORT u16 #define UINT u32 diff --git a/include/drv_types.h b/include/drv_types.h index 9498a99..6e23b2f 100755 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -420,7 +420,7 @@ struct adapter { struct wifi_display_info wfd_info; #endif //CONFIG_WFD - PVOID HalData; + void * HalData; u32 hal_data_sz; struct hal_ops HalFunc; diff --git a/include/drv_types_ce.h b/include/drv_types_ce.h index 27b8d47..5e1bb0d 100755 --- a/include/drv_types_ce.h +++ b/include/drv_types_ce.h @@ -63,7 +63,7 @@ typedef struct _MP_REG_ENTRY typedef struct _USB_EXTENSION { LPCUSB_FUNCS _lpUsbFuncs; USB_HANDLE _hDevice; - PVOID pAdapter; + void * pAdapter; } USB_EXTENSION, *PUSB_EXTENSION; typedef struct _OCTET_STRING{ diff --git a/include/hal_intf.h b/include/hal_intf.h index 15da240..143fa38 100755 --- a/include/hal_intf.h +++ b/include/hal_intf.h @@ -200,11 +200,11 @@ struct hal_ops { void (*SetHwRegHandler)(struct adapter *padapter, u8 variable,u8* val); void (*GetHwRegHandler)(struct adapter *padapter, u8 variable,u8* val); - u8 (*GetHalDefVarHandler)(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); - u8 (*SetHalDefVarHandler)(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); + u8 (*GetHalDefVarHandler)(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); + u8 (*SetHalDefVarHandler)(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); - void (*GetHalODMVarHandler)(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); - void (*SetHalODMVarHandler)(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); + void (*GetHalODMVarHandler)(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet); + void (*SetHalODMVarHandler)(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet); void (*UpdateRAMaskHandler)(struct adapter *padapter, u32 mac_id, u8 rssi_level); void (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter); @@ -401,11 +401,11 @@ void rtw_hal_chip_configure(struct adapter *padapter); void rtw_hal_read_chip_info(struct adapter *padapter); void rtw_hal_read_chip_version(struct adapter *padapter); -u8 rtw_hal_set_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); -u8 rtw_hal_get_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); +u8 rtw_hal_set_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); +u8 rtw_hal_get_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); -void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); -void rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); +void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet); +void rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet); void rtw_hal_enable_interrupt(struct adapter *padapter); void rtw_hal_disable_interrupt(struct adapter *padapter); diff --git a/include/osdep_ce_service.h b/include/osdep_ce_service.h index 7417032..512026a 100755 --- a/include/osdep_ce_service.h +++ b/include/osdep_ce_service.h @@ -115,7 +115,7 @@ __inline static void rtw_list_delete(_list *plist) InitializeListHead(plist); } -__inline static void _init_timer(_timer *ptimer,_nic_hdl nic_hdl,void *pfunc,PVOID cntx) +__inline static void _init_timer(_timer *ptimer,_nic_hdl nic_hdl,void *pfunc,void * cntx) { NdisMInitializeTimer(ptimer, nic_hdl, pfunc, cntx); } @@ -130,7 +130,7 @@ __inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled) NdisMCancelTimer(ptimer,bcancelled); } -__inline static void _init_workitem(_workitem *pwork, void *pfunc, PVOID cntx) +__inline static void _init_workitem(_workitem *pwork, void *pfunc, void * cntx) { NdisInitializeWorkItem(pwork, pfunc, cntx); diff --git a/include/osdep_service.h b/include/osdep_service.h index 383a2de..9a8f5f7 100755 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -289,7 +289,7 @@ __inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled) #define RTW_DECLARE_TIMER_HDL(name) void RTW_TIMER_HDL_NAME(name)(RTW_TIMER_HDL_ARGS) -__inline static void _init_workitem(_workitem *pwork, void *pfunc, PVOID cntx) +__inline static void _init_workitem(_workitem *pwork, void *pfunc, void * cntx) { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) INIT_WORK(pwork, pfunc); diff --git a/include/rtl8188e_rf.h b/include/rtl8188e_rf.h index 204d78c..f8c76a5 100755 --- a/include/rtl8188e_rf.h +++ b/include/rtl8188e_rf.h @@ -31,10 +31,10 @@ void rtl8188e_RF_ChangeTxPath( IN struct adapter *Adapter, void rtl8188e_PHY_RF6052SetBandwidth( IN struct adapter * Adapter, IN HT_CHANNEL_WIDTH Bandwidth); -VOID rtl8188e_PHY_RF6052SetCckTxPower( +void rtl8188e_PHY_RF6052SetCckTxPower( IN struct adapter *Adapter, IN u8* pPowerlevel); -VOID rtl8188e_PHY_RF6052SetOFDMTxPower( +void rtl8188e_PHY_RF6052SetOFDMTxPower( IN struct adapter *Adapter, IN u8* pPowerLevelOFDM, IN u8* pPowerLevelBW20, diff --git a/include/rtl8192c_hal.h b/include/rtl8192c_hal.h index e94f222..1b10407 100755 --- a/include/rtl8192c_hal.h +++ b/include/rtl8192c_hal.h @@ -520,16 +520,16 @@ typedef struct hal_data_8192cu HAL_DATA_TYPE, *PHAL_DATA_TYPE; #define INCLUDE_MULTI_FUNC_BT(_Adapter) (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_BT) #define INCLUDE_MULTI_FUNC_GPS(_Adapter) (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_GPS) -VOID rtl8192c_FirmwareSelfReset(IN struct adapter *Adapter); +void rtl8192c_FirmwareSelfReset(IN struct adapter *Adapter); int FirmwareDownload92C(IN struct adapter *Adapter); -VOID InitializeFirmwareVars92C(struct adapter *Adapter); +void InitializeFirmwareVars92C(struct adapter *Adapter); u8 GetEEPROMSize8192C(struct adapter *Adapter); void rtl8192c_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); HAL_VERSION rtl8192c_ReadChipVersion(IN struct adapter *Adapter); void rtl8192c_ReadBluetoothCoexistInfo(struct adapter *Adapter, u8 *PROMContent, BOOLEAN AutoloadFail); //void rtl8192c_free_hal_data(struct adapter * padapter); -VOID rtl8192c_EfuseParseIDCode(struct adapter *pAdapter, u8 *hwinfo); +void rtl8192c_EfuseParseIDCode(struct adapter *pAdapter, u8 *hwinfo); void rtl8192c_set_hal_ops(struct hal_ops *pHalFunc); s32 c2h_id_filter_ccx_8192c(u8 id); diff --git a/include/rtl8192c_rf.h b/include/rtl8192c_rf.h index 2588f88..af0104f 100755 --- a/include/rtl8192c_rf.h +++ b/include/rtl8192c_rf.h @@ -76,10 +76,10 @@ void rtl8192c_RF_ChangeTxPath( IN struct adapter *Adapter, void rtl8192c_PHY_RF6052SetBandwidth( IN struct adapter * Adapter, IN HT_CHANNEL_WIDTH Bandwidth); -VOID rtl8192c_PHY_RF6052SetCckTxPower( +void rtl8192c_PHY_RF6052SetCckTxPower( IN struct adapter *Adapter, IN u8* pPowerlevel); -VOID rtl8192c_PHY_RF6052SetOFDMTxPower( +void rtl8192c_PHY_RF6052SetOFDMTxPower( IN struct adapter *Adapter, IN u8* pPowerLevel, IN u8 Channel); diff --git a/include/rtl8192d_hal.h b/include/rtl8192d_hal.h index 90ce181..a788ae8 100755 --- a/include/rtl8192d_hal.h +++ b/include/rtl8192d_hal.h @@ -533,7 +533,7 @@ typedef struct hal_data_8192de HAL_DATA_TYPE, *PHAL_DATA_TYPE; #define RT_IS_FUNC_DISABLED(__pAdapter, __FuncBits) ( (__pAdapter)->DisabledFunctions & (__FuncBits) ) void InterruptRecognized8192DE(struct adapter *Adapter, PRT_ISR_CONTENT pIsrContent); -VOID UpdateInterruptMask8192DE(struct adapter *Adapter, u32 AddMSR, u32 RemoveMSR); +void UpdateInterruptMask8192DE(struct adapter *Adapter, u32 AddMSR, u32 RemoveMSR); //should be renamed and moved to another file typedef enum _INTERFACE_SELECT_8192DUSB{ @@ -745,14 +745,14 @@ typedef struct hal_data_8192du HAL_DATA_TYPE, *PHAL_DATA_TYPE; #define GET_RF_TYPE(priv) (GET_HAL_DATA(priv)->rf_type) int FirmwareDownload92D(IN struct adapter *Adapter); -VOID rtl8192d_FirmwareSelfReset(IN struct adapter *Adapter); +void rtl8192d_FirmwareSelfReset(IN struct adapter *Adapter); void rtl8192d_ReadChipVersion(IN struct adapter *Adapter); -VOID rtl8192d_EfuseParseChnlPlan(struct adapter *Adapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -VOID rtl8192d_ReadTxPowerInfo(struct adapter *Adapter, u8* PROMContent, BOOLEAN AutoLoadFail); -VOID rtl8192d_ResetDualMacSwitchVariables(IN struct adapter *Adapter); +void rtl8192d_EfuseParseChnlPlan(struct adapter *Adapter, u8 *hwinfo, BOOLEAN AutoLoadFail); +void rtl8192d_ReadTxPowerInfo(struct adapter *Adapter, u8* PROMContent, BOOLEAN AutoLoadFail); +void rtl8192d_ResetDualMacSwitchVariables(IN struct adapter *Adapter); u8 GetEEPROMSize8192D(struct adapter *Adapter); BOOLEAN PHY_CheckPowerOffFor8192D(struct adapter *Adapter); -VOID PHY_SetPowerOnFor8192D(struct adapter *Adapter); +void PHY_SetPowerOnFor8192D(struct adapter *Adapter); //void PHY_ConfigMacPhyMode92D(struct adapter *Adapter); void rtl8192d_free_hal_data(struct adapter * padapter); void rtl8192d_set_hal_ops(struct hal_ops *pHalFunc); diff --git a/include/rtl8192d_rf.h b/include/rtl8192d_rf.h index 3d92888..b6505d2 100755 --- a/include/rtl8192d_rf.h +++ b/include/rtl8192d_rf.h @@ -76,10 +76,10 @@ void rtl8192d_RF_ChangeTxPath( IN struct adapter *Adapter, void rtl8192d_PHY_RF6052SetBandwidth( IN struct adapter * Adapter, IN HT_CHANNEL_WIDTH Bandwidth); -VOID rtl8192d_PHY_RF6052SetCckTxPower( +void rtl8192d_PHY_RF6052SetCckTxPower( IN struct adapter *Adapter, IN u8* pPowerlevel); -VOID rtl8192d_PHY_RF6052SetOFDMTxPower( +void rtl8192d_PHY_RF6052SetOFDMTxPower( IN struct adapter *Adapter, IN u8* pPowerLevel, IN u8 Channel); diff --git a/include/rtw_bt_mp.h b/include/rtw_bt_mp.h index 074d1a6..2be4eb4 100755 --- a/include/rtw_bt_mp.h +++ b/include/rtw_bt_mp.h @@ -194,7 +194,7 @@ typedef enum _BT_REPORT_TYPE{ BT_REPORT_MAX }BT_REPORT_TYPE,*PBT_REPORT_TYPE; -VOID +void MPTBT_Test( IN struct adapter *Adapter, IN u1Byte opCode, @@ -206,13 +206,13 @@ MPTBT_Test( NDIS_STATUS MPTBT_SendOidBT( IN struct adapter * pAdapter, - IN PVOID InformationBuffer, + IN void * InformationBuffer, IN ULONG InformationBufferLength, OUT PULONG BytesRead, OUT PULONG BytesNeeded ); -VOID +void MPTBT_FwC2hBtMpCtrl( struct adapter *Adapter, pu1Byte tmpBuf, @@ -221,9 +221,9 @@ MPTBT_FwC2hBtMpCtrl( void MPh2c_timeout_handle(void *FunctionContext); -VOID mptbt_BtControlProcess( +void mptbt_BtControlProcess( struct adapter *Adapter, - PVOID pInBuf + void * pInBuf ); #define BT_H2C_MAX_RETRY 1 diff --git a/include/rtw_mp.h b/include/rtw_mp.h index d743df1..9bd4016 100755 --- a/include/rtw_mp.h +++ b/include/rtw_mp.h @@ -195,7 +195,7 @@ struct mp_tx -typedef VOID (*MPT_WORK_ITEM_HANDLER)(IN PVOID Adapter); +typedef void (*MPT_WORK_ITEM_HANDLER)(IN void * Adapter); typedef struct _MPT_CONTEXT { // Indicate if we have started Mass Production Test. diff --git a/include/usb_vendor_req.h b/include/usb_vendor_req.h index 0f67122..53b1249 100755 --- a/include/usb_vendor_req.h +++ b/include/usb_vendor_req.h @@ -51,9 +51,9 @@ typedef enum _RT_USB_WVALUE { } RT_USB_WVALUE; -//BOOLEAN usbvendorrequest(PCE_USB_DEVICE CEdevice, RT_USB_BREQUEST bRequest, RT_USB_WVALUE wValue, UCHAR wIndex, PVOID Data, UCHAR DataLength, BOOLEAN isDirectionIn); -//BOOLEAN CEusbGetStatusRequest(PCE_USB_DEVICE CEdevice, IN USHORT Op, IN USHORT Index, PVOID Data); +//BOOLEAN usbvendorrequest(PCE_USB_DEVICE CEdevice, RT_USB_BREQUEST bRequest, RT_USB_WVALUE wValue, UCHAR wIndex, void * Data, UCHAR DataLength, BOOLEAN isDirectionIn); +//BOOLEAN CEusbGetStatusRequest(PCE_USB_DEVICE CEdevice, IN USHORT Op, IN USHORT Index, void * Data); //BOOLEAN CEusbFeatureRequest(PCE_USB_DEVICE CEdevice, IN USHORT Op, IN USHORT FeatureSelector, IN USHORT Index); -//BOOLEAN CEusbGetDescriptorRequest(PCE_USB_DEVICE CEdevice, IN short urbLength, IN UCHAR DescriptorType, IN UCHAR Index, IN USHORT LanguageId, IN PVOID TransferBuffer, IN ULONG TransferBufferLength); +//BOOLEAN CEusbGetDescriptorRequest(PCE_USB_DEVICE CEdevice, IN short urbLength, IN UCHAR DescriptorType, IN UCHAR Index, IN USHORT LanguageId, IN void * TransferBuffer, IN ULONG TransferBufferLength); #endif diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index 6ca4436..4c451e8 100755 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -8896,7 +8896,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, } DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts); - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); if ((addr + cnts) > max_available_size) { DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); @@ -8957,7 +8957,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, cnts = 6; - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); if ((addr + cnts) > max_available_size) { DBG_871X("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); err = -EFAULT; @@ -8988,7 +8988,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, { cnts = 4; - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); if ((addr + cnts) > max_available_size) { DBG_871X("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); @@ -9106,7 +9106,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, } DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts); - EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); if ((addr + cnts) > max_available_size) { DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); @@ -9396,7 +9396,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, setdata[jj] = key_2char2num(tmp[2][kk], tmp[2][kk+1]); } //Change to check TYPE_EFUSE_MAP_LEN ,beacuse 8188E raw 256,logic map over 256. - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_size, _FALSE); if ((addr+cnts) > max_available_size) { DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); @@ -9489,7 +9489,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, setdata[jj] = key_2char2num(tmp[1][kk], tmp[1][kk+1]); } //Change to check TYPE_EFUSE_MAP_LEN ,beacuse 8188E raw 256,logic map over 256. - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_size, _FALSE); if ((addr+cnts) > max_available_size) { DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); @@ -9533,7 +9533,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, setdata[jj] = key_2char2num(tmp[1][kk], tmp[1][kk+1]); } - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); if ((addr+cnts) > max_available_size) { DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); @@ -9590,7 +9590,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, setdata[jj] = key_2char2num(tmp[2][kk], tmp[2][kk+1]); } - EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); if ((addr+cnts) > max_available_size) { DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); @@ -9651,7 +9651,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, { _rtw_memcpy(pEfuseHal->BTEfuseModifiedMap, pEfuseHal->fakeBTEfuseModifiedMap, EFUSE_BT_MAX_MAP_LEN); - EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); if (max_available_size < 1) { err = -EFAULT; @@ -9667,7 +9667,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, } else if (strcmp(tmp[0], "wlfk2map") == 0) { - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, _FALSE); if (max_available_size < 1) { err = -EFAULT;