diff options
| author | Andres More <more.andres@gmail.com> | 2010-05-01 14:25:00 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:36:01 -0700 |
| commit | 8611a29ab967bc197494db19d31994d1b5a26fdc (patch) | |
| tree | 521ae94c2e0bf1f7db85d1480909ad6d39aed370 /drivers/staging/vt6656 | |
| parent | 8a9e77b66508a1c2598ce1cb765d7ced52f48cf4 (diff) | |
| download | blackbird-op-linux-8611a29ab967bc197494db19d31994d1b5a26fdc.tar.gz blackbird-op-linux-8611a29ab967bc197494db19d31994d1b5a26fdc.zip | |
Staging: vt6656: removed VOID/PVOID definitions
Warnings about the usage of externs in .c files were not resolved here.
Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6656')
45 files changed, 409 insertions, 427 deletions
diff --git a/drivers/staging/vt6656/80211mgr.c b/drivers/staging/vt6656/80211mgr.c index b9dc7b1d9387..f24dc55e68f1 100644 --- a/drivers/staging/vt6656/80211mgr.c +++ b/drivers/staging/vt6656/80211mgr.c @@ -89,7 +89,7 @@ static int msglevel =MSG_LEVEL_INFO; * -*/ -VOID +void vMgrEncodeBeacon( PWLAN_FR_BEACON pFrame ) @@ -121,7 +121,7 @@ vMgrEncodeBeacon( -*/ -VOID +void vMgrDecodeBeacon( PWLAN_FR_BEACON pFrame ) @@ -242,7 +242,7 @@ vMgrDecodeBeacon( -*/ -VOID +void vMgrEncodeIBSSATIM( PWLAN_FR_IBSSATIM pFrame ) @@ -265,7 +265,7 @@ vMgrEncodeIBSSATIM( * -*/ -VOID +void vMgrDecodeIBSSATIM( PWLAN_FR_IBSSATIM pFrame ) @@ -287,7 +287,7 @@ vMgrDecodeIBSSATIM( * -*/ -VOID +void vMgrEncodeDisassociation( PWLAN_FR_DISASSOC pFrame ) @@ -315,7 +315,7 @@ vMgrEncodeDisassociation( * -*/ -VOID +void vMgrDecodeDisassociation( PWLAN_FR_DISASSOC pFrame ) @@ -341,7 +341,7 @@ vMgrDecodeDisassociation( -*/ -VOID +void vMgrEncodeAssocRequest( PWLAN_FR_ASSOCREQ pFrame ) @@ -368,7 +368,7 @@ vMgrEncodeAssocRequest( * -*/ -VOID +void vMgrDecodeAssocRequest( PWLAN_FR_ASSOCREQ pFrame ) @@ -434,7 +434,7 @@ vMgrDecodeAssocRequest( * -*/ -VOID +void vMgrEncodeAssocResponse( PWLAN_FR_ASSOCRESP pFrame ) @@ -466,7 +466,7 @@ vMgrEncodeAssocResponse( * -*/ -VOID +void vMgrDecodeAssocResponse( PWLAN_FR_ASSOCRESP pFrame ) @@ -512,7 +512,7 @@ vMgrDecodeAssocResponse( * -*/ -VOID +void vMgrEncodeReassocRequest( PWLAN_FR_REASSOCREQ pFrame ) @@ -544,7 +544,7 @@ vMgrEncodeReassocRequest( -*/ -VOID +void vMgrDecodeReassocRequest( PWLAN_FR_REASSOCREQ pFrame ) @@ -616,7 +616,7 @@ vMgrDecodeReassocRequest( -*/ -VOID +void vMgrEncodeProbeRequest( PWLAN_FR_PROBEREQ pFrame ) @@ -637,7 +637,7 @@ vMgrEncodeProbeRequest( * -*/ -VOID +void vMgrDecodeProbeRequest( PWLAN_FR_PROBEREQ pFrame ) @@ -690,7 +690,7 @@ vMgrDecodeProbeRequest( -*/ -VOID +void vMgrEncodeProbeResponse( PWLAN_FR_PROBERESP pFrame ) @@ -724,7 +724,7 @@ vMgrEncodeProbeResponse( * -*/ -VOID +void vMgrDecodeProbeResponse( PWLAN_FR_PROBERESP pFrame ) @@ -838,7 +838,7 @@ vMgrDecodeProbeResponse( * -*/ -VOID +void vMgrEncodeAuthen( PWLAN_FR_AUTHEN pFrame ) @@ -869,7 +869,7 @@ vMgrEncodeAuthen( * -*/ -VOID +void vMgrDecodeAuthen( PWLAN_FR_AUTHEN pFrame ) @@ -909,7 +909,7 @@ vMgrDecodeAuthen( * -*/ -VOID +void vMgrEncodeDeauthen( PWLAN_FR_DEAUTHEN pFrame ) @@ -936,7 +936,7 @@ vMgrEncodeDeauthen( * -*/ -VOID +void vMgrDecodeDeauthen( PWLAN_FR_DEAUTHEN pFrame ) @@ -962,7 +962,7 @@ vMgrDecodeDeauthen( * -*/ -VOID +void vMgrEncodeReassocResponse( PWLAN_FR_REASSOCRESP pFrame ) @@ -995,7 +995,7 @@ vMgrEncodeReassocResponse( -*/ -VOID +void vMgrDecodeReassocResponse( PWLAN_FR_REASSOCRESP pFrame ) diff --git a/drivers/staging/vt6656/80211mgr.h b/drivers/staging/vt6656/80211mgr.h index f7160cdd164a..50982e9f8cdf 100644 --- a/drivers/staging/vt6656/80211mgr.h +++ b/drivers/staging/vt6656/80211mgr.h @@ -748,112 +748,112 @@ typedef struct tagWLAN_FR_DEAUTHEN { } WLAN_FR_DEAUTHEN, *PWLAN_FR_DEAUTHEN; /*--------------------- Export Functions --------------------------*/ -VOID +void vMgrEncodeBeacon( PWLAN_FR_BEACON pFrame ); -VOID +void vMgrDecodeBeacon( PWLAN_FR_BEACON pFrame ); -VOID +void vMgrEncodeIBSSATIM( PWLAN_FR_IBSSATIM pFrame ); -VOID +void vMgrDecodeIBSSATIM( PWLAN_FR_IBSSATIM pFrame ); -VOID +void vMgrEncodeDisassociation( PWLAN_FR_DISASSOC pFrame ); -VOID +void vMgrDecodeDisassociation( PWLAN_FR_DISASSOC pFrame ); -VOID +void vMgrEncodeAssocRequest( PWLAN_FR_ASSOCREQ pFrame ); -VOID +void vMgrDecodeAssocRequest( PWLAN_FR_ASSOCREQ pFrame ); -VOID +void vMgrEncodeAssocResponse( PWLAN_FR_ASSOCRESP pFrame ); -VOID +void vMgrDecodeAssocResponse( PWLAN_FR_ASSOCRESP pFrame ); -VOID +void vMgrEncodeReassocRequest( PWLAN_FR_REASSOCREQ pFrame ); -VOID +void vMgrDecodeReassocRequest( PWLAN_FR_REASSOCREQ pFrame ); -VOID +void vMgrEncodeProbeRequest( PWLAN_FR_PROBEREQ pFrame ); -VOID +void vMgrDecodeProbeRequest( PWLAN_FR_PROBEREQ pFrame ); -VOID +void vMgrEncodeProbeResponse( PWLAN_FR_PROBERESP pFrame ); -VOID +void vMgrDecodeProbeResponse( PWLAN_FR_PROBERESP pFrame ); -VOID +void vMgrEncodeAuthen( PWLAN_FR_AUTHEN pFrame ); -VOID +void vMgrDecodeAuthen( PWLAN_FR_AUTHEN pFrame ); -VOID +void vMgrEncodeDeauthen( PWLAN_FR_DEAUTHEN pFrame ); -VOID +void vMgrDecodeDeauthen( PWLAN_FR_DEAUTHEN pFrame ); -VOID +void vMgrEncodeReassocResponse( PWLAN_FR_REASSOCRESP pFrame ); -VOID +void vMgrDecodeReassocResponse( PWLAN_FR_REASSOCRESP pFrame ); diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c index 9063249efd54..a52a2d84805c 100644 --- a/drivers/staging/vt6656/baseband.c +++ b/drivers/staging/vt6656/baseband.c @@ -756,7 +756,7 @@ BBuGetFrameTime ( * Return Value: none * */ -VOID +void BBvCaculateParameter ( PSDevice pDevice, UINT cbFrameLength, @@ -929,7 +929,7 @@ BBvCaculateParameter ( * Return Value: none * */ -VOID +void BBvSetAntennaMode (PSDevice pDevice, BYTE byAntennaMode) { //{{ RobertYu: 20041124, ABG Mode, VC1/VC2 define, make the ANT_A, ANT_B inverted @@ -1274,7 +1274,7 @@ void BBvLoopbackOff (PSDevice pDevice) * Return Value: none * */ -VOID +void BBvSetShortSlotTime (PSDevice pDevice) { BYTE byBBVGA=0; @@ -1295,7 +1295,7 @@ BBvSetShortSlotTime (PSDevice pDevice) } -VOID BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData) +void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData) { ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0xE7, byData); @@ -1324,7 +1324,7 @@ VOID BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData) * Return Value: none * */ -VOID +void BBvSoftwareReset (PSDevice pDevice) { ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x50, 0x40); @@ -1345,14 +1345,14 @@ BBvSoftwareReset (PSDevice pDevice) * Return Value: none * */ -VOID +void BBvSetDeepSleep (PSDevice pDevice) { ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0c, 0x17);//CR12 ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0D, 0xB9);//CR13 } -VOID +void BBvExitDeepSleep (PSDevice pDevice) { ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0C, 0x00);//CR12 @@ -1445,7 +1445,7 @@ s_vClearSQ3Value (PSDevice pDevice) * */ -VOID +void BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3) { @@ -1576,7 +1576,7 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3) * -*/ -VOID +void TimerSQ3CallBack ( HANDLE hDeviceContext ) @@ -1618,7 +1618,7 @@ TimerSQ3CallBack ( * -*/ -VOID +void TimerSQ3Tmax3CallBack ( HANDLE hDeviceContext ) @@ -1650,7 +1650,7 @@ TimerSQ3Tmax3CallBack ( return; } -VOID +void BBvUpdatePreEDThreshold( PSDevice pDevice, BOOL bScanning) diff --git a/drivers/staging/vt6656/baseband.h b/drivers/staging/vt6656/baseband.h index 10eea90279fa..fbc2847122b3 100644 --- a/drivers/staging/vt6656/baseband.h +++ b/drivers/staging/vt6656/baseband.h @@ -104,7 +104,7 @@ BBuGetFrameTime( WORD wRate ); -VOID +void BBvCaculateParameter ( PSDevice pDevice, UINT cbFrameLength, @@ -117,28 +117,28 @@ BBvCaculateParameter ( // timer for antenna diversity -VOID +void TimerSQ3CallBack ( HANDLE hDeviceContext ); -VOID +void TimerSQ3Tmax3CallBack ( HANDLE hDeviceContext ); -VOID BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3); -void BBvLoopbackOn (PSDevice pDevice); -void BBvLoopbackOff (PSDevice pDevice); -void BBvSoftwareReset (PSDevice pDevice); +void BBvAntennaDiversity(PSDevice pDevice, BYTE byRxRate, BYTE bySQ3); +void BBvLoopbackOn(PSDevice pDevice); +void BBvLoopbackOff(PSDevice pDevice); +void BBvSoftwareReset(PSDevice pDevice); void BBvSetShortSlotTime(PSDevice pDevice); -VOID BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData); +void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData); void BBvSetAntennaMode(PSDevice pDevice, BYTE byAntennaMode); BOOL BBbVT3184Init (PSDevice pDevice); -VOID BBvSetDeepSleep (PSDevice pDevice); -VOID BBvExitDeepSleep (PSDevice pDevice); -VOID BBvUpdatePreEDThreshold( +void BBvSetDeepSleep(PSDevice pDevice); +void BBvExitDeepSleep(PSDevice pDevice); +void BBvUpdatePreEDThreshold( PSDevice pDevice, BOOL bScanning ); diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c index fa1ca7902055..61841b48537e 100644 --- a/drivers/staging/vt6656/bssdb.c +++ b/drivers/staging/vt6656/bssdb.c @@ -91,16 +91,16 @@ const WORD awHWRetry1[5][5] = { /*--------------------- Static Functions --------------------------*/ -VOID s_vCheckSensitivity( +void s_vCheckSensitivity( HANDLE hDeviceContext ); -VOID s_vCheckPreEDThreshold( +void s_vCheckPreEDThreshold( HANDLE hDeviceContext ); #ifdef Calcu_LinkQual -VOID s_uCalculateLinkQual( +void s_uCalculateLinkQual( HANDLE hDeviceContext ); #endif @@ -296,7 +296,7 @@ pDevice->bSameBSSMaxNum = jj; -*/ -VOID +void BSSvClearBSSList( HANDLE hDeviceContext, BOOL bKeepCurrBSSID @@ -804,7 +804,7 @@ BSSbIsSTAInNodeDB( * None * -*/ -VOID +void BSSvCreateOneNode( HANDLE hDeviceContext, OUT PUINT puNodeIndex @@ -869,7 +869,7 @@ BSSvCreateOneNode( * None * -*/ -VOID +void BSSvRemoveOneNode( HANDLE hDeviceContext, UINT uNodeIndex @@ -902,7 +902,7 @@ BSSvRemoveOneNode( * -*/ -VOID +void BSSvUpdateAPNode( HANDLE hDeviceContext, PWORD pwCapInfo, @@ -926,7 +926,7 @@ BSSvUpdateAPNode( pMgmt->abyCurrExtSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)pExtSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates, uRateLen); - RATEvParseMaxRate((PVOID) pDevice, + RATEvParseMaxRate((void *) pDevice, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates, TRUE, @@ -962,7 +962,7 @@ BSSvUpdateAPNode( -*/ -VOID +void BSSvAddMulticastNode( HANDLE hDeviceContext ) @@ -976,7 +976,7 @@ BSSvAddMulticastNode( pMgmt->sNodeDBTable[0].bActive = TRUE; pMgmt->sNodeDBTable[0].bPSEnable = FALSE; skb_queue_head_init(&pMgmt->sNodeDBTable[0].sTxPSQueue); - RATEvParseMaxRate((PVOID) pDevice, + RATEvParseMaxRate((void *) pDevice, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates, TRUE, @@ -1009,7 +1009,7 @@ BSSvAddMulticastNode( -*/ -VOID +void BSSvSecondCallBack( HANDLE hDeviceContext ) @@ -1131,12 +1131,14 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) && */ if (ii > 0) { // ii = 0 for multicast node (AP & Adhoc) - RATEvTxRateFallBack((PVOID)pDevice, &(pMgmt->sNodeDBTable[ii])); + RATEvTxRateFallBack((void *)pDevice, + &(pMgmt->sNodeDBTable[ii])); } else { // ii = 0 reserved for unicast AP node (Infra STA) - if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA) - RATEvTxRateFallBack((PVOID)pDevice, &(pMgmt->sNodeDBTable[ii])); + if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA) + RATEvTxRateFallBack((void *)pDevice, + &(pMgmt->sNodeDBTable[ii])); } } @@ -1177,14 +1179,14 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) && if (pDevice->bShortSlotTime) { pDevice->bShortSlotTime = FALSE; BBvSetShortSlotTime(pDevice); - vUpdateIFS((PVOID)pDevice); + vUpdateIFS((void *)pDevice); } } else { if (!pDevice->bShortSlotTime) { pDevice->bShortSlotTime = TRUE; BBvSetShortSlotTime(pDevice); - vUpdateIFS((PVOID)pDevice); + vUpdateIFS((void *)pDevice); } } @@ -1395,7 +1397,7 @@ else { -VOID +void BSSvUpdateNodeTxCounter( HANDLE hDeviceContext, PSStatCounter pStatistic, @@ -1564,7 +1566,7 @@ BSSvUpdateNodeTxCounter( -*/ -VOID +void BSSvClearNodeDBTable( HANDLE hDeviceContext, UINT uStartIndex @@ -1593,7 +1595,7 @@ BSSvClearNodeDBTable( }; -VOID s_vCheckSensitivity( +void s_vCheckSensitivity( HANDLE hDeviceContext ) { @@ -1637,7 +1639,7 @@ VOID s_vCheckSensitivity( } #ifdef Calcu_LinkQual -VOID s_uCalculateLinkQual( +void s_uCalculateLinkQual( HANDLE hDeviceContext ) { @@ -1685,7 +1687,7 @@ else } #endif -VOID +void BSSvClearAnyBSSJoinRecord ( HANDLE hDeviceContext ) @@ -1700,7 +1702,7 @@ BSSvClearAnyBSSJoinRecord ( return; } -VOID s_vCheckPreEDThreshold( +void s_vCheckPreEDThreshold( HANDLE hDeviceContext ) { diff --git a/drivers/staging/vt6656/bssdb.h b/drivers/staging/vt6656/bssdb.h index eec6cea86071..343bfacdbe9b 100644 --- a/drivers/staging/vt6656/bssdb.h +++ b/drivers/staging/vt6656/bssdb.h @@ -246,7 +246,7 @@ BSSpAddrIsInBSSList( PWLAN_IE_SSID pSSID ); -VOID +void BSSvClearBSSList( HANDLE hDeviceContext, BOOL bKeepCurrBSSID @@ -304,13 +304,13 @@ BSSbIsSTAInNodeDB( OUT PUINT puNodeIndex ); -VOID +void BSSvCreateOneNode( HANDLE hDeviceContext, OUT PUINT puNodeIndex ); -VOID +void BSSvUpdateAPNode( HANDLE hDeviceContext, PWORD pwCapInfo, @@ -319,13 +319,13 @@ BSSvUpdateAPNode( ); -VOID +void BSSvSecondCallBack( HANDLE hDeviceContext ); -VOID +void BSSvUpdateNodeTxCounter( HANDLE hDeviceContext, PSStatCounter pStatistic, @@ -333,25 +333,25 @@ BSSvUpdateNodeTxCounter( BYTE byPktNO ); -VOID +void BSSvRemoveOneNode( HANDLE hDeviceContext, UINT uNodeIndex ); -VOID +void BSSvAddMulticastNode( HANDLE hDeviceContext ); -VOID +void BSSvClearNodeDBTable( HANDLE hDeviceContext, UINT uStartIndex ); -VOID +void BSSvClearAnyBSSJoinRecord( HANDLE hDeviceContext ); diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index 4ad1e94ffba4..c7562a0ad834 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -95,7 +95,7 @@ const WORD cwRXBCNTSFOff[MAX_RATE] = * Return Value: TRUE if succeeded; FALSE if failed. * */ -BOOL CARDbSetMediaChannel (PVOID pDeviceHandler, UINT uConnectionChannel) +BOOL CARDbSetMediaChannel(void *pDeviceHandler, UINT uConnectionChannel) { PSDevice pDevice = (PSDevice) pDeviceHandler; BOOL bResult = TRUE; @@ -156,8 +156,7 @@ BOOL bResult = TRUE; * Return Value: response Control frame rate * */ -static -WORD swGetCCKControlRate(PVOID pDeviceHandler, WORD wRateIdx) +static WORD swGetCCKControlRate(void *pDeviceHandler, WORD wRateIdx) { PSDevice pDevice = (PSDevice) pDeviceHandler; UINT ui = (UINT)wRateIdx; @@ -183,8 +182,7 @@ WORD swGetCCKControlRate(PVOID pDeviceHandler, WORD wRateIdx) * Return Value: response Control frame rate * */ -static -WORD swGetOFDMControlRate (PVOID pDeviceHandler, WORD wRateIdx) +static WORD swGetOFDMControlRate(void *pDeviceHandler, WORD wRateIdx) { PSDevice pDevice = (PSDevice) pDeviceHandler; UINT ui = (UINT)wRateIdx; @@ -222,7 +220,7 @@ WORD swGetOFDMControlRate (PVOID pDeviceHandler, WORD wRateIdx) * Return Value: none * */ -VOID +void CARDvCaculateOFDMRParameter ( WORD wRate, BYTE byBBType, @@ -334,7 +332,7 @@ CARDvCaculateOFDMRParameter ( * Return Value: None. * */ -void CARDvSetRSPINF (PVOID pDeviceHandler, BYTE byBBType) +void CARDvSetRSPINF(void *pDeviceHandler, BYTE byBBType) { PSDevice pDevice = (PSDevice) pDeviceHandler; BYTE abyServ[4] = {0,0,0,0}; // For CCK @@ -486,7 +484,7 @@ void CARDvSetRSPINF (PVOID pDeviceHandler, BYTE byBBType) * Return Value: None. * */ -void vUpdateIFS (PVOID pDeviceHandler) +void vUpdateIFS(void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; //Set SIFS, DIFS, EIFS, SlotTime, CwMin @@ -571,7 +569,7 @@ void vUpdateIFS (PVOID pDeviceHandler) &byMaxMin); } -void CARDvUpdateBasicTopRate (PVOID pDeviceHandler) +void CARDvUpdateBasicTopRate(void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; BYTE byTopOFDM = RATE_24M, byTopCCK = RATE_1M; @@ -610,7 +608,7 @@ BYTE ii; * Return Value: TRUE if succeeded; FALSE if failed. * */ -BOOL CARDbAddBasicRate (PVOID pDeviceHandler, WORD wRateIdx) +BOOL CARDbAddBasicRate(void *pDeviceHandler, WORD wRateIdx) { PSDevice pDevice = (PSDevice) pDeviceHandler; WORD wRate = (WORD)(1<<wRateIdx); @@ -623,7 +621,7 @@ WORD wRate = (WORD)(1<<wRateIdx); return(TRUE); } -BOOL CARDbIsOFDMinBasicRate (PVOID pDeviceHandler) +BOOL CARDbIsOFDMinBasicRate(void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; int ii; @@ -635,7 +633,7 @@ int ii; return FALSE; } -BYTE CARDbyGetPktType (PVOID pDeviceHandler) +BYTE CARDbyGetPktType(void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -707,7 +705,8 @@ QWORD CARDqGetTSFOffset (BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2) * Return Value: none * */ -void CARDvAdjustTSF (PVOID pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF) +void CARDvAdjustTSF(void *pDeviceHandler, BYTE byRxRate, + QWORD qwBSSTimestamp, QWORD qwLocalTSF) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -756,7 +755,7 @@ void CARDvAdjustTSF (PVOID pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp, * Return Value: TRUE if success; otherwise FALSE * */ -BOOL CARDbGetCurrentTSF (PVOID pDeviceHandler, PQWORD pqwCurrTSF) +BOOL CARDbGetCurrentTSF(void *pDeviceHandler, PQWORD pqwCurrTSF) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -778,7 +777,7 @@ BOOL CARDbGetCurrentTSF (PVOID pDeviceHandler, PQWORD pqwCurrTSF) * Return Value: TRUE if success; otherwise FALSE * */ -BOOL CARDbClearCurrentTSF(PVOID pDeviceHandler) +BOOL CARDbClearCurrentTSF(void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -844,7 +843,7 @@ QWORD CARDqGetNextTBTT (QWORD qwTSF, WORD wBeaconInterval) * Return Value: none * */ -void CARDvSetFirstNextTBTT (PVOID pDeviceHandler, WORD wBeaconInterval) +void CARDvSetFirstNextTBTT(void *pDeviceHandler, WORD wBeaconInterval) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -898,7 +897,8 @@ void CARDvSetFirstNextTBTT (PVOID pDeviceHandler, WORD wBeaconInterval) * Return Value: none * */ -void CARDvUpdateNextTBTT (PVOID pDeviceHandler, QWORD qwTSF, WORD wBeaconInterval) +void CARDvUpdateNextTBTT(void *pDeviceHandler, QWORD qwTSF, + WORD wBeaconInterval) { PSDevice pDevice = (PSDevice) pDeviceHandler; DWORD dwLoTBTT,dwHiTBTT; @@ -945,7 +945,7 @@ void CARDvUpdateNextTBTT (PVOID pDeviceHandler, QWORD qwTSF, WORD wBeaconInterva * Return Value: TRUE if success; otherwise FALSE * */ -BOOL CARDbRadioPowerOff (PVOID pDeviceHandler) +BOOL CARDbRadioPowerOff(void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; BOOL bResult = TRUE; @@ -986,7 +986,7 @@ BOOL bResult = TRUE; * Return Value: TRUE if success; otherwise FALSE * */ -BOOL CARDbRadioPowerOn (PVOID pDeviceHandler) +BOOL CARDbRadioPowerOn(void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; BOOL bResult = TRUE; @@ -1019,7 +1019,7 @@ BOOL bResult = TRUE; return bResult; } -void CARDvSetBSSMode (PVOID pDeviceHandler) +void CARDvSetBSSMode(void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; // Set BB and packet type at the same time.//{{RobertYu:20050222, AL7230 have two TX PA output, only connet to b/g now @@ -1080,7 +1080,7 @@ void CARDvSetBSSMode (PVOID pDeviceHandler) -*/ BOOL CARDbChannelSwitch ( - PVOID pDeviceHandler, + void *pDeviceHandler, BYTE byMode, BYTE byNewChannel, BYTE byCount diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h index 16beb71a19bb..2f7335e8aee1 100644 --- a/drivers/staging/vt6656/card.h +++ b/drivers/staging/vt6656/card.h @@ -63,27 +63,29 @@ typedef enum _CARD_OP_MODE { /*--------------------- Export Functions --------------------------*/ -BOOL CARDbSetMediaChannel(PVOID pDeviceHandler, UINT uConnectionChannel); -void CARDvSetRSPINF(PVOID pDeviceHandler, BYTE byBBType); -void vUpdateIFS(PVOID pDeviceHandler); -void CARDvUpdateBasicTopRate(PVOID pDeviceHandler); -BOOL CARDbAddBasicRate(PVOID pDeviceHandler, WORD wRateIdx); -BOOL CARDbIsOFDMinBasicRate(PVOID pDeviceHandler); -void CARDvAdjustTSF(PVOID pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF); -BOOL CARDbGetCurrentTSF (PVOID pDeviceHandler, PQWORD pqwCurrTSF); -BOOL CARDbClearCurrentTSF(PVOID pDeviceHandler); -void CARDvSetFirstNextTBTT(PVOID pDeviceHandler, WORD wBeaconInterval); -void CARDvUpdateNextTBTT(PVOID pDeviceHandler, QWORD qwTSF, WORD wBeaconInterval); +BOOL CARDbSetMediaChannel(void *pDeviceHandler, UINT uConnectionChannel); +void CARDvSetRSPINF(void *pDeviceHandler, BYTE byBBType); +void vUpdateIFS(void *pDeviceHandler); +void CARDvUpdateBasicTopRate(void *pDeviceHandler); +BOOL CARDbAddBasicRate(void *pDeviceHandler, WORD wRateIdx); +BOOL CARDbIsOFDMinBasicRate(void *pDeviceHandler); +void CARDvAdjustTSF(void *pDeviceHandler, BYTE byRxRate, + QWORD qwBSSTimestamp, QWORD qwLocalTSF); +BOOL CARDbGetCurrentTSF(void *pDeviceHandler, PQWORD pqwCurrTSF); +BOOL CARDbClearCurrentTSF(void *pDeviceHandler); +void CARDvSetFirstNextTBTT(void *pDeviceHandler, WORD wBeaconInterval); +void CARDvUpdateNextTBTT(void *pDeviceHandler, QWORD qwTSF, + WORD wBeaconInterval); QWORD CARDqGetNextTBTT(QWORD qwTSF, WORD wBeaconInterval); QWORD CARDqGetTSFOffset(BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2); -BOOL CARDbRadioPowerOff(PVOID pDeviceHandler); -BOOL CARDbRadioPowerOn(PVOID pDeviceHandler); -BYTE CARDbyGetPktType(PVOID pDeviceHandler); -void CARDvSetBSSMode(PVOID pDeviceHandler); +BOOL CARDbRadioPowerOff(void *pDeviceHandler); +BOOL CARDbRadioPowerOn(void *pDeviceHandler); +BYTE CARDbyGetPktType(void *pDeviceHandler); +void CARDvSetBSSMode(void *pDeviceHandler); BOOL CARDbChannelSwitch ( - PVOID pDeviceHandler, + void *pDeviceHandler, BYTE byMode, BYTE byNewChannel, BYTE byCount diff --git a/drivers/staging/vt6656/channel.c b/drivers/staging/vt6656/channel.c index 32500af78bc4..67392b8abcfe 100644 --- a/drivers/staging/vt6656/channel.c +++ b/drivers/staging/vt6656/channel.c @@ -437,7 +437,7 @@ CHvChannelGetList ( } -VOID CHvInitChannelTable (PVOID pDeviceHandler) +void CHvInitChannelTable(void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; BOOL bMultiBand = FALSE; diff --git a/drivers/staging/vt6656/channel.h b/drivers/staging/vt6656/channel.h index c965d6aff15f..81b915dc5c4b 100644 --- a/drivers/staging/vt6656/channel.h +++ b/drivers/staging/vt6656/channel.h @@ -45,7 +45,7 @@ typedef struct tagSChannelTblElement { /*--------------------- Export Functions --------------------------*/ BOOL ChannelValid(UINT CountryCode, UINT ChannelNum); -VOID CHvInitChannelTable (PVOID pDeviceHandler); +void CHvInitChannelTable(void *pDeviceHandler); BYTE CHbyGetChannelMapping(BYTE byChannelNumber); BOOL diff --git a/drivers/staging/vt6656/datarate.c b/drivers/staging/vt6656/datarate.c index e487af57213f..348e1ebfe4c7 100644 --- a/drivers/staging/vt6656/datarate.c +++ b/drivers/staging/vt6656/datarate.c @@ -65,16 +65,9 @@ const BYTE acbyIERate[MAX_RATE] = /*--------------------- Static Functions --------------------------*/ -VOID s_vResetCounter ( - PKnownNodeDB psNodeDBTable - ); - - +void s_vResetCounter(PKnownNodeDB psNodeDBTable); -VOID -s_vResetCounter ( - PKnownNodeDB psNodeDBTable - ) +void s_vResetCounter(PKnownNodeDB psNodeDBTable) { BYTE ii; @@ -195,9 +188,8 @@ RATEwGetRateIdx( * Return Value: none * -*/ -VOID -RATEvParseMaxRate ( - PVOID pDeviceHandler, +void RATEvParseMaxRate( + void *pDeviceHandler, PWLAN_IE_SUPP_RATES pItemRates, PWLAN_IE_SUPP_RATES pItemExtRates, BOOL bUpdateBasicRate, @@ -236,7 +228,7 @@ UINT uRateLen; if (WLAN_MGMT_IS_BASICRATE(byRate) && (bUpdateBasicRate == TRUE)) { // Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate - CARDbAddBasicRate((PVOID)pDevice, RATEwGetRateIdx(byRate)); + CARDbAddBasicRate((void *)pDevice, RATEwGetRateIdx(byRate)); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", RATEwGetRateIdx(byRate)); } byRate = (BYTE)(pItemRates->abyRates[ii]&0x7F); @@ -259,7 +251,7 @@ UINT uRateLen; // select highest basic rate if (WLAN_MGMT_IS_BASICRATE(pItemExtRates->abyRates[ii])) { // Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate - CARDbAddBasicRate((PVOID)pDevice, RATEwGetRateIdx(byRate)); + CARDbAddBasicRate((void *)pDevice, RATEwGetRateIdx(byRate)); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", RATEwGetRateIdx(byRate)); } byRate = (BYTE)(pItemExtRates->abyRates[ii]&0x7F); @@ -272,7 +264,8 @@ UINT uRateLen; } } //if(pItemExtRates != NULL) - if ((pDevice->byPacketType == PK_TYPE_11GB) && CARDbIsOFDMinBasicRate((PVOID)pDevice)) { + if ((pDevice->byPacketType == PK_TYPE_11GB) + && CARDbIsOFDMinBasicRate((void *)pDevice)) { pDevice->byPacketType = PK_TYPE_11GA; } @@ -284,7 +277,7 @@ UINT uRateLen; else *pwMaxBasicRate = pDevice->byTopOFDMBasicRate; if (wOldBasicRate != pDevice->wBasicRate) - CARDvSetRSPINF((PVOID)pDevice, pDevice->byBBType); + CARDvSetRSPINF((void *)pDevice, pDevice->byBBType); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Exit ParseMaxRate\n"); } @@ -308,9 +301,9 @@ UINT uRateLen; #define AUTORATE_TXCNT_THRESHOLD 20 #define AUTORATE_INC_THRESHOLD 30 -VOID -RATEvTxRateFallBack ( - PVOID pDeviceHandler, +void +RATEvTxRateFallBack( + void *pDeviceHandler, PKnownNodeDB psNodeDBTable ) { diff --git a/drivers/staging/vt6656/datarate.h b/drivers/staging/vt6656/datarate.h index 5024f716238b..da51854988bf 100644 --- a/drivers/staging/vt6656/datarate.h +++ b/drivers/staging/vt6656/datarate.h @@ -69,9 +69,9 @@ -VOID +void RATEvParseMaxRate( - PVOID pDeviceHandler, + void *pDeviceHandler, PWLAN_IE_SUPP_RATES pItemRates, PWLAN_IE_SUPP_RATES pItemExtRates, BOOL bUpdateBasicRate, @@ -82,9 +82,9 @@ RATEvParseMaxRate( OUT PBYTE pbyTopOFDMRate ); -VOID +void RATEvTxRateFallBack( - PVOID pDeviceHandler, + void *pDeviceHandler, PKnownNodeDB psNodeDBTable ); diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 29bb5977541c..6d255ca1d6ff 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -209,9 +209,9 @@ typedef enum _CONTEXT_TYPE { // RCB (Receive Control Block) typedef struct _RCB { - PVOID Next; + void *Next; LONG Ref; - PVOID pDevice; + void *pDevice; struct urb *pUrb; SRxMgmtPacket sMngPacket; struct sk_buff* skb; @@ -222,13 +222,13 @@ typedef struct _RCB // used to track bulk out irps typedef struct _USB_SEND_CONTEXT { - PVOID pDevice; + void *pDevice; struct sk_buff *pPacket; struct urb *pUrb; UINT uBufLen; CONTEXT_TYPE Type; SEthernetHeader sEthHeader; - PVOID Next; + void *Next; BOOL bBoolInUse; UCHAR Data[MAX_TOTAL_SIZE_WITH_ALL_HEADERS]; } USB_SEND_CONTEXT, *PUSB_SEND_CONTEXT; diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index 957b7622eb68..75be9708b6c3 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/drivers/staging/vt6656/dpc.c @@ -77,7 +77,7 @@ const BYTE acbyRxRate[MAX_RATE] = static BYTE s_byGetRateIdx(BYTE byRate); static -VOID +void s_vGetDASA( PBYTE pbyRxBufferAddr, OUT PUINT pcbHeaderSize, @@ -85,7 +85,7 @@ s_vGetDASA( ); static -VOID +void s_vProcessRxMACHeader ( PSDevice pDevice, PBYTE pbyRxBufferAddr, @@ -160,7 +160,7 @@ static BOOL s_bHostWepRxEncryption( * -*/ static -VOID +void s_vProcessRxMACHeader ( PSDevice pDevice, PBYTE pbyRxBufferAddr, @@ -259,7 +259,7 @@ static BYTE s_byGetRateIdx(BYTE byRate) static -VOID +void s_vGetDASA ( PBYTE pbyRxBufferAddr, OUT PUINT pcbHeaderSize, @@ -1513,10 +1513,7 @@ static BOOL s_bAPModeRxData ( -VOID -RXvWorkItem( - PVOID Context - ) +void RXvWorkItem(void *Context) { PSDevice pDevice = (PSDevice) Context; NTSTATUS ntStatus; @@ -1539,7 +1536,7 @@ RXvWorkItem( } -VOID +void RXvFreeRCB( PRCB pRCB, BOOL bReAllocSkb @@ -1579,10 +1576,7 @@ RXvFreeRCB( } -VOID -RXvMngWorkItem( - PVOID Context - ) +void RXvMngWorkItem(void *Context) { PSDevice pDevice = (PSDevice) Context; PRCB pRCB=NULL; diff --git a/drivers/staging/vt6656/dpc.h b/drivers/staging/vt6656/dpc.h index 8e6dceef2407..457db7716922 100644 --- a/drivers/staging/vt6656/dpc.h +++ b/drivers/staging/vt6656/dpc.h @@ -41,17 +41,11 @@ /*--------------------- Export Functions --------------------------*/ -VOID -RXvWorkItem( - PVOID Context - ); +void RXvWorkItem(void *Context); -VOID -RXvMngWorkItem( - PVOID Context - ); +void RXvMngWorkItem(void *Context); -VOID +void RXvFreeRCB( PRCB pRCB, BOOL bReAllocSkb diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c index a47eeb069300..2ba20893ce73 100644 --- a/drivers/staging/vt6656/int.c +++ b/drivers/staging/vt6656/int.c @@ -79,8 +79,7 @@ static int msglevel = MSG_LEVEL_INFO; * if we've gotten no data * -*/ -VOID -INTvWorkItem(PVOID Context) +void INTvWorkItem(void *Context) { PSDevice pDevice = (PSDevice) Context; NTSTATUS ntStatus; diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h index c3476cff5429..20c96f550688 100644 --- a/drivers/staging/vt6656/int.h +++ b/drivers/staging/vt6656/int.h @@ -67,10 +67,7 @@ SINTData, *PSINTData; /*--------------------- Export Functions --------------------------*/ -VOID -INTvWorkItem( - PVOID Context - ); +void INTvWorkItem(void *Context); NTSTATUS INTnsProcessData( diff --git a/drivers/staging/vt6656/ioctl.h b/drivers/staging/vt6656/ioctl.h index d3f49d444164..46eb699a71ea 100644 --- a/drivers/staging/vt6656/ioctl.h +++ b/drivers/staging/vt6656/ioctl.h @@ -43,7 +43,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq); /* -VOID vConfigWEPKey ( +void vConfigWEPKey ( PSDevice pDevice, DWORD dwKeyIndex, PBYTE pbyKey, diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c index 6cdc85e8352d..338ec087f737 100644 --- a/drivers/staging/vt6656/key.c +++ b/drivers/staging/vt6656/key.c @@ -60,8 +60,8 @@ static int msglevel =MSG_LEVEL_INFO; /*--------------------- Static Variables --------------------------*/ /*--------------------- Static Functions --------------------------*/ -static VOID -s_vCheckKeyTableValid (PVOID pDeviceHandler, PSKeyManagement pTable) +static void s_vCheckKeyTableValid(void *pDeviceHandler, + PSKeyManagement pTable) { PSDevice pDevice = (PSDevice) pDeviceHandler; int i; @@ -112,7 +112,7 @@ s_vCheckKeyTableValid (PVOID pDeviceHandler, PSKeyManagement pTable) * Return Value: none * */ -VOID KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable) +void KeyvInitTable(void *pDeviceHandler, PSKeyManagement pTable) { PSDevice pDevice = (PSDevice) pDeviceHandler; int i; @@ -123,10 +123,12 @@ VOID KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable) for (i=0;i<MAX_KEY_TABLE;i++) { pTable->KeyTable[i].bInUse = FALSE; pTable->KeyTable[i].PairwiseKey.bKeyValid = FALSE; - pTable->KeyTable[i].PairwiseKey.pvKeyTable = (PVOID)&pTable->KeyTable[i]; + pTable->KeyTable[i].PairwiseKey.pvKeyTable = + (void *)&pTable->KeyTable[i]; for (jj=0; jj < MAX_GROUP_KEY; jj++) { pTable->KeyTable[i].GroupKey[jj].bKeyValid = FALSE; - pTable->KeyTable[i].GroupKey[jj].pvKeyTable = (PVOID) &(pTable->KeyTable[i]); + pTable->KeyTable[i].GroupKey[jj].pvKeyTable = + (void *) &(pTable->KeyTable[i]); } pTable->KeyTable[i].wKeyCtl = 0; pTable->KeyTable[i].dwGTKeyIndex = 0; @@ -220,8 +222,8 @@ BOOL KeybGetKey ( * Return Value: TRUE if success otherwise FALSE * */ -BOOL KeybSetKey ( - PVOID pDeviceHandler, +BOOL KeybSetKey( + void *pDeviceHandler, PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyIndex, @@ -393,8 +395,8 @@ BOOL KeybSetKey ( * Return Value: TRUE if success otherwise FALSE * */ -BOOL KeybRemoveKey ( - PVOID pDeviceHandler, +BOOL KeybRemoveKey( + void *pDeviceHandler, PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyIndex @@ -474,8 +476,8 @@ BOOL KeybRemoveKey ( * Return Value: TRUE if success otherwise FALSE * */ -BOOL KeybRemoveAllKey ( - PVOID pDeviceHandler, +BOOL KeybRemoveAllKey( + void *pDeviceHandler, PSKeyManagement pTable, PBYTE pbyBSSID ) @@ -510,8 +512,8 @@ BOOL KeybRemoveAllKey ( * Return Value: TRUE if success otherwise FALSE * */ -VOID KeyvRemoveWEPKey ( - PVOID pDeviceHandler, +void KeyvRemoveWEPKey( + void *pDeviceHandler, PSKeyManagement pTable, DWORD dwKeyIndex ) @@ -533,8 +535,8 @@ VOID KeyvRemoveWEPKey ( return; } -VOID KeyvRemoveAllWEPKey ( - PVOID pDeviceHandler, +void KeyvRemoveAllWEPKey( + void *pDeviceHandler, PSKeyManagement pTable ) { @@ -675,8 +677,8 @@ BOOL KeybCheckPairewiseKey ( * Return Value: TRUE if success otherwise FALSE * */ -BOOL KeybSetDefaultKey ( - PVOID pDeviceHandler, +BOOL KeybSetDefaultKey( + void *pDeviceHandler, PSKeyManagement pTable, DWORD dwKeyIndex, ULONG uKeyLength, @@ -783,8 +785,8 @@ BOOL KeybSetDefaultKey ( * Return Value: TRUE if success otherwise FALSE * */ -BOOL KeybSetAllGroupKey ( - PVOID pDeviceHandler, +BOOL KeybSetAllGroupKey( + void *pDeviceHandler, PSKeyManagement pTable, DWORD dwKeyIndex, ULONG uKeyLength, diff --git a/drivers/staging/vt6656/key.h b/drivers/staging/vt6656/key.h index 11236e848d9b..7aec57b6f61b 100644 --- a/drivers/staging/vt6656/key.h +++ b/drivers/staging/vt6656/key.h @@ -66,7 +66,7 @@ typedef struct tagSKeyItem BYTE byCipherSuite; BYTE byReserved0; DWORD dwKeyIndex; - PVOID pvKeyTable; + void *pvKeyTable; } SKeyItem, *PSKeyItem; //64 typedef struct tagSKeyTable @@ -97,7 +97,7 @@ typedef struct tagSKeyManagement /*--------------------- Export Functions --------------------------*/ -VOID KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable); +void KeyvInitTable(void *pDeviceHandler, PSKeyManagement pTable); BOOL KeybGetKey( PSKeyManagement pTable, @@ -107,7 +107,7 @@ BOOL KeybGetKey( ); BOOL KeybSetKey( - PVOID pDeviceHandler, + void *pDeviceHandler, PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyIndex, @@ -118,26 +118,26 @@ BOOL KeybSetKey( ); BOOL KeybRemoveKey( - PVOID pDeviceHandler, + void *pDeviceHandler, PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyIndex ); -BOOL KeybRemoveAllKey ( - PVOID pDeviceHandler, +BOOL KeybRemoveAllKey( + void *pDeviceHandler, PSKeyManagement pTable, PBYTE pbyBSSID ); -VOID KeyvRemoveWEPKey( - PVOID pDeviceHandler, +void KeyvRemoveWEPKey( + void *pDeviceHandler, PSKeyManagement pTable, DWORD dwKeyIndex ); -VOID KeyvRemoveAllWEPKey( - PVOID pDeviceHandler, +void KeyvRemoveAllWEPKey( + void *pDeviceHandler, PSKeyManagement pTable ); @@ -153,8 +153,8 @@ BOOL KeybCheckPairewiseKey( OUT PSKeyItem *pKey ); -BOOL KeybSetDefaultKey ( - PVOID pDeviceHandler, +BOOL KeybSetDefaultKey( + void *pDeviceHandler, PSKeyManagement pTable, DWORD dwKeyIndex, ULONG uKeyLength, @@ -163,8 +163,8 @@ BOOL KeybSetDefaultKey ( BYTE byKeyDecMode ); -BOOL KeybSetAllGroupKey ( - PVOID pDeviceHandler, +BOOL KeybSetAllGroupKey( + void *pDeviceHandler, PSKeyManagement pTable, DWORD dwKeyIndex, ULONG uKeyLength, diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c index 55a798668fa5..71f09663e65d 100644 --- a/drivers/staging/vt6656/mac.c +++ b/drivers/staging/vt6656/mac.c @@ -110,7 +110,7 @@ void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx) * Return Value: none * */ -VOID MACvWriteMultiAddr (PSDevice pDevice, UINT uByteIdx, BYTE byData) +void MACvWriteMultiAddr(PSDevice pDevice, UINT uByteIdx, BYTE byData) { BYTE byData1; diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h index fe99e3df2a51..1a7c2f5cff0e 100644 --- a/drivers/staging/vt6656/mac.h +++ b/drivers/staging/vt6656/mac.h @@ -421,7 +421,7 @@ /*--------------------- Export Functions --------------------------*/ void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx); -VOID MACvWriteMultiAddr (PSDevice pDevice, UINT uByteIdx, BYTE byData); +void MACvWriteMultiAddr(PSDevice pDevice, UINT uByteIdx, BYTE byData); BOOL MACbShutdown(PSDevice pDevice);; void MACvSetBBType(PSDevice pDevice,BYTE byType); void MACvSetMISCFifo (PSDevice pDevice, WORD wOffset, DWORD dwData); diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index ebd7a1ebce8c..2fcaf70aa465 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -331,8 +331,8 @@ device_set_options(PSDevice pDevice) { } -static VOID device_init_diversity_timer(PSDevice pDevice) { - +static void device_init_diversity_timer(PSDevice pDevice) +{ init_timer(&pDevice->TimerSQ3Tmax1); pDevice->TimerSQ3Tmax1.data = (ULONG)pDevice; pDevice->TimerSQ3Tmax1.function = (TimerFunction)TimerSQ3CallBack; @@ -791,7 +791,7 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id) spin_lock_init(&pDevice->lock); pDevice->tx_80211 = device_dma0_tx_80211; - pDevice->sMgmtObj.pAdapter = (PVOID)pDevice; + pDevice->sMgmtObj.pAdapter = (void *)pDevice; netdev->netdev_ops = &device_netdev_ops; @@ -843,7 +843,8 @@ err_nomem: } -static VOID device_free_tx_bufs(PSDevice pDevice) { +static void device_free_tx_bufs(PSDevice pDevice) +{ PUSB_SEND_CONTEXT pTxContext; int ii; @@ -862,7 +863,8 @@ static VOID device_free_tx_bufs(PSDevice pDevice) { } -static VOID device_free_rx_bufs(PSDevice pDevice) { +static void device_free_rx_bufs(PSDevice pDevice) +{ PRCB pRCB; int ii; @@ -894,8 +896,8 @@ static void usb_device_reset(PSDevice pDevice) return ; } -static VOID device_free_int_bufs(PSDevice pDevice) { - +static void device_free_int_bufs(PSDevice pDevice) +{ if (pDevice->intBuf.pDataBuf != NULL) kfree(pDevice->intBuf.pDataBuf); return; @@ -917,7 +919,7 @@ static BOOL device_alloc_bufs(PSDevice pDevice) { goto free_tx; } pDevice->apTD[ii] = pTxContext; - pTxContext->pDevice = (PVOID) pDevice; + pTxContext->pDevice = (void *) pDevice; //allocate URBs pTxContext->pUrb = usb_alloc_urb(0, GFP_ATOMIC); if (pTxContext->pUrb == NULL) { @@ -946,7 +948,7 @@ static BOOL device_alloc_bufs(PSDevice pDevice) { for (ii = 0; ii < pDevice->cbRD; ii++) { pDevice->apRCB[ii] = pRCB; - pRCB->pDevice = (PVOID) pDevice; + pRCB->pDevice = (void *) pDevice; //allocate URBs pRCB->pUrb = usb_alloc_urb(0, GFP_ATOMIC); diff --git a/drivers/staging/vt6656/michael.c b/drivers/staging/vt6656/michael.c index d4c08209a17f..d45333fc2420 100644 --- a/drivers/staging/vt6656/michael.c +++ b/drivers/staging/vt6656/michael.c @@ -50,14 +50,14 @@ /* * static DWORD s_dwGetUINT32(BYTE * p); Get DWORD from * 4 bytes LSByte first - * static VOID s_vPutUINT32(BYTE* p, DWORD val); Put DWORD into + * static void s_vPutUINT32(BYTE* p, DWORD val); Put DWORD into * 4 bytes LSByte first */ -static VOID s_vClear(void); /* Clear the internal message, +static void s_vClear(void); /* Clear the internal message, * resets the object to the * state just after construction. */ -static VOID s_vSetKey(DWORD dwK0, DWORD dwK1); -static VOID s_vAppendByte(BYTE b); /* Add a single byte to the internal +static void s_vSetKey(DWORD dwK0, DWORD dwK1); +static void s_vAppendByte(BYTE b); /* Add a single byte to the internal * message */ /*--------------------- Export Variables --------------------------*/ @@ -79,7 +79,7 @@ static DWORD s_dwGetUINT32 (BYTE * p) return res; } -static VOID s_vPutUINT32 (BYTE* p, DWORD val) +static void s_vPutUINT32(BYTE *p, DWORD val) // Convert from DWORD to BYTE[] in a portable way { UINT i; @@ -90,7 +90,7 @@ static VOID s_vPutUINT32 (BYTE* p, DWORD val) } */ -static VOID s_vClear(void) +static void s_vClear(void) { /* Reset the state to the empty message. */ L = K0; @@ -99,7 +99,7 @@ static VOID s_vClear(void) M = 0; } -static VOID s_vSetKey(DWORD dwK0, DWORD dwK1) +static void s_vSetKey(DWORD dwK0, DWORD dwK1) { /* Set the key */ K0 = dwK0; @@ -108,7 +108,7 @@ static VOID s_vSetKey(DWORD dwK0, DWORD dwK1) s_vClear(); } -static VOID s_vAppendByte(BYTE b) +static void s_vAppendByte(BYTE b) { /* Append the byte to our word-sized buffer */ M |= b << (8*nBytesInM); @@ -130,14 +130,14 @@ static VOID s_vAppendByte(BYTE b) } } -VOID MIC_vInit(DWORD dwK0, DWORD dwK1) +void MIC_vInit(DWORD dwK0, DWORD dwK1) { /* Set the key */ s_vSetKey(dwK0, dwK1); } -VOID MIC_vUnInit(void) +void MIC_vUnInit(void) { /* Wipe the key material */ K0 = 0; @@ -148,7 +148,7 @@ VOID MIC_vUnInit(void) s_vClear(); } -VOID MIC_vAppend(PBYTE src, UINT nBytes) +void MIC_vAppend(PBYTE src, UINT nBytes) { /* This is simple */ while (nBytes > 0) { @@ -157,7 +157,7 @@ VOID MIC_vAppend(PBYTE src, UINT nBytes) } } -VOID MIC_vGetMIC(PDWORD pdwL, PDWORD pdwR) +void MIC_vGetMIC(PDWORD pdwL, PDWORD pdwR) { /* Append the minimum padding */ s_vAppendByte(0x5a); diff --git a/drivers/staging/vt6656/michael.h b/drivers/staging/vt6656/michael.h index 3f79b52832d1..97de77b4da2c 100644 --- a/drivers/staging/vt6656/michael.h +++ b/drivers/staging/vt6656/michael.h @@ -35,16 +35,16 @@ /*--------------------- Export Types ------------------------------*/ -VOID MIC_vInit(DWORD dwK0, DWORD dwK1); +void MIC_vInit(DWORD dwK0, DWORD dwK1); -VOID MIC_vUnInit(void); +void MIC_vUnInit(void); // Append bytes to the message to be MICed -VOID MIC_vAppend(PBYTE src, UINT nBytes); +void MIC_vAppend(PBYTE src, UINT nBytes); // Get the MIC result. Destination should accept 8 bytes of result. // This also resets the message to empty. -VOID MIC_vGetMIC(PDWORD pdwL, PDWORD pdwR); +void MIC_vGetMIC(PDWORD pdwL, PDWORD pdwR); /*--------------------- Export Macros ------------------------------*/ diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c index e50093e355a9..05d51fbb00b1 100644 --- a/drivers/staging/vt6656/power.c +++ b/drivers/staging/vt6656/power.c @@ -76,7 +76,7 @@ static int msglevel =MSG_LEVEL_INFO; -*/ -VOID +void PSvEnablePowerSaving( HANDLE hDeviceContext, WORD wListenInterval @@ -154,7 +154,7 @@ PSvEnablePowerSaving( * -*/ -VOID +void PSvDisablePowerSaving( HANDLE hDeviceContext ) @@ -262,7 +262,7 @@ PSbConsiderPowerDown( -VOID +void PSvSendPSPOLL( HANDLE hDeviceContext ) diff --git a/drivers/staging/vt6656/power.h b/drivers/staging/vt6656/power.h index 0a14811ced97..e83ac4ecf6d0 100644 --- a/drivers/staging/vt6656/power.h +++ b/drivers/staging/vt6656/power.h @@ -55,18 +55,18 @@ PSbConsiderPowerDown( BOOL bCheckCountToWakeUp ); -VOID +void PSvDisablePowerSaving( HANDLE hDeviceContext ); -VOID +void PSvEnablePowerSaving( HANDLE hDeviceContext, WORD wListenInterval ); -VOID +void PSvSendPSPOLL( HANDLE hDeviceContext ); diff --git a/drivers/staging/vt6656/rc4.c b/drivers/staging/vt6656/rc4.c index 64c419df9321..487f1dcfd8c4 100644 --- a/drivers/staging/vt6656/rc4.c +++ b/drivers/staging/vt6656/rc4.c @@ -32,7 +32,7 @@ #include "rc4.h" -VOID rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len) +void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len) { UINT ust1, ust2; UINT keyindex; @@ -78,7 +78,7 @@ UINT rc4_byte(PRC4Ext pRC4) return pbyst[(ustx + usty) & 0xff]; } -VOID rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, +void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, PBYTE pbySrc, UINT cbData_len) { UINT ii; diff --git a/drivers/staging/vt6656/rc4.h b/drivers/staging/vt6656/rc4.h index bf607c9d446a..e65cae69efaf 100644 --- a/drivers/staging/vt6656/rc4.h +++ b/drivers/staging/vt6656/rc4.h @@ -40,7 +40,7 @@ typedef struct { BYTE abystate[256]; } RC4Ext, *PRC4Ext; -VOID rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len); +void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len); UINT rc4_byte(PRC4Ext pRC4); void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, PBYTE pbySrc, UINT cbData_len); diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c index d69925ff469b..1126cb48f4a1 100644 --- a/drivers/staging/vt6656/rf.c +++ b/drivers/staging/vt6656/rf.c @@ -954,7 +954,7 @@ BOOL bResult = TRUE; * Return Value: none * -*/ -VOID +void RFvRSSITodBm ( PSDevice pDevice, BYTE byCurrRSSI, @@ -984,7 +984,7 @@ RFvRSSITodBm ( -VOID +void RFbRFTableDownload ( PSDevice pDevice ) diff --git a/drivers/staging/vt6656/rf.h b/drivers/staging/vt6656/rf.h index 22159869364e..6c3faf8adc8b 100644 --- a/drivers/staging/vt6656/rf.h +++ b/drivers/staging/vt6656/rf.h @@ -76,14 +76,14 @@ BOOL RFbRawSetPower( UINT uRATE ); -VOID +void RFvRSSITodBm ( PSDevice pDevice, BYTE byCurrRSSI, long * pldBm ); -VOID +void RFbRFTableDownload ( PSDevice pDevice ); diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 1d7ca2286248..9ddb7e1c2546 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -113,7 +113,7 @@ const WORD wFB_Opt1[2][5] = { /*--------------------- Static Functions --------------------------*/ static -VOID +void s_vSaveTxPktInfo( PSDevice pDevice, BYTE byPktNum, @@ -123,22 +123,22 @@ s_vSaveTxPktInfo( ); static -PVOID +void * s_vGetFreeContext( PSDevice pDevice ); static -VOID +void s_vGenerateTxParameter( PSDevice pDevice, BYTE byPktType, WORD wCurrentRate, - PVOID pTxBufHead, - PVOID pvRrvTime, - PVOID pvRTS, - PVOID pvCTS, + void *pTxBufHead, + void *pvRrvTime, + void *pvRTS, + void *pvCTS, UINT cbFrameSize, BOOL bNeedACK, UINT uDMAIdx, @@ -152,7 +152,7 @@ s_uFillDataHead ( PSDevice pDevice, BYTE byPktType, WORD wCurrentRate, - PVOID pTxDataHead, + void *pTxDataHead, UINT cbFrameLength, UINT uDMAIdx, BOOL bNeedAck, @@ -166,7 +166,7 @@ s_uFillDataHead ( static -VOID +void s_vGenerateMACHeader ( PSDevice pDevice, PBYTE pbyBufferAddr, @@ -179,7 +179,7 @@ s_vGenerateMACHeader ( ); static -VOID +void s_vFillTxKey( PSDevice pDevice, PBYTE pbyBuf, @@ -191,7 +191,7 @@ s_vFillTxKey( ); static -VOID +void s_vSWencryption ( PSDevice pDevice, PSKeyItem pTransmitKey, @@ -221,12 +221,12 @@ s_uGetRTSCTSRsvTime ( ); static -VOID +void s_vFillCTSHead ( PSDevice pDevice, UINT uDMAIdx, BYTE byPktType, - PVOID pvCTS, + void *pvCTS, UINT cbFrameLength, BOOL bNeedAck, BOOL bDisCRC, @@ -235,11 +235,11 @@ s_vFillCTSHead ( ); static -VOID +void s_vFillRTSHead( PSDevice pDevice, BYTE byPktType, - PVOID pvRTS, + void *pvRTS, UINT cbFrameLength, BOOL bNeedAck, BOOL bDisCRC, @@ -280,7 +280,7 @@ s_uGetRTSCTSDuration ( /*--------------------- Export Variables --------------------------*/ static -PVOID +void * s_vGetFreeContext( PSDevice pDevice ) @@ -302,12 +302,12 @@ s_vGetFreeContext( if ( ii == pDevice->cbTD ) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No Free Tx Context\n"); } - return ((PVOID) pReturnContext); + return (void *) pReturnContext; } static -VOID +void s_vSaveTxPktInfo(PSDevice pDevice, BYTE byPktNum, PBYTE pbyDestAddr, WORD wPktLength, WORD wFIFOCtl) { PSStatCounter pStatistic=&(pDevice->scStatistic); @@ -331,7 +331,7 @@ s_vSaveTxPktInfo(PSDevice pDevice, BYTE byPktNum, PBYTE pbyDestAddr, WORD wPktLe static -VOID +void s_vFillTxKey ( PSDevice pDevice, PBYTE pbyBuf, @@ -448,7 +448,7 @@ s_vFillTxKey ( static -VOID +void s_vSWencryption ( PSDevice pDevice, PSKeyItem pTransmitKey, @@ -841,7 +841,7 @@ s_uFillDataHead ( PSDevice pDevice, BYTE byPktType, WORD wCurrentRate, - PVOID pTxDataHead, + void *pTxDataHead, UINT cbFrameLength, UINT uDMAIdx, BOOL bNeedAck, @@ -981,11 +981,11 @@ s_uFillDataHead ( static -VOID +void s_vFillRTSHead ( PSDevice pDevice, BYTE byPktType, - PVOID pvRTS, + void *pvRTS, UINT cbFrameLength, BOOL bNeedAck, BOOL bDisCRC, @@ -1209,12 +1209,12 @@ s_vFillRTSHead ( } static -VOID +void s_vFillCTSHead ( PSDevice pDevice, UINT uDMAIdx, BYTE byPktType, - PVOID pvCTS, + void *pvCTS, UINT cbFrameLength, BOOL bNeedAck, BOOL bDisCRC, @@ -1309,15 +1309,15 @@ s_vFillCTSHead ( -*/ // UINT cbFrameSize,//Hdr+Payload+FCS static -VOID +void s_vGenerateTxParameter ( PSDevice pDevice, BYTE byPktType, WORD wCurrentRate, - PVOID pTxBufHead, - PVOID pvRrvTime, - PVOID pvRTS, - PVOID pvCTS, + void *pTxBufHead, + void *pvRrvTime, + void *pvRTS, + void *pvCTS, UINT cbFrameSize, BOOL bNeedACK, UINT uDMAIdx, @@ -1455,11 +1455,11 @@ s_bPacketToWirelessUsb( BYTE abySNAP_Bridgetunnel[6] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0xF8}; UINT uDuration; UINT cbHeaderLength= 0,uPadding = 0; - PVOID pvRrvTime; + void *pvRrvTime; PSMICHDRHead pMICHDR; - PVOID pvRTS; - PVOID pvCTS; - PVOID pvTxDataHd; + void *pvRTS; + void *pvCTS; + void *pvTxDataHd; BYTE byFBOption = AUTO_FB_NONE,byFragType; WORD wTxBufSize; DWORD dwMICKey0,dwMICKey1,dwMIC_Priority,dwCRC; @@ -1694,7 +1694,8 @@ s_bPacketToWirelessUsb( //Fill FIFO,RrvTime,RTS,and CTS - s_vGenerateTxParameter(pDevice, byPktType, wCurrentRate, (PVOID)pbyTxBufferAddr, pvRrvTime, pvRTS, pvCTS, + s_vGenerateTxParameter(pDevice, byPktType, wCurrentRate, + (void *)pbyTxBufferAddr, pvRrvTime, pvRTS, pvCTS, cbFrameSize, bNeedACK, uDMAIdx, psEthHeader); //Fill DataHead uDuration = s_uFillDataHead(pDevice, byPktType, wCurrentRate, pvTxDataHd, cbFrameSize, uDMAIdx, bNeedACK, @@ -1856,7 +1857,7 @@ s_bPacketToWirelessUsb( * -*/ -VOID +void s_vGenerateMACHeader ( PSDevice pDevice, PBYTE pbyBufferAddr, @@ -1964,9 +1965,9 @@ CMD_STATUS csMgmt_xmit( { BYTE byPktType; PBYTE pbyTxBufferAddr; - PVOID pvRTS; + void *pvRTS; PSCTS pCTS; - PVOID pvTxDataHd; + void *pvTxDataHd; UINT uDuration; UINT cbReqCount; PS802_11Header pMACHeader; @@ -1984,8 +1985,8 @@ CMD_STATUS csMgmt_xmit( WORD wTxBufSize; UINT cbMacHdLen; SEthernetHeader sEthHeader; - PVOID pvRrvTime; - PVOID pMICHDR; + void *pvRrvTime; + void *pMICHDR; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); WORD wCurrentRate = RATE_1M; PTX_BUFFER pTX_Buffer; @@ -2137,7 +2138,8 @@ CMD_STATUS csMgmt_xmit( cbHeaderSize = wTxBufSize + sizeof(SRrvTime_ab) + sizeof(STxDataHead_ab); } - memset((PVOID)(pbyTxBufferAddr + wTxBufSize), 0, (cbHeaderSize - wTxBufSize)); + memset((void *)(pbyTxBufferAddr + wTxBufSize), 0, + (cbHeaderSize - wTxBufSize)); memcpy(&(sEthHeader.abyDstAddr[0]), &(pPacket->p80211Header->sA3.abyAddr1[0]), @@ -2342,15 +2344,15 @@ csBeacon_xmit( -VOID +void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) { PSMgmtObject pMgmt = &(pDevice->sMgmtObj); BYTE byPktType; PBYTE pbyTxBufferAddr; - PVOID pvRTS; - PVOID pvCTS; - PVOID pvTxDataHd; + void *pvRTS; + void *pvCTS; + void *pvTxDataHd; UINT uDuration; UINT cbReqCount; PS802_11Header pMACHeader; @@ -2374,8 +2376,8 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) { WORD wTxBufSize; UINT cbMacHdLen; SEthernetHeader sEthHeader; - PVOID pvRrvTime; - PVOID pMICHDR; + void *pvRrvTime; + void *pMICHDR; WORD wCurrentRate = RATE_1M; PUWLAN_80211HDR p80211Header; UINT uNodeIndex = 0; @@ -2574,7 +2576,8 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) { pvTxDataHd = (PSTxDataHead_ab) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_ab) + cbMICHDR); cbHeaderSize = wTxBufSize + sizeof(SRrvTime_ab) + cbMICHDR + sizeof(STxDataHead_ab); } - memset((PVOID)(pbyTxBufferAddr + wTxBufSize), 0, (cbHeaderSize - wTxBufSize)); + memset((void *)(pbyTxBufferAddr + wTxBufSize), 0, + (cbHeaderSize - wTxBufSize)); memcpy(&(sEthHeader.abyDstAddr[0]), &(p80211Header->sA3.abyAddr1[0]), ETH_ALEN); diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index 1160c0354f3f..7c7e078495c8 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h @@ -682,7 +682,7 @@ bPacketToWirelessUsb( OUT UINT *pcbTotalLen ); -VOID vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb); +void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb); NTSTATUS nsDMA_tx_packet(PSDevice pDevice, UINT uDMAIdx, struct sk_buff *skb); CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); diff --git a/drivers/staging/vt6656/tkip.c b/drivers/staging/vt6656/tkip.c index 8ca154080e98..f83af5913aa6 100644 --- a/drivers/staging/vt6656/tkip.c +++ b/drivers/staging/vt6656/tkip.c @@ -183,7 +183,7 @@ unsigned int rotr1(unsigned int a) * Return Value: none * */ -VOID TKIPvMixKey( +void TKIPvMixKey( PBYTE pbyTKey, PBYTE pbyTA, WORD wTSC15_0, diff --git a/drivers/staging/vt6656/tkip.h b/drivers/staging/vt6656/tkip.h index 847ecdf97ee8..3dfa7f5ee7ec 100644 --- a/drivers/staging/vt6656/tkip.h +++ b/drivers/staging/vt6656/tkip.h @@ -46,7 +46,7 @@ /*--------------------- Export Functions --------------------------*/ -VOID TKIPvMixKey( +void TKIPvMixKey( PBYTE pbyTKey, PBYTE pbyTA, WORD wTSC15_0, diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h index 2365fa411393..5bbd4e37256a 100644 --- a/drivers/staging/vt6656/ttype.h +++ b/drivers/staging/vt6656/ttype.h @@ -33,10 +33,6 @@ /******* Common definitions and typedefs ***********************************/ -#ifndef VOID -#define VOID void -#endif - #ifndef OUT #define OUT #endif @@ -146,13 +142,11 @@ typedef DWORD * PDWORD; typedef QWORD * PQWORD; -typedef void * PVOID; - // handle declaration #ifdef STRICT typedef void *HANDLE; #else -typedef PVOID HANDLE; +typedef void *HANDLE; #endif #endif // __TTYPE_H__ diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index 901c684b11e9..7c325728b836 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -71,34 +71,34 @@ static int msglevel =MSG_LEVEL_INFO; /*--------------------- Static Functions --------------------------*/ static -VOID +void s_nsInterruptUsbIoCompleteRead( struct urb *urb ); static -VOID +void s_nsBulkInUsbIoCompleteRead( struct urb *urb ); static -VOID +void s_nsBulkOutIoCompleteWrite( struct urb *urb ); static -VOID +void s_nsControlInUsbIoCompleteRead( struct urb *urb ); static -VOID +void s_nsControlInUsbIoCompleteWrite( struct urb *urb ); @@ -142,7 +142,7 @@ PIPEnsControlOutAsyn( 0x40, // RequestType wValue, wIndex, - (PVOID) pbyBuffer, + (void *) pbyBuffer, wLength, HZ ); @@ -279,7 +279,7 @@ PIPEnsControlIn( } static -VOID +void s_nsControlInUsbIoCompleteWrite( struct urb *urb ) @@ -320,7 +320,7 @@ s_nsControlInUsbIoCompleteWrite( * */ static -VOID +void s_nsControlInUsbIoCompleteRead( struct urb *urb ) @@ -385,7 +385,7 @@ PIPEnsInterruptRead( usb_fill_int_urb(pDevice->pInterruptURB, pDevice->usb, usb_rcvintpipe(pDevice->usb, 1), - (PVOID) pDevice->intBuf.pDataBuf, + (void *) pDevice->intBuf.pDataBuf, MAX_INTERRUPT_SIZE, s_nsInterruptUsbIoCompleteRead, pDevice, @@ -396,7 +396,7 @@ PIPEnsInterruptRead( usb_fill_int_urb(pDevice->pInterruptURB, pDevice->usb, usb_rcvintpipe(pDevice->usb, 1), - (PVOID) pDevice->intBuf.pDataBuf, + (void *) pDevice->intBuf.pDataBuf, MAX_INTERRUPT_SIZE, s_nsInterruptUsbIoCompleteRead, pDevice, @@ -409,7 +409,7 @@ PIPEnsInterruptRead( usb_fill_bulk_urb(pDevice->pInterruptURB, pDevice->usb, usb_rcvbulkpipe(pDevice->usb, 1), - (PVOID) pDevice->intBuf.pDataBuf, + (void *) pDevice->intBuf.pDataBuf, MAX_INTERRUPT_SIZE, s_nsInterruptUsbIoCompleteRead, pDevice); @@ -441,7 +441,7 @@ usb_fill_bulk_urb(pDevice->pInterruptURB, * */ static -VOID +void s_nsInterruptUsbIoCompleteRead( struct urb *urb ) @@ -506,7 +506,7 @@ s_nsInterruptUsbIoCompleteRead( usb_fill_bulk_urb(pDevice->pInterruptURB, pDevice->usb, usb_rcvbulkpipe(pDevice->usb, 1), - (PVOID) pDevice->intBuf.pDataBuf, + (void *) pDevice->intBuf.pDataBuf, MAX_INTERRUPT_SIZE, s_nsInterruptUsbIoCompleteRead, pDevice); @@ -572,7 +572,7 @@ PIPEnsBulkInUsbRead( usb_fill_bulk_urb(pUrb, pDevice->usb, usb_rcvbulkpipe(pDevice->usb, 2), - (PVOID) (pRCB->skb->data), + (void *) (pRCB->skb->data), MAX_TOTAL_SIZE_WITH_ALL_HEADERS, s_nsBulkInUsbIoCompleteRead, pRCB); @@ -606,7 +606,7 @@ PIPEnsBulkInUsbRead( * */ static -VOID +void s_nsBulkInUsbIoCompleteRead( struct urb *urb ) @@ -718,8 +718,8 @@ PIPEnsSendBulkOut( usb_fill_bulk_urb( pUrb, pDevice->usb, - usb_sndbulkpipe(pDevice->usb, 3), - (PVOID) &(pContext->Data[0]), + usb_sndbulkpipe(pDevice->usb, 3), + (void *) &(pContext->Data[0]), pContext->uBufLen, s_nsBulkOutIoCompleteWrite, pContext); @@ -766,7 +766,7 @@ PIPEnsSendBulkOut( * */ static -VOID +void s_nsBulkOutIoCompleteWrite( struct urb *urb ) diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index 7e543396536e..23db5f63c789 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -69,7 +69,7 @@ static int msglevel =MSG_LEVEL_INFO; /*--------------------- Static Functions --------------------------*/ static -VOID +void s_vProbeChannel( PSDevice pDevice ); @@ -210,7 +210,7 @@ vAdHocBeaconRestart(PSDevice pDevice) -*/ static -VOID +void s_vProbeChannel( PSDevice pDevice ) @@ -325,7 +325,7 @@ s_MgrMakeProbeRequest( -VOID +void vCommandTimerWait( HANDLE hDeviceContext, UINT MSecond @@ -345,7 +345,7 @@ vCommandTimerWait( -VOID +void vRunCommand( HANDLE hDeviceContext ) @@ -1287,7 +1287,7 @@ BOOL s_bClearBSSID_SCAN ( //mike add:reset command timer -VOID +void vResetCommandTimer( HANDLE hDeviceContext ) @@ -1311,7 +1311,7 @@ vResetCommandTimer( //2007-0115-08<Add>by MikeLiu #ifdef TxInSleep -VOID +void BSSvSecondTxData( HANDLE hDeviceContext ) diff --git a/drivers/staging/vt6656/wcmd.h b/drivers/staging/vt6656/wcmd.h index 28c0aa559c97..f3eac0353602 100644 --- a/drivers/staging/vt6656/wcmd.h +++ b/drivers/staging/vt6656/wcmd.h @@ -116,7 +116,7 @@ typedef enum tagCMD_STATE { /*--------------------- Export Functions --------------------------*/ -VOID +void vResetCommandTimer( HANDLE hDeviceContext ); @@ -128,20 +128,20 @@ bScheduleCommand( PBYTE pbyItem0 ); -VOID +void vRunCommand( HANDLE hDeviceContext ); /* -VOID +void WCMDvCommandThread( - PVOID Context + void * Context ); */ //2007-0115-09<Add>by MikeLiu #ifdef TxInSleep -VOID +void BSSvSecondTxData( HANDLE hDeviceContext ); diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index b93cb1d2bfb2..994022aa0d62 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -113,7 +113,7 @@ s_MgrMakeAssocRequest( ); static -VOID +void s_vMgrRxAssocRequest( PSDevice pDevice, PSMgmtObject pMgmt, @@ -135,7 +135,7 @@ s_MgrMakeReAssocRequest( ); static -VOID +void s_vMgrRxAssocResponse( PSDevice pDevice, PSMgmtObject pMgmt, @@ -144,7 +144,7 @@ s_vMgrRxAssocResponse( ); static -VOID +void s_vMgrRxDisassociation( PSDevice pDevice, PSMgmtObject pMgmt, @@ -153,7 +153,7 @@ s_vMgrRxDisassociation( // Authentication/deauthen functions static -VOID +void s_vMgrRxAuthenSequence_1( PSDevice pDevice, PSMgmtObject pMgmt, @@ -161,7 +161,7 @@ s_vMgrRxAuthenSequence_1( ); static -VOID +void s_vMgrRxAuthenSequence_2( PSDevice pDevice, PSMgmtObject pMgmt, @@ -169,7 +169,7 @@ s_vMgrRxAuthenSequence_2( ); static -VOID +void s_vMgrRxAuthenSequence_3( PSDevice pDevice, PSMgmtObject pMgmt, @@ -177,7 +177,7 @@ s_vMgrRxAuthenSequence_3( ); static -VOID +void s_vMgrRxAuthenSequence_4( PSDevice pDevice, PSMgmtObject pMgmt, @@ -185,7 +185,7 @@ s_vMgrRxAuthenSequence_4( ); static -VOID +void s_vMgrRxAuthentication( PSDevice pDevice, PSMgmtObject pMgmt, @@ -193,7 +193,7 @@ s_vMgrRxAuthentication( ); static -VOID +void s_vMgrRxDeauthentication( PSDevice pDevice, PSMgmtObject pMgmt, @@ -203,7 +203,7 @@ s_vMgrRxDeauthentication( // Scan functions // probe request/response functions static -VOID +void s_vMgrRxProbeRequest( PSDevice pDevice, PSMgmtObject pMgmt, @@ -211,7 +211,7 @@ s_vMgrRxProbeRequest( ); static -VOID +void s_vMgrRxProbeResponse( PSDevice pDevice, PSMgmtObject pMgmt, @@ -220,7 +220,7 @@ s_vMgrRxProbeResponse( // beacon functions static -VOID +void s_vMgrRxBeacon( PSDevice pDevice, PSMgmtObject pMgmt, @@ -229,7 +229,7 @@ s_vMgrRxBeacon( ); static -VOID +void s_vMgrFormatTIM( PSMgmtObject pMgmt, PWLAN_IE_TIM pTIM @@ -299,7 +299,7 @@ s_MgrMakeProbeResponse( // received status static -VOID +void s_vMgrLogStatus( PSMgmtObject pMgmt, WORD wStatus @@ -307,7 +307,7 @@ s_vMgrLogStatus( static -VOID +void s_vMgrSynchBSS ( PSDevice pDevice, UINT uBSSMode, @@ -324,7 +324,7 @@ s_bCipherMatch ( OUT PBYTE pbyCCSGK ); - static VOID Encyption_Rebuild( + static void Encyption_Rebuild( PSDevice pDevice, PKnownBSS pCurr ); @@ -347,7 +347,7 @@ s_bCipherMatch ( * -*/ -VOID +void vMgrObjectInit( HANDLE hDeviceContext ) @@ -415,7 +415,7 @@ vMgrObjectInit( -*/ -VOID +void vMgrAssocBeginSta( HANDLE hDeviceContext, PSMgmtObject pMgmt, @@ -491,7 +491,7 @@ vMgrAssocBeginSta( * -*/ -VOID +void vMgrReAssocBeginSta( HANDLE hDeviceContext, PSMgmtObject pMgmt, @@ -570,7 +570,7 @@ vMgrReAssocBeginSta( * -*/ -VOID +void vMgrDisassocBeginSta( HANDLE hDeviceContext, PSMgmtObject pMgmt, @@ -633,7 +633,7 @@ vMgrDisassocBeginSta( -*/ static -VOID +void s_vMgrRxAssocRequest( PSDevice pDevice, PSMgmtObject pMgmt, @@ -691,7 +691,7 @@ s_vMgrRxAssocRequest( } - RATEvParseMaxRate((PVOID)pDevice, + RATEvParseMaxRate((void *)pDevice, (PWLAN_IE_SUPP_RATES)abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)abyCurrExtSuppRates, FALSE, // do not change our basic rate @@ -789,7 +789,7 @@ s_vMgrRxAssocRequest( -*/ static -VOID +void s_vMgrRxReAssocRequest( PSDevice pDevice, PSMgmtObject pMgmt, @@ -844,7 +844,7 @@ s_vMgrRxReAssocRequest( } - RATEvParseMaxRate((PVOID)pDevice, + RATEvParseMaxRate((void *)pDevice, (PWLAN_IE_SUPP_RATES)abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)abyCurrExtSuppRates, FALSE, // do not change our basic rate @@ -936,7 +936,7 @@ s_vMgrRxReAssocRequest( -*/ static -VOID +void s_vMgrRxAssocResponse( PSDevice pDevice, PSMgmtObject pMgmt, @@ -1102,7 +1102,7 @@ if(pMgmt->eCurrState == WMAC_STATE_ASSOC) * -*/ -VOID +void vMgrAuthenBeginSta( HANDLE hDeviceContext, PSMgmtObject pMgmt, @@ -1160,7 +1160,7 @@ vMgrAuthenBeginSta( * -*/ -VOID +void vMgrDeAuthenBeginSta( HANDLE hDeviceContext, PSMgmtObject pMgmt, @@ -1217,7 +1217,7 @@ vMgrDeAuthenBeginSta( -*/ static -VOID +void s_vMgrRxAuthentication( PSDevice pDevice, PSMgmtObject pMgmt, @@ -1275,7 +1275,7 @@ s_vMgrRxAuthentication( static -VOID +void s_vMgrRxAuthenSequence_1( PSDevice pDevice, PSMgmtObject pMgmt, @@ -1381,7 +1381,7 @@ s_vMgrRxAuthenSequence_1( -*/ static -VOID +void s_vMgrRxAuthenSequence_2( PSDevice pDevice, PSMgmtObject pMgmt, @@ -1483,7 +1483,7 @@ s_vMgrRxAuthenSequence_2( -*/ static -VOID +void s_vMgrRxAuthenSequence_3( PSDevice pDevice, PSMgmtObject pMgmt, @@ -1571,7 +1571,7 @@ reply: * -*/ static -VOID +void s_vMgrRxAuthenSequence_4( PSDevice pDevice, PSMgmtObject pMgmt, @@ -1610,7 +1610,7 @@ s_vMgrRxAuthenSequence_4( -*/ static -VOID +void s_vMgrRxDisassociation( PSDevice pDevice, PSMgmtObject pMgmt, @@ -1700,7 +1700,7 @@ s_vMgrRxDisassociation( -*/ static -VOID +void s_vMgrRxDeauthentication( PSDevice pDevice, PSMgmtObject pMgmt, @@ -1826,7 +1826,7 @@ ChannelExceedZoneType( -*/ static -VOID +void s_vMgrRxBeacon( PSDevice pDevice, PSMgmtObject pMgmt, @@ -2089,7 +2089,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) pMgmt->abyCurrExtSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)pBSSList->abyExtSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates, uRateLen); - RATEvParseMaxRate( (PVOID)pDevice, + RATEvParseMaxRate((void *)pDevice, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates, TRUE, @@ -2227,7 +2227,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)sFrame.pSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, WLAN_RATES_MAXLEN_11B); - RATEvParseMaxRate( (PVOID)pDevice, + RATEvParseMaxRate((void *)pDevice, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, NULL, TRUE, @@ -2248,7 +2248,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)sFrame.pSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, WLAN_RATES_MAXLEN_11B); - RATEvParseMaxRate( (PVOID)pDevice, + RATEvParseMaxRate((void *)pDevice, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, NULL, TRUE, @@ -2355,7 +2355,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) * CMD_STATUS * -*/ -VOID +void vMgrCreateOwnIBSS( HANDLE hDeviceContext, OUT PCMD_STATUS pStatus @@ -2466,7 +2466,8 @@ vMgrCreateOwnIBSS( // set basic rate - RATEvParseMaxRate((PVOID)pDevice, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, + RATEvParseMaxRate((void *)pDevice, + (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates, TRUE, &wMaxBasicRate, &wMaxSuppRate, &wSuppRate, &byTopCCKBasicRate, &byTopOFDMBasicRate); @@ -2629,7 +2630,7 @@ vMgrCreateOwnIBSS( * -*/ -VOID +void vMgrJoinBSSBegin( HANDLE hDeviceContext, OUT PCMD_STATUS pStatus @@ -2760,7 +2761,7 @@ vMgrJoinBSSBegin( } } - RATEvParseMaxRate((PVOID)pDevice, pItemRates, pItemExtRates, TRUE, + RATEvParseMaxRate((void *)pDevice, pItemRates, pItemExtRates, TRUE, &wMaxBasicRate, &wMaxSuppRate, &wSuppRate, &byTopCCKBasicRate, &byTopOFDMBasicRate); vUpdateIFS(pDevice); @@ -2899,7 +2900,8 @@ vMgrJoinBSSBegin( (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, WLAN_RATES_MAXLEN_11B); // set basic rate - RATEvParseMaxRate((PVOID)pDevice, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, + RATEvParseMaxRate((void *)pDevice, + (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, NULL, TRUE, &wMaxBasicRate, &wMaxSuppRate, &wSuppRate, &byTopCCKBasicRate, &byTopOFDMBasicRate); vUpdateIFS(pDevice); @@ -2960,7 +2962,7 @@ vMgrJoinBSSBegin( * -*/ static -VOID +void s_vMgrSynchBSS ( PSDevice pDevice, UINT uBSSMode, @@ -3004,7 +3006,7 @@ s_vMgrSynchBSS ( pDevice->byPreambleType = 0; pDevice->wBasicRate = 0; // Set Basic Rate - CARDbAddBasicRate((PVOID)pDevice, RATE_1M); + CARDbAddBasicRate((void *)pDevice, RATE_1M); // calculate TSF offset // TSF Offset = Received Timestamp TSF - Marked Local's TSF @@ -3122,7 +3124,7 @@ s_vMgrSynchBSS ( //mike add: fix NetworkManager 0.7.0 hidden ssid mode in WPA encryption // ,need reset eAuthenMode and eEncryptionStatus - static VOID Encyption_Rebuild( + static void Encyption_Rebuild( PSDevice pDevice, PKnownBSS pCurr ) @@ -3174,12 +3176,12 @@ s_vMgrSynchBSS ( * * * Return Value: - * VOID + * void * -*/ static -VOID +void s_vMgrFormatTIM( PSMgmtObject pMgmt, PWLAN_IE_TIM pTIM @@ -4224,7 +4226,7 @@ s_MgrMakeReAssocResponse( -*/ static -VOID +void s_vMgrRxProbeResponse( PSDevice pDevice, PSMgmtObject pMgmt, @@ -4354,7 +4356,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) static -VOID +void s_vMgrRxProbeRequest( PSDevice pDevice, PSMgmtObject pMgmt, @@ -4450,7 +4452,7 @@ s_vMgrRxProbeRequest( -*/ -VOID +void vMgrRxManagePacket( HANDLE hDeviceContext, PSMgmtObject pMgmt, @@ -4658,7 +4660,7 @@ bMgrPrepareBeaconToSend( * -*/ static -VOID +void s_vMgrLogStatus( PSMgmtObject pMgmt, WORD wStatus @@ -4791,7 +4793,7 @@ bAdd_PMKID_Candidate ( * Return Value: none. * -*/ -VOID +void vFlush_PMKID_Candidate ( HANDLE hDeviceContext ) diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h index f6774cedacfa..d554715e2cd0 100644 --- a/drivers/staging/vt6656/wmgr.h +++ b/drivers/staging/vt6656/wmgr.h @@ -246,8 +246,7 @@ typedef struct tagSRxMgmtPacket { typedef struct tagSMgmtObject { - - PVOID pAdapter; + void *pAdapter; // MAC address BYTE abyMACAddr[WLAN_ADDR_LEN]; @@ -421,14 +420,14 @@ vMgrAssocBeginSta( OUT PCMD_STATUS pStatus ); -VOID +void vMgrReAssocBeginSta( HANDLE hDeviceContext, PSMgmtObject pMgmt, OUT PCMD_STATUS pStatus ); -VOID +void vMgrDisassocBeginSta( HANDLE hDeviceContext, PSMgmtObject pMgmt, @@ -437,26 +436,26 @@ vMgrDisassocBeginSta( OUT PCMD_STATUS pStatus ); -VOID +void vMgrAuthenBeginSta( HANDLE hDeviceContext, PSMgmtObject pMgmt, OUT PCMD_STATUS pStatus ); -VOID +void vMgrCreateOwnIBSS( HANDLE hDeviceContext, OUT PCMD_STATUS pStatus ); -VOID +void vMgrJoinBSSBegin( HANDLE hDeviceContext, OUT PCMD_STATUS pStatus ); -VOID +void vMgrRxManagePacket( HANDLE hDeviceContext, PSMgmtObject pMgmt, @@ -464,14 +463,14 @@ vMgrRxManagePacket( ); /* -VOID +void vMgrScanBegin( HANDLE hDeviceContext, OUT PCMD_STATUS pStatus ); */ -VOID +void vMgrDeAuthenBeginSta( HANDLE hDeviceContext, PSMgmtObject pMgmt, @@ -494,7 +493,7 @@ bAdd_PMKID_Candidate ( PSRSNCapObject psRSNCapObj ); -VOID +void vFlush_PMKID_Candidate ( HANDLE hDeviceContext ); diff --git a/drivers/staging/vt6656/wpa.c b/drivers/staging/vt6656/wpa.c index 9992291ab22c..1fa6c9b88ed3 100644 --- a/drivers/staging/vt6656/wpa.c +++ b/drivers/staging/vt6656/wpa.c @@ -68,7 +68,7 @@ const BYTE abyOUI05[4] = { 0x00, 0x50, 0xf2, 0x05 }; * -*/ -VOID +void WPA_ClearRSN ( PKnownBSS pBSSList ) @@ -104,7 +104,7 @@ WPA_ClearRSN ( * Return Value: none. * -*/ -VOID +void WPA_ParseRSN ( PKnownBSS pBSSList, PWLAN_IE_RSN_EXT pRSN diff --git a/drivers/staging/vt6656/wpa.h b/drivers/staging/vt6656/wpa.h index 0a955b3200fe..661f40d526f5 100644 --- a/drivers/staging/vt6656/wpa.h +++ b/drivers/staging/vt6656/wpa.h @@ -58,12 +58,12 @@ /*--------------------- Export Functions --------------------------*/ -VOID +void WPA_ClearRSN( PKnownBSS pBSSList ); -VOID +void WPA_ParseRSN( PKnownBSS pBSSList, PWLAN_IE_RSN_EXT pRSN diff --git a/drivers/staging/vt6656/wpa2.c b/drivers/staging/vt6656/wpa2.c index 9a972a4f6433..73bfb500d45b 100644 --- a/drivers/staging/vt6656/wpa2.c +++ b/drivers/staging/vt6656/wpa2.c @@ -71,7 +71,7 @@ const BYTE abyOUIPSK[4] = { 0x00, 0x0F, 0xAC, 0x02 }; * Return Value: none. * -*/ -VOID +void WPA2_ClearRSN ( PKnownBSS pBSSNode ) @@ -106,7 +106,7 @@ WPA2_ClearRSN ( * Return Value: none. * -*/ -VOID +void WPA2vParseRSN ( PKnownBSS pBSSNode, PWLAN_IE_RSN pRSN @@ -261,8 +261,7 @@ WPA2vParseRSN ( * -*/ UINT -WPA2uSetIEs( - PVOID pMgmtHandle, +WPA2uSetIEs(void *pMgmtHandle, OUT PWLAN_IE_RSN pRSNIEs ) { diff --git a/drivers/staging/vt6656/wpa2.h b/drivers/staging/vt6656/wpa2.h index 51fb3fd8b659..6026005ca8c2 100644 --- a/drivers/staging/vt6656/wpa2.h +++ b/drivers/staging/vt6656/wpa2.h @@ -58,12 +58,12 @@ typedef struct tagSPMKIDCache { /*--------------------- Export Functions --------------------------*/ -VOID +void WPA2_ClearRSN ( PKnownBSS pBSSNode ); -VOID +void WPA2vParseRSN ( PKnownBSS pBSSNode, PWLAN_IE_RSN pRSN @@ -71,7 +71,7 @@ WPA2vParseRSN ( UINT WPA2uSetIEs( - PVOID pMgmtHandle, + void *pMgmtHandle, OUT PWLAN_IE_RSN pRSNIEs ); |
