From f6b0b0658a344afaaa88865e7f348905ef475b06 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 18 May 2013 23:37:45 -0500 Subject: [PATCH] rtl8188eu: Convert VOID to void Signed-off-by: Larry Finger --- core/rtw_efuse.c | 80 +++--- core/rtw_ioctl_set.c | 4 +- core/rtw_mp.c | 4 +- core/rtw_mp_ioctl.c | 6 +- core/rtw_security.c | 8 +- hal/Hal8188ERateAdaptive.c | 24 +- hal/HalPhyRf.c | 22 +- hal/HalPhyRf_8188e.c | 46 ++-- hal/hal_com.c | 6 +- hal/hal_intf.c | 8 +- hal/odm.c | 482 ++++++++++++++++----------------- hal/odm_HWConfig.c | 14 +- hal/odm_RTL8188E.c | 52 ++-- hal/odm_debug.c | 2 +- hal/odm_interface.c | 64 ++--- hal/rtl8188e_cmd.c | 2 +- hal/rtl8188e_dm.c | 8 +- hal/rtl8188e_hal_init.c | 70 ++--- hal/rtl8188e_phycfg.c | 48 ++-- hal/rtl8188e_rf6052.c | 26 +- hal/usb_halinit.c | 98 +++---- include/Hal8188EPhyCfg.h | 12 +- include/Hal8188ERateAdaptive.h | 10 +- include/Hal8192CPhyCfg.h | 8 +- include/Hal8192DPhyCfg.h | 24 +- include/HalPhyRf.h | 2 +- include/HalPhyRf_8188e.h | 12 +- include/basic_types.h | 11 - include/drv_types.h | 2 +- include/drv_types_ce.h | 2 +- include/hal_intf.h | 16 +- include/odm.h | 86 +++--- include/odm_HWConfig.h | 6 +- include/odm_RTL8188E.h | 26 +- include/odm_debug.h | 2 +- include/odm_interface.h | 66 ++--- include/odm_types.h | 2 +- include/osdep_ce_service.h | 4 +- include/osdep_service.h | 10 +- include/rtl8188e_rf.h | 4 +- include/rtl8192c_hal.h | 8 +- include/rtl8192c_rf.h | 4 +- include/rtl8192d_hal.h | 12 +- include/rtl8192d_rf.h | 4 +- include/rtl8723a_bt-coexist.h | 2 +- include/rtw_bt_mp.h | 10 +- include/rtw_mlme.h | 16 +- include/rtw_mp.h | 2 +- include/rtw_security.h | 8 +- include/usb_vendor_req.h | 6 +- os_dep/ioctl_linux.c | 26 +- 51 files changed, 733 insertions(+), 744 deletions(-) diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index b0e5547..5681aed 100644 --- 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 PADAPTER pAdapter, IN u8 bWrite, @@ -176,7 +176,7 @@ Efuse_CalculateWordCnts(IN u8 word_en) // // Created by Roger, 2008.10.21. // -VOID +void ReadEFuseByte( PADAPTER Adapter, u16 _offset, @@ -244,7 +244,7 @@ ReadEFuseByte( // write addr must be after sec5. // -VOID +void efuse_ReadEFuse( PADAPTER Adapter, u8 efuseType, @@ -253,7 +253,7 @@ efuse_ReadEFuse( u8 *pbuf, IN BOOLEAN bPseudoTest ); -VOID +void efuse_ReadEFuse( PADAPTER Adapter, u8 efuseType, @@ -266,7 +266,7 @@ efuse_ReadEFuse( Adapter->HalFunc.ReadEFuse(Adapter, efuseType, _offset, _size_byte, pbuf, bPseudoTest); } -VOID +void EFUSE_GetEfuseDefinition( IN PADAPTER 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(PADAPTER padapter, u8 bWrite, u16 start_addr, u16 cnts, u8 * u8 res = _FAIL ; u8 (*rw8)(PADAPTER, 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(PADAPTER padapter, u8 bWrite, u16 start_addr, u16 cnts, u8 * u16 efuse_GetMaxSize(PADAPTER 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(PADAPTER 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(PADAPTER 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(PADAPTER 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(PADAPTER 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 PADAPTER pAdapter, IN u8 efuseType, IN OUT u8 *Efuse, IN BOOLEAN bPseudoTest); -VOID +void Efuse_ReadAllMap( IN PADAPTER 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 PADAPTER pAdapter, IN u16 Offset, @@ -969,7 +969,7 @@ efuse_ShadowRead1Byte( } // EFUSE_ShadowRead1Byte //---------------Read Two Bytes -static VOID +static void efuse_ShadowRead2Byte( IN PADAPTER pAdapter, IN u16 Offset, @@ -983,7 +983,7 @@ efuse_ShadowRead2Byte( } // EFUSE_ShadowRead2Byte //---------------Read Four Bytes -static VOID +static void efuse_ShadowRead4Byte( IN PADAPTER pAdapter, IN u16 Offset, @@ -1018,13 +1018,13 @@ efuse_ShadowRead4Byte( * *---------------------------------------------------------------------------*/ #ifdef PLATFORM -static VOID +static void efuse_ShadowWrite1Byte( IN PADAPTER pAdapter, IN u16 Offset, IN u8 Value); #endif //PLATFORM -static VOID +static void efuse_ShadowWrite1Byte( IN PADAPTER pAdapter, IN u16 Offset, @@ -1037,7 +1037,7 @@ efuse_ShadowWrite1Byte( } // efuse_ShadowWrite1Byte //---------------Write Two Bytes -static VOID +static void efuse_ShadowWrite2Byte( IN PADAPTER pAdapter, IN u16 Offset, @@ -1051,7 +1051,7 @@ efuse_ShadowWrite2Byte( } // efuse_ShadowWrite1Byte //---------------Write Four Bytes -static VOID +static void efuse_ShadowWrite4Byte( IN PADAPTER 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 PADAPTER pAdapter, IN u8 Type, IN u16 Offset, IN OUT u32 Value); -VOID +void EFUSE_ShadowWrite( IN PADAPTER pAdapter, IN u8 Type, @@ -1192,34 +1192,34 @@ EFUSE_ShadowWrite( } // EFUSE_ShadowWrite -VOID +void Efuse_InitSomeVar( IN PADAPTER pAdapter ); -VOID +void Efuse_InitSomeVar( IN PADAPTER 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; iType) { case 1: - NdisMIndicateStatus(padapter->hndis_adapter, NDIS_STATUS_MEDIA_SPECIFIC_INDICATION, (PVOID)&test->AuthenticationEvent, test->Length - 8); + NdisMIndicateStatus(padapter->hndis_adapter, NDIS_STATUS_MEDIA_SPECIFIC_INDICATION, (void *)&test->AuthenticationEvent, test->Length - 8); NdisMIndicateStatusComplete(padapter->hndis_adapter); break; case 2: - NdisMIndicateStatus(padapter->hndis_adapter, NDIS_STATUS_MEDIA_SPECIFIC_INDICATION, (PVOID)&test->RssiTrigger, sizeof(NDIS_802_11_RSSI)); + NdisMIndicateStatus(padapter->hndis_adapter, NDIS_STATUS_MEDIA_SPECIFIC_INDICATION, (void *)&test->RssiTrigger, sizeof(NDIS_802_11_RSSI)); NdisMIndicateStatusComplete(padapter->hndis_adapter); break; diff --git a/core/rtw_mp.c b/core/rtw_mp.c index 6b048b8..8df9259 100644 --- a/core/rtw_mp.c +++ b/core/rtw_mp.c @@ -161,7 +161,7 @@ static void _init_mp_priv_(struct mp_priv *pmp_priv) /* void mp_wi_callback( IN NDIS_WORK_ITEM* pwk_item, - IN PVOID cntx + IN void * cntx ) { _adapter* padapter =(_adapter *)cntx; @@ -468,7 +468,7 @@ MPT_InitializeAdapter( * 05/18/2007 MHC Add normal driver MPHalt code. * *---------------------------------------------------------------------------*/ -VOID +void MPT_DeInitAdapter( IN PADAPTER pAdapter ) diff --git a/core/rtw_mp_ioctl.c b/core/rtw_mp_ioctl.c index f6dc748..2084f34 100644 --- a/core/rtw_mp_ioctl.c +++ b/core/rtw_mp_ioctl.c @@ -1232,7 +1232,7 @@ _func_enter_; ("+oid_rt_pro_read_efuse_hd: buf_len=%d addr=%d 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_read_efuse_hdl: parameter error!\n")); @@ -1278,7 +1278,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")); @@ -1443,7 +1443,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/core/rtw_security.c b/core/rtw_security.c index 2cc3637..5c72348 100644 --- a/core/rtw_security.c +++ b/core/rtw_security.c @@ -2837,10 +2837,10 @@ int tdls_verify_mic(u8 *kck, u8 trans_seq, #ifdef PLATFORM_WINDOWS void rtw_use_tkipkey_handler ( - IN PVOID SystemSpecific1, - IN PVOID FunctionContext, - IN PVOID SystemSpecific2, - IN PVOID SystemSpecific3 + IN void * SystemSpecific1, + IN void * FunctionContext, + IN void * SystemSpecific2, + IN void * SystemSpecific3 ) #endif #ifdef PLATFORM_LINUX diff --git a/hal/Hal8188ERateAdaptive.c b/hal/Hal8188ERateAdaptive.c index 5885757..8fc9dc8 100644 --- a/hal/Hal8188ERateAdaptive.c +++ b/hal/Hal8188ERateAdaptive.c @@ -620,7 +620,7 @@ odm_PTDecision_8188E( } #endif -static VOID +static void odm_RATxRPTTimerSetting( IN PDM_ODM_T pDM_Odm, IN u2Byte minRptTime @@ -643,7 +643,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, @@ -980,7 +980,7 @@ ODM_RA_TxRPT2Handle_8188E( #else -static VOID +static void odm_RATxRPTTimerSetting( IN PDM_ODM_T pDM_Odm, IN u2Byte minRptTime @@ -990,7 +990,7 @@ odm_RATxRPTTimerSetting( } -VOID +void ODM_RASupport_Init( IN PDM_ODM_T pDM_Odm ) @@ -1041,7 +1041,7 @@ ODM_RA_GetHwPwrStatus_8188E( return 0; } -VOID +void ODM_RA_UpdateRateInfo_8188E( IN PDM_ODM_T pDM_Odm, IN u1Byte MacID, @@ -1053,7 +1053,7 @@ ODM_RA_UpdateRateInfo_8188E( return; } -VOID +void ODM_RA_SetRSSI_8188E( IN PDM_ODM_T pDM_Odm, IN u1Byte MacID, @@ -1063,7 +1063,7 @@ ODM_RA_SetRSSI_8188E( return; } -VOID +void ODM_RA_Set_TxRPT_Time( IN PDM_ODM_T pDM_Odm, IN u2Byte minRptTime @@ -1072,7 +1072,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/HalPhyRf.c b/hal/HalPhyRf.c index 1980887..54564dc 100644 --- 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 PADAPTER pAdapter ) @@ -176,7 +176,7 @@ phy_PathB_IQK_8192C( } -VOID +void phy_PathAFillIQKMatrix( IN PADAPTER pAdapter, IN BOOLEAN bIQKOK, @@ -243,7 +243,7 @@ phy_PathAFillIQKMatrix( } } -VOID +void phy_PathBFillIQKMatrix( IN PADAPTER pAdapter, IN BOOLEAN bIQKOK, @@ -392,7 +392,7 @@ phy_SimularityCompare( } -VOID +void phy_IQCalibrate_8192C( IN PADAPTER pAdapter, IN s4Byte result[][8], @@ -648,7 +648,7 @@ phy_IQCalibrate_8192C( } -VOID +void phy_LCCalibrate92C( IN PADAPTER pAdapter, IN BOOLEAN is2T @@ -712,7 +712,7 @@ phy_LCCalibrate92C( } -VOID +void phy_LCCalibrate( IN PADAPTER 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 PADAPTER pAdapter, IN s1Byte delta, @@ -1178,7 +1178,7 @@ if (pAdapter->registrypriv.mp_mode == 1) } -VOID +void PHY_IQCalibrate_8192C( IN PADAPTER pAdapter, IN BOOLEAN bReCovery @@ -1388,7 +1388,7 @@ if (pAdapter->registrypriv.mp_mode == 1) } -VOID +void PHY_LCCalibrate_8192C( IN PADAPTER pAdapter ) @@ -1456,7 +1456,7 @@ if (pAdapter->registrypriv.mp_mode == 1) } -VOID +void PHY_APCalibrate_8192C( IN PADAPTER 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_8188e.c b/hal/HalPhyRf_8188e.c index 813f957..88683a6 100644 --- a/hal/HalPhyRf_8188e.c +++ b/hal/HalPhyRf_8188e.c @@ -51,7 +51,7 @@ * 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 @@ -130,7 +130,7 @@ ODM_TxPwrTrackAdjust88E( * 04/23/2012 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -VOID +void odm_TxPwrTrackSetPwr88E( PDM_ODM_T pDM_Odm ) @@ -152,7 +152,7 @@ odm_TxPwrTrackSetPwr88E( //091212 chiyokolin -VOID +void odm_TXPowerTrackingCallback_ThermalMeter_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm @@ -899,7 +899,7 @@ phy_PathB_IQK_8188E( } -VOID +void _PHY_PathAFillIQKMatrix( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -974,7 +974,7 @@ _PHY_PathAFillIQKMatrix( } } -VOID +void _PHY_PathBFillIQKMatrix( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1078,7 +1078,7 @@ ODM_CheckPowerStatus( } #endif -VOID +void _PHY_SaveADDARegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1111,7 +1111,7 @@ _PHY_SaveADDARegisters( } -VOID +void _PHY_SaveMACRegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1141,7 +1141,7 @@ _PHY_SaveMACRegisters( } -VOID +void _PHY_ReloadADDARegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1171,7 +1171,7 @@ _PHY_ReloadADDARegisters( } } -VOID +void _PHY_ReloadMACRegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1200,7 +1200,7 @@ _PHY_ReloadMACRegisters( } -VOID +void _PHY_PathADDAOn( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1240,7 +1240,7 @@ _PHY_PathADDAOn( } -VOID +void _PHY_MACSettingCalibration( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1272,7 +1272,7 @@ _PHY_MACSettingCalibration( } -VOID +void _PHY_PathAStandBy( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm @@ -1297,7 +1297,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, @@ -1459,7 +1459,7 @@ phy_SimularityCompare_8188E( -VOID +void phy_IQCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1739,7 +1739,7 @@ else } -VOID +void phy_LCCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -1830,7 +1830,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, @@ -2323,7 +2323,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, @@ -2589,7 +2589,7 @@ if (*(pDM_Odm->mp_mode) == 1) } -VOID +void PHY_LCCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm @@ -2678,7 +2678,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, @@ -2729,7 +2729,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 @@ -2778,7 +2778,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 @@ -2821,7 +2821,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 PADAPTER pAdapter, @@ -3256,7 +3256,7 @@ phy_DigitalPredistortion( #endif } -VOID +void PHY_DigitalPredistortion_8188E( #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) IN PADAPTER pAdapter diff --git a/hal/hal_com.c b/hal/hal_com.c index fdb493b..0eb7b39 100644 --- a/hal/hal_com.c +++ b/hal/hal_com.c @@ -180,7 +180,7 @@ void HalSetBrateCfg( } } -static VOID +static void _OneOutPipeMapping( IN PADAPTER pAdapter ) @@ -198,7 +198,7 @@ _OneOutPipeMapping( pdvobjpriv->Queue2Pipe[7] = pdvobjpriv->RtOutPipe[0];//TXCMD } -static VOID +static void _TwoOutPipeMapping( IN PADAPTER pAdapter, IN BOOLEAN bWIFICfg @@ -244,7 +244,7 @@ _TwoOutPipeMapping( } -static VOID _ThreeOutPipeMapping( +static void _ThreeOutPipeMapping( IN PADAPTER pAdapter, IN BOOLEAN bWIFICfg ) diff --git a/hal/hal_intf.c b/hal/hal_intf.c index 7e873ef..140b6b8 100644 --- a/hal/hal_intf.c +++ b/hal/hal_intf.c @@ -183,25 +183,25 @@ void rtw_hal_get_hwreg(_adapter *padapter, u8 variable, u8 *val) padapter->HalFunc.GetHwRegHandler(padapter, variable, val); } -u8 rtw_hal_set_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue) +u8 rtw_hal_set_def_var(_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(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue) +u8 rtw_hal_get_def_var(_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(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet) +void rtw_hal_set_odm_var(_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(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet) +void rtw_hal_get_odm_var(_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 f8a9cb3..0740f9b 100644 --- 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,39 +316,39 @@ 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 ); @@ -359,51 +359,51 @@ odm_1R_CCA( //============================================================ // Function predefine. //============================================================ -VOID odm_PathDiversityInit_92C( IN PADAPTER Adapter); -VOID odm_2TPathDiversityInit_92C( IN PADAPTER Adapter); -VOID odm_1TPathDiversityInit_92C( IN PADAPTER Adapter); +void odm_PathDiversityInit_92C( IN PADAPTER Adapter); +void odm_2TPathDiversityInit_92C( IN PADAPTER Adapter); +void odm_1TPathDiversityInit_92C( IN PADAPTER Adapter); BOOLEAN odm_IsConnected_92C(IN PADAPTER Adapter); -VOID odm_PathDiversityAfterLink_92C( IN PADAPTER Adapter); +void odm_PathDiversityAfterLink_92C( IN PADAPTER 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 PADAPTER Adapter, IN u1Byte DefaultRespPath); -VOID odm_OFDMTXPathDiversity_92C( IN PADAPTER Adapter); -VOID odm_CCKTXPathDiversity_92C( IN PADAPTER Adapter); -VOID odm_ResetPathDiversity_92C( IN PADAPTER Adapter); +void odm_SetRespPath_92C( IN PADAPTER Adapter, IN u1Byte DefaultRespPath); +void odm_OFDMTXPathDiversity_92C( IN PADAPTER Adapter); +void odm_CCKTXPathDiversity_92C( IN PADAPTER Adapter); +void odm_ResetPathDiversity_92C( IN PADAPTER Adapter); //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 PADAPTER Adapter, IN u1Byte DefaultRespPath @@ -412,112 +412,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 @@ -525,38 +525,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 ); @@ -567,79 +567,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 PADAPTER Adapter , IN PRT_WLAN_STA pEntry ); -VOID +void odm_TXPowerTrackingCallbackThermalMeter92C( IN PADAPTER Adapter ); -VOID +void odm_TXPowerTrackingCallbackRXGainThermalMeter92D( IN PADAPTER Adapter ); -VOID +void odm_TXPowerTrackingCallbackThermalMeter92D( IN PADAPTER Adapter ); -VOID +void odm_TXPowerTrackingDirectCall92C( IN PADAPTER Adapter ); -VOID +void odm_TXPowerTrackingThermalMeterCheck( IN PADAPTER 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 ); @@ -650,14 +650,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, @@ -667,17 +667,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 ); @@ -688,7 +688,7 @@ odm_EdcaParaInit( #define RxDefaultAnt1 0x65a9 #define RxDefaultAnt2 0x569a -VOID +void odm_InitHybridAntDiv( IN PDM_ODM_T pDM_Odm ); @@ -703,7 +703,7 @@ odm_StaDefAntSel( OUT u1Byte *pDefAnt ); -VOID +void odm_SetRxIdleAnt( IN PDM_ODM_T pDM_Odm, IN u1Byte Ant, @@ -712,7 +712,7 @@ odm_SetRxIdleAnt( -VOID +void odm_HwAntDiv( IN PDM_ODM_T pDM_Odm ); @@ -724,7 +724,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 ) @@ -780,7 +780,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 ) @@ -868,7 +868,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, @@ -967,11 +967,11 @@ ODM_CmnInfoInit( } -VOID +void ODM_CmnInfoHook( IN PDM_ODM_T pDM_Odm, IN ODM_CMNINFO_E CmnInfo, - IN PVOID pValue + IN void * pValue ) { // @@ -1089,12 +1089,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 ) { // @@ -1120,7 +1120,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, @@ -1198,7 +1198,7 @@ ODM_CmnInfoUpdate( } -VOID +void odm_CommonInfoSelfInit( IN PDM_ODM_T pDM_Odm ) @@ -1222,7 +1222,7 @@ odm_CommonInfoSelfInit( ODM_InitDebugSetting(pDM_Odm); } -VOID +void odm_CommonInfoSelfUpdate( IN PDM_ODM_T pDM_Odm ) @@ -1274,7 +1274,7 @@ odm_CommonInfoSelfUpdate( pDM_Odm->bOneEntryOnly = FALSE; } -VOID +void odm_CmnInfoInit_Debug( IN PDM_ODM_T pDM_Odm ) @@ -1298,7 +1298,7 @@ odm_CmnInfoInit_Debug( } -VOID +void odm_CmnInfoHook_Debug( IN PDM_ODM_T pDM_Odm ) @@ -1331,7 +1331,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 ) @@ -1344,7 +1344,7 @@ odm_CmnInfoUpdate_Debug( } #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -VOID +void ODM_InitAllWorkItems(IN PDM_ODM_T pDM_Odm ) { #if USE_WORKITEM @@ -1353,7 +1353,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" ); @@ -1361,14 +1361,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) @@ -1376,7 +1376,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 @@ -1384,12 +1384,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 @@ -1408,7 +1408,7 @@ ODM_FreeAllWorkItems(IN PDM_ODM_T pDM_Odm ) #endif /* -VOID +void odm_FindMinimumRSSI( IN PDM_ODM_T pDM_Odm ) @@ -1432,7 +1432,7 @@ odm_FindMinimumRSSI( } -VOID +void odm_IsLinked( IN PDM_ODM_T pDM_Odm ) @@ -1473,7 +1473,7 @@ odm_IsLinked( * When Who Remark * *---------------------------------------------------------------------------*/ -VOID +void ODM_ChangeDynamicInitGainThresh( IN PDM_ODM_T pDM_Odm, IN u4Byte DM_Type, @@ -1537,7 +1537,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 ) @@ -1567,7 +1567,7 @@ odm_EnableEDCCA( //PlatformEFIOWrite1Byte(Adapter, rOFDM0_ECCAThreshold+2, 0x00); } -VOID +void odm_DisableEDCCA( IN PDM_ODM_T pDM_Odm ) @@ -1582,7 +1582,7 @@ odm_DisableEDCCA( // // Suggested by SD3 Wilson. Added by tynli. 2011.11.25. // -VOID +void odm_DynamicEDCCA( IN PDM_ODM_T pDM_Odm ) @@ -1620,7 +1620,7 @@ odm_DynamicEDCCA( #endif // end MP platform support -VOID +void ODM_Write_DIG( IN PDM_ODM_T pDM_Odm, IN u1Byte CurrentIGI @@ -1681,7 +1681,7 @@ ODM_Write_DIG( //8723AS/8189ES #if (DM_ODM_SUPPORT_TYPE == ODM_CE) -VOID +void odm_DIGbyRSSI_LPS( IN PDM_ODM_T pDM_Odm ) @@ -1744,7 +1744,7 @@ odm_DIGbyRSSI_LPS( #endif -VOID +void odm_DIGInit( IN PDM_ODM_T pDM_Odm ) @@ -1790,7 +1790,7 @@ odm_DIGInit( } -VOID +void odm_DIG( IN PDM_ODM_T pDM_Odm ) @@ -2281,7 +2281,7 @@ odm_DIG( //3 FASLE ALARM CHECK //3============================================================ -VOID +void odm_FalseAlarmCounterStatistics( IN PDM_ODM_T pDM_Odm ) @@ -2432,7 +2432,7 @@ odm_FalseAlarmCounterStatistics( //3 CCK Packet Detect Threshold //3============================================================ -VOID +void odm_CCKPacketDetectionThresh( IN PDM_ODM_T pDM_Odm ) @@ -2493,7 +2493,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 @@ -2513,7 +2513,7 @@ ODM_Write_CCK_CCA_Thres( //3============================================================ //3 BB Power Save //3============================================================ -VOID +void odm_DynamicBBPowerSavingInit( IN PDM_ODM_T pDM_Odm ) @@ -2529,7 +2529,7 @@ odm_DynamicBBPowerSavingInit( } -VOID +void odm_DynamicBBPowerSaving( IN PDM_ODM_T pDM_Odm ) @@ -2560,7 +2560,7 @@ odm_DynamicBBPowerSaving( } -VOID +void odm_1R_CCA( IN PDM_ODM_T pDM_Odm ) @@ -2713,7 +2713,7 @@ ODM_RF_Saving( //3 Rate Adaptive //3============================================================ -VOID +void odm_RateAdaptiveMaskInit( IN PDM_ODM_T pDM_Odm ) @@ -2745,7 +2745,7 @@ odm_RateAdaptiveMaskInit( } #if (DM_ODM_SUPPORT_TYPE & ODM_MP) -VOID +void ODM_RateAdaptiveStateApInit( IN PADAPTER Adapter , IN PRT_WLAN_STA pEntry @@ -2875,7 +2875,7 @@ u4Byte ODM_Get_Rate_Bitmap( * 05/27/2009 hpfan Create Version 0. * *---------------------------------------------------------------------------*/ -VOID +void odm_RefreshRateAdaptiveMask( IN PDM_ODM_T pDM_Odm ) @@ -2905,7 +2905,7 @@ odm_RefreshRateAdaptiveMask( } -VOID +void odm_RefreshRateAdaptiveMaskMP( IN PDM_ODM_T pDM_Odm ) @@ -3001,7 +3001,7 @@ odm_RefreshRateAdaptiveMaskMP( } -VOID +void odm_RefreshRateAdaptiveMaskCE( IN PDM_ODM_T pDM_Odm ) @@ -3040,7 +3040,7 @@ odm_RefreshRateAdaptiveMaskCE( #endif } -VOID +void odm_RefreshRateAdaptiveMaskAPADSL( IN PDM_ODM_T pDM_Odm ) @@ -3142,7 +3142,7 @@ ODM_RAStateCheck( //3 Dynamic Tx Power //3============================================================ -VOID +void odm_DynamicTxPowerInit( IN PDM_ODM_T pDM_Odm ) @@ -3203,7 +3203,7 @@ odm_DynamicTxPowerInit( } -VOID +void odm_DynamicTxPowerSavePowerIndex( IN PDM_ODM_T pDM_Odm ) @@ -3225,7 +3225,7 @@ odm_DynamicTxPowerSavePowerIndex( #endif } -VOID +void odm_DynamicTxPowerRestorePowerIndex( IN PDM_ODM_T pDM_Odm ) @@ -3247,7 +3247,7 @@ odm_DynamicTxPowerRestorePowerIndex( #endif } -VOID +void odm_DynamicTxPowerWritePowerIndex( IN PDM_ODM_T pDM_Odm, IN u1Byte Value) @@ -3263,7 +3263,7 @@ odm_DynamicTxPowerWritePowerIndex( } -VOID +void odm_DynamicTxPower( IN PDM_ODM_T pDM_Odm ) @@ -3307,7 +3307,7 @@ odm_DynamicTxPower( } -VOID +void odm_DynamicTxPowerNIC( IN PDM_ODM_T pDM_Odm ) @@ -3337,7 +3337,7 @@ odm_DynamicTxPowerNIC( #endif } -VOID +void odm_DynamicTxPowerAP( IN PDM_ODM_T pDM_Odm @@ -3375,7 +3375,7 @@ odm_DynamicTxPowerAP( } -VOID +void odm_DynamicTxPower_92C( IN PDM_ODM_T pDM_Odm ) @@ -3607,7 +3607,7 @@ odm_DynamicTxPower_92C( } -VOID +void odm_DynamicTxPower_92D( IN PDM_ODM_T pDM_Odm ) @@ -3923,14 +3923,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 ) @@ -3972,7 +3972,7 @@ odm_RSSIMonitorCheck( } // odm_RSSIMonitorCheck -VOID +void odm_RSSIMonitorCheckMP( IN PDM_ODM_T pDM_Odm ) @@ -4062,7 +4062,7 @@ odm_RSSIMonitorCheckMP( // //sherry move from DUSC to here 20110517 // -static VOID +static void FindMinimumRSSI_Dmsp( IN PADAPTER pAdapter ) @@ -4125,7 +4125,7 @@ IN PADAPTER pAdapter } #endif -VOID +void odm_RSSIMonitorCheckCE( IN PDM_ODM_T pDM_Odm ) @@ -4272,7 +4272,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 ) @@ -4302,7 +4302,7 @@ odm_RSSIMonitorCheckAP( -VOID +void ODM_InitAllTimers( IN PDM_ODM_T pDM_Odm ) @@ -4337,7 +4337,7 @@ ODM_InitAllTimers( #endif } -VOID +void ODM_CancelAllTimers( IN PDM_ODM_T pDM_Odm ) @@ -4371,7 +4371,7 @@ ODM_CancelAllTimers( } -VOID +void ODM_ReleaseAllTimers( IN PDM_ODM_T pDM_Odm ) @@ -4404,7 +4404,7 @@ ODM_ReleaseAllTimers( //3 Tx Power Tracking //3============================================================ -VOID +void odm_TXPowerTrackingInit( IN PDM_ODM_T pDM_Odm ) @@ -4413,7 +4413,7 @@ odm_TXPowerTrackingInit( } -VOID +void odm_TXPowerTrackingThermalMeterInit( IN PDM_ODM_T pDM_Odm ) @@ -4478,7 +4478,7 @@ odm_TXPowerTrackingThermalMeterInit( } -VOID +void ODM_TXPowerTrackingCheck( IN PDM_ODM_T pDM_Odm ) @@ -4519,7 +4519,7 @@ ODM_TXPowerTrackingCheck( } -VOID +void odm_TXPowerTrackingCheckCE( IN PDM_ODM_T pDM_Odm ) @@ -4566,7 +4566,7 @@ odm_TXPowerTrackingCheckCE( #endif } -VOID +void odm_TXPowerTrackingCheckMP( IN PDM_ODM_T pDM_Odm ) @@ -4587,7 +4587,7 @@ odm_TXPowerTrackingCheckMP( } -VOID +void odm_TXPowerTrackingCheckAP( IN PDM_ODM_T pDM_Odm ) @@ -4623,7 +4623,7 @@ odm_TXPowerTrackingCheckAP( #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -VOID +void odm_TXPowerTrackingThermalMeterCheck( IN PADAPTER Adapter ) @@ -4671,7 +4671,7 @@ odm_TXPowerTrackingThermalMeterCheck( //3 SW Antenna Diversity //3============================================================ #if (defined(CONFIG_SW_ANTENNA_DIVERSITY)) -VOID +void odm_SwAntDivInit( IN PDM_ODM_T pDM_Odm ) @@ -4684,7 +4684,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) { @@ -4708,7 +4708,7 @@ odm_SwAntDivInit_NIC_8723A( } #endif -VOID +void odm_SwAntDivInit_NIC( IN PDM_ODM_T pDM_Odm ) @@ -4749,7 +4749,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 ) @@ -4765,7 +4765,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 ) @@ -4780,7 +4780,7 @@ ODM_SwAntDivRestAfterLink( pDM_SWAT_Table->SelectAntennaMap=0xAA; } -VOID +void ODM_SwAntDivChkPerPktRssi( IN PDM_ODM_T pDM_Odm, IN u1Byte StationID, @@ -4811,7 +4811,7 @@ ODM_SwAntDivChkPerPktRssi( } // -VOID +void odm_SwAntDivChkAntSwitch( IN PDM_ODM_T pDM_Odm, IN u1Byte Step @@ -4861,7 +4861,7 @@ odm_SwAntDivChkAntSwitch( // penalty to get next try. -VOID +void ODM_SetAntenna( IN PDM_ODM_T pDM_Odm, IN u1Byte Antenna) @@ -4872,7 +4872,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 @@ -5369,7 +5369,7 @@ odm_SwAntDivSelectChkChnl( } -VOID +void odm_SwAntDivConsructChkScanChnl( IN PADAPTER Adapter, IN u1Byte ChkChnl @@ -5412,7 +5412,7 @@ odm_SwAntDivConsructChkScanChnl( // Callback function for 500ms antenna test trying. // #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -VOID +void odm_SwAntDivChkAntSwitchCallback( PRT_TIMER pTimer ) @@ -5432,9 +5432,9 @@ odm_SwAntDivChkAntSwitchCallback( #endif } -VOID +void odm_SwAntDivChkAntSwitchWorkitemCallback( - IN PVOID pContext + IN void * pContext ) { @@ -5445,7 +5445,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; PADAPTER padapter = pDM_Odm->Adapter; @@ -5454,7 +5454,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); @@ -5463,33 +5463,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 PADAPTER Adapter ){ return 0;} -VOID +void odm_SwAntDivConsructChkScanChnl( IN PADAPTER 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)) @@ -5580,7 +5580,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) { @@ -5720,7 +5720,7 @@ ODM_SwAntDivCheckBeforeLink8192C( //3============================================================ #if (defined(CONFIG_HW_ANTENNA_DIVERSITY)) -VOID +void odm_InitHybridAntDiv_88C_92D( IN PDM_ODM_T pDM_Odm ) @@ -5805,7 +5805,7 @@ odm_InitHybridAntDiv_88C_92D( } -VOID +void odm_InitHybridAntDiv( IN PDM_ODM_T pDM_Odm ) @@ -5893,7 +5893,7 @@ odm_StaDefAntSel( } -VOID +void odm_SetRxIdleAnt( IN PDM_ODM_T pDM_Odm, IN u1Byte Ant, @@ -5927,7 +5927,7 @@ odm_SetRxIdleAnt( } -VOID +void ODM_AntselStatistics_88C( IN PDM_ODM_T pDM_Odm, IN u1Byte MacId, @@ -5964,7 +5964,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, @@ -5987,7 +5987,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 ) @@ -5995,7 +5995,7 @@ ODM_SetTxAntByTxInfo_88C_92D( } #elif (DM_ODM_SUPPORT_TYPE==ODM_AP) -VOID +void ODM_SetTxAntByTxInfo_88C_92D( IN PDM_ODM_T pDM_Odm ) @@ -6004,7 +6004,7 @@ ODM_SetTxAntByTxInfo_88C_92D( } #endif -VOID +void odm_HwAntDiv_92C_92D( IN PDM_ODM_T pDM_Odm ) @@ -6123,7 +6123,7 @@ odm_HwAntDiv_92C_92D( } -VOID +void odm_HwAntDiv( IN PDM_ODM_T pDM_Odm ) @@ -6242,18 +6242,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)) @@ -6263,7 +6263,7 @@ VOID ODM_SetTxAntByTxInfo_88C_92D( IN PDM_ODM_T pDM_Odm){ } //============================================================ //EDCA Turbo //============================================================ -VOID +void ODM_EdcaTurboInit( IN PDM_ODM_T pDM_Odm) { @@ -6301,7 +6301,7 @@ ODM_EdcaTurboInit( } // ODM_InitEdcaTurbo -VOID +void odm_EdcaTurboCheck( IN PDM_ODM_T pDM_Odm ) @@ -6353,7 +6353,7 @@ odm_EdcaTurboCheck( #if (DM_ODM_SUPPORT_TYPE==ODM_CE) -VOID +void odm_EdcaTurboCheckCE( IN PDM_ODM_T pDM_Odm ) @@ -6474,7 +6474,7 @@ dm_CheckEdcaTurbo_EXIT: #elif (DM_ODM_SUPPORT_TYPE==ODM_MP) -VOID +void odm_EdcaTurboCheckMP( IN PDM_ODM_T pDM_Odm ) @@ -6732,7 +6732,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, @@ -6934,7 +6934,7 @@ ODM_EdcaParaSelByIot( } -VOID +void odm_EdcaChooseTrafficIdx( IN PDM_ODM_T pDM_Odm, IN u8Byte cur_tx_bytes, @@ -7149,7 +7149,7 @@ ODM_ChooseIotMainSTA( #ifdef WIFI_WMM -VOID +void ODM_IotEdcaSwitch( IN PDM_ODM_T pDM_Odm, IN unsigned char enable @@ -7320,7 +7320,7 @@ ODM_IotEdcaSwitch( } #endif -VOID +void odm_IotEngine( IN PDM_ODM_T pDM_Odm ) @@ -7862,7 +7862,7 @@ ConvertTo_dB( #define Low_TP_Mode 2 -VOID +void odm_PSDMonitorInit( IN PDM_ODM_T pDM_Odm) { @@ -7888,7 +7888,7 @@ odm_PSDMonitorInit( #endif } -VOID +void PatchDCTone( IN PDM_ODM_T pDM_Odm, pu4Byte PSD_report, @@ -7966,7 +7966,7 @@ PatchDCTone( } -VOID +void GoodChannelDecision( PDM_ODM_T pDM_Odm, ps4Byte PSD_report, @@ -8170,7 +8170,7 @@ GoodChannelDecision( -VOID +void odm_PSD_Monitor( PDM_ODM_T pDM_Odm ) @@ -8652,7 +8652,7 @@ odm_PSD_Monitor( /* //Neil for Get BT RSSI // Be Triggered by BT C2H CMD -VOID +void ODM_PSDGetRSSI( IN u1Byte RSSI_BT) { @@ -8662,7 +8662,7 @@ ODM_PSDGetRSSI( */ -VOID +void ODM_PSDMonitor( IN PDM_ODM_T pDM_Odm ) @@ -8693,7 +8693,7 @@ ODM_PSDMonitor( } } -VOID +void odm_PSDMonitorCallback( PRT_TIMER pTimer ) @@ -8710,9 +8710,9 @@ odm_PSDMonitorCallback( #endif } -VOID +void odm_PSDMonitorWorkItemCallback( - IN PVOID pContext + IN void * pContext ) { PADAPTER Adapter = (PADAPTER)pContext; @@ -8727,7 +8727,7 @@ odm_PSDMonitorWorkItemCallback( //cosa debug tool need to modify -VOID +void ODM_PSDDbgControl( IN PADAPTER Adapter, IN u4Byte mode, @@ -9161,7 +9161,7 @@ void odm_Write_RXHP( } -VOID +void odm_PSD_RXHP( IN PDM_ODM_T pDM_Odm ) @@ -9458,7 +9458,7 @@ odm_PSD_RXHP( } } -VOID +void odm_PSD_RXHPCallback( PRT_TIMER pTimer ) @@ -9480,9 +9480,9 @@ odm_PSD_RXHPCallback( } -VOID +void odm_PSD_RXHPWorkitemCallback( - IN PVOID pContext + IN void * pContext ) { PADAPTER pAdapter = (PADAPTER)pContext; @@ -9497,9 +9497,9 @@ odm_PSD_RXHPWorkitemCallback( // // 2011/09/22 MH Add for 92D global spin lock utilization. // -VOID +void odm_GlobalAdapterCheck( - IN VOID + IN void ) { @@ -9528,7 +9528,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 PADAPTER Adapter) { @@ -9651,7 +9651,7 @@ odm_IsConnected_92C( } -VOID +void odm_ResetPathDiversity_92C( IN PADAPTER Adapter ) @@ -9698,7 +9698,7 @@ odm_ResetPathDiversity_92C( } -VOID +void odm_CCKTXPathDiversity_92C( IN PADAPTER Adapter ) @@ -9847,7 +9847,7 @@ odm_CCKTXPathDiversity_92C( -VOID +void odm_PathDiversityAfterLink_92C( IN PADAPTER Adapter ) @@ -9939,7 +9939,7 @@ odm_PathDiversityAfterLink_92C( -VOID +void odm_CCKTXPathDiversityCallback( PRT_TIMER pTimer ) @@ -9965,9 +9965,9 @@ odm_CCKTXPathDiversityCallback( } -VOID +void odm_CCKTXPathDiversityWorkItemCallback( - IN PVOID pContext + IN void * pContext ) { PADAPTER Adapter = (PADAPTER)pContext; @@ -9976,7 +9976,7 @@ odm_CCKTXPathDiversityWorkItemCallback( } -VOID +void ODM_CCKPathDiversityChkPerPktRssi( PADAPTER Adapter, BOOLEAN bIsDefPort, @@ -10109,7 +10109,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) @@ -10253,7 +10253,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( PADAPTER Adapter, BOOLEAN bIsDefPort, @@ -10295,7 +10295,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 ) @@ -10318,7 +10318,7 @@ ODM_PathDivRestAfterLink( // 20100514 Luke/Joseph: // Callback function for 500ms antenna test trying. // -VOID +void odm_PathDivChkAntSwitchCallback( PRT_TIMER pTimer ) @@ -10343,9 +10343,9 @@ odm_PathDivChkAntSwitchCallback( } -VOID +void odm_PathDivChkAntSwitchWorkitemCallback( - IN PVOID pContext + IN void * pContext ) { PADAPTER pAdapter = (PADAPTER)pContext; @@ -10363,7 +10363,7 @@ odm_PathDivChkAntSwitchWorkitemCallback( // 92D Path Diversity Main function // refer to 88C software antenna diversity // -VOID +void odm_PathDivChkAntSwitch( PDM_ODM_T pDM_Odm //PADAPTER Adapter, @@ -10832,7 +10832,7 @@ odm_PathDivChkAntSwitch( //3 PathDiv End //================================================== -VOID +void odm_SetRespPath_92C( IN PADAPTER Adapter, IN u1Byte DefaultRespPath @@ -10856,7 +10856,7 @@ odm_SetRespPath_92C( } -VOID +void ODM_FillTXPathInTXDESC( IN PADAPTER Adapter, IN PRT_TCB pTcb, @@ -10896,7 +10896,7 @@ ODM_FillTXPathInTXDESC( } //Only for MP //Neil Chen--2012--0502-- -VOID +void odm_PathDivInit( IN PDM_ODM_T pDM_Odm) { @@ -10931,7 +10931,7 @@ IN PDM_ODM_T pDM_Odm) // // Added by Joseph, 2012.03.22 // -VOID +void ODM_SingleDualAntennaDefaultSetting( IN PDM_ODM_T pDM_Odm ) @@ -10945,7 +10945,7 @@ ODM_SingleDualAntennaDefaultSetting( //2 8723A ANT DETECT -VOID +void odm_PHY_SaveAFERegisters( IN PDM_ODM_T pDM_Odm, IN pu4Byte AFEReg, @@ -10961,7 +10961,7 @@ odm_PHY_SaveAFERegisters( } } -VOID +void odm_PHY_ReloadAFERegisters( IN PDM_ODM_T pDM_Odm, IN pu4Byte AFEReg, diff --git a/hal/odm_HWConfig.c b/hal/odm_HWConfig.c index 723cc12..c53757f 100644 --- 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, @@ -968,7 +968,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, @@ -998,7 +998,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, @@ -1010,7 +1010,7 @@ ODM_PhyStatusQuery_JaguarSeries( } -VOID +void ODM_PhyStatusQuery( IN OUT PDM_ODM_T pDM_Odm, OUT PODM_PHY_INFO_T pPhyInfo, @@ -1022,7 +1022,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_RTL8188E.c b/hal/odm_RTL8188E.c index e7e883a..07e6a08 100644 --- 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)) -static VOID +static 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 } -static VOID +static 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 } -static VOID +static 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) } -static VOID +static 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 -static VOID +static 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 ) @@ -533,7 +533,7 @@ odm_SetNextMACAddrTarget( } -VOID +void odm_FastAntTraining( IN PDM_ODM_T pDM_Odm ) @@ -628,7 +628,7 @@ odm_FastAntTraining( } -VOID +void odm_FastAntTrainingCallback( IN PDM_ODM_T pDM_Odm ) @@ -649,7 +649,7 @@ odm_FastAntTrainingCallback( #endif } -VOID +void odm_FastAntTrainingWorkItemCallback( IN PDM_ODM_T pDM_Odm ) @@ -658,7 +658,7 @@ odm_FastAntTrainingWorkItemCallback( } #endif -VOID +void ODM_AntennaDiversity_88E( IN PDM_ODM_T pDM_Odm ) @@ -749,7 +749,7 @@ ODM_AntennaDiversity_88E( /* #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -VOID +void odm_FastAntTrainingCallback( PRT_TIMER pTimer ) @@ -769,7 +769,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; PADAPTER padapter = pDM_Odm->Adapter; @@ -778,7 +778,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); @@ -789,7 +789,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, @@ -798,7 +798,7 @@ ODM_SetTxAntByTxInfo_88E( { } #else// (DM_ODM_SUPPORT_TYPE == ODM_AP) -VOID +void ODM_SetTxAntByTxInfo_88E( IN PDM_ODM_T pDM_Odm ) @@ -810,7 +810,7 @@ ODM_SetTxAntByTxInfo_88E( //3 Dynamic Primary CCA //3============================================================ -VOID +void odm_PrimaryCCA_Init( IN PDM_ODM_T pDM_Odm) { @@ -832,7 +832,7 @@ ODM_DynamicPrimaryCCA_DupRTS( return PrimaryCCA->DupRTS_flag; } -VOID +void odm_DynamicPrimaryCCA( IN PDM_ODM_T pDM_Odm ) @@ -1203,16 +1203,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_debug.c b/hal/odm_debug.c index a1574a9..7f91958 100644 --- 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_interface.c b/hal/odm_interface.c index f61a655..7e4b80f 100644 --- 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 PADAPTER Adapter, IN u1Byte ElementID, diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c index 64cabf2..ed9970b 100644 --- a/hal/rtl8188e_cmd.c +++ b/hal/rtl8188e_cmd.c @@ -627,7 +627,7 @@ void ConstructProbeRsp(_adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr // 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 PADAPTER Adapter ) diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c index 29d2219..caf34f4 100644 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -40,14 +40,14 @@ //============================================================ -static VOID +static void dm_CheckProtection( IN PADAPTER Adapter ) { } -static VOID +static void dm_CheckStatistics( IN PADAPTER Adapter ) @@ -132,7 +132,7 @@ static void dm_CheckPbcGPIO(_adapter *padapter) // // Created by Roger, 2010.03.05. // -VOID +void dm_InterruptMigration( IN PADAPTER Adapter ) @@ -396,7 +396,7 @@ rtl8188e_InitHalDm( } -VOID +void rtl8188e_HalDmWatchDog( IN PADAPTER Adapter ) diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c index 433881e..54e96e0 100644 --- 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; @@ -534,7 +534,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter,int data_len) #endif /* defined(CONFIG_IOL) */ -static VOID +static void _FWDownloadEnable( IN PADAPTER padapter, IN BOOLEAN enable @@ -567,7 +567,7 @@ _FWDownloadEnable( static int _BlockWrite( IN PADAPTER padapter, - IN PVOID buffer, + IN void * buffer, IN u32 buffSize ) { @@ -681,7 +681,7 @@ static int _PageWrite( IN PADAPTER padapter, IN u32 page, - IN PVOID buffer, + IN void * buffer, IN u32 size ) { @@ -694,7 +694,7 @@ _PageWrite( return _BlockWrite(padapter,buffer,size); } -static VOID +static void _FillDummy( u8* pFwBuf, u32* pFwLen @@ -717,7 +717,7 @@ _FillDummy( static int _WriteFW( IN PADAPTER padapter, - IN PVOID buffer, + IN void * buffer, IN u32 size ) { @@ -1016,7 +1016,7 @@ void rtl8188e_InitializeFirmwareVars(PADAPTER padapter) // // 2011.04.12 by tynli. // -VOID +void SetFwRelatedForWoWLAN8188ES( IN PADAPTER padapter, IN u8 bHostIsGoingtoSleep @@ -1096,7 +1096,7 @@ hal_EfusePgPacketWriteData( IN PPGPKT_STRUCT pTargetPkt, IN BOOLEAN bPseudoTest); -static VOID +static void hal_EfusePowerSwitch_RTL8188E( IN PADAPTER pAdapter, IN u8 bWrite, @@ -1150,7 +1150,7 @@ hal_EfusePowerSwitch_RTL8188E( } } -static VOID +static void rtl8188e_EfusePowerSwitch( IN PADAPTER pAdapter, IN u8 bWrite, @@ -1202,7 +1202,7 @@ static bool efuse_read_phymap( } -static VOID +static void Hal_EfuseReadEFuse88E( PADAPTER Adapter, u16 _offset, @@ -1449,7 +1449,7 @@ Hal_EfuseSwitchToBank( -static VOID +static void ReadEFuseByIC( PADAPTER Adapter, u8 efuseType, @@ -1508,7 +1508,7 @@ exit: return; } -static VOID +static void ReadEFuse_Pseudo ( PADAPTER Adapter, u8 efuseType, @@ -1521,7 +1521,7 @@ ReadEFuse_Pseudo ( Hal_EfuseReadEFuse88E(Adapter, _offset, _size_byte, pbuf, bPseudoTest); } -static VOID +static void rtl8188e_ReadEFuse( PADAPTER Adapter, u8 efuseType, @@ -1542,12 +1542,12 @@ rtl8188e_ReadEFuse( } //Do not support BT -VOID +void Hal_EFUSEGetEfuseDefinition88E( IN PADAPTER pAdapter, IN u1Byte efuseType, IN u1Byte type, - OUT PVOID pOut + OUT void * pOut ) { switch (type) @@ -1610,12 +1610,12 @@ Hal_EFUSEGetEfuseDefinition88E( break; } } -VOID +void Hal_EFUSEGetEfuseDefinition_Pseudo88E( IN PADAPTER pAdapter, IN u8 efuseType, IN u8 type, - OUT PVOID pOut + OUT void * pOut ) { switch (type) @@ -1680,7 +1680,7 @@ Hal_EFUSEGetEfuseDefinition_Pseudo88E( } -static VOID +static void rtl8188e_EFUSE_GetEfuseDefinition( IN PADAPTER pAdapter, IN u8 efuseType, @@ -1711,7 +1711,7 @@ Hal_EfuseWordEnableDataWrite( IN PADAPTER 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)) @@ -1926,15 +1926,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); // @@ -2082,7 +2082,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 @@ -2124,7 +2124,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) { @@ -2389,8 +2389,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) { @@ -2509,9 +2509,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) @@ -2522,7 +2522,7 @@ hal_EfusePgCheckAvailableAddr( return _TRUE; } -static VOID +static void hal_EfuseConstructPGPkt( IN u8 offset, IN u8 word_en, @@ -2531,7 +2531,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); @@ -2708,7 +2708,7 @@ static void rtl8188e_read_chip_version(PADAPTER padapter) void rtl8188e_GetHalODMVar( PADAPTER Adapter, HAL_ODM_VARIABLE eVariable, - PVOID pValue1, + void * pValue1, BOOLEAN bSet) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2723,7 +2723,7 @@ void rtl8188e_GetHalODMVar( void rtl8188e_SetHalODMVar( PADAPTER Adapter, HAL_ODM_VARIABLE eVariable, - PVOID pValue1, + void * pValue1, BOOLEAN bSet) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -3090,8 +3090,8 @@ Hal_EfuseParseIDCode88E( static void Hal_EEValueCheck( IN u8 EEType, - IN PVOID pInValue, - OUT PVOID pOutValue + IN void * pInValue, + OUT void * pOutValue ) { switch (EEType) @@ -3453,7 +3453,7 @@ Hal_ReadTxPowerInfo88E( } -VOID +void Hal_EfuseParseXtal_8188E( IN PADAPTER pAdapter, IN u8* hwinfo, diff --git a/hal/rtl8188e_phycfg.c b/hal/rtl8188e_phycfg.c index 380a41b..459e97b 100644 --- a/hal/rtl8188e_phycfg.c +++ b/hal/rtl8188e_phycfg.c @@ -141,7 +141,7 @@ sic_CalculateBitShift( static u32 sic_Read4Byte( - PVOID Adapter, + void * Adapter, u32 offset ) { @@ -192,9 +192,9 @@ sic_Read4Byte( return u4ret; } -static VOID +static void sic_Write4Byte( - PVOID Adapter, + void * Adapter, u32 offset, u32 data ) @@ -238,7 +238,7 @@ sic_Write4Byte( //============================================================ // extern function //============================================================ -static VOID +static void SIC_SetBBReg( IN PADAPTER Adapter, IN u32 RegAddr, @@ -321,7 +321,7 @@ SIC_QueryBBReg( return (ReturnValue); } -VOID +void SIC_Init( IN PADAPTER Adapter ) @@ -422,7 +422,7 @@ rtl8188e_PHY_QueryBBReg( * Note: This function is equal to "PutRegSetting" in PHY programming guide */ -VOID +void rtl8188e_PHY_SetBBReg( IN PADAPTER Adapter, IN u32 RegAddr, @@ -597,7 +597,7 @@ phy_RFSerialRead( * * */ -static VOID +static void phy_RFSerialWrite( IN PADAPTER Adapter, IN RF_RADIO_PATH_E eRFPath, @@ -724,7 +724,7 @@ rtl8188e_PHY_QueryRFReg( * Return: None * Note: This function is equal to "PutRFRegSetting" in PHY programming guide */ -VOID +void rtl8188e_PHY_SetRFReg( IN PADAPTER Adapter, IN RF_RADIO_PATH_E eRFPath, @@ -932,7 +932,7 @@ s32 PHY_MACConfig8188E(PADAPTER Adapter) * Return: None * Note: The initialization value is constant and it should never be changes */ -static VOID +static void phy_InitBBRFRegisterDefinition( IN PADAPTER Adapter ) @@ -1074,7 +1074,7 @@ phy_ConfigBBWithParaFile( //**************************************** // The following is for High Power PA //**************************************** -VOID +void phy_ConfigBBExternalPA( IN PADAPTER Adapter ) @@ -1238,7 +1238,7 @@ exit: } #endif //#ifndef CONFIG_PHY_SETTING_WITH_ODM -VOID +void storePwrIndexDiffRateOffset( IN PADAPTER Adapter, IN u32 RegAddr, @@ -1430,7 +1430,7 @@ phy_ConfigBBWithPgHeaderFile( -static VOID +static void phy_BB8192C_Config_1T( IN PADAPTER Adapter ) @@ -1992,7 +1992,7 @@ PHY_CheckBBAndRFOK( } -VOID +void rtl8192c_PHY_GetHWRegOriginalValue( IN PADAPTER Adapter ) @@ -2129,7 +2129,7 @@ phy_TxPwrIdxToDbm( * Return: NONE * *---------------------------------------------------------------------------*/ -VOID +void PHY_GetTxPowerLevel8188E( IN PADAPTER Adapter, OUT u32* powerlevel @@ -2292,7 +2292,7 @@ void phy_PowerIndexCheck88E( * 2009/01/21 MHC Support new EEPROM format from SD3 requirement. * *---------------------------------------------------------------------------*/ -VOID +void PHY_SetTxPowerLevel8188E( IN PADAPTER Adapter, IN u8 channel @@ -2390,7 +2390,7 @@ rtl8192c_PHY_SetBeaconHwReg( } -VOID +void PHY_ScanOperationBackup8188E( IN PADAPTER Adapter, IN u8 Operation @@ -2413,7 +2413,7 @@ PHY_ScanOperationBackup8188E( * (2) Will two workitem of "switch channel" and "switch channel bandwidth" run * concurrently? *---------------------------------------------------------------------------*/ -static VOID +static void _PHY_SetBWMode92C( IN PADAPTER Adapter ) @@ -2556,7 +2556,7 @@ _PHY_SetBWMode92C( * * Note: We do not take j mode into consideration now *---------------------------------------------------------------------------*/ -VOID +void PHY_SetBWMode8188E( IN PADAPTER Adapter, IN HT_CHANNEL_WIDTH Bandwidth, // 20M or 40M @@ -2631,7 +2631,7 @@ static void _PHY_SwChnl8192C(PADAPTER Adapter, u8 channel) } -VOID +void PHY_SwChnl8188E( // Call after initialization IN PADAPTER Adapter, IN u8 channel @@ -2763,7 +2763,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 PADAPTER Adapter, IN u8 channel @@ -2809,7 +2809,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 PADAPTER pAdapter, IN BOOLEAN bEnableMonitorMode @@ -2848,7 +2848,7 @@ PHY_CheckIsLegalRfPath8192C( } /* PHY_CheckIsLegalRfPath8192C */ -static VOID _PHY_SetRFPathSwitch( +static void _PHY_SetRFPathSwitch( IN PADAPTER pAdapter, IN BOOLEAN bMain, IN BOOLEAN is2T @@ -2915,7 +2915,7 @@ static BOOLEAN _PHY_QueryRFPathSwitch( } -static VOID +static void _PHY_DumpRFReg(IN PADAPTER pAdapter) { u32 rfRegValue,rfRegOffset; @@ -2941,7 +2941,7 @@ _PHY_DumpRFReg(IN PADAPTER pAdapter) // To dump all Tx FIFO LLT related link-list table. // Added by Roger, 2009.03.10. // -VOID +void DumpBBDbgPort_92CU( IN PADAPTER Adapter ) diff --git a/hal/rtl8188e_rf6052.c b/hal/rtl8188e_rf6052.c index 47ed4d8..be86d51 100644 --- a/hal/rtl8188e_rf6052.c +++ b/hal/rtl8188e_rf6052.c @@ -113,7 +113,7 @@ void rtl8188e_RF_ChangeTxPath( IN PADAPTER Adapter, * * Note: For RF type 0222D *---------------------------------------------------------------------------*/ -VOID +void rtl8188e_PHY_RF6052SetBandwidth( IN PADAPTER Adapter, IN HT_CHANNEL_WIDTH Bandwidth) //20M or 40M @@ -157,7 +157,7 @@ rtl8188e_PHY_RF6052SetBandwidth( * *---------------------------------------------------------------------------*/ -VOID +void rtl8188e_PHY_RF6052SetCckTxPower( IN PADAPTER Adapter, IN u8* pPowerlevel) @@ -578,7 +578,7 @@ static void writeOFDMPowerReg88E( * *---------------------------------------------------------------------------*/ -VOID +void rtl8188e_PHY_RF6052SetOFDMTxPower( IN PADAPTER Adapter, IN u8* pPowerLevelOFDM, @@ -623,7 +623,7 @@ rtl8188e_PHY_RF6052SetOFDMTxPower( } -static VOID +static void phy_RF6052_Config_HardCode( IN PADAPTER Adapter ) @@ -819,7 +819,7 @@ PHY_RFShadowRead( } /* PHY_RFShadowRead */ -VOID +void PHY_RFShadowWrite( IN PADAPTER Adapter, IN RF_RADIO_PATH_E eRFPath, @@ -858,7 +858,7 @@ PHY_RFShadowCompare( } /* PHY_RFShadowCompare */ -VOID +void PHY_RFShadowRecorver( IN PADAPTER Adapter, IN RF_RADIO_PATH_E eRFPath, @@ -881,7 +881,7 @@ PHY_RFShadowRecorver( } /* PHY_RFShadowRecorver */ -VOID +void PHY_RFShadowCompareAll( IN PADAPTER Adapter) { @@ -899,7 +899,7 @@ PHY_RFShadowCompareAll( } /* PHY_RFShadowCompareAll */ -VOID +void PHY_RFShadowRecorverAll( IN PADAPTER Adapter) { @@ -917,7 +917,7 @@ PHY_RFShadowRecorverAll( } /* PHY_RFShadowRecorverAll */ -VOID +void PHY_RFShadowCompareFlagSet( IN PADAPTER Adapter, IN RF_RADIO_PATH_E eRFPath, @@ -930,7 +930,7 @@ PHY_RFShadowCompareFlagSet( } /* PHY_RFShadowCompareFlagSet */ -VOID +void PHY_RFShadowRecorverFlagSet( IN PADAPTER Adapter, IN RF_RADIO_PATH_E eRFPath, @@ -943,7 +943,7 @@ PHY_RFShadowRecorverFlagSet( } /* PHY_RFShadowRecorverFlagSet */ -VOID +void PHY_RFShadowCompareFlagSetAll( IN PADAPTER Adapter) { @@ -965,7 +965,7 @@ PHY_RFShadowCompareFlagSetAll( } /* PHY_RFShadowCompareFlagSetAll */ -VOID +void PHY_RFShadowRecorverFlagSetAll( IN PADAPTER Adapter) { @@ -986,7 +986,7 @@ PHY_RFShadowRecorverFlagSetAll( } /* PHY_RFShadowCompareFlagSetAll */ -VOID +void PHY_RFShadowRefresh( IN PADAPTER Adapter) { diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index 35d4da9..ab70b88 100644 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -63,7 +63,7 @@ #endif -static VOID +static void _ConfigNormalChipOutEP_8188E( IN PADAPTER pAdapter, IN u8 NumOutPipe @@ -300,7 +300,7 @@ static void _InitBTCoexist(_adapter *padapter) // MAC init functions // //--------------------------------------------------------------- -static VOID +static void _SetMacID( IN PADAPTER Adapter, u8* MacID ) @@ -316,7 +316,7 @@ _SetMacID( } } -static VOID +static void _SetBSSID( IN PADAPTER Adapter, u8* BSSID ) @@ -334,7 +334,7 @@ _SetBSSID( // Shall USB interface init this? -static VOID +static void _InitInterrupt( IN PADAPTER Adapter ) @@ -377,7 +377,7 @@ _InitInterrupt( } -static VOID +static void _InitQueueReservedPage( IN PADAPTER Adapter ) @@ -426,7 +426,7 @@ _InitQueueReservedPage( } } -static VOID +static void _InitTxBufferBoundary( IN PADAPTER Adapter, IN u8 txpktbuf_bndy @@ -445,7 +445,7 @@ _InitTxBufferBoundary( } -static VOID +static void _InitPageBoundary( IN PADAPTER Adapter ) @@ -458,7 +458,7 @@ _InitPageBoundary( } -static VOID +static void _InitNormalChipRegPriority( IN PADAPTER Adapter, IN u16 beQ, @@ -478,7 +478,7 @@ _InitNormalChipRegPriority( rtw_write16(Adapter, REG_TRXDMA_CTRL, value16); } -static VOID +static void _InitNormalChipOneOutEpPriority( IN PADAPTER Adapter ) @@ -513,7 +513,7 @@ _InitNormalChipOneOutEpPriority( } -static VOID +static void _InitNormalChipTwoOutEpPriority( IN PADAPTER Adapter ) @@ -566,7 +566,7 @@ _InitNormalChipTwoOutEpPriority( } -static VOID +static void _InitNormalChipThreeOutEpPriority( IN PADAPTER Adapter ) @@ -593,7 +593,7 @@ _InitNormalChipThreeOutEpPriority( _InitNormalChipRegPriority(Adapter,beQ,bkQ,viQ,voQ,mgtQ,hiQ); } -static VOID +static void _InitQueuePriority( IN PADAPTER Adapter ) @@ -621,7 +621,7 @@ _InitQueuePriority( -static VOID +static void _InitHardwareDropIncorrectBulkOut( IN PADAPTER Adapter ) @@ -631,7 +631,7 @@ _InitHardwareDropIncorrectBulkOut( rtw_write32(Adapter, REG_TXDMA_OFFSET_CHK, value32); } -static VOID +static void _InitNetworkType( IN PADAPTER Adapter ) @@ -646,7 +646,7 @@ _InitNetworkType( // RASSERT(pIoBase->rtw_read8(REG_CR + 2) == 0x2); } -static VOID +static void _InitTransferPageSize( IN PADAPTER Adapter ) @@ -658,7 +658,7 @@ _InitTransferPageSize( rtw_write8(Adapter, REG_PBP, value8); } -static VOID +static void _InitDriverInfoSize( IN PADAPTER Adapter, IN u8 drvInfoSize @@ -667,7 +667,7 @@ _InitDriverInfoSize( rtw_write8(Adapter,REG_RX_DRVINFO_SZ, drvInfoSize); } -static VOID +static void _InitWMACSetting( IN PADAPTER Adapter ) @@ -711,7 +711,7 @@ _InitWMACSetting( } -static VOID +static void _InitAdaptiveCtrl( IN PADAPTER Adapter ) @@ -738,7 +738,7 @@ _InitAdaptiveCtrl( } -static VOID +static void _InitRateFallback( IN PADAPTER Adapter ) @@ -752,7 +752,7 @@ _InitRateFallback( } -static VOID +static void _InitEDCA( IN PADAPTER Adapter ) @@ -775,7 +775,7 @@ _InitEDCA( } -static VOID +static void _InitBeaconMaxError( IN PADAPTER Adapter, IN BOOLEAN InfraMode @@ -800,7 +800,7 @@ static void _InitHWLed(PADAPTER Adapter) } #endif //CONFIG_LED -static VOID +static void _InitRDGSetting( IN PADAPTER Adapter ) @@ -810,7 +810,7 @@ _InitRDGSetting( rtw_write8(Adapter,REG_RD_RESP_PKT_TH,0x05); } -static VOID +static void _InitRxSetting( IN PADAPTER Adapter ) @@ -819,7 +819,7 @@ _InitRxSetting( rtw_write32(Adapter, 0x0700, 0x87654321); } -static VOID +static void _InitRetryFunction( IN PADAPTER Adapter ) @@ -849,7 +849,7 @@ _InitRetryFunction( * 12/10/2010 MHC Seperate to smaller function. * *---------------------------------------------------------------------------*/ -static VOID +static void usb_AggSettingTxUpdate( IN PADAPTER Adapter ) @@ -889,7 +889,7 @@ usb_AggSettingTxUpdate( * 12/10/2010 MHC Seperate to smaller function. * *---------------------------------------------------------------------------*/ -static VOID +static void usb_AggSettingRxUpdate( IN PADAPTER Adapter ) @@ -975,7 +975,7 @@ usb_AggSettingRxUpdate( #endif } // usb_AggSettingRxUpdate -static VOID +static void InitUsbAggregationSetting( IN PADAPTER Adapter ) @@ -991,7 +991,7 @@ InitUsbAggregationSetting( // 201/12/10 MH Add for USB agg mode dynamic switch. pHalData->UsbRxHighSpeedMode = _FALSE; } -VOID +void HalRxAggr8188EUsb( IN PADAPTER Adapter, IN BOOLEAN Value @@ -1018,14 +1018,14 @@ HalRxAggr8188EUsb( * 12/10/2010 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -VOID +void USB_AggModeSwitch( IN PADAPTER Adapter ) { } // USB_AggModeSwitch -static VOID +static void _InitOperationMode( IN PADAPTER Adapter ) @@ -1033,7 +1033,7 @@ _InitOperationMode( } - static VOID + static void _InitBeaconParameters( IN PADAPTER Adapter ) @@ -1058,7 +1058,7 @@ _InitBeaconParameters( pHalData->RegCR_1 = rtw_read8(Adapter, REG_CR+1); } -static VOID +static void _InitRFType( IN PADAPTER Adapter ) @@ -1088,7 +1088,7 @@ _InitRFType( } -static VOID +static void _BeaconFunctionEnable( IN PADAPTER Adapter, IN BOOLEAN Enable, @@ -1104,7 +1104,7 @@ _BeaconFunctionEnable( // Set CCK and OFDM Block "ON" -static VOID _BBTurnOnBlock( +static void _BBTurnOnBlock( IN PADAPTER Adapter ) { @@ -1116,7 +1116,7 @@ static VOID _BBTurnOnBlock( PHY_SetBBReg(Adapter, rFPGA0_RFMOD, bOFDMEn, 0x1); } -static VOID _RfPowerSave( +static void _RfPowerSave( IN PADAPTER Adapter ) { @@ -1127,7 +1127,7 @@ enum { Antenna_Right = 2, }; -static VOID +static void _InitAntenna_Selection(IN PADAPTER Adapter) { @@ -1154,7 +1154,7 @@ _InitAntenna_Selection(IN PADAPTER 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 PADAPTER Adapter ) @@ -1175,7 +1175,7 @@ HalDetectSelectiveSuspendMode( * When Who Remark * 08/23/2010 MHC HW suspend mode switch test.. *---------------------------------------------------------------------------*/ -static VOID +static void HwSuspendModeEnable_88eu( IN PADAPTER pAdapter, IN u8 Type @@ -1747,7 +1747,7 @@ void _ps_close_RF(_adapter *padapter){ } -VOID +void CardDisableRTL8188EU( IN PADAPTER Adapter ) @@ -1939,7 +1939,7 @@ static void _ReadIDs(PADAPTER Adapter, u8 *PROMContent, BOOLEAN AutoloadFail) { } -static VOID +static void _ReadBoardType( IN PADAPTER Adapter, IN u8* PROMContent, @@ -1950,7 +1950,7 @@ _ReadBoardType( } -static VOID +static void _ReadLEDSetting( IN PADAPTER Adapter, IN u8* PROMContent, @@ -1974,7 +1974,7 @@ _ReadLEDSetting( #endif //CONFIG_SW_LED } -static VOID +static void _ReadThermalMeter( IN PADAPTER Adapter, IN u8* PROMContent, @@ -1983,7 +1983,7 @@ _ReadThermalMeter( { } -static VOID +static void _ReadRFSetting( IN PADAPTER Adapter, IN u8* PROMContent, @@ -2001,7 +2001,7 @@ _ReadPROMVersion( { } -static VOID +static void readAntennaDiversity( IN PADAPTER pAdapter, IN u8 *hwinfo, @@ -2014,7 +2014,7 @@ readAntennaDiversity( pHalData->AntDivCfg = registry_par->antdiv_cfg ; // 0:OFF , 1:ON, } -static VOID +static void hal_InitPGData( IN PADAPTER pAdapter, IN OUT u8 *PROMContent @@ -2215,7 +2215,7 @@ Hal_ReadMACAddrFromFile_8188EU( } #endif //CONFIG_EFUSE_CONFIG_FILE -static VOID +static void readAdapterInfo_8188EU( IN PADAPTER padapter ) @@ -2297,7 +2297,7 @@ static void _ReadPROMContent( -static VOID +static void _ReadRFType( IN PADAPTER Adapter ) @@ -3895,7 +3895,7 @@ u8 GetHalDefVar8188EUsb( IN PADAPTER Adapter, IN HAL_DEF_VARIABLE eVariable, - IN PVOID pValue + IN void * pValue ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -4030,7 +4030,7 @@ u8 SetHalDefVar8188EUsb( IN PADAPTER 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 243a9c9..e55958f 100644 --- a/include/Hal8188EPhyCfg.h +++ b/include/Hal8188EPhyCfg.h @@ -264,7 +264,7 @@ BOOLEAN PHY_UpdateTxPowerDbm8188E( IN PADAPTER Adapter, IN int powerInDbm ); // -VOID +void PHY_ScanOperationBackup8188E(IN PADAPTER Adapter, IN u8 Operation ); @@ -311,14 +311,14 @@ void PHY_SetMonitorMode8192C(IN PADAPTER pAdapter, BOOLEAN PHY_CheckIsLegalRfPath8192C(IN PADAPTER pAdapter, IN u32 eRFPath ); -VOID PHY_SetRFPathSwitch_8188E(IN PADAPTER pAdapter, IN BOOLEAN bMain); +void PHY_SetRFPathSwitch_8188E(IN PADAPTER pAdapter, IN BOOLEAN bMain); -extern VOID +extern void PHY_SwitchEphyParameter( IN PADAPTER Adapter ); -extern VOID +extern void PHY_EnableHostClkReq( IN PADAPTER Adapter ); @@ -330,7 +330,7 @@ SetAntennaConfig92C( ); #ifdef CONFIG_PHY_SETTING_WITH_ODM -VOID +void storePwrIndexDiffRateOffset( IN PADAPTER Adapter, IN u32 RegAddr, @@ -419,7 +419,7 @@ storePwrIndexDiffRateOffset( #endif #if (SIC_ENABLE == 1) -VOID SIC_Init(IN PADAPTER Adapter); +void SIC_Init(IN PADAPTER Adapter); #endif diff --git a/include/Hal8188ERateAdaptive.h b/include/Hal8188ERateAdaptive.h index 803411c..b8c9cf1 100644 --- a/include/Hal8188ERateAdaptive.h +++ b/include/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/include/Hal8192CPhyCfg.h b/include/Hal8192CPhyCfg.h index 0fe244f..bd066cb 100644 --- a/include/Hal8192CPhyCfg.h +++ b/include/Hal8192CPhyCfg.h @@ -305,7 +305,7 @@ BOOLEAN PHY_UpdateTxPowerDbm8192C( IN PADAPTER Adapter, IN int powerInDbm ); // -VOID +void PHY_ScanOperationBackup8192C(IN PADAPTER Adapter, IN u8 Operation ); @@ -353,7 +353,7 @@ BOOLEAN PHY_CheckIsLegalRfPath8192C(IN PADAPTER pAdapter, IN u32 eRFPath ); -VOID rtl8192c_PHY_SetRFPathSwitch(IN PADAPTER pAdapter, IN BOOLEAN bMain); +void rtl8192c_PHY_SetRFPathSwitch(IN PADAPTER pAdapter, IN BOOLEAN bMain); // // Modify the value of the hw register when beacon interval be changed. @@ -363,12 +363,12 @@ rtl8192c_PHY_SetBeaconHwReg( IN PADAPTER Adapter, IN u16 BeaconInterval ); -extern VOID +extern void PHY_SwitchEphyParameter( IN PADAPTER Adapter ); -extern VOID +extern void PHY_EnableHostClkReq( IN PADAPTER Adapter ); diff --git a/include/Hal8192DPhyCfg.h b/include/Hal8192DPhyCfg.h index f2126c6..bffbece 100644 --- a/include/Hal8192DPhyCfg.h +++ b/include/Hal8192DPhyCfg.h @@ -358,7 +358,7 @@ BOOLEAN PHY_UpdateTxPowerDbm8192D( IN PADAPTER Adapter, IN int powerInDbm ); // -VOID +void PHY_ScanOperationBackup8192D(IN PADAPTER Adapter, IN u8 Operation ); @@ -415,12 +415,12 @@ rtl8192d_PHY_SetBeaconHwReg( IN PADAPTER Adapter, IN u16 BeaconInterval ); -extern VOID +extern void PHY_SwitchEphyParameter( IN PADAPTER Adapter ); -extern VOID +extern void PHY_EnableHostClkReq( IN PADAPTER Adapter ); @@ -431,45 +431,45 @@ SetAntennaConfig92C( IN u8 DefaultAnt ); -VOID +void PHY_UpdateBBRFConfiguration8192D( IN PADAPTER Adapter, IN BOOLEAN bisBandSwitch ); -VOID PHY_ReadMacPhyMode92D( +void PHY_ReadMacPhyMode92D( IN PADAPTER Adapter, IN BOOLEAN AutoloadFail ); -VOID PHY_ConfigMacPhyMode92D( +void PHY_ConfigMacPhyMode92D( IN PADAPTER Adapter ); -VOID PHY_ConfigMacPhyModeInfo92D( +void PHY_ConfigMacPhyModeInfo92D( IN PADAPTER Adapter ); -VOID PHY_ConfigMacCoexist_RFPage92D( +void PHY_ConfigMacCoexist_RFPage92D( IN PADAPTER Adapter ); -VOID +void rtl8192d_PHY_InitRxSetting( IN PADAPTER Adapter ); -VOID +void rtl8192d_PHY_SetRFPathSwitch(IN PADAPTER pAdapter, IN BOOLEAN bMain); -VOID +void HalChangeCCKStatus8192D( IN PADAPTER Adapter, IN BOOLEAN bCCKDisable ); -VOID +void PHY_InitPABias92D(IN PADAPTER Adapter); /*--------------------------Exported Function prototype---------------------*/ diff --git a/include/HalPhyRf.h b/include/HalPhyRf.h index a16ef68..350353e 100644 --- a/include/HalPhyRf.h +++ b/include/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/include/HalPhyRf_8188e.h b/include/HalPhyRf_8188e.h index 49afe87..c3658c3 100644 --- a/include/HalPhyRf_8188e.h +++ b/include/HalPhyRf_8188e.h @@ -27,7 +27,7 @@ #define AVG_THERMAL_NUM_88E 4 -VOID +void ODM_TxPwrTrackAdjust88E( PDM_ODM_T pDM_Odm, u1Byte Type, // 0 = OFDM, 1 = CCK @@ -36,7 +36,7 @@ ODM_TxPwrTrackAdjust88E( ); -VOID +void odm_TXPowerTrackingCallback_ThermalMeter_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm @@ -85,7 +85,7 @@ void PHY_DigitalPredistortion_8188E( IN PADAPTER pAdapter); -VOID +void _PHY_SaveADDARegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -97,7 +97,7 @@ _PHY_SaveADDARegisters( IN u4Byte RegisterNum ); -VOID +void _PHY_PathADDAOn( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -109,7 +109,7 @@ _PHY_PathADDAOn( IN BOOLEAN is2T ); -VOID +void _PHY_MACSettingCalibration( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, @@ -121,7 +121,7 @@ _PHY_MACSettingCalibration( ); -VOID +void _PHY_PathAStandBy( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm diff --git a/include/basic_types.h b/include/basic_types.h index 9c6f3c3..aa71046 100644 --- a/include/basic_types.h +++ b/include/basic_types.h @@ -82,17 +82,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 @@ -126,14 +120,9 @@ typedef unsigned long long u64; #define IN #define OUT - #define VOID void #define NDIS_OID uint #define NDIS_STATUS uint - #ifndef PVOID - typedef void * PVOID; - //#define PVOID (void *) - #endif typedef u32 dma_addr_t; #define UCHAR u8 #define USHORT u16 diff --git a/include/drv_types.h b/include/drv_types.h index 0da421c..29352db 100644 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -513,7 +513,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 f4bcc9c..db4686d 100644 --- a/include/drv_types_ce.h +++ b/include/drv_types_ce.h @@ -64,7 +64,7 @@ typedef struct _MP_REG_ENTRY typedef struct _USB_EXTENSION { LPCUSB_FUNCS _lpUsbFuncs; USB_HANDLE _hDevice; - PVOID pAdapter; + void * pAdapter; } USB_EXTENSION, *PUSB_EXTENSION; #endif diff --git a/include/hal_intf.h b/include/hal_intf.h index 3785984..ec5b03c 100644 --- a/include/hal_intf.h +++ b/include/hal_intf.h @@ -195,11 +195,11 @@ struct hal_ops { void (*SetHwRegHandler)(_adapter *padapter, u8 variable,u8* val); void (*GetHwRegHandler)(_adapter *padapter, u8 variable,u8* val); - u8 (*GetHalDefVarHandler)(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); - u8 (*SetHalDefVarHandler)(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); + u8 (*GetHalDefVarHandler)(_adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); + u8 (*SetHalDefVarHandler)(_adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); - void (*GetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); - void (*SetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); + void (*GetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet); + void (*SetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet); void (*UpdateRAMaskHandler)(_adapter *padapter, u32 mac_id, u8 rssi_level); void (*SetBeaconRelatedRegistersHandler)(_adapter *padapter); @@ -395,11 +395,11 @@ void rtw_hal_chip_configure(_adapter *padapter); void rtw_hal_read_chip_info(_adapter *padapter); void rtw_hal_read_chip_version(_adapter *padapter); -u8 rtw_hal_set_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); -u8 rtw_hal_get_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); +u8 rtw_hal_set_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); +u8 rtw_hal_get_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); -void rtw_hal_set_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); -void rtw_hal_get_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); +void rtw_hal_set_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet); +void rtw_hal_get_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,BOOLEAN bSet); void rtw_hal_enable_interrupt(_adapter *padapter); void rtw_hal_disable_interrupt(_adapter *padapter); diff --git a/include/odm.h b/include/odm.h index df7ce57..90c9015 100644 --- a/include/odm.h +++ b/include/odm.h @@ -1556,10 +1556,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); @@ -1570,10 +1570,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 ); @@ -1594,7 +1594,7 @@ ODM_RAStateCheck( //void ODM_ChangeDynamicInitGainThresh(IN PADAPTER pAdapter, // IN INT32 DM_Type, // IN INT32 DM_Value); -VOID +void ODM_ChangeDynamicInitGainThresh( IN PDM_ODM_T pDM_Odm, IN u4Byte DM_Type, @@ -1608,7 +1608,7 @@ ODM_CheckPowerStatus( #if (DM_ODM_SUPPORT_TYPE != ODM_ADSL) -VOID +void ODM_RateAdaptiveStateApInit( IN PADAPTER Adapter , IN PRT_WLAN_STA pEntry @@ -1619,7 +1619,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 @@ -1644,7 +1644,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 @@ -1657,7 +1657,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 @@ -1677,7 +1677,7 @@ GetPSDData( #if (DM_ODM_SUPPORT_TYPE == ODM_CE) -VOID +void odm_DIGbyRSSI_LPS( IN PDM_ODM_T pDM_Odm ); @@ -1692,28 +1692,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 PADAPTER Adapter, IN u4Byte mode, @@ -1724,69 +1724,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 ); @@ -1804,13 +1804,13 @@ VOID ODM_PathDivRestAfterLink( //#define PATHDIV_ENABLE 1 -//VOID odm_PathDivChkAntSwitch(PADAPTER Adapter,u1Byte Step); -VOID ODM_PathDivRestAfterLink( +//void odm_PathDivChkAntSwitch(PADAPTER Adapter,u1Byte Step); +void ODM_PathDivRestAfterLink( IN PDM_ODM_T pDM_Odm ); #define dm_PathDiv_RSSI_Check ODM_PathDivChkPerPktRssi -VOID ODM_PathDivChkPerPktRssi(PADAPTER Adapter, +void ODM_PathDivChkPerPktRssi(PADAPTER Adapter, BOOLEAN bIsDefPort, BOOLEAN bMatchBSSID, PRT_WLAN_STA pEntry, @@ -1849,7 +1849,7 @@ ODM_PathDiversityBeforeLink92C( // -VOID +void ODM_CCKPathDiversityChkPerPktRssi( PADAPTER Adapter, BOOLEAN bIsDefPort, @@ -1871,7 +1871,7 @@ typedef enum tag_DIG_Connect_Definition }DM_DIG_CONNECT_E; -VOID +void ODM_FillTXPathInTXDESC( IN PADAPTER Adapter, IN PRT_TCB pTcb, @@ -1900,14 +1900,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, @@ -1917,7 +1917,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/include/odm_HWConfig.h b/include/odm_HWConfig.h index 9124233..c2b3097 100644 --- a/include/odm_HWConfig.h +++ b/include/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/include/odm_RTL8188E.h b/include/odm_RTL8188E.h index 1ecbfea..76b0fae 100644 --- a/include/odm_RTL8188E.h +++ b/include/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/include/odm_debug.h b/include/odm_debug.h index 9ff31e0..efd84a5 100644 --- a/include/odm_debug.h +++ b/include/odm_debug.h @@ -168,6 +168,6 @@ #define ODM_PRINT_ADDR(pDM_Odm, comp, level, title_str, ptr) #endif -VOID ODM_InitDebugSetting(PDM_ODM_T pDM_Odm); +void ODM_InitDebugSetting(PDM_ODM_T pDM_Odm); #endif // __ODM_DBG_H__ diff --git a/include/odm_interface.h b/include/odm_interface.h index aa0da5a..5d13d38 100644 --- a/include/odm_interface.h +++ b/include/odm_interface.h @@ -84,7 +84,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 // @@ -115,28 +115,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, @@ -151,7 +151,7 @@ ODM_GetMACReg( IN u4Byte BitMask ); -VOID +void ODM_SetBBReg( IN PDM_ODM_T pDM_Odm, IN u4Byte RegAddr, @@ -166,7 +166,7 @@ ODM_GetBBReg( IN u4Byte BitMask ); -VOID +void ODM_SetRFReg( IN PDM_ODM_T pDM_Odm, IN ODM_RF_RADIO_PATH_E eRFPath, @@ -187,36 +187,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 @@ -226,36 +226,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 ); @@ -263,47 +263,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 @@ -314,7 +314,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/include/odm_types.h b/include/odm_types.h index 8fb61ca..cb99cc0 100644 --- a/include/odm_types.h +++ b/include/odm_types.h @@ -117,7 +117,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/include/osdep_ce_service.h b/include/osdep_ce_service.h index a747ed0..c7cf5e8 100644 --- a/include/osdep_ce_service.h +++ b/include/osdep_ce_service.h @@ -122,7 +122,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); } @@ -137,7 +137,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 75530ae..58e397d 100644 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -713,7 +713,7 @@ __inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled) rtw_mtx_unlock(NULL); } -__inline static void _init_workitem(_workitem *pwork, void *pfunc, PVOID cntx) +__inline static void _init_workitem(_workitem *pwork, void *pfunc, void * cntx) { printf("%s Not implement yet!\n",__func__); } @@ -969,14 +969,14 @@ __inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled) #ifdef PLATFORM_LINUX #define RTW_TIMER_HDL_ARGS void *FunctionContext #elif defined(PLATFORM_OS_CE) || defined(PLATFORM_WINDOWS) -#define RTW_TIMER_HDL_ARGS IN PVOID SystemSpecific1, IN PVOID FunctionContext, IN PVOID SystemSpecific2, IN PVOID SystemSpecific3 +#define RTW_TIMER_HDL_ARGS IN void * SystemSpecific1, IN void * FunctionContext, IN PVOID SystemSpecific2, IN PVOID SystemSpecific3 #endif #define RTW_TIMER_HDL_NAME(name) rtw_##name##_timer_hdl #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); @@ -1171,7 +1171,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); } @@ -1186,7 +1186,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/rtl8188e_rf.h b/include/rtl8188e_rf.h index 9a4748d..dbe5c5a 100644 --- a/include/rtl8188e_rf.h +++ b/include/rtl8188e_rf.h @@ -31,10 +31,10 @@ void rtl8188e_RF_ChangeTxPath( IN PADAPTER Adapter, void rtl8188e_PHY_RF6052SetBandwidth( IN PADAPTER Adapter, IN HT_CHANNEL_WIDTH Bandwidth); -VOID rtl8188e_PHY_RF6052SetCckTxPower( +void rtl8188e_PHY_RF6052SetCckTxPower( IN PADAPTER Adapter, IN u8* pPowerlevel); -VOID rtl8188e_PHY_RF6052SetOFDMTxPower( +void rtl8188e_PHY_RF6052SetOFDMTxPower( IN PADAPTER Adapter, IN u8* pPowerLevelOFDM, IN u8* pPowerLevelBW20, diff --git a/include/rtl8192c_hal.h b/include/rtl8192c_hal.h index 8186b49..29a66ac 100644 --- a/include/rtl8192c_hal.h +++ b/include/rtl8192c_hal.h @@ -630,7 +630,7 @@ typedef struct hal_data_8192ce HAL_DATA_TYPE, *PHAL_DATA_TYPE; #define IS_MULTI_FUNC_CHIP(_Adapter) (((((PHAL_DATA_TYPE)(_Adapter->HalData))->MultiFunc) & (RT_MULTI_FUNC_BT|RT_MULTI_FUNC_GPS)) ? _TRUE : _FALSE) void InterruptRecognized8192CE(PADAPTER Adapter, PRT_ISR_CONTENT pIsrContent); -VOID UpdateInterruptMask8192CE(PADAPTER Adapter, u32 AddMSR, u32 AddMSR1, u32 RemoveMSR, u32 RemoveMSR1); +void UpdateInterruptMask8192CE(PADAPTER Adapter, u32 AddMSR, u32 AddMSR1, u32 RemoveMSR, u32 RemoveMSR1); #endif #ifdef CONFIG_USB_HCI @@ -832,16 +832,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 PADAPTER Adapter); +void rtl8192c_FirmwareSelfReset(IN PADAPTER Adapter); int FirmwareDownload92C(IN PADAPTER Adapter); -VOID InitializeFirmwareVars92C(PADAPTER Adapter); +void InitializeFirmwareVars92C(PADAPTER Adapter); u8 GetEEPROMSize8192C(PADAPTER Adapter); void rtl8192c_EfuseParseChnlPlan(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); HAL_VERSION rtl8192c_ReadChipVersion(IN PADAPTER Adapter); void rtl8192c_ReadBluetoothCoexistInfo(PADAPTER Adapter, u8 *PROMContent, BOOLEAN AutoloadFail); //void rtl8192c_free_hal_data(_adapter * padapter); -VOID rtl8192c_EfuseParseIDCode(PADAPTER pAdapter, u8 *hwinfo); +void rtl8192c_EfuseParseIDCode(PADAPTER pAdapter, u8 *hwinfo); void rtl8192c_set_hal_ops(struct hal_ops *pHalFunc); void rtl8192c_clone_haldata(_adapter* dst_adapter, _adapter* src_adapter); diff --git a/include/rtl8192c_rf.h b/include/rtl8192c_rf.h index 7e22503..676e9ea 100644 --- a/include/rtl8192c_rf.h +++ b/include/rtl8192c_rf.h @@ -76,10 +76,10 @@ void rtl8192c_RF_ChangeTxPath( IN PADAPTER Adapter, void rtl8192c_PHY_RF6052SetBandwidth( IN PADAPTER Adapter, IN HT_CHANNEL_WIDTH Bandwidth); -VOID rtl8192c_PHY_RF6052SetCckTxPower( +void rtl8192c_PHY_RF6052SetCckTxPower( IN PADAPTER Adapter, IN u8* pPowerlevel); -VOID rtl8192c_PHY_RF6052SetOFDMTxPower( +void rtl8192c_PHY_RF6052SetOFDMTxPower( IN PADAPTER Adapter, IN u8* pPowerLevel, IN u8 Channel); diff --git a/include/rtl8192d_hal.h b/include/rtl8192d_hal.h index 5a930e0..c2db06d 100644 --- a/include/rtl8192d_hal.h +++ b/include/rtl8192d_hal.h @@ -623,7 +623,7 @@ typedef struct hal_data_8192de HAL_DATA_TYPE, *PHAL_DATA_TYPE; #define RT_IS_FUNC_DISABLED(__pAdapter, __FuncBits) ( (__pAdapter)->DisabledFunctions & (__FuncBits) ) void InterruptRecognized8192DE(PADAPTER Adapter, PRT_ISR_CONTENT pIsrContent); -VOID UpdateInterruptMask8192DE(PADAPTER Adapter, u32 AddMSR, u32 RemoveMSR); +void UpdateInterruptMask8192DE(PADAPTER Adapter, u32 AddMSR, u32 RemoveMSR); #endif #ifdef CONFIG_USB_HCI @@ -839,14 +839,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 PADAPTER Adapter); -VOID rtl8192d_FirmwareSelfReset(IN PADAPTER Adapter); +void rtl8192d_FirmwareSelfReset(IN PADAPTER Adapter); void rtl8192d_ReadChipVersion(IN PADAPTER Adapter); -VOID rtl8192d_EfuseParseChnlPlan(PADAPTER Adapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -VOID rtl8192d_ReadTxPowerInfo(PADAPTER Adapter, u8* PROMContent, BOOLEAN AutoLoadFail); -VOID rtl8192d_ResetDualMacSwitchVariables(IN PADAPTER Adapter); +void rtl8192d_EfuseParseChnlPlan(PADAPTER Adapter, u8 *hwinfo, BOOLEAN AutoLoadFail); +void rtl8192d_ReadTxPowerInfo(PADAPTER Adapter, u8* PROMContent, BOOLEAN AutoLoadFail); +void rtl8192d_ResetDualMacSwitchVariables(IN PADAPTER Adapter); u8 GetEEPROMSize8192D(PADAPTER Adapter); BOOLEAN PHY_CheckPowerOffFor8192D(PADAPTER Adapter); -VOID PHY_SetPowerOnFor8192D(PADAPTER Adapter); +void PHY_SetPowerOnFor8192D(PADAPTER Adapter); //void PHY_ConfigMacPhyMode92D(PADAPTER Adapter); void rtl8192d_free_hal_data(_adapter * padapter); void rtl8192d_set_hal_ops(struct hal_ops *pHalFunc); diff --git a/include/rtl8192d_rf.h b/include/rtl8192d_rf.h index 1aba229..538f4e8 100644 --- a/include/rtl8192d_rf.h +++ b/include/rtl8192d_rf.h @@ -76,10 +76,10 @@ void rtl8192d_RF_ChangeTxPath( IN PADAPTER Adapter, void rtl8192d_PHY_RF6052SetBandwidth( IN PADAPTER Adapter, IN HT_CHANNEL_WIDTH Bandwidth); -VOID rtl8192d_PHY_RF6052SetCckTxPower( +void rtl8192d_PHY_RF6052SetCckTxPower( IN PADAPTER Adapter, IN u8* pPowerlevel); -VOID rtl8192d_PHY_RF6052SetOFDMTxPower( +void rtl8192d_PHY_RF6052SetOFDMTxPower( IN PADAPTER Adapter, IN u8* pPowerLevel, IN u8 Channel); diff --git a/include/rtl8723a_bt-coexist.h b/include/rtl8723a_bt-coexist.h index cdcfaf3..85ea4cb 100644 --- a/include/rtl8723a_bt-coexist.h +++ b/include/rtl8723a_bt-coexist.h @@ -1149,7 +1149,7 @@ typedef struct _BT30Info RT_TIMER BTAuthTimeoutTimer; RT_TIMER BTAsocTimeoutTimer; - PVOID pBtChnlList; + void * pBtChnlList; }BT30Info, *PBT30Info; typedef struct _PACKET_IRP_ACL_DATA diff --git a/include/rtw_bt_mp.h b/include/rtw_bt_mp.h index a8eeffd..f1c6b39 100644 --- a/include/rtw_bt_mp.h +++ b/include/rtw_bt_mp.h @@ -180,7 +180,7 @@ typedef enum _BT_REPORT_TYPE{ BT_REPORT_MAX }BT_REPORT_TYPE,*PBT_REPORT_TYPE; -VOID +void MPTBT_Test( IN PADAPTER Adapter, IN u1Byte opCode, @@ -192,13 +192,13 @@ MPTBT_Test( NDIS_STATUS MPTBT_SendOidBT( IN PADAPTER pAdapter, - IN PVOID InformationBuffer, + IN void * InformationBuffer, IN ULONG InformationBufferLength, OUT PULONG BytesRead, OUT PULONG BytesNeeded ); -VOID +void MPTBT_FwC2hBtMpCtrl( PADAPTER Adapter, pu1Byte tmpBuf, @@ -207,9 +207,9 @@ MPTBT_FwC2hBtMpCtrl( void MPh2c_timeout_handle(void *FunctionContext); -VOID mptbt_BtControlProcess( +void mptbt_BtControlProcess( PADAPTER Adapter, - PVOID pInBuf + void * pInBuf ); #define BT_H2C_MAX_RETRY 1 diff --git a/include/rtw_mlme.h b/include/rtw_mlme.h index 929bf64..5cf6641 100644 --- a/include/rtw_mlme.h +++ b/include/rtw_mlme.h @@ -601,17 +601,17 @@ void rtw_indicate_wx_disassoc_event(_adapter *padapter); extern thread_return event_thread(void *context); extern void rtw_join_timeout_handler ( - IN PVOID SystemSpecific1, - IN PVOID FunctionContext, - IN PVOID SystemSpecific2, - IN PVOID SystemSpecific3 + IN void * SystemSpecific1, + IN void * FunctionContext, + IN void * SystemSpecific2, + IN void * SystemSpecific3 ); extern void _rtw_scan_timeout_handler ( - IN PVOID SystemSpecific1, - IN PVOID FunctionContext, - IN PVOID SystemSpecific2, - IN PVOID SystemSpecific3 + IN void * SystemSpecific1, + IN void * FunctionContext, + IN void * SystemSpecific2, + IN void * SystemSpecific3 ); #endif diff --git a/include/rtw_mp.h b/include/rtw_mp.h index fd4287c..6c711f7 100644 --- a/include/rtw_mp.h +++ b/include/rtw_mp.h @@ -234,7 +234,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/rtw_security.h b/include/rtw_security.h index bb02be4..bd16946 100644 --- a/include/rtw_security.h +++ b/include/rtw_security.h @@ -430,10 +430,10 @@ int tdls_verify_mic(u8 *kck, u8 trans_seq, #ifdef PLATFORM_WINDOWS void rtw_use_tkipkey_handler ( - IN PVOID SystemSpecific1, - IN PVOID FunctionContext, - IN PVOID SystemSpecific2, - IN PVOID SystemSpecific3 + IN void * SystemSpecific1, + IN void * FunctionContext, + IN void * SystemSpecific2, + IN void * SystemSpecific3 ); #endif #ifdef PLATFORM_LINUX diff --git a/include/usb_vendor_req.h b/include/usb_vendor_req.h index 0f67122..53b1249 100644 --- 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 7d1b2ba..c799f2e 100644 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -8723,7 +8723,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, } DBG_871X("%s: cnts=%d\n", __func__, 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", __func__, addr, cnts); @@ -8799,7 +8799,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, #endif // CONFIG_RTL8723A 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", __func__, addr, cnts); err = -EFAULT; @@ -8840,7 +8840,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, #endif 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", __func__, addr, cnts); @@ -8958,7 +8958,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, } DBG_871X("%s: cnts=%d\n", __func__, 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", __func__, addr, cnts); @@ -9184,10 +9184,10 @@ static int rtw_mp_efuse_set(struct net_device *dev, setdata[jj] = key_2char2num(tmp[2][kk], tmp[2][kk+1]); } #ifndef CONFIG_RTL8188E - 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); #else //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); #endif if ((addr+cnts) > max_available_size) { @@ -9309,10 +9309,10 @@ static int rtw_mp_efuse_set(struct net_device *dev, setdata[jj] = key_2char2num(tmp[1][kk], tmp[1][kk+1]); } #ifndef CONFIG_RTL8188E - 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); #else //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); #endif if ((addr+cnts) > max_available_size) { @@ -9376,7 +9376,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", __func__, addr, cnts); @@ -9424,7 +9424,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", __func__, addr, cnts); @@ -9494,7 +9494,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; @@ -9510,7 +9510,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; @@ -10466,7 +10466,7 @@ static int rtw_mp_thermal(struct net_device *dev, if (bwrite == 0) { //DBG_871X("to write val:%d",val); - 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 (2 > max_available_size) { DBG_871X("no available efuse!\n");