Remove gross PVOID type

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>

diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c
index ab6ca1c..f1d93d5 100644 (file)
--- a/core/rtw_efuse.c
+++ b/core/rtw_efuse.c
@@ -301,7 +301,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 */
        {
@@ -371,7 +371,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 */
        {
@@ -611,8 +611,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;
@@ -645,7 +645,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;
 }
 /*  */
@@ -662,7 +662,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;
@@ -680,7 +680,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;
@@ -703,7 +703,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;
@@ -800,7 +800,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;
@@ -923,7 +923,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);
 
@@ -1075,7 +1075,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)
        {
@@ -1095,8 +1095,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 */
 
 /*-----------------------------------------------------------------------------
@@ -1173,23 +1173,23 @@ Efuse_InitSomeVar(
 {
        u8 i;
 
-       memset((PVOID)&fakeEfuseContent[0], 0xff, EFUSE_MAX_HW_SIZE);
-       memset((PVOID)&fakeEfuseInitMap[0], 0xff, EFUSE_MAX_MAP_LEN);
-       memset((PVOID)&fakeEfuseModifiedMap[0], 0xff, EFUSE_MAX_MAP_LEN);
+       memset(&fakeEfuseContent[0], 0xff, EFUSE_MAX_HW_SIZE);
+       memset(&fakeEfuseInitMap[0], 0xff, EFUSE_MAX_MAP_LEN);
+       memset(&fakeEfuseModifiedMap[0], 0xff, EFUSE_MAX_MAP_LEN);
 
        for(i=0; i<EFUSE_MAX_BT_BANK; i++)
        {
-               memset((PVOID)&BTEfuseContent[i][0], EFUSE_MAX_HW_SIZE, 0xff);
+               memset(&BTEfuseContent[i][0], EFUSE_MAX_HW_SIZE, 0xff);
        }
-       memset((PVOID)&BTEfuseInitMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN);
-       memset((PVOID)&BTEfuseModifiedMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN);
+       memset(&BTEfuseInitMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN);
+       memset(&BTEfuseModifiedMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN);
 
        for(i=0; i<EFUSE_MAX_BT_BANK; i++)
        {
-               memset((PVOID)&fakeBTEfuseContent[i][0], 0xff, EFUSE_MAX_HW_SIZE);
+               memset(&fakeBTEfuseContent[i][0], 0xff, EFUSE_MAX_HW_SIZE);
        }
-       memset((PVOID)&fakeBTEfuseInitMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN);
-       memset((PVOID)&fakeBTEfuseModifiedMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN);
+       memset(&fakeBTEfuseInitMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN);
+       memset(&fakeBTEfuseModifiedMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN);
 }
 
 #ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE

diff --git a/hal/hal_intf.c b/hal/hal_intf.c
index ed85e6a..069b261 100644 (file)
--- a/hal/hal_intf.c
+++ b/hal/hal_intf.c
@@ -177,25 +177,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,bool bSet)
+void rtw_hal_set_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool 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,bool bSet)
+void   rtw_hal_get_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet)
 {
        if(padapter->HalFunc.GetHalODMVarHandler)
                padapter->HalFunc.GetHalODMVarHandler(padapter,eVariable,pValue1,bSet);

diff --git a/hal/odm.c b/hal/odm.c
index 5d86086..9467272 100644 (file)
--- a/hal/odm.c
+++ b/hal/odm.c
@@ -372,7 +372,7 @@ odm_CCKTXPathDiversityCallback(
 
 VOID
 odm_CCKTXPathDiversityWorkItemCallback(
-    IN PVOID            pContext
+    IN void *            pContext
     );
 
 VOID
@@ -382,7 +382,7 @@ odm_PathDivChkAntSwitchCallback(
 
 VOID
 odm_PathDivChkAntSwitchWorkitemCallback(
-    IN PVOID            pContext
+    IN void *            pContext
     );
 
 VOID   odm_SetRespPath_92C(            IN      PADAPTER        Adapter,        IN      u1Byte  DefaultRespPath);
@@ -397,7 +397,7 @@ 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_RXHPWorkitemCallback(   IN void *            pContext);
 //End--------------------- RX High Power -----------------------//
 
 VOID
@@ -531,7 +531,7 @@ odm_SwAntDivChkAntSwitchCallback(
 );
 VOID
 odm_SwAntDivChkAntSwitchWorkitemCallback(
-    IN PVOID            pContext
+    IN void *            pContext
     );
 #elif (DM_ODM_SUPPORT_TYPE == ODM_CE)
 VOID odm_SwAntDivChkAntSwitchCallback(void *FunctionContext);
@@ -1007,7 +1007,7 @@ VOID
 ODM_CmnInfoHook(
        IN              PDM_ODM_T               pDM_Odm,
        IN              ODM_CMNINFO_E   CmnInfo,
-       IN              PVOID                   pValue
+       IN              void *                  pValue
        )
 {
        //
@@ -1127,7 +1127,7 @@ ODM_CmnInfoPtrArrayHook(
        IN              PDM_ODM_T               pDM_Odm,
        IN              ODM_CMNINFO_E   CmnInfo,
        IN              u2Byte                  Index,
-       IN              PVOID                   pValue
+       IN              void *                  pValue
        )
 {
        //
@@ -1386,7 +1386,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"
        );
 
@@ -1394,14 +1394,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)
@@ -1409,7 +1409,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
@@ -1417,7 +1417,7 @@ 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
 }
@@ -5531,7 +5531,7 @@ odm_SwAntDivChkAntSwitchCallback(
 }
 VOID
 odm_SwAntDivChkAntSwitchWorkitemCallback(
-    IN PVOID            pContext
+    IN void *            pContext
     )
 {
 
@@ -5582,7 +5582,7 @@ odm_SwAntDivConsructChkScanChnl(
 #endif
 #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
 VOID odm_SwAntDivChkAntSwitchCallback( PRT_TIMER               pTimer){}
-VOID odm_SwAntDivChkAntSwitchWorkitemCallback(    IN PVOID            pContext    ){}
+VOID odm_SwAntDivChkAntSwitchWorkitemCallback(    IN void *            pContext    ){}
 #elif (DM_ODM_SUPPORT_TYPE == ODM_CE)
 VOID odm_SwAntDivChkAntSwitchCallback(void *FunctionContext){}
 #elif (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
@@ -5677,7 +5677,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)
                {
@@ -8995,7 +8995,7 @@ odm_PSDMonitorCallback(
 
 VOID
 odm_PSDMonitorWorkItemCallback(
-    IN PVOID            pContext
+    IN void *            pContext
     )
 {
        PADAPTER        Adapter = (PADAPTER)pContext;
@@ -9765,7 +9765,7 @@ odm_PSD_RXHPCallback(
 
 VOID
 odm_PSD_RXHPWorkitemCallback(
-    IN PVOID            pContext
+    IN void *            pContext
     )
 {
        PADAPTER        pAdapter = (PADAPTER)pContext;
@@ -10250,7 +10250,7 @@ odm_CCKTXPathDiversityCallback(
 
 VOID
 odm_CCKTXPathDiversityWorkItemCallback(
-    IN PVOID            pContext
+    IN void *            pContext
     )
 {
        PADAPTER        Adapter = (PADAPTER)pContext;
@@ -10392,7 +10392,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)
@@ -10639,7 +10639,7 @@ odm_PathDivChkAntSwitchCallback(
 
 VOID
 odm_PathDivChkAntSwitchWorkitemCallback(
-    IN PVOID            pContext
+    IN void *            pContext
     )
 {
        PADAPTER        pAdapter = (PADAPTER)pContext;

diff --git a/hal/odm_interface.c b/hal/odm_interface.c
index ccc0861..ec96357 100644 (file)
--- a/hal/odm_interface.c
+++ b/hal/odm_interface.c
@@ -259,7 +259,7 @@ ODM_GetRFReg(
 VOID
 ODM_AllocateMemory(
        IN      PDM_ODM_T       pDM_Odm,
-       OUT     PVOID           *pPtr,
+       OUT     void *          *pPtr,
        IN      u4Byte          length
        )
 {
@@ -277,7 +277,7 @@ ODM_AllocateMemory(
 VOID
 ODM_FreeMemory(
        IN      PDM_ODM_T       pDM_Odm,
-       OUT     PVOID           pPtr,
+       OUT     void *          pPtr,
        IN      u4Byte          length
        )
 {
@@ -334,7 +334,7 @@ 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
        )
 {
@@ -511,7 +511,7 @@ 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
        )
 {

diff --git a/hal/rtl8723a_hal_init.c b/hal/rtl8723a_hal_init.c
index 78b5934..694816c 100644 (file)
--- a/hal/rtl8723a_hal_init.c
+++ b/hal/rtl8723a_hal_init.c
@@ -61,7 +61,7 @@ _FWDownloadEnable(
 static int
 _BlockWrite(
        IN              PADAPTER                padapter,
-       IN              PVOID           buffer,
+       IN              void *          buffer,
        IN              u32                     buffSize
        )
 {
@@ -150,7 +150,7 @@ static int
 _PageWrite(
        IN              PADAPTER        padapter,
        IN              u32                     page,
-       IN              PVOID           buffer,
+       IN              void *          buffer,
        IN              u32                     size
        )
 {
@@ -186,7 +186,7 @@ _FillDummy(
 static int
 _WriteFW(
        IN              PADAPTER                padapter,
-       IN              PVOID                   buffer,
+       IN              void *                  buffer,
        IN              u32                     size
        )
 {
@@ -2106,7 +2106,7 @@ static void rtl8723a_SetBeaconRelatedRegisters(PADAPTER padapter)
 void rtl8723a_GetHalODMVar(
        PADAPTER                                Adapter,
        HAL_ODM_VARIABLE                eVariable,
-       PVOID                                   pValue1,
+       void *                                  pValue1,
        bool                                    bSet)
 {
        HAL_DATA_TYPE   *pHalData = GET_HAL_DATA(Adapter);
@@ -2122,7 +2122,7 @@ void rtl8723a_GetHalODMVar(
 void rtl8723a_SetHalODMVar(
        PADAPTER                                Adapter,
        HAL_ODM_VARIABLE                eVariable,
-       PVOID                                   pValue1,
+       void *                                  pValue1,
        bool                                    bSet)
 {
        HAL_DATA_TYPE   *pHalData = GET_HAL_DATA(Adapter);
@@ -2973,8 +2973,8 @@ Hal_EfuseParseIDCode(
 static void
 Hal_EEValueCheck(
        IN              u8              EEType,
-       IN              PVOID           pInValue,
-       OUT             PVOID           pOutValue
+       IN              void *          pInValue,
+       OUT             void *          pOutValue
        )
 {
        switch(EEType)

diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c
index 018508f..85ef7da 100644 (file)
--- a/hal/usb_halinit.c
+++ b/hal/usb_halinit.c
@@ -3604,7 +3604,7 @@ u8
 GetHalDefVar8192CUsb(
        IN      PADAPTER                                Adapter,
        IN      HAL_DEF_VARIABLE                eVariable,
-       IN      PVOID                                   pValue
+       IN      void *                                  pValue
        )
 {
        HAL_DATA_TYPE   *pHalData = GET_HAL_DATA(Adapter);
@@ -3670,7 +3670,7 @@ u8
 SetHalDefVar8192CUsb(
        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/usb_ops_linux.c b/hal/usb_ops_linux.c
index 9730b36..cd5bf93 100644 (file)
--- a/hal/usb_ops_linux.c
+++ b/hal/usb_ops_linux.c
@@ -491,7 +491,7 @@ LogInterruptHistory8723AU(
 bool
 InterruptRecognized8723AU(
        IN      PADAPTER                        Adapter,
-       IN      PVOID                           pContent,
+       IN      void *                          pContent,
        IN      u32                             ContentLen
 )
 {

diff --git a/include/basic_types.h b/include/basic_types.h
index bd10f0f..c7a944c 100644 (file)
--- a/include/basic_types.h
+++ b/include/basic_types.h
@@ -47,11 +47,6 @@
 
 typedef        signed int sint;
 
-#ifndef        PVOID
-typedef void * PVOID;
-//#define PVOID        (void *)
-#endif
-
 typedef void (*proc_t)(void*);
 
 typedef                __kernel_size_t SIZE_T;

diff --git a/include/drv_types.h b/include/drv_types.h
index 06f0f82..cb8edf3 100644 (file)
--- a/include/drv_types.h
+++ b/include/drv_types.h
@@ -467,7 +467,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/hal_intf.h b/include/hal_intf.h
index f42d914..e2f4b5a 100644 (file)
--- a/include/hal_intf.h
+++ b/include/hal_intf.h
@@ -200,11 +200,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,bool bSet);
-       void    (*SetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,bool bSet);
+       void    (*GetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet);
+       void    (*SetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet);
 
        void    (*UpdateRAMaskHandler)(_adapter *padapter, u32 mac_id, u8 rssi_level);
        void    (*SetBeaconRelatedRegistersHandler)(_adapter *padapter);
@@ -402,11 +402,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,bool bSet);
-void   rtw_hal_get_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,bool bSet);
+void rtw_hal_set_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet);
+void   rtw_hal_get_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool 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 71e8612..a292be6 100644 (file)
--- a/include/odm.h
+++ b/include/odm.h
@@ -1742,7 +1742,7 @@ VOID      odm_PSDMonitorCallback(PRT_TIMER                pTimer);
 
 VOID
 odm_PSDMonitorWorkItemCallback(
-    IN PVOID            pContext
+    IN void *            pContext
     );
 
 
@@ -1788,7 +1788,7 @@ VOID
 ODM_CmnInfoHook(
        IN              PDM_ODM_T               pDM_Odm,
        IN              ODM_CMNINFO_E   CmnInfo,
-       IN              PVOID                   pValue
+       IN              void *                  pValue
        );
 
 VOID
@@ -1796,7 +1796,7 @@ ODM_CmnInfoPtrArrayHook(
        IN              PDM_ODM_T               pDM_Odm,
        IN              ODM_CMNINFO_E   CmnInfo,
        IN              u2Byte                  Index,
-       IN              PVOID                   pValue
+       IN              void *                  pValue
        );
 
 VOID

diff --git a/include/odm_interface.h b/include/odm_interface.h
index 94a5bff..79a252f 100644 (file)
--- a/include/odm_interface.h
+++ b/include/odm_interface.h
@@ -101,7 +101,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);
 
 #if 0
 typedef struct tasklet_struct RT_WORKITEM_HANDLE, *PRT_WORKITEM_HANDLE;
@@ -110,11 +110,11 @@ typedef struct _RT_WORK_ITEM
 {
 
        RT_WORKITEM_HANDLE                      Handle;                 // Platform-dependent handle for this workitem, e.g. Ndis Workitem object.
-       PVOID                                           Adapter;                // Pointer to Adapter object.
-       PVOID                                           pContext;               // Parameter to passed to CallBackFunc().
+       void *                                          Adapter;                // Pointer to Adapter object.
+       void *                                          pContext;               // Parameter to passed to CallBackFunc().
        RT_WORKITEM_CALL_BACK           CallbackFunc;   // Callback function of the workitem.
        u1Byte                                          RefCount;               // 0: driver is going to unload, 1: No such workitem scheduled, 2: one workitem is schedueled.
-       PVOID                                           pPlatformExt;   // Pointer to platform-dependent extension.
+       void *                                          pPlatformExt;   // Pointer to platform-dependent extension.
        bool                                            bFree;
        char                                            szID[36];               // An identity string of this workitem.
 }RT_WORK_ITEM, *PRT_WORK_ITEM;
@@ -227,20 +227,20 @@ ODM_GetRFReg(
 VOID
 ODM_AllocateMemory(
        IN      PDM_ODM_T       pDM_Odm,
-       OUT     PVOID           *pPtr,
+       OUT     void *          *pPtr,
        IN      u4Byte          length
        );
 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
        );
 
@@ -268,7 +268,7 @@ 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
        );
 
@@ -330,7 +330,7 @@ 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
        );
 

diff --git a/include/osdep_service.h b/include/osdep_service.h
index 2cbab45..df30aae 100644 (file)
--- a/include/osdep_service.h
+++ b/include/osdep_service.h
@@ -229,7 +229,7 @@ __inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled)
 #define RTW_DECLARE_TIMER_HDL(name) void RTW_TIMER_HDL_NAME(name)(RTW_TIMER_HDL_ARGS)
 
 
-__inline static void _init_workitem(_workitem *pwork, void *pfunc, PVOID cntx)
+__inline static void _init_workitem(_workitem *pwork, void *pfunc, void *cntx)
 {
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
        INIT_WORK(pwork, pfunc);

diff --git a/include/rtl8723a_bt-coexist.h b/include/rtl8723a_bt-coexist.h
index d075e12..23c0f41 100644 (file)
--- a/include/rtl8723a_bt-coexist.h
+++ b/include/rtl8723a_bt-coexist.h
@@ -1174,7 +1174,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/usb_vendor_req.h b/include/usb_vendor_req.h
index 426b582..34790ef 100644 (file)
--- a/include/usb_vendor_req.h
+++ b/include/usb_vendor_req.h
@@ -51,9 +51,9 @@ typedef enum _RT_USB_WVALUE {
 } RT_USB_WVALUE;
 
 
-//bool usbvendorrequest(PCE_USB_DEVICE CEdevice, RT_USB_BREQUEST bRequest, RT_USB_WVALUE wValue, UCHAR wIndex, PVOID Data, UCHAR DataLength, bool isDirectionIn);
-//bool CEusbGetStatusRequest(PCE_USB_DEVICE CEdevice, IN USHORT Op, IN USHORT Index, PVOID Data);
+//bool usbvendorrequest(PCE_USB_DEVICE CEdevice, RT_USB_BREQUEST bRequest, RT_USB_WVALUE wValue, UCHAR wIndex, void * Data, UCHAR DataLength, bool isDirectionIn);
+//bool CEusbGetStatusRequest(PCE_USB_DEVICE CEdevice, IN USHORT Op, IN USHORT Index, void * Data);
 //bool CEusbFeatureRequest(PCE_USB_DEVICE CEdevice, IN USHORT Op, IN USHORT FeatureSelector, IN USHORT Index);
-//bool CEusbGetDescriptorRequest(PCE_USB_DEVICE CEdevice, IN short urbLength, IN UCHAR DescriptorType, IN UCHAR Index, IN USHORT LanguageId, IN PVOID  TransferBuffer, IN ULONG TransferBufferLength);
+//bool CEusbGetDescriptorRequest(PCE_USB_DEVICE CEdevice, IN short urbLength, IN UCHAR DescriptorType, IN UCHAR Index, IN USHORT LanguageId, IN void *  TransferBuffer, IN ULONG TransferBufferLength);
 
 #endif