From 722e1c9b2e29b6caf373432a846b2f7766def167 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 12 Nov 2018 21:24:45 -0600 Subject: [PATCH] rtl8188eu: Replace VOID with void and PVOID with void * Signed-off-by: Larry Finger --- core/rtw_beamforming.c | 8 +- core/rtw_cmd.c | 2 +- core/rtw_efuse.c | 88 ++++++++++---------- core/rtw_mp.c | 8 +- core/rtw_odm.c | 6 +- core/rtw_security.c | 2 +- hal/HalEfuseMask8188E_USB.c | 4 +- hal/HalEfuseMask8188E_USB.h | 4 +- hal/btc/halbtcoutsrc.h | 150 +++++++++++++++++----------------- hal/hal_btcoex.c | 10 +-- hal/hal_btcoex_wifionly.c | 18 ++-- hal/hal_com.c | 14 ++-- hal/hal_com_phycfg.c | 44 +++++----- hal/hal_intf.c | 8 +- hal/hal_mp.c | 8 +- hal/hal_phy.c | 18 ++-- hal/hal_usb_led.c | 2 +- hal/phydm/phydm_hwconfig.c | 2 +- hal/phydm/phydm_rainfo.h | 2 +- hal/rtl8188e_cmd.c | 2 +- hal/rtl8188e_dm.c | 6 +- hal/rtl8188e_hal_init.c | 64 +++++++-------- hal/rtl8188e_rf6052.c | 2 +- hal/usb_halinit.c | 80 +++++++++--------- include/Hal8188EPhyCfg.h | 14 ++-- include/Hal8188FPhyCfg.h | 14 ++-- include/basic_types.h | 6 -- include/drv_types.h | 2 +- include/hal_btcoex_wifionly.h | 20 ++--- include/hal_com.h | 6 +- include/hal_com_led.h | 2 +- include/hal_com_phycfg.h | 22 ++--- include/hal_intf.h | 16 ++-- include/hal_phy.h | 18 ++-- include/rtl8188e_dm.h | 2 +- include/rtl8188e_hal.h | 2 +- include/rtw_beamforming.h | 2 +- include/rtw_bt_mp.h | 10 +-- include/rtw_cmd.h | 4 +- include/rtw_efuse.h | 2 +- include/rtw_mp.h | 2 +- include/rtw_odm.h | 6 +- include/rtw_security.h | 2 +- include/rtw_vht.h | 4 +- os_dep/ioctl_linux.c | 20 ++--- os_dep/ioctl_mp.c | 2 +- 46 files changed, 362 insertions(+), 368 deletions(-) diff --git a/core/rtw_beamforming.c b/core/rtw_beamforming.c index ca7140d..91a1fce 100644 --- a/core/rtw_beamforming.c +++ b/core/rtw_beamforming.c @@ -1981,7 +1981,7 @@ struct beamforming_entry *beamforming_get_entry_by_addr(struct mlme_priv *pmlmep return NULL; } -BEAMFORMING_CAP beamforming_get_entry_beam_cap_by_mac_id(PVOID pmlmepriv , u8 mac_id) +BEAMFORMING_CAP beamforming_get_entry_beam_cap_by_mac_id(void * pmlmepriv , u8 mac_id) { u8 i = 0; struct beamforming_info *pBeamInfo = GET_BEAMFORM_INFO((struct mlme_priv *)pmlmepriv); @@ -2785,7 +2785,7 @@ void beamforming_check_sounding_success(PADAPTER Adapter, BOOLEAN status) } } -void beamforming_enter(PADAPTER adapter, PVOID psta) +void beamforming_enter(PADAPTER adapter, void * psta) { u8 idx = 0xff; @@ -2982,7 +2982,7 @@ void beamforming_wk_hdl(_adapter *padapter, u8 type, u8 *pbuf) #if (BEAMFORMING_SUPPORT == 1) /*(BEAMFORMING_SUPPORT == 1)- for PHYDM beamfoming*/ switch (type) { case BEAMFORMING_CTRL_ENTER: { - struct sta_info *psta = (PVOID)pbuf; + struct sta_info *psta = (void *)pbuf; u16 staIdx = psta->mac_id; beamforming_enter(pDM_Odm, staIdx); @@ -2998,7 +2998,7 @@ void beamforming_wk_hdl(_adapter *padapter, u8 type, u8 *pbuf) #else /*(BEAMFORMING_SUPPORT == 0)- for drv beamfoming*/ switch (type) { case BEAMFORMING_CTRL_ENTER: - beamforming_enter(padapter, (PVOID)pbuf); + beamforming_enter(padapter, (void *)pbuf); break; case BEAMFORMING_CTRL_LEAVE: diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 303eac5..58ad027 100644 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -2170,7 +2170,7 @@ inline u8 rtw_set_country_cmd(_adapter *adapter, int flags, const char *country_ return _rtw_set_chplan_cmd(adapter, flags, RTW_CHPLAN_MAX, ent, swconfig); } -u8 rtw_led_blink_cmd(_adapter *padapter, PVOID pLed) +u8 rtw_led_blink_cmd(_adapter *padapter, void * pLed) { struct cmd_obj *pcmdobj; struct LedBlink_param *ledBlink_param; diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index 17b56ba..725c383 100644 --- a/core/rtw_efuse.c +++ b/core/rtw_efuse.c @@ -95,7 +95,7 @@ u8 rtw_efuse_mask_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) u8 ret = _SUCCESS; u16 mapLen = 0, i = 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); ret = rtw_efuse_map_read(padapter, addr, cnts , data); @@ -523,7 +523,7 @@ exit: return _SUCCESS; } -VOID hal_ReadEFuse_BT_logic_map( +void hal_ReadEFuse_BT_logic_map( PADAPTER padapter, u16 _offset, u16 _size_byte, @@ -1165,13 +1165,13 @@ u8 EfusePgPacketWrite_BT( #define EFUSE_CTRL REG_EFUSE_CTRL /* E-Fuse Control. */ /* ------------------------------------------------------------------------------ */ -static VOID efuse_PreUpdateAction( +static void efuse_PreUpdateAction( PADAPTER pAdapter, pu4Byte BackupRegs) { } -static VOID efuse_PostUpdateAction( +static void efuse_PostUpdateAction( PADAPTER pAdapter, pu4Byte BackupRegs) { @@ -1237,7 +1237,7 @@ Efuse_Write1ByteToFakeContent( * 11/17/2008 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -VOID +void Efuse_PowerSwitch( IN PADAPTER pAdapter, IN u8 bWrite, @@ -1246,7 +1246,7 @@ Efuse_PowerSwitch( pAdapter->hal_func.EfusePowerSwitch(pAdapter, bWrite, PwrState); } -VOID +void BTEfuse_PowerSwitch( IN PADAPTER pAdapter, IN u8 bWrite, @@ -1296,7 +1296,7 @@ Efuse_GetCurrentSize( * * Created by Roger, 2008.10.21. * */ -VOID +void ReadEFuseByte( PADAPTER Adapter, u16 _offset, @@ -1360,7 +1360,7 @@ ReadEFuseByte( * write addr must be after sec5. * */ -VOID +void efuse_ReadEFuse( PADAPTER Adapter, u8 efuseType, @@ -1369,7 +1369,7 @@ efuse_ReadEFuse( u8 *pbuf, IN BOOLEAN bPseudoTest ); -VOID +void efuse_ReadEFuse( PADAPTER Adapter, u8 efuseType, @@ -1382,7 +1382,7 @@ efuse_ReadEFuse( Adapter->hal_func.ReadEFuse(Adapter, efuseType, _offset, _size_byte, pbuf, bPseudoTest); } -VOID +void EFUSE_GetEfuseDefinition( IN PADAPTER pAdapter, IN u8 efuseType, @@ -1600,8 +1600,8 @@ u8 rtw_efuse_access(PADAPTER padapter, u8 bWrite, u16 start_addr, u16 cnts, u8 * u32 backupRegs[4] = {0}; - 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; @@ -1641,7 +1641,7 @@ u16 efuse_GetMaxSize(PADAPTER padapter) u16 max_size; max_size = 0; - 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; } /* ------------------------------------------------------------------------------ */ @@ -1659,7 +1659,7 @@ u16 efuse_bt_GetMaxSize(PADAPTER padapter) u16 max_size; max_size = 0; - EFUSE_GetEfuseDefinition(padapter, EFUSE_BT , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_size, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_BT , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_size, _FALSE); return max_size; } @@ -1676,7 +1676,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; @@ -1694,7 +1694,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; @@ -1729,7 +1729,7 @@ u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) PEFUSE_HAL pEfuseHal = &pHalData->EfuseHal; - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, _FALSE); EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, &efuse_max_available_len, _FALSE); if ((addr + cnts) > mapLen) @@ -1859,7 +1859,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; @@ -1940,13 +1940,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, @@ -1957,7 +1957,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); @@ -1982,7 +1982,7 @@ Efuse_ReadAllMap( * 11/12/2008 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -static VOID +static void efuse_ShadowRead1Byte( IN PADAPTER pAdapter, IN u16 Offset, @@ -1995,7 +1995,7 @@ efuse_ShadowRead1Byte( } /* EFUSE_ShadowRead1Byte */ /* ---------------Read Two Bytes */ -static VOID +static void efuse_ShadowRead2Byte( IN PADAPTER pAdapter, IN u16 Offset, @@ -2009,7 +2009,7 @@ efuse_ShadowRead2Byte( } /* EFUSE_ShadowRead2Byte */ /* ---------------Read Four Bytes */ -static VOID +static void efuse_ShadowRead4Byte( IN PADAPTER pAdapter, IN u16 Offset, @@ -2044,7 +2044,7 @@ efuse_ShadowRead4Byte( * *---------------------------------------------------------------------------*/ -static VOID +static void efuse_ShadowWrite1Byte( IN PADAPTER pAdapter, IN u16 Offset, @@ -2057,7 +2057,7 @@ efuse_ShadowWrite1Byte( } /* efuse_ShadowWrite1Byte */ /* ---------------Write Two Bytes */ -static VOID +static void efuse_ShadowWrite2Byte( IN PADAPTER pAdapter, IN u16 Offset, @@ -2073,7 +2073,7 @@ efuse_ShadowWrite2Byte( } /* efuse_ShadowWrite1Byte */ /* ---------------Write Four Bytes */ -static VOID +static void efuse_ShadowWrite4Byte( IN PADAPTER pAdapter, IN u16 Offset, @@ -2137,13 +2137,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, @@ -2166,30 +2166,30 @@ 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; i < EFUSE_MAX_BT_BANK; i++) - _rtw_memset((PVOID)&BTEfuseContent[i][0], EFUSE_MAX_HW_SIZE, 0xff); - _rtw_memset((PVOID)&BTEfuseInitMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); - _rtw_memset((PVOID)&BTEfuseModifiedMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); + _rtw_memset((void *)&BTEfuseContent[i][0], EFUSE_MAX_HW_SIZE, 0xff); + _rtw_memset((void *)&BTEfuseInitMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); + _rtw_memset((void *)&BTEfuseModifiedMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); for (i = 0; i < EFUSE_MAX_BT_BANK; i++) - _rtw_memset((PVOID)&fakeBTEfuseContent[i][0], 0xff, EFUSE_MAX_HW_SIZE); - _rtw_memset((PVOID)&fakeBTEfuseInitMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); - _rtw_memset((PVOID)&fakeBTEfuseModifiedMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); + _rtw_memset((void *)&fakeBTEfuseContent[i][0], 0xff, EFUSE_MAX_HW_SIZE); + _rtw_memset((void *)&fakeBTEfuseInitMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); + _rtw_memset((void *)&fakeBTEfuseModifiedMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); } #endif /* !RTW_HALMAC */ /* 11/16/2008 MH Add description. Get current efuse area enabled word!!. */ @@ -2281,7 +2281,7 @@ void EFUSE_ShadowMapUpdate( /* efuse default content is 0xFF */ _rtw_memset(efuse_map, 0xFF, EEPROM_MAX_SIZE); - EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, bPseudoTest); + EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, bPseudoTest); if (!mapLen) { RTW_WARN("%s: fail to get efuse size!\n", __func__); mapLen = EEPROM_MAX_SIZE; @@ -2298,7 +2298,7 @@ void EFUSE_ShadowMapUpdate( RTW_ERR("%s: fail to get efuse map!\n", __func__); } #else /* !RTW_HALMAC */ - EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, bPseudoTest); + EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, bPseudoTest); if (pHalData->bautoload_fail_flag == _TRUE) _rtw_memset(pHalData->efuse_eeprom_data, 0xFF, mapLen); @@ -2315,8 +2315,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); */ #endif /* !RTW_HALMAC */ rtw_dump_cur_efuse(pAdapter); diff --git a/core/rtw_mp.c b/core/rtw_mp.c index 31293b8..d383723 100644 --- a/core/rtw_mp.c +++ b/core/rtw_mp.c @@ -280,7 +280,7 @@ void free_mp_priv(struct mp_priv *pmp_priv) } -static VOID PHY_IQCalibrate_default( +static void PHY_IQCalibrate_default( IN PADAPTER pAdapter, IN BOOLEAN bReCovery ) @@ -288,14 +288,14 @@ static VOID PHY_IQCalibrate_default( RTW_INFO("%s\n", __func__); } -static VOID PHY_LCCalibrate_default( +static void PHY_LCCalibrate_default( IN PADAPTER pAdapter ) { RTW_INFO("%s\n", __func__); } -static VOID PHY_SetRFPathSwitch_default( +static void PHY_SetRFPathSwitch_default( IN PADAPTER pAdapter, IN BOOLEAN bMain ) @@ -396,7 +396,7 @@ MPT_InitializeAdapter( * 05/18/2007 MHC Add normal driver MPHalt code. * *---------------------------------------------------------------------------*/ -VOID +void MPT_DeInitAdapter( IN PADAPTER pAdapter ) diff --git a/core/rtw_odm.c b/core/rtw_odm.c index d8b3624..a1e3e1c 100644 --- a/core/rtw_odm.c +++ b/core/rtw_odm.c @@ -230,18 +230,18 @@ inline u8 rtw_odm_dfs_domain_unknown(_adapter *adapter) } #ifdef CONFIG_DFS_MASTER -inline VOID rtw_odm_radar_detect_reset(_adapter *adapter) +inline void rtw_odm_radar_detect_reset(_adapter *adapter) { phydm_radar_detect_reset(GET_ODM(adapter)); } -inline VOID rtw_odm_radar_detect_disable(_adapter *adapter) +inline void rtw_odm_radar_detect_disable(_adapter *adapter) { phydm_radar_detect_disable(GET_ODM(adapter)); } /* called after ch, bw is set */ -inline VOID rtw_odm_radar_detect_enable(_adapter *adapter) +inline void rtw_odm_radar_detect_enable(_adapter *adapter) { phydm_radar_detect_enable(GET_ODM(adapter)); } diff --git a/core/rtw_security.c b/core/rtw_security.c index c998c58..e7b435d 100644 --- a/core/rtw_security.c +++ b/core/rtw_security.c @@ -2799,7 +2799,7 @@ static int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac) } #ifdef CONFIG_TDLS -void wpa_tdls_generate_tpk(_adapter *padapter, PVOID sta) +void wpa_tdls_generate_tpk(_adapter *padapter, void * sta) { struct sta_info *psta = (struct sta_info *)sta; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; diff --git a/hal/HalEfuseMask8188E_USB.c b/hal/HalEfuseMask8188E_USB.c index 4cd772e..0072191 100644 --- a/hal/HalEfuseMask8188E_USB.c +++ b/hal/HalEfuseMask8188E_USB.c @@ -67,12 +67,12 @@ static u1Byte Array_MP_8188E_MUSB[] = { }; u2Byte -EFUSE_GetArrayLen_MP_8188E_MUSB(VOID) +EFUSE_GetArrayLen_MP_8188E_MUSB(void) { return sizeof(Array_MP_8188E_MUSB) / sizeof(u1Byte); } -VOID +void EFUSE_GetMaskArray_MP_8188E_MUSB( IN OUT pu1Byte Array ) diff --git a/hal/HalEfuseMask8188E_USB.h b/hal/HalEfuseMask8188E_USB.h index 8b70454..d43c9e1 100644 --- a/hal/HalEfuseMask8188E_USB.h +++ b/hal/HalEfuseMask8188E_USB.h @@ -26,9 +26,9 @@ u2Byte -EFUSE_GetArrayLen_MP_8188E_MUSB(VOID); +EFUSE_GetArrayLen_MP_8188E_MUSB(void); -VOID +void EFUSE_GetMaskArray_MP_8188E_MUSB( IN OUT pu1Byte Array ); diff --git a/hal/btc/halbtcoutsrc.h b/hal/btc/halbtcoutsrc.h index 5a276ef..d038e70 100644 --- a/hal/btc/halbtcoutsrc.h +++ b/hal/btc/halbtcoutsrc.h @@ -506,66 +506,66 @@ extern BTC_OFFLOAD gl_coex_offload; typedef u1Byte (*BFP_BTC_R1)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u4Byte RegAddr ); typedef u2Byte (*BFP_BTC_R2)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u4Byte RegAddr ); typedef u4Byte (*BFP_BTC_R4)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u4Byte RegAddr ); -typedef VOID +typedef void (*BFP_BTC_W1)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u4Byte RegAddr, IN u1Byte Data ); -typedef VOID +typedef void (*BFP_BTC_W1_BIT_MASK)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u4Byte regAddr, IN u1Byte bitMask, IN u1Byte data1b ); -typedef VOID +typedef void (*BFP_BTC_W2)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u4Byte RegAddr, IN u2Byte Data ); -typedef VOID +typedef void (*BFP_BTC_W4)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u4Byte RegAddr, IN u4Byte Data ); -typedef VOID +typedef void (*BFP_BTC_LOCAL_REG_W1)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u4Byte RegAddr, IN u1Byte Data ); -typedef VOID +typedef void (*BFP_BTC_SET_BB_REG)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u4Byte RegAddr, IN u4Byte BitMask, IN u4Byte Data ); typedef u4Byte (*BFP_BTC_GET_BB_REG)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u4Byte RegAddr, IN u4Byte BitMask ); -typedef VOID +typedef void (*BFP_BTC_SET_RF_REG)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u1Byte eRFPath, IN u4Byte RegAddr, IN u4Byte BitMask, @@ -573,14 +573,14 @@ typedef VOID ); typedef u4Byte (*BFP_BTC_GET_RF_REG)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u1Byte eRFPath, IN u4Byte RegAddr, IN u4Byte BitMask ); -typedef VOID +typedef void (*BFP_BTC_FILL_H2C)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u1Byte elementId, IN u4Byte cmdLen, IN pu1Byte pCmdBuffer @@ -588,52 +588,52 @@ typedef VOID typedef BOOLEAN (*BFP_BTC_GET)( - IN PVOID pBtCoexist, + IN void * pBtCoexist, IN u1Byte getType, - OUT PVOID pOutBuf + OUT void * pOutBuf ); typedef BOOLEAN (*BFP_BTC_SET)( - IN PVOID pBtCoexist, + IN void * pBtCoexist, IN u1Byte setType, - OUT PVOID pInBuf + OUT void * pInBuf ); typedef u2Byte (*BFP_BTC_SET_BT_REG)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u1Byte regType, IN u4Byte offset, IN u4Byte value ); typedef BOOLEAN (*BFP_BTC_SET_BT_ANT_DETECTION)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u1Byte txTime, IN u1Byte btChnl ); typedef BOOLEAN (*BFP_BTC_SET_BT_TRX_MASK)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u1Byte bt_trx_mask ); typedef u4Byte (*BFP_BTC_GET_BT_REG)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u1Byte regType, IN u4Byte offset ); -typedef VOID +typedef void (*BFP_BTC_DISP_DBG_MSG)( - IN PVOID pBtCoexist, + IN void * pBtCoexist, IN u1Byte dispType ); typedef COL_H2C_STATUS (*BFP_BTC_COEX_H2C_PROCESS)( - IN PVOID pBtCoexist, + IN void * pBtCoexist, IN u1Byte opcode, IN u1Byte opcode_ver, IN pu1Byte ph2c_par, @@ -642,52 +642,52 @@ typedef COL_H2C_STATUS typedef u4Byte (*BFP_BTC_GET_BT_COEX_SUPPORTED_FEATURE)( - IN PVOID pBtcContext + IN void * pBtcContext ); typedef u4Byte (*BFP_BTC_GET_BT_COEX_SUPPORTED_VERSION)( - IN PVOID pBtcContext + IN void * pBtcContext ); typedef u4Byte (*BFP_BTC_GET_PHYDM_VERSION)( - IN PVOID pBtcContext + IN void * pBtcContext ); -typedef VOID +typedef void (*BTC_PHYDM_MODIFY_RA_PCR_THRESHLOD)( - IN PVOID pDM_Odm, + IN void * pDM_Odm, IN u1Byte RA_offset_direction, IN u1Byte RA_threshold_offset ); typedef u4Byte (*BTC_PHYDM_CMNINFOQUERY)( - IN PVOID pDM_Odm, + IN void * pDM_Odm, IN u1Byte info_type ); typedef u1Byte (*BFP_BTC_GET_ANT_DET_VAL_FROM_BT)( - IN PVOID pBtcContext + IN void * pBtcContext ); typedef u1Byte (*BFP_BTC_GET_BLE_SCAN_TYPE_FROM_BT)( - IN PVOID pBtcContext + IN void * pBtcContext ); typedef u4Byte (*BFP_BTC_GET_BLE_SCAN_PARA_FROM_BT)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u1Byte scanType ); typedef BOOLEAN (*BFP_BTC_GET_BT_AFH_MAP_FROM_BT)( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u1Byte mapType, OUT pu1Byte afhMap ); @@ -776,13 +776,13 @@ struct btc_statistics { struct btc_coexist { BOOLEAN bBinded; /*make sure only one adapter can bind the data context*/ - PVOID Adapter; /*default adapter*/ + void * Adapter; /*default adapter*/ struct btc_board_info board_info; struct btc_bt_info bt_info; /*some bt info referenced by non-bt module*/ struct btc_stack_info stack_info; struct btc_bt_link_info bt_link_info; BTC_CHIP_INTERFACE chip_interface; - PVOID odm_priv; + void * odm_priv; BOOLEAN initilized; BOOLEAN stop_coex_dm; @@ -841,101 +841,101 @@ extern struct btc_coexist GLBtCoexist; BOOLEAN EXhalbtcoutsrc_InitlizeVariables( - IN PVOID Adapter + IN void * Adapter ); -VOID +void EXhalbtcoutsrc_PowerOnSetting( IN PBTC_COEXIST pBtCoexist ); -VOID +void EXhalbtcoutsrc_PreLoadFirmware( IN PBTC_COEXIST pBtCoexist ); -VOID +void EXhalbtcoutsrc_InitHwConfig( IN PBTC_COEXIST pBtCoexist, IN BOOLEAN bWifiOnly ); -VOID +void EXhalbtcoutsrc_InitCoexDm( IN PBTC_COEXIST pBtCoexist ); -VOID +void EXhalbtcoutsrc_IpsNotify( IN PBTC_COEXIST pBtCoexist, IN u1Byte type ); -VOID +void EXhalbtcoutsrc_LpsNotify( IN PBTC_COEXIST pBtCoexist, IN u1Byte type ); -VOID +void EXhalbtcoutsrc_ScanNotify( IN PBTC_COEXIST pBtCoexist, IN u1Byte type ); -VOID +void EXhalbtcoutsrc_SetAntennaPathNotify( IN PBTC_COEXIST pBtCoexist, IN u1Byte type ); -VOID +void EXhalbtcoutsrc_ConnectNotify( IN PBTC_COEXIST pBtCoexist, IN u1Byte action ); -VOID +void EXhalbtcoutsrc_MediaStatusNotify( IN PBTC_COEXIST pBtCoexist, IN RT_MEDIA_STATUS mediaStatus ); -VOID +void EXhalbtcoutsrc_SpecificPacketNotify( IN PBTC_COEXIST pBtCoexist, IN u1Byte pktType ); -VOID +void EXhalbtcoutsrc_BtInfoNotify( IN PBTC_COEXIST pBtCoexist, IN pu1Byte tmpBuf, IN u1Byte length ); -VOID +void EXhalbtcoutsrc_RfStatusNotify( IN PBTC_COEXIST pBtCoexist, IN u1Byte type ); -VOID +void EXhalbtcoutsrc_StackOperationNotify( IN PBTC_COEXIST pBtCoexist, IN u1Byte type ); -VOID +void EXhalbtcoutsrc_HaltNotify( IN PBTC_COEXIST pBtCoexist ); -VOID +void EXhalbtcoutsrc_PnpNotify( IN PBTC_COEXIST pBtCoexist, IN u1Byte pnpState ); -VOID +void EXhalbtcoutsrc_CoexDmSwitch( IN PBTC_COEXIST pBtCoexist ); -VOID +void EXhalbtcoutsrc_Periodical( IN PBTC_COEXIST pBtCoexist ); -VOID +void EXhalbtcoutsrc_DbgControl( IN PBTC_COEXIST pBtCoexist, IN u1Byte opCode, IN u1Byte opLen, IN pu1Byte pData ); -VOID +void EXhalbtcoutsrc_AntennaDetection( IN PBTC_COEXIST pBtCoexist, IN u4Byte centFreq, @@ -943,41 +943,41 @@ EXhalbtcoutsrc_AntennaDetection( IN u4Byte span, IN u4Byte seconds ); -VOID +void EXhalbtcoutsrc_StackUpdateProfileInfo( - VOID + void ); -VOID +void EXhalbtcoutsrc_SetHciVersion( IN u2Byte hciVersion ); -VOID +void EXhalbtcoutsrc_SetBtPatchVersion( IN u2Byte btHciVersion, IN u2Byte btPatchVersion ); -VOID +void EXhalbtcoutsrc_UpdateMinBtRssi( IN s1Byte btRssi ); -VOID +void EXhalbtcoutsrc_SetChipType( IN u1Byte chipType ); -VOID +void EXhalbtcoutsrc_SetAntNum( IN u1Byte type, IN u1Byte antNum ); -VOID +void EXhalbtcoutsrc_SetSingleAntPath( IN u1Byte singleAntPath ); -VOID +void EXhalbtcoutsrc_DisplayBtCoexInfo( IN PBTC_COEXIST pBtCoexist ); -VOID +void EXhalbtcoutsrc_DisplayAntDetection( IN PBTC_COEXIST pBtCoexist ); diff --git a/hal/hal_btcoex.c b/hal/hal_btcoex.c index 595cd82..f21c040 100644 --- a/hal/hal_btcoex.c +++ b/hal/hal_btcoex.c @@ -1584,7 +1584,7 @@ u8 halbtcoutsrc_SetBtAntDetection(void *pBtcContext, u8 txTime, u8 btChnl) BOOLEAN halbtcoutsrc_SetBtTRXMASK( - IN PVOID pBtcContext, + IN void * pBtcContext, IN u1Byte bt_trx_mask ) { @@ -1728,7 +1728,7 @@ COL_H2C_STATUS halbtcoutsrc_CoexH2cProcess(void *pBtCoexist, gl_coex_offload.h2c_record[opcode].count++; gl_coex_offload.h2c_record[opcode].h2c_len = col_h2c_len; - _rtw_memmove((PVOID)&gl_coex_offload.h2c_record[opcode].h2c_buf[0], (PVOID)pcol_h2c, col_h2c_len); + _rtw_memmove((void *)&gl_coex_offload.h2c_record[opcode].h2c_buf[0], (void *)pcol_h2c, col_h2c_len); h2c_status = halbtcoutsrc_send_h2c(Adapter, pcol_h2c, col_h2c_len); @@ -1911,7 +1911,7 @@ u8 EXhalbtcoutsrc_BindBtCoexWithAdapter(void *padapter) pBtCoexist->statistics.cnt_bind++; pBtCoexist->Adapter = padapter; - pBtCoexist->odm_priv = (PVOID)&(pHalData->odmpriv); + pBtCoexist->odm_priv = (void *)&(pHalData->odmpriv); pBtCoexist->stack_info.profile_notified = _FALSE; @@ -2628,7 +2628,7 @@ void EXhalbtcoutsrc_bt_info_notify(PBTC_COEXIST pBtCoexist, u8 *tmpBuf, u8 lengt /* halbtcoutsrc_NormalLowPower(pBtCoexist); */ } -VOID +void EXhalbtcoutsrc_RfStatusNotify( IN PBTC_COEXIST pBtCoexist, IN u1Byte type @@ -3682,7 +3682,7 @@ hal_btcoex_ParseAntIsolationConfigFile( RTW_INFO("Fail to parse parameters , format error!\n"); break; } - _rtw_memset((PVOID)param_value_string , 0 , 10); + _rtw_memset((void *)param_value_string , 0 , 10); if (!ParseQualifiedString(szLine , &i , param_value_string , '"' , '"')) { RTW_INFO("Fail to parse parameters\n"); return _FAIL; diff --git a/hal/hal_btcoex_wifionly.c b/hal/hal_btcoex_wifionly.c index 8d08a8a..55b996a 100644 --- a/hal/hal_btcoex_wifionly.c +++ b/hal/hal_btcoex_wifionly.c @@ -3,7 +3,7 @@ static struct wifi_only_cfg GLBtCoexistWifiOnly; -void halwifionly_write1byte(PVOID pwifionlyContext, u32 RegAddr, u8 Data) +void halwifionly_write1byte(void * pwifionlyContext, u32 RegAddr, u8 Data) { struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext; PADAPTER Adapter = pwifionlycfg->Adapter; @@ -11,7 +11,7 @@ void halwifionly_write1byte(PVOID pwifionlyContext, u32 RegAddr, u8 Data) rtw_write8(Adapter, RegAddr, Data); } -void halwifionly_write2byte(PVOID pwifionlyContext, u32 RegAddr, u16 Data) +void halwifionly_write2byte(void * pwifionlyContext, u32 RegAddr, u16 Data) { struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext; PADAPTER Adapter = pwifionlycfg->Adapter; @@ -19,7 +19,7 @@ void halwifionly_write2byte(PVOID pwifionlyContext, u32 RegAddr, u16 Data) rtw_write16(Adapter, RegAddr, Data); } -void halwifionly_write4byte(PVOID pwifionlyContext, u32 RegAddr, u32 Data) +void halwifionly_write4byte(void * pwifionlyContext, u32 RegAddr, u32 Data) { struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext; PADAPTER Adapter = pwifionlycfg->Adapter; @@ -27,7 +27,7 @@ void halwifionly_write4byte(PVOID pwifionlyContext, u32 RegAddr, u32 Data) rtw_write32(Adapter, RegAddr, Data); } -u8 halwifionly_read1byte(PVOID pwifionlyContext, u32 RegAddr) +u8 halwifionly_read1byte(void * pwifionlyContext, u32 RegAddr) { struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext; PADAPTER Adapter = pwifionlycfg->Adapter; @@ -35,7 +35,7 @@ u8 halwifionly_read1byte(PVOID pwifionlyContext, u32 RegAddr) return rtw_read8(Adapter, RegAddr); } -u16 halwifionly_read2byte(PVOID pwifionlyContext, u32 RegAddr) +u16 halwifionly_read2byte(void * pwifionlyContext, u32 RegAddr) { struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext; PADAPTER Adapter = pwifionlycfg->Adapter; @@ -43,7 +43,7 @@ u16 halwifionly_read2byte(PVOID pwifionlyContext, u32 RegAddr) return rtw_read16(Adapter, RegAddr); } -u32 halwifionly_read4byte(PVOID pwifionlyContext, u32 RegAddr) +u32 halwifionly_read4byte(void * pwifionlyContext, u32 RegAddr) { struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext; PADAPTER Adapter = pwifionlycfg->Adapter; @@ -51,7 +51,7 @@ u32 halwifionly_read4byte(PVOID pwifionlyContext, u32 RegAddr) return rtw_read32(Adapter, RegAddr); } -void halwifionly_bitmaskwrite1byte(PVOID pwifionlyContext, u32 regAddr, u8 bitMask, u8 data) +void halwifionly_bitmaskwrite1byte(void * pwifionlyContext, u32 regAddr, u8 bitMask, u8 data) { u8 originalValue, bitShift = 0; u8 i; @@ -71,7 +71,7 @@ void halwifionly_bitmaskwrite1byte(PVOID pwifionlyContext, u32 regAddr, u8 bitMa rtw_write8(Adapter, regAddr, data); } -void halwifionly_phy_set_rf_reg(PVOID pwifionlyContext, u8 eRFPath, u32 RegAddr, u32 BitMask, u32 Data) +void halwifionly_phy_set_rf_reg(void * pwifionlyContext, u8 eRFPath, u32 RegAddr, u32 BitMask, u32 Data) { struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext; PADAPTER Adapter = pwifionlycfg->Adapter; @@ -79,7 +79,7 @@ void halwifionly_phy_set_rf_reg(PVOID pwifionlyContext, u8 eRFPath, u32 RegAddr, phy_set_rf_reg(Adapter, eRFPath, RegAddr, BitMask, Data); } -void halwifionly_phy_set_bb_reg(PVOID pwifionlyContext, u32 RegAddr, u32 BitMask, u32 Data) +void halwifionly_phy_set_bb_reg(void * pwifionlyContext, u32 RegAddr, u32 BitMask, u32 Data) { struct wifi_only_cfg *pwifionlycfg = (struct wifi_only_cfg *)pwifionlyContext; PADAPTER Adapter = pwifionlycfg->Adapter; diff --git a/hal/hal_com.c b/hal/hal_com.c index d55c7e9..78fd79c 100644 --- a/hal/hal_com.c +++ b/hal/hal_com.c @@ -939,7 +939,7 @@ void HalSetBrateCfg( } } -static VOID +static void _OneOutPipeMapping( IN PADAPTER pAdapter ) @@ -957,7 +957,7 @@ _OneOutPipeMapping( pdvobjpriv->Queue2Pipe[7] = pdvobjpriv->RtOutPipe[0];/* TXCMD */ } -static VOID +static void _TwoOutPipeMapping( IN PADAPTER pAdapter, IN BOOLEAN bWIFICfg @@ -1002,7 +1002,7 @@ _TwoOutPipeMapping( } -static VOID _ThreeOutPipeMapping( +static void _ThreeOutPipeMapping( IN PADAPTER pAdapter, IN BOOLEAN bWIFICfg ) @@ -1044,7 +1044,7 @@ static VOID _ThreeOutPipeMapping( } } -static VOID _FourOutPipeMapping( +static void _FourOutPipeMapping( IN PADAPTER pAdapter, IN BOOLEAN bWIFICfg ) @@ -8398,7 +8398,7 @@ GetHalDefVar(_adapter *adapter, HAL_DEF_VARIABLE variable, void *value) void SetHalODMVar( PADAPTER Adapter, HAL_ODM_VARIABLE eVariable, - PVOID pValue1, + void * pValue1, BOOLEAN bSet) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -8558,8 +8558,8 @@ void SetHalODMVar( void GetHalODMVar( PADAPTER Adapter, HAL_ODM_VARIABLE eVariable, - PVOID pValue1, - PVOID pValue2) + void * pValue1, + void * pValue2) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); struct PHY_DM_STRUCT *podmpriv = &pHalData->odmpriv; diff --git a/hal/hal_com_phycfg.c b/hal/hal_com_phycfg.c index 19879b6..4afc22e 100644 --- a/hal/hal_com_phycfg.c +++ b/hal/hal_com_phycfg.c @@ -1168,7 +1168,7 @@ PHY_GetTxPowerByRateBase( return value; } -static VOID +static void phy_SetTxPowerByRateBase( IN PADAPTER Adapter, IN u8 Band, @@ -1291,7 +1291,7 @@ static void phy_txpwr_by_rate_chk_for_path_dup(_adapter *adapter) } } -static VOID +static void phy_StoreTxPowerByRateBase( IN PADAPTER pAdapter ) @@ -1343,7 +1343,7 @@ phy_StoreTxPowerByRateBase( } } -VOID +void PHY_GetRateValuesOfTxPowerByRate( IN PADAPTER pAdapter, IN u32 RegAddr, @@ -1781,7 +1781,7 @@ PHY_StoreTxPowerByRateNew( } } -VOID +void PHY_InitTxPowerByRate( IN PADAPTER pAdapter ) @@ -1796,7 +1796,7 @@ PHY_InitTxPowerByRate( pHalData->TxPwrByRateOffset[band][rfPath][TxNum][rate] = 0; } -VOID +void phy_store_tx_power_by_rate( IN PADAPTER pAdapter, IN u32 Band, @@ -1817,7 +1817,7 @@ phy_store_tx_power_by_rate( } -static VOID +static void phy_ConvertTxPowerByRateInDbmToRelativeValues( IN PADAPTER pAdapter ) @@ -1911,7 +1911,7 @@ phy_ConvertTxPowerByRateInDbmToRelativeValues( * This function must be called if the value in the PHY_REG_PG.txt(or header) * is exact dBm values */ -VOID +void PHY_TxPowerByRateConfiguration( IN PADAPTER pAdapter ) @@ -1923,7 +1923,7 @@ PHY_TxPowerByRateConfiguration( phy_ConvertTxPowerByRateInDbmToRelativeValues(pAdapter); } -VOID +void phy_set_tx_power_index_by_rate_section( IN PADAPTER pAdapter, IN u8 RFPath, @@ -2521,7 +2521,7 @@ PHY_GetTxPowerByRateOriginal( #endif -VOID +void PHY_SetTxPowerByRate( IN PADAPTER pAdapter, IN u8 Band, @@ -2554,7 +2554,7 @@ PHY_SetTxPowerByRate( pHalData->TxPwrByRateOffset[Band][RFPath][TxNum][rateIndex] = Value; } -VOID +void phy_set_tx_power_level_by_path( IN PADAPTER Adapter, IN u8 channel, @@ -2581,7 +2581,7 @@ phy_set_tx_power_level_by_path( #define DBG_TX_POWER_IDX 0 #endif -VOID +void PHY_SetTxPowerIndexByRateArray( IN PADAPTER pAdapter, IN u8 RFPath, @@ -3190,7 +3190,7 @@ static void phy_CrossReferenceHTAndVHTTxPowerLimit(PADAPTER pAdapter) pHalData->tx_pwr_lmt_5g_20_40_ref |= TX_PWR_LMT_REF_VHT_FROM_HT; } -VOID +void PHY_ConvertTxPowerLimitToPowerIndex( IN PADAPTER Adapter ) @@ -3234,7 +3234,7 @@ PHY_ConvertTxPowerLimitToPowerIndex( /* * PHY_InitTxPowerLimit - Set all hal_data.TxPwrLimit_2_4G, TxPwrLimit_5G array to MAX_POWER_INDEX */ -VOID +void PHY_InitTxPowerLimit( IN PADAPTER Adapter ) @@ -3260,7 +3260,7 @@ PHY_InitTxPowerLimit( /* * phy_set_tx_power_limit - Parsing TX power limit from phydm array, called by odm_ConfigBB_TXPWR_LMT_XXX in phydm */ -VOID +void phy_set_tx_power_limit( IN struct PHY_DM_STRUCT *pDM_Odm, IN u8 *Regulation, @@ -3403,7 +3403,7 @@ phy_get_tx_power_index( return rtw_hal_get_tx_power_index(pAdapter, RFPath, Rate, BandWidth, Channel, NULL); } -VOID +void PHY_SetTxPowerIndex( IN PADAPTER pAdapter, IN u32 PowerIndex, @@ -4855,12 +4855,12 @@ static int phy_ParsePowerLimitTableFile( if (loadingStage == 0) { for (forCnt = 0; forCnt < TXPWR_LMT_MAX_REGULATION_NUM; ++forCnt) - _rtw_memset((PVOID) regulation[forCnt], 0, 10); - _rtw_memset((PVOID) band, 0, 10); - _rtw_memset((PVOID) bandwidth, 0, 10); - _rtw_memset((PVOID) rateSection, 0, 10); - _rtw_memset((PVOID) rfPath, 0, 10); - _rtw_memset((PVOID) colNumBuf, 0, 10); + _rtw_memset((void *) regulation[forCnt], 0, 10); + _rtw_memset((void *) band, 0, 10); + _rtw_memset((void *) bandwidth, 0, 10); + _rtw_memset((void *) rateSection, 0, 10); + _rtw_memset((void *) rfPath, 0, 10); + _rtw_memset((void *) colNumBuf, 0, 10); if (szLine[0] != '#' || szLine[1] != '#') continue; @@ -4991,7 +4991,7 @@ static int phy_ParsePowerLimitTableFile( /* load the power limit value */ cnt = 0; fraction = 0; - _rtw_memset((PVOID) powerLimit, 0, 10); + _rtw_memset((void *) powerLimit, 0, 10); while ((szLine[i] >= '0' && szLine[i] <= '9') || szLine[i] == '.') { if (szLine[i] == '.') { if ((szLine[i + 1] >= '0' && szLine[i + 1] <= '9')) { diff --git a/hal/hal_intf.c b/hal/hal_intf.c index 35d07c8..abb5fcf 100644 --- a/hal/hal_intf.c +++ b/hal/hal_intf.c @@ -268,20 +268,20 @@ void rtw_hal_get_hwreg(_adapter *padapter, u8 variable, u8 *val) padapter->hal_func.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) { return padapter->hal_func.SetHalDefVarHandler(padapter, eVariable, pValue); } -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) { return padapter->hal_func.get_hal_def_var_handler(padapter, eVariable, pValue); } -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) { padapter->hal_func.SetHalODMVarHandler(padapter, eVariable, pValue1, bSet); } -void rtw_hal_get_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1, PVOID pValue2) +void rtw_hal_get_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1, void * pValue2) { padapter->hal_func.GetHalODMVarHandler(padapter, eVariable, pValue1, pValue2); } diff --git a/hal/hal_mp.c b/hal/hal_mp.c index 9a9be42..a6b6421 100644 --- a/hal/hal_mp.c +++ b/hal/hal_mp.c @@ -757,7 +757,7 @@ u32 hal_mpt_query_phytxok(PADAPTER pAdapter) } -static VOID mpt_StopCckContTx( +static void mpt_StopCckContTx( PADAPTER pAdapter ) { @@ -781,7 +781,7 @@ static VOID mpt_StopCckContTx( } /* mpt_StopCckContTx */ -static VOID mpt_StopOfdmContTx( +static void mpt_StopOfdmContTx( PADAPTER pAdapter ) { @@ -806,7 +806,7 @@ static VOID mpt_StopOfdmContTx( } /* mpt_StopOfdmContTx */ -static VOID mpt_StartCckContTx( +static void mpt_StartCckContTx( PADAPTER pAdapter ) { @@ -843,7 +843,7 @@ static VOID mpt_StartCckContTx( } /* mpt_StartCckContTx */ -static VOID mpt_StartOfdmContTx( +static void mpt_StartOfdmContTx( PADAPTER pAdapter ) { diff --git a/hal/hal_phy.c b/hal/hal_phy.c index 5c87dbb..0000c8d 100644 --- a/hal/hal_phy.c +++ b/hal/hal_phy.c @@ -93,7 +93,7 @@ PHY_RFShadowRead( } /* PHY_RFShadowRead */ -VOID +void PHY_RFShadowWrite( IN PADAPTER Adapter, IN u8 eRFPath, @@ -127,7 +127,7 @@ PHY_RFShadowCompare( } /* PHY_RFShadowCompare */ -VOID +void PHY_RFShadowRecorver( IN PADAPTER Adapter, IN u8 eRFPath, @@ -145,7 +145,7 @@ PHY_RFShadowRecorver( } /* PHY_RFShadowRecorver */ -VOID +void PHY_RFShadowCompareAll( IN PADAPTER Adapter) { @@ -160,7 +160,7 @@ PHY_RFShadowCompareAll( } /* PHY_RFShadowCompareAll */ -VOID +void PHY_RFShadowRecorverAll( IN PADAPTER Adapter) { @@ -175,7 +175,7 @@ PHY_RFShadowRecorverAll( } /* PHY_RFShadowRecorverAll */ -VOID +void PHY_RFShadowCompareFlagSet( IN PADAPTER Adapter, IN u8 eRFPath, @@ -188,7 +188,7 @@ PHY_RFShadowCompareFlagSet( } /* PHY_RFShadowCompareFlagSet */ -VOID +void PHY_RFShadowRecorverFlagSet( IN PADAPTER Adapter, IN u8 eRFPath, @@ -201,7 +201,7 @@ PHY_RFShadowRecorverFlagSet( } /* PHY_RFShadowRecorverFlagSet */ -VOID +void PHY_RFShadowCompareFlagSetAll( IN PADAPTER Adapter) { @@ -221,7 +221,7 @@ PHY_RFShadowCompareFlagSetAll( } /* PHY_RFShadowCompareFlagSetAll */ -VOID +void PHY_RFShadowRecorverFlagSetAll( IN PADAPTER Adapter) { @@ -240,7 +240,7 @@ PHY_RFShadowRecorverFlagSetAll( } /* PHY_RFShadowCompareFlagSetAll */ -VOID +void PHY_RFShadowRefresh( IN PADAPTER Adapter) { diff --git a/hal/hal_usb_led.c b/hal/hal_usb_led.c index 2d3d57d..5f206a1 100644 --- a/hal/hal_usb_led.c +++ b/hal/hal_usb_led.c @@ -1823,7 +1823,7 @@ void BlinkTimerCallback(struct timer_list *t) } #ifdef CONFIG_LED_HANDLED_BY_CMD_THREAD - rtw_led_blink_cmd(padapter, (PVOID)pLed); + rtw_led_blink_cmd(padapter, (void *)pLed); #else _set_workitem(&(pLed->BlinkWorkItem)); #endif diff --git a/hal/phydm/phydm_hwconfig.c b/hal/phydm/phydm_hwconfig.c index 4352d37..aaed496 100644 --- a/hal/phydm/phydm_hwconfig.c +++ b/hal/phydm/phydm_hwconfig.c @@ -1531,7 +1531,7 @@ phydm_query_is_mu_api( } -VOID +void phydm_rx_statistic_cal( struct PHY_DM_STRUCT *p_phydm, u8 *p_phy_status, diff --git a/hal/phydm/phydm_rainfo.h b/hal/phydm/phydm_rainfo.h index aa97436..47f788b 100644 --- a/hal/phydm/phydm_rainfo.h +++ b/hal/phydm/phydm_rainfo.h @@ -469,7 +469,7 @@ phydm_update_pwr_track( void odm_rate_adaptive_state_ap_init( - void *PADAPTER_VOID, + void *PADAPTER_void, struct sta_info *p_entry ); diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c index 7ebffb8..3673ad1 100644 --- a/hal/rtl8188e_cmd.c +++ b/hal/rtl8188e_cmd.c @@ -528,7 +528,7 @@ static void rtl8188e_set_FwRsvdPage_cmd(PADAPTER padapter, PRSVDPAGE_LOC rsvdpag /* To check if reserved page content is destroyed by beacon beacuse beacon is too large. * 2010.06.23. Added by tynli. */ -VOID +void CheckFwRsvdPageContent( IN PADAPTER Adapter ) diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c index 5aed347..674a50a 100644 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -37,14 +37,14 @@ * ************************************************************ */ -static VOID +static void dm_CheckProtection( IN PADAPTER Adapter ) { } -static VOID +static void dm_CheckStatistics( IN PADAPTER Adapter ) @@ -207,7 +207,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 58bc675..8c185ad 100644 --- a/hal/rtl8188e_hal_init.c +++ b/hal/rtl8188e_hal_init.c @@ -96,7 +96,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; @@ -487,7 +487,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter, int data_len) #endif /* defined(CONFIG_IOL) */ -static VOID +static void _FWDownloadEnable_8188E( IN PADAPTER padapter, IN BOOLEAN enable @@ -517,7 +517,7 @@ _FWDownloadEnable_8188E( static int _BlockWrite( IN PADAPTER padapter, - IN PVOID buffer, + IN void * buffer, IN u32 buffSize ) { @@ -586,7 +586,7 @@ static int _PageWrite( IN PADAPTER padapter, IN u32 page, - IN PVOID buffer, + IN void * buffer, IN u32 size ) { @@ -599,7 +599,7 @@ _PageWrite( return _BlockWrite(padapter, buffer, size); } -static VOID +static void _FillDummy( u8 *pFwBuf, u32 *pFwLen @@ -621,7 +621,7 @@ _FillDummy( static int _WriteFW( IN PADAPTER padapter, - IN PVOID buffer, + IN void * buffer, IN u32 size ) { @@ -992,7 +992,7 @@ hal_EfusePgPacketWriteData( IN PPGPKT_STRUCT pTargetPkt, IN BOOLEAN bPseudoTest); -static VOID +static void hal_EfusePowerSwitch_RTL8188E( IN PADAPTER pAdapter, IN u8 bWrite, @@ -1040,7 +1040,7 @@ hal_EfusePowerSwitch_RTL8188E( } } -static VOID +static void rtl8188e_EfusePowerSwitch( IN PADAPTER pAdapter, IN u8 bWrite, @@ -1088,7 +1088,7 @@ static bool efuse_read_phymap( } -static VOID +static void Hal_EfuseReadEFuse88E( PADAPTER Adapter, u16 _offset, @@ -1296,7 +1296,7 @@ Hal_EfuseSwitchToBank( -static VOID +static void ReadEFuseByIC( PADAPTER Adapter, u8 efuseType, @@ -1352,7 +1352,7 @@ exit: return; } -static VOID +static void ReadEFuse_Pseudo( PADAPTER Adapter, u8 efuseType, @@ -1365,7 +1365,7 @@ ReadEFuse_Pseudo( Hal_EfuseReadEFuse88E(Adapter, _offset, _size_byte, pbuf, bPseudoTest); } -static VOID +static void rtl8188e_ReadEFuse( PADAPTER Adapter, u8 efuseType, @@ -1387,7 +1387,7 @@ Hal_EFUSEGetEfuseDefinition88E( IN PADAPTER pAdapter, IN u1Byte efuseType, IN u1Byte type, - OUT PVOID pOut + OUT void * pOut ) { switch (type) { @@ -1447,7 +1447,7 @@ Hal_EFUSEGetEfuseDefinition_Pseudo88E( IN PADAPTER pAdapter, IN u8 efuseType, IN u8 type, - OUT PVOID pOut + OUT void * pOut ) { switch (type) { @@ -1503,7 +1503,7 @@ Hal_EFUSEGetEfuseDefinition_Pseudo88E( } -static VOID +static void rtl8188e_EFUSE_GetEfuseDefinition( IN PADAPTER pAdapter, IN u8 efuseType, @@ -1530,7 +1530,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); if (!(word_en & BIT0)) { tmpaddr = start_addr; @@ -1722,15 +1722,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); /* */ @@ -1856,7 +1856,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 */ @@ -1891,7 +1891,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) { pg_header = ((pTargetPkt->offset & 0x07) << 5) | 0x0F; @@ -2128,8 +2128,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) { if (bPseudoTest) @@ -2222,9 +2222,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) { @@ -2234,7 +2234,7 @@ hal_EfusePgCheckAvailableAddr( return _TRUE; } -static VOID +static void hal_EfuseConstructPGPkt( IN u8 offset, IN u8 word_en, @@ -2243,7 +2243,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); @@ -2765,7 +2765,7 @@ Hal_ReadTxPowerInfo88E( } -VOID +void Hal_EfuseParseXtal_8188E( IN PADAPTER pAdapter, IN u8 *hwinfo, @@ -2783,7 +2783,7 @@ Hal_EfuseParseXtal_8188E( RTW_INFO("crystal_cap: 0x%2x\n", pHalData->crystal_cap); } -VOID +void Hal_ReadPAType_8188E( IN PADAPTER Adapter, IN u8 *PROMContent, @@ -2842,7 +2842,7 @@ Hal_ReadPAType_8188E( RTW_INFO("pHalData->ExternalPA_2G = %d , pHalData->ExternalLNA_2G = %d\n", pHalData->ExternalPA_2G, pHalData->ExternalLNA_2G); } -VOID +void Hal_ReadAmplifierType_8188E( IN PADAPTER Adapter, IN pu1Byte PROMContent, @@ -2880,7 +2880,7 @@ Hal_ReadAmplifierType_8188E( RTW_INFO("pHalData->TypeGLNA is 0x%x\n", pHalData->TypeGLNA); } -VOID +void Hal_ReadRFEType_8188E( IN PADAPTER Adapter, IN pu1Byte PROMContent, @@ -4543,7 +4543,7 @@ u8 GetHalDefVar8188E( 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/hal/rtl8188e_rf6052.c b/hal/rtl8188e_rf6052.c index 01a6563..7b8fe87 100644 --- a/hal/rtl8188e_rf6052.c +++ b/hal/rtl8188e_rf6052.c @@ -95,7 +95,7 @@ void rtl8188e_RF_ChangeTxPath(IN PADAPTER Adapter, * * Note: For RF type 0222D *---------------------------------------------------------------------------*/ -VOID +void rtl8188e_PHY_RF6052SetBandwidth( IN PADAPTER Adapter, IN CHANNEL_WIDTH Bandwidth) /* 20M or 40M */ diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index bf826bc..30bddb3 100644 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -23,7 +23,7 @@ #include #include "hal_com_h2c.h" -static VOID +static void _ConfigNormalChipOutEP_8188E( IN PADAPTER pAdapter, IN u8 NumOutPipe @@ -244,7 +244,7 @@ static void _InitBTCoexist(_adapter *padapter) * --------------------------------------------------------------- */ /* Shall USB interface init this? */ -static VOID +static void _InitInterrupt( IN PADAPTER Adapter ) @@ -289,7 +289,7 @@ _InitInterrupt( } -static VOID +static void _InitQueueReservedPage( IN PADAPTER Adapter ) @@ -337,7 +337,7 @@ _InitQueueReservedPage( rtw_write32(Adapter, REG_RQPN, value32); } -static VOID +static void _InitTxBufferBoundary( IN PADAPTER Adapter, IN u8 txpktbuf_bndy @@ -356,7 +356,7 @@ _InitTxBufferBoundary( } -static VOID +static void _InitPageBoundary( IN PADAPTER Adapter ) @@ -369,7 +369,7 @@ _InitPageBoundary( rtw_write16(Adapter, (REG_TRXFF_BNDY + 2), rxff_bndy); } -static VOID +static void _InitNormalChipRegPriority( IN PADAPTER Adapter, IN u16 beQ, @@ -389,7 +389,7 @@ _InitNormalChipRegPriority( rtw_write16(Adapter, REG_TRXDMA_CTRL, value16); } -static VOID +static void _InitNormalChipOneOutEpPriority( IN PADAPTER Adapter ) @@ -423,7 +423,7 @@ _InitNormalChipOneOutEpPriority( } -static VOID +static void _InitNormalChipTwoOutEpPriority( IN PADAPTER Adapter ) @@ -473,7 +473,7 @@ _InitNormalChipTwoOutEpPriority( } -static VOID +static void _InitNormalChipThreeOutEpPriority( IN PADAPTER Adapter ) @@ -499,7 +499,7 @@ _InitNormalChipThreeOutEpPriority( _InitNormalChipRegPriority(Adapter, beQ, bkQ, viQ, voQ, mgtQ, hiQ); } -static VOID +static void _InitQueuePriority( IN PADAPTER Adapter ) @@ -523,7 +523,7 @@ _InitQueuePriority( } -static VOID +static void _InitHardwareDropIncorrectBulkOut( IN PADAPTER Adapter ) @@ -535,7 +535,7 @@ _InitHardwareDropIncorrectBulkOut( #endif } -static VOID +static void _InitNetworkType( IN PADAPTER Adapter ) @@ -550,7 +550,7 @@ _InitNetworkType( /* RASSERT(pIoBase->rtw_read8(REG_CR + 2) == 0x2); */ } -static VOID +static void _InitDriverInfoSize( IN PADAPTER Adapter, IN u8 drvInfoSize @@ -559,7 +559,7 @@ _InitDriverInfoSize( rtw_write8(Adapter, REG_RX_DRVINFO_SZ, drvInfoSize); } -static VOID +static void _InitWMACSetting( IN PADAPTER Adapter ) @@ -604,7 +604,7 @@ _InitWMACSetting( } -static VOID +static void _InitAdaptiveCtrl( IN PADAPTER Adapter ) @@ -631,7 +631,7 @@ _InitAdaptiveCtrl( } -static VOID +static void _InitRateFallback( IN PADAPTER Adapter ) @@ -644,7 +644,7 @@ _InitRateFallback( } -static VOID +static void _InitEDCA( IN PADAPTER Adapter ) @@ -666,7 +666,7 @@ _InitEDCA( rtw_write32(Adapter, REG_EDCA_VO_PARAM, 0x002FA226); } -static VOID +static void _InitBeaconMaxError( IN PADAPTER Adapter, IN BOOLEAN InfraMode @@ -690,7 +690,7 @@ static void _InitHWLed(PADAPTER Adapter) } #endif /* CONFIG_LED */ -static VOID +static void _InitRDGSetting( IN PADAPTER Adapter ) @@ -700,7 +700,7 @@ _InitRDGSetting( rtw_write8(Adapter, REG_RD_RESP_PKT_TH, 0x05); } -static VOID +static void _InitRetryFunction( IN PADAPTER Adapter ) @@ -730,7 +730,7 @@ _InitRetryFunction( * 12/10/2010 MHC Seperate to smaller function. * *---------------------------------------------------------------------------*/ -static VOID +static void usb_AggSettingTxUpdate( IN PADAPTER Adapter ) @@ -769,7 +769,7 @@ usb_AggSettingTxUpdate( * 12/10/2010 MHC Seperate to smaller function. * *---------------------------------------------------------------------------*/ -static VOID +static void usb_AggSettingRxUpdate( IN PADAPTER Adapter ) @@ -852,7 +852,7 @@ usb_AggSettingRxUpdate( #endif } /* usb_AggSettingRxUpdate */ -static VOID +static void InitUsbAggregationSetting( IN PADAPTER Adapter ) @@ -869,7 +869,7 @@ InitUsbAggregationSetting( pHalData->UsbRxHighSpeedMode = _FALSE; } -static VOID +static void HalRxAggr8188EUsb( IN PADAPTER Adapter, IN BOOLEAN Value @@ -896,21 +896,21 @@ HalRxAggr8188EUsb( * 12/10/2010 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -static VOID +static void USB_AggModeSwitch( IN PADAPTER Adapter ) { } /* USB_AggModeSwitch */ -static VOID +static void _InitOperationMode( IN PADAPTER Adapter ) { } -static VOID +static void _InitBeaconParameters( IN PADAPTER Adapter ) @@ -942,7 +942,7 @@ _InitBeaconParameters( pHalData->RegCR_1 = rtw_read8(Adapter, REG_CR + 1); } -static VOID +static void _InitRFType( IN PADAPTER Adapter ) @@ -963,7 +963,7 @@ _InitRFType( } -static VOID +static void _BeaconFunctionEnable( IN PADAPTER Adapter, IN BOOLEAN Enable, @@ -977,7 +977,7 @@ _BeaconFunctionEnable( } /* Set CCK and OFDM Block "ON" */ -static VOID _BBTurnOnBlock( +static void _BBTurnOnBlock( IN PADAPTER Adapter ) { @@ -989,7 +989,7 @@ static VOID _BBTurnOnBlock( phy_set_bb_reg(Adapter, rFPGA0_RFMOD, bOFDMEn, 0x1); } -static VOID _RfPowerSave( +static void _RfPowerSave( IN PADAPTER Adapter ) { @@ -1000,7 +1000,7 @@ enum { Antenna_Right = 2, }; -static VOID +static void _InitAntenna_Selection(IN PADAPTER Adapter) { #ifdef CONFIG_ANTENNA_DIVERSITY @@ -1020,7 +1020,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 ) @@ -1678,7 +1678,7 @@ static unsigned int rtl8188eu_inirp_deinit(PADAPTER Adapter) * * ------------------------------------------------------------------- */ -static VOID +static void _ReadLEDSetting( IN PADAPTER Adapter, IN u8 *PROMContent, @@ -1701,7 +1701,7 @@ _ReadLEDSetting( #endif /* CONFIG_SW_LED */ } -static VOID +static void _ReadRFSetting( IN PADAPTER Adapter, IN u8 *PROMContent, @@ -1710,7 +1710,7 @@ _ReadRFSetting( { } -static VOID +static void hal_InitPGData( IN PADAPTER pAdapter, IN OUT u8 *PROMContent @@ -1757,7 +1757,7 @@ Hal_CustomizeByCustomerID_8188EU( { } -static VOID +static void readAdapterInfo_8188EU( IN PADAPTER padapter ) @@ -1810,7 +1810,7 @@ static void _ReadPROMContent( readAdapterInfo_8188EU(Adapter); } -static VOID +static void _ReadRFType( IN PADAPTER Adapter ) @@ -1920,7 +1920,7 @@ static u8 GetHalDefVar8188EUsb( IN PADAPTER Adapter, IN HAL_DEF_VARIABLE eVariable, - IN PVOID pValue + IN void * pValue ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1957,7 +1957,7 @@ static 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 a3fb0b5..3618a19 100644 --- a/include/Hal8188EPhyCfg.h +++ b/include/Hal8188EPhyCfg.h @@ -104,7 +104,7 @@ void PHY_SetTxPowerLevel8188E(IN PADAPTER Adapter, BOOLEAN PHY_UpdateTxPowerDbm8188E(IN PADAPTER Adapter, IN int powerInDbm); -VOID +void PHY_SetTxPowerIndex_8188E( IN PADAPTER Adapter, IN u32 PowerIndex, @@ -151,7 +151,7 @@ extern void FillA2Entry8192C(IN PADAPTER Adapter, void PHY_SwChnl8188E(IN PADAPTER pAdapter, IN u8 channel); -VOID +void PHY_SetSwChnlBWMode8188E( IN PADAPTER Adapter, IN u8 channel, @@ -160,21 +160,21 @@ PHY_SetSwChnlBWMode8188E( IN u8 Offset80 ); -VOID +void PHY_SetRFEReg_8188E( IN PADAPTER Adapter ); /* * BB/MAC/RF other monitor API * */ -VOID phy_set_rf_path_switch_8188e(IN PADAPTER pAdapter, IN bool bMain); +void phy_set_rf_path_switch_8188e(IN PADAPTER pAdapter, IN bool bMain); -extern VOID +extern void PHY_SwitchEphyParameter( IN PADAPTER Adapter ); -extern VOID +extern void PHY_EnableHostClkReq( IN PADAPTER Adapter ); @@ -239,7 +239,7 @@ SetAntennaConfig92C( #endif #if (SIC_ENABLE == 1) - VOID SIC_Init(IN PADAPTER Adapter); + void SIC_Init(IN PADAPTER Adapter); #endif diff --git a/include/Hal8188FPhyCfg.h b/include/Hal8188FPhyCfg.h index 410d9c3..a490c77 100644 --- a/include/Hal8188FPhyCfg.h +++ b/include/Hal8188FPhyCfg.h @@ -49,7 +49,7 @@ PHY_QueryBBReg_8188F( IN u32 BitMask ); -VOID +void PHY_SetBBReg_8188F( IN PADAPTER Adapter, IN u32 RegAddr, @@ -65,7 +65,7 @@ PHY_QueryRFReg_8188F( IN u32 BitMask ); -VOID +void PHY_SetRFReg_8188F( IN PADAPTER Adapter, IN u8 eRFPath, @@ -88,7 +88,7 @@ PHY_ConfigRFWithParaFile_8188F( RF_PATH eRFPath ); -VOID +void PHY_SetTxPowerIndex_8188F( IN PADAPTER Adapter, IN u32 PowerIndex, @@ -106,19 +106,19 @@ PHY_GetTxPowerIndex_8188F( struct txpwr_idx_comp *tic ); -VOID +void PHY_GetTxPowerLevel8188F( IN PADAPTER Adapter, OUT s32 *powerlevel ); -VOID +void PHY_SetTxPowerLevel8188F( IN PADAPTER Adapter, IN u8 channel ); -VOID +void PHY_SetSwChnlBWMode8188F( IN PADAPTER Adapter, IN u8 channel, @@ -127,7 +127,7 @@ PHY_SetSwChnlBWMode8188F( IN u8 Offset80 ); -VOID phy_set_rf_path_switch_8188f( +void phy_set_rf_path_switch_8188f( IN PADAPTER pAdapter, IN bool bMain ); diff --git a/include/basic_types.h b/include/basic_types.h index f57af2c..716091d 100644 --- a/include/basic_types.h +++ b/include/basic_types.h @@ -44,17 +44,11 @@ #include #define IN #define OUT - #define VOID void #define NDIS_OID uint #define NDIS_STATUS uint typedef signed int sint; - #ifndef PVOID - typedef void *PVOID; - /* #define PVOID (void *) */ - #endif - #define UCHAR u8 #define USHORT u16 #define UINT u32 diff --git a/include/drv_types.h b/include/drv_types.h index 4160d1c..46cb432 100644 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -1130,7 +1130,7 @@ struct _ADAPTER { ERROR_CODE LastError; /* <20130613, Kordan> Only the functions associated with MP records the error code by now. */ - PVOID HalData; + void * HalData; u32 hal_data_sz; struct hal_ops hal_func; diff --git a/include/hal_btcoex_wifionly.h b/include/hal_btcoex_wifionly.h index 2633d95..d708411 100644 --- a/include/hal_btcoex_wifionly.h +++ b/include/hal_btcoex_wifionly.h @@ -26,20 +26,20 @@ struct wifi_only_haldata { }; struct wifi_only_cfg { - PVOID Adapter; + void * Adapter; struct wifi_only_haldata haldata_info; WIFIONLY_CHIP_INTERFACE chip_interface; }; -void halwifionly_write1byte(PVOID pwifionlyContext, u32 RegAddr, u8 Data); -void halwifionly_write2byte(PVOID pwifionlyContext, u32 RegAddr, u16 Data); -void halwifionly_write4byte(PVOID pwifionlyContext, u32 RegAddr, u32 Data); -u8 halwifionly_read1byte(PVOID pwifionlyContext, u32 RegAddr); -u16 halwifionly_read2byte(PVOID pwifionlyContext, u32 RegAddr); -u32 halwifionly_read4byte(PVOID pwifionlyContext, u32 RegAddr); -void halwifionly_bitmaskwrite1byte(PVOID pwifionlyContext, u32 regAddr, u8 bitMask, u8 data); -void halwifionly_phy_set_rf_reg(PVOID pwifionlyContext, u8 eRFPath, u32 RegAddr, u32 BitMask, u32 Data); -void halwifionly_phy_set_bb_reg(PVOID pwifionlyContext, u32 RegAddr, u32 BitMask, u32 Data); +void halwifionly_write1byte(void * pwifionlyContext, u32 RegAddr, u8 Data); +void halwifionly_write2byte(void * pwifionlyContext, u32 RegAddr, u16 Data); +void halwifionly_write4byte(void * pwifionlyContext, u32 RegAddr, u32 Data); +u8 halwifionly_read1byte(void * pwifionlyContext, u32 RegAddr); +u16 halwifionly_read2byte(void * pwifionlyContext, u32 RegAddr); +u32 halwifionly_read4byte(void * pwifionlyContext, u32 RegAddr); +void halwifionly_bitmaskwrite1byte(void * pwifionlyContext, u32 regAddr, u8 bitMask, u8 data); +void halwifionly_phy_set_rf_reg(void * pwifionlyContext, u8 eRFPath, u32 RegAddr, u32 BitMask, u32 Data); +void halwifionly_phy_set_bb_reg(void * pwifionlyContext, u32 RegAddr, u32 BitMask, u32 Data); void hal_btcoex_wifionly_switchband_notify(PADAPTER padapter); void hal_btcoex_wifionly_scan_notify(PADAPTER padapter); void hal_btcoex_wifionly_hw_config(PADAPTER padapter); diff --git a/include/hal_com.h b/include/hal_com.h index a3d193a..0c86b92 100644 --- a/include/hal_com.h +++ b/include/hal_com.h @@ -508,12 +508,12 @@ u8 rtw_hal_busagg_qsel_check(_adapter *padapter, u8 pre_qsel, u8 next_qsel); void GetHalODMVar( PADAPTER Adapter, HAL_ODM_VARIABLE eVariable, - PVOID pValue1, - PVOID pValue2); + void * pValue1, + void * pValue2); void SetHalODMVar( PADAPTER Adapter, HAL_ODM_VARIABLE eVariable, - PVOID pValue1, + void * pValue1, BOOLEAN bSet); #ifdef CONFIG_BACKGROUND_NOISE_MONITOR diff --git a/include/hal_com_led.h b/include/hal_com_led.h index 4b991c6..4bd6dd0 100644 --- a/include/hal_com_led.h +++ b/include/hal_com_led.h @@ -216,7 +216,7 @@ typedef struct _LED_USB { typedef struct _LED_USB LED_DATA, *PLED_DATA; typedef enum _LED_STRATEGY_USB LED_STRATEGY, *PLED_STRATEGY; -VOID +void LedControlUSB( IN PADAPTER Adapter, IN LED_CTL_MODE LedAction diff --git a/include/hal_com_phycfg.h b/include/hal_com_phycfg.h index fb86c2b..8eabc15 100644 --- a/include/hal_com_phycfg.h +++ b/include/hal_com_phycfg.h @@ -83,7 +83,7 @@ PHY_GetTxPowerByRateBase( IN RATE_SECTION RateSection ); -VOID +void PHY_GetRateValuesOfTxPowerByRate( IN PADAPTER pAdapter, IN u32 RegAddr, @@ -99,7 +99,7 @@ PHY_GetRateIndexOfTxPowerByRate( IN u8 Rate ); -VOID +void phy_set_tx_power_index_by_rate_section( IN PADAPTER pAdapter, IN u8 RFPath, @@ -136,7 +136,7 @@ PHY_GetTxPowerByRateOriginal( ); #endif -VOID +void PHY_SetTxPowerByRate( IN PADAPTER pAdapter, IN u8 Band, @@ -146,14 +146,14 @@ PHY_SetTxPowerByRate( IN s8 Value ); -VOID +void phy_set_tx_power_level_by_path( IN PADAPTER Adapter, IN u8 channel, IN u8 path ); -VOID +void PHY_SetTxPowerIndexByRateArray( IN PADAPTER pAdapter, IN u8 RFPath, @@ -163,12 +163,12 @@ PHY_SetTxPowerIndexByRateArray( IN u8 RateArraySize ); -VOID +void PHY_InitTxPowerByRate( IN PADAPTER pAdapter ); -VOID +void phy_store_tx_power_by_rate( IN PADAPTER pAdapter, IN u32 Band, @@ -179,7 +179,7 @@ phy_store_tx_power_by_rate( IN u32 Data ); -VOID +void PHY_TxPowerByRateConfiguration( IN PADAPTER pAdapter ); @@ -229,12 +229,12 @@ PHY_GetTxPowerLimitOriginal( ); #endif -VOID +void PHY_ConvertTxPowerLimitToPowerIndex( IN PADAPTER Adapter ); -VOID +void PHY_InitTxPowerLimit( IN PADAPTER Adapter ); @@ -263,7 +263,7 @@ phy_get_tx_power_index( IN u8 Channel ); -VOID +void PHY_SetTxPowerIndex( IN PADAPTER pAdapter, IN u32 PowerIndex, diff --git a/include/hal_intf.h b/include/hal_intf.h index 8c0d617..a228492 100644 --- a/include/hal_intf.h +++ b/include/hal_intf.h @@ -337,12 +337,12 @@ struct hal_ops { - u8 (*get_hal_def_var_handler)(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); + u8 (*get_hal_def_var_handler)(_adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); - u8(*SetHalDefVarHandler)(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); + u8(*SetHalDefVarHandler)(_adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue); - void (*GetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1, PVOID pValue2); - void (*SetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1, BOOLEAN bSet); + void (*GetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1, void * pValue2); + void (*SetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1, BOOLEAN bSet); void (*update_ra_mask_handler)(_adapter *padapter, struct sta_info *psta, struct macid_cfg *h2c_macid_cfg); void (*SetBeaconRelatedRegistersHandler)(_adapter *padapter); @@ -516,11 +516,11 @@ void rtw_hal_chip_configure(_adapter *padapter); u8 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, PVOID pValue2); +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, void * pValue2); void rtw_hal_enable_interrupt(_adapter *padapter); void rtw_hal_disable_interrupt(_adapter *padapter); diff --git a/include/hal_phy.h b/include/hal_phy.h index af1dcad..79306cb 100644 --- a/include/hal_phy.h +++ b/include/hal_phy.h @@ -187,7 +187,7 @@ PHY_RFShadowRead( IN u8 eRFPath, IN u32 Offset); -VOID +void PHY_RFShadowWrite( IN PADAPTER Adapter, IN u8 eRFPath, @@ -200,43 +200,43 @@ PHY_RFShadowCompare( IN u8 eRFPath, IN u32 Offset); -VOID +void PHY_RFShadowRecorver( IN PADAPTER Adapter, IN u8 eRFPath, IN u32 Offset); -VOID +void PHY_RFShadowCompareAll( IN PADAPTER Adapter); -VOID +void PHY_RFShadowRecorverAll( IN PADAPTER Adapter); -VOID +void PHY_RFShadowCompareFlagSet( IN PADAPTER Adapter, IN u8 eRFPath, IN u32 Offset, IN u8 Type); -VOID +void PHY_RFShadowRecorverFlagSet( IN PADAPTER Adapter, IN u8 eRFPath, IN u32 Offset, IN u8 Type); -VOID +void PHY_RFShadowCompareFlagSetAll( IN PADAPTER Adapter); -VOID +void PHY_RFShadowRecorverFlagSetAll( IN PADAPTER Adapter); -VOID +void PHY_RFShadowRefresh( IN PADAPTER Adapter); diff --git a/include/rtl8188e_dm.h b/include/rtl8188e_dm.h index a4c2527..7d24347 100644 --- a/include/rtl8188e_dm.h +++ b/include/rtl8188e_dm.h @@ -25,7 +25,7 @@ void rtl8188e_deinit_dm_priv(IN PADAPTER Adapter); void rtl8188e_InitHalDm(IN PADAPTER Adapter); void rtl8188e_HalDmWatchDog(IN PADAPTER Adapter); -/* VOID rtl8192c_dm_CheckTXPowerTracking(IN PADAPTER Adapter); */ +/* void rtl8192c_dm_CheckTXPowerTracking(IN PADAPTER Adapter); */ /* void rtl8192c_dm_RF_Saving(IN PADAPTER pAdapter, IN u8 bForceInNormal); */ diff --git a/include/rtl8188e_hal.h b/include/rtl8188e_hal.h index 9f19b00..5ef982a 100644 --- a/include/rtl8188e_hal.h +++ b/include/rtl8188e_hal.h @@ -285,7 +285,7 @@ u8 GetHalDefVar8188E( IN PADAPTER Adapter, IN HAL_DEF_VARIABLE eVariable, - IN PVOID pValue + IN void * pValue ); #ifdef CONFIG_GPIO_API int rtl8188e_GpioFuncCheck(PADAPTER adapter, u8 gpio_num); diff --git a/include/rtw_beamforming.h b/include/rtw_beamforming.h index 3dfbd60..8206cc4 100644 --- a/include/rtw_beamforming.h +++ b/include/rtw_beamforming.h @@ -356,7 +356,7 @@ struct rtw_ndpa_sta_info { u16 nc_index:3; }; -BEAMFORMING_CAP beamforming_get_entry_beam_cap_by_mac_id(PVOID pmlmepriv , u8 mac_id); +BEAMFORMING_CAP beamforming_get_entry_beam_cap_by_mac_id(void * pmlmepriv , u8 mac_id); void beamforming_notify(PADAPTER adapter); BEAMFORMING_CAP beamforming_get_beamform_cap(struct beamforming_info *pBeamInfo); diff --git a/include/rtw_bt_mp.h b/include/rtw_bt_mp.h index cd6ed0a..0096c61 100644 --- a/include/rtw_bt_mp.h +++ b/include/rtw_bt_mp.h @@ -165,7 +165,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, @@ -177,13 +177,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, @@ -192,9 +192,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_cmd.h b/include/rtw_cmd.h index 52e9dd1..33391c1 100644 --- a/include/rtw_cmd.h +++ b/include/rtw_cmd.h @@ -938,7 +938,7 @@ struct SetChannelPlan_param { /*H2C Handler index: 60 */ struct LedBlink_param { - PVOID pLed; + void * pLed; }; /*H2C Handler index: 61 */ @@ -1077,7 +1077,7 @@ u8 rtw_set_ch_cmd(_adapter *padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue); u8 rtw_set_chplan_cmd(_adapter *adapter, int flags, u8 chplan, u8 swconfig); u8 rtw_set_country_cmd(_adapter *adapter, int flags, const char *country_code, u8 swconfig); -extern u8 rtw_led_blink_cmd(_adapter *padapter, PVOID pLed); +extern u8 rtw_led_blink_cmd(_adapter *padapter, void * pLed); extern u8 rtw_set_csa_cmd(_adapter *padapter, u8 new_ch_no); extern u8 rtw_tdls_cmd(_adapter *padapter, u8 *addr, u8 option); diff --git a/include/rtw_efuse.h b/include/rtw_efuse.h index 02261d7..bfe732d 100644 --- a/include/rtw_efuse.h +++ b/include/rtw_efuse.h @@ -209,7 +209,7 @@ u8 Efuse_WordEnableDataWrite(PADAPTER pAdapter, u16 efuse_addr, u8 word_en, u8 * void EFUSE_ShadowMapUpdate(PADAPTER pAdapter, u8 efuseType, BOOLEAN bPseudoTest); void EFUSE_ShadowRead(PADAPTER pAdapter, u8 Type, u16 Offset, u32 *Value); -VOID hal_ReadEFuse_BT_logic_map( +void hal_ReadEFuse_BT_logic_map( PADAPTER padapter, u16 _offset, u16 _size_byte, diff --git a/include/rtw_mp.h b/include/rtw_mp.h index e097f7e..4fced5f 100644 --- a/include/rtw_mp.h +++ b/include/rtw_mp.h @@ -153,7 +153,7 @@ typedef struct _RT_PMAC_TX_INFO { } RT_PMAC_TX_INFO, *PRT_PMAC_TX_INFO; -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. */ BOOLEAN bMassProdTest; diff --git a/include/rtw_odm.h b/include/rtw_odm.h index e14119a..e0b26f2 100644 --- a/include/rtw_odm.h +++ b/include/rtw_odm.h @@ -44,9 +44,9 @@ void rtw_odm_releasespinlock(_adapter *adapter, enum rt_spinlock_type type); u8 rtw_odm_get_dfs_domain(_adapter *adapter); u8 rtw_odm_dfs_domain_unknown(_adapter *adapter); #ifdef CONFIG_DFS_MASTER -VOID rtw_odm_radar_detect_reset(_adapter *adapter); -VOID rtw_odm_radar_detect_disable(_adapter *adapter); -VOID rtw_odm_radar_detect_enable(_adapter *adapter); +void rtw_odm_radar_detect_reset(_adapter *adapter); +void rtw_odm_radar_detect_disable(_adapter *adapter); +void rtw_odm_radar_detect_enable(_adapter *adapter); BOOLEAN rtw_odm_radar_detect(_adapter *adapter); #endif /* CONFIG_DFS_MASTER */ diff --git a/include/rtw_security.h b/include/rtw_security.h index 0c9f629..8c2891f 100644 --- a/include/rtw_security.h +++ b/include/rtw_security.h @@ -469,7 +469,7 @@ void rtw_wep_decrypt(_adapter *padapter, u8 *precvframe); u32 rtw_BIP_verify(_adapter *padapter, u8 *precvframe); #endif /* CONFIG_IEEE80211W */ #ifdef CONFIG_TDLS -void wpa_tdls_generate_tpk(_adapter *padapter, PVOID sta); +void wpa_tdls_generate_tpk(_adapter *padapter, void * sta); int wpa_tdls_ftie_mic(u8 *kck, u8 trans_seq, u8 *lnkid, u8 *rsnie, u8 *timeoutie, u8 *ftie, u8 *mic); diff --git a/include/rtw_vht.h b/include/rtw_vht.h index dda83f9..8cfff9e 100644 --- a/include/rtw_vht.h +++ b/include/rtw_vht.h @@ -131,11 +131,11 @@ void rtw_vht_use_default_setting(_adapter *padapter); u32 rtw_build_vht_operation_ie(_adapter *padapter, u8 *pbuf, u8 channel); u32 rtw_build_vht_op_mode_notify_ie(_adapter *padapter, u8 *pbuf, u8 bw); u32 rtw_build_vht_cap_ie(_adapter *padapter, u8 *pbuf); -void update_sta_vht_info_apmode(_adapter *padapter, PVOID psta); +void update_sta_vht_info_apmode(_adapter *padapter, void * psta); void update_hw_vht_param(_adapter *padapter); void VHT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE); void VHT_operation_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE); -void rtw_process_vht_op_mode_notify(_adapter *padapter, u8 *pframe, PVOID sta); +void rtw_process_vht_op_mode_notify(_adapter *padapter, u8 *pframe, void * sta); u32 rtw_restructure_vht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len); void VHTOnAssocRsp(_adapter *padapter); u8 rtw_vht_mcsmap_to_nss(u8 *pvht_mcs_map); diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index 76d70b8..4a1a700 100644 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -8405,7 +8405,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, } RTW_INFO("%s: cnts=%d\n", __func__, cnts); - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN , (PVOID)&max_available_len, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN , (void *)&max_available_len, _FALSE); if ((addr + cnts) > max_available_len) { RTW_INFO("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts); err = -EINVAL; @@ -8431,7 +8431,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, u32 blksz = 0x200; /* The size of one time show, default 512 */ addr = 0; - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN , (PVOID)&mapLen, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN , (void *)&mapLen, _FALSE); RTW_INFO("Real content len = %d\n",mapLen ); if (rtw_efuse_access(padapter, _FALSE, addr, mapLen, rawdata) == _FAIL) { @@ -8470,7 +8470,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, u32 blksz = 0x200; /* The size of one time show, default 512 */ addr = 0; - EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_REAL_CONTENT_LEN, (PVOID)&mapLen, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&mapLen, _FALSE); RTW_INFO("Real content len = %d\n", mapLen); #ifdef RTW_HALMAC if (rtw_efuse_bt_access(padapter, _FALSE, 0, mapLen, rawdata) == _FAIL) { @@ -8520,7 +8520,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, addr = hal_efuse_macaddr_offset(padapter); cnts = 6; - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&max_available_len, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_len, _FALSE); if ((addr + cnts) > max_available_len) { RTW_INFO("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __func__, addr, cnts); err = -EFAULT; @@ -8548,7 +8548,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, addr = EEPROM_VID_88EU; cnts = 4; - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&max_available_len, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_len, _FALSE); if ((addr + cnts) > max_available_len) { RTW_INFO("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __func__, addr, cnts); err = -EFAULT; @@ -8673,7 +8673,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, } RTW_INFO("%s: cnts=%d\n", __func__, cnts); #ifndef RTW_HALMAC - EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (PVOID)&max_available_len, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&max_available_len, _FALSE); if ((addr + cnts) > max_available_len) { RTW_INFO("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts); err = -EFAULT; @@ -8974,7 +8974,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, for (jj = 0, kk = 0; jj < cnts; jj++, kk += 2) setdata[jj] = key_2char2num(tmp[2][kk], tmp[2][kk + 1]); - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&max_available_len, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_len, _FALSE); if ((addr + cnts) > max_available_len) { RTW_INFO("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts); @@ -9113,7 +9113,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, for (jj = 0, kk = 0; jj < cnts; jj++, kk += 2) setdata[jj] = key_2char2num(tmp[1][kk], tmp[1][kk + 1]); - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&max_available_len, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_len, _FALSE); if ((addr + cnts) > max_available_len) { RTW_INFO("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts); @@ -9152,7 +9152,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, for (jj = 0, kk = 0; jj < cnts; jj++, kk += 2) setdata[jj] = key_2char2num(tmp[1][kk], tmp[1][kk + 1]); - EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (PVOID)&max_available_len, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&max_available_len, _FALSE); if ((addr + cnts) > max_available_len) { RTW_INFO("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts); err = -EFAULT; @@ -9223,7 +9223,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, for (jj = 0, kk = 0; jj < cnts; jj++, kk += 2) setdata[jj] = key_2char2num(tmp[2][kk], tmp[2][kk + 1]); #ifndef RTW_HALMAC - EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (PVOID)&max_available_len, _FALSE); + EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&max_available_len, _FALSE); if ((addr + cnts) > max_available_len) { RTW_INFO("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts); err = -EFAULT; diff --git a/os_dep/ioctl_mp.c b/os_dep/ioctl_mp.c index 6093af7..e497ad2 100644 --- a/os_dep/ioctl_mp.c +++ b/os_dep/ioctl_mp.c @@ -1108,7 +1108,7 @@ int rtw_mp_thermal(struct net_device *dev, if (bwrite == 0) { /*RTW_INFO("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) { RTW_INFO("no available efuse!\n"); return -EFAULT;