diff options
| author | Charles Clément <caratorn@gmail.com> | 2010-05-12 20:54:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-14 13:24:03 -0700 |
| commit | 3a215e0ff4184314f7f1a099354a272ddedff289 (patch) | |
| tree | 997552cb95f28681348474b04ebd88f25c366a4b | |
| parent | 71e510673134999627fd180181079ffccb9ec756 (diff) | |
Staging: vt6655: remove IN definition
Remove empty IN definition used to specify input parameters.
Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
36 files changed, 1055 insertions, 1059 deletions
diff --git a/drivers/staging/vt6655/80211mgr.c b/drivers/staging/vt6655/80211mgr.c index da964a92f96..38697c86248 100644 --- a/drivers/staging/vt6655/80211mgr.c +++ b/drivers/staging/vt6655/80211mgr.c @@ -91,7 +91,7 @@ static int msglevel =MSG_LEVEL_INFO; void vMgrEncodeBeacon( - IN PWLAN_FR_BEACON pFrame + PWLAN_FR_BEACON pFrame ) { pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; @@ -123,7 +123,7 @@ vMgrEncodeBeacon( void vMgrDecodeBeacon( - IN PWLAN_FR_BEACON pFrame + PWLAN_FR_BEACON pFrame ) { PWLAN_IE pItem; @@ -244,7 +244,7 @@ vMgrDecodeBeacon( void vMgrEncodeIBSSATIM( - IN PWLAN_FR_IBSSATIM pFrame + PWLAN_FR_IBSSATIM pFrame ) { pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; @@ -267,7 +267,7 @@ vMgrEncodeIBSSATIM( void vMgrDecodeIBSSATIM( - IN PWLAN_FR_IBSSATIM pFrame + PWLAN_FR_IBSSATIM pFrame ) { pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; @@ -289,7 +289,7 @@ vMgrDecodeIBSSATIM( void vMgrEncodeDisassociation( - IN PWLAN_FR_DISASSOC pFrame + PWLAN_FR_DISASSOC pFrame ) { pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; @@ -317,7 +317,7 @@ vMgrEncodeDisassociation( void vMgrDecodeDisassociation( - IN PWLAN_FR_DISASSOC pFrame + PWLAN_FR_DISASSOC pFrame ) { pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; @@ -343,7 +343,7 @@ vMgrDecodeDisassociation( void vMgrEncodeAssocRequest( - IN PWLAN_FR_ASSOCREQ pFrame + PWLAN_FR_ASSOCREQ pFrame ) { pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; @@ -370,7 +370,7 @@ vMgrEncodeAssocRequest( void vMgrDecodeAssocRequest( - IN PWLAN_FR_ASSOCREQ pFrame + PWLAN_FR_ASSOCREQ pFrame ) { PWLAN_IE pItem; @@ -436,7 +436,7 @@ vMgrDecodeAssocRequest( void vMgrEncodeAssocResponse( - IN PWLAN_FR_ASSOCRESP pFrame + PWLAN_FR_ASSOCRESP pFrame ) { pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; @@ -468,7 +468,7 @@ vMgrEncodeAssocResponse( void vMgrDecodeAssocResponse( - IN PWLAN_FR_ASSOCRESP pFrame + PWLAN_FR_ASSOCRESP pFrame ) { PWLAN_IE pItem; @@ -514,7 +514,7 @@ vMgrDecodeAssocResponse( void vMgrEncodeReassocRequest( - IN PWLAN_FR_REASSOCREQ pFrame + PWLAN_FR_REASSOCREQ pFrame ) { pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; @@ -546,7 +546,7 @@ vMgrEncodeReassocRequest( void vMgrDecodeReassocRequest( - IN PWLAN_FR_REASSOCREQ pFrame + PWLAN_FR_REASSOCREQ pFrame ) { PWLAN_IE pItem; @@ -618,7 +618,7 @@ vMgrDecodeReassocRequest( void vMgrEncodeProbeRequest( - IN PWLAN_FR_PROBEREQ pFrame + PWLAN_FR_PROBEREQ pFrame ) { pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; @@ -639,7 +639,7 @@ vMgrEncodeProbeRequest( void vMgrDecodeProbeRequest( - IN PWLAN_FR_PROBEREQ pFrame + PWLAN_FR_PROBEREQ pFrame ) { PWLAN_IE pItem; @@ -692,7 +692,7 @@ vMgrDecodeProbeRequest( void vMgrEncodeProbeResponse( - IN PWLAN_FR_PROBERESP pFrame + PWLAN_FR_PROBERESP pFrame ) { pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; @@ -726,7 +726,7 @@ vMgrEncodeProbeResponse( void vMgrDecodeProbeResponse( - IN PWLAN_FR_PROBERESP pFrame + PWLAN_FR_PROBERESP pFrame ) { PWLAN_IE pItem; @@ -840,7 +840,7 @@ vMgrDecodeProbeResponse( void vMgrEncodeAuthen( - IN PWLAN_FR_AUTHEN pFrame + PWLAN_FR_AUTHEN pFrame ) { pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; @@ -871,7 +871,7 @@ vMgrEncodeAuthen( void vMgrDecodeAuthen( - IN PWLAN_FR_AUTHEN pFrame + PWLAN_FR_AUTHEN pFrame ) { PWLAN_IE pItem; @@ -911,7 +911,7 @@ vMgrDecodeAuthen( void vMgrEncodeDeauthen( - IN PWLAN_FR_DEAUTHEN pFrame + PWLAN_FR_DEAUTHEN pFrame ) { pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; @@ -938,7 +938,7 @@ vMgrEncodeDeauthen( void vMgrDecodeDeauthen( - IN PWLAN_FR_DEAUTHEN pFrame + PWLAN_FR_DEAUTHEN pFrame ) { pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; @@ -964,7 +964,7 @@ vMgrDecodeDeauthen( void vMgrEncodeReassocResponse( - IN PWLAN_FR_REASSOCRESP pFrame + PWLAN_FR_REASSOCRESP pFrame ) { pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; @@ -997,7 +997,7 @@ vMgrEncodeReassocResponse( void vMgrDecodeReassocResponse( - IN PWLAN_FR_REASSOCRESP pFrame + PWLAN_FR_REASSOCRESP pFrame ) { PWLAN_IE pItem; diff --git a/drivers/staging/vt6655/80211mgr.h b/drivers/staging/vt6655/80211mgr.h index c3eafd28da4..658fe144f89 100644 --- a/drivers/staging/vt6655/80211mgr.h +++ b/drivers/staging/vt6655/80211mgr.h @@ -716,112 +716,112 @@ typedef struct tagWLAN_FR_DEAUTHEN { void vMgrEncodeBeacon( - IN PWLAN_FR_BEACON pFrame + PWLAN_FR_BEACON pFrame ); void vMgrDecodeBeacon( - IN PWLAN_FR_BEACON pFrame + PWLAN_FR_BEACON pFrame ); void vMgrEncodeIBSSATIM( - IN PWLAN_FR_IBSSATIM pFrame + PWLAN_FR_IBSSATIM pFrame ); void vMgrDecodeIBSSATIM( - IN PWLAN_FR_IBSSATIM pFrame + PWLAN_FR_IBSSATIM pFrame ); void vMgrEncodeDisassociation( - IN PWLAN_FR_DISASSOC pFrame + PWLAN_FR_DISASSOC pFrame ); void vMgrDecodeDisassociation( - IN PWLAN_FR_DISASSOC pFrame + PWLAN_FR_DISASSOC pFrame ); void vMgrEncodeAssocRequest( - IN PWLAN_FR_ASSOCREQ pFrame + PWLAN_FR_ASSOCREQ pFrame ); void vMgrDecodeAssocRequest( - IN PWLAN_FR_ASSOCREQ pFrame + PWLAN_FR_ASSOCREQ pFrame ); void vMgrEncodeAssocResponse( - IN PWLAN_FR_ASSOCRESP pFrame + PWLAN_FR_ASSOCRESP pFrame ); void vMgrDecodeAssocResponse( - IN PWLAN_FR_ASSOCRESP pFrame + PWLAN_FR_ASSOCRESP pFrame ); void vMgrEncodeReassocRequest( - IN PWLAN_FR_REASSOCREQ pFrame + PWLAN_FR_REASSOCREQ pFrame ); void vMgrDecodeReassocRequest( - IN PWLAN_FR_REASSOCREQ pFrame + PWLAN_FR_REASSOCREQ pFrame ); void vMgrEncodeProbeRequest( - IN PWLAN_FR_PROBEREQ pFrame + PWLAN_FR_PROBEREQ pFrame ); void vMgrDecodeProbeRequest( - IN PWLAN_FR_PROBEREQ pFrame + PWLAN_FR_PROBEREQ pFrame ); void vMgrEncodeProbeResponse( - IN PWLAN_FR_PROBERESP pFrame + PWLAN_FR_PROBERESP pFrame ); void vMgrDecodeProbeResponse( - IN PWLAN_FR_PROBERESP pFrame + PWLAN_FR_PROBERESP pFrame ); void vMgrEncodeAuthen( - IN PWLAN_FR_AUTHEN pFrame + PWLAN_FR_AUTHEN pFrame ); void vMgrDecodeAuthen( - IN PWLAN_FR_AUTHEN pFrame + PWLAN_FR_AUTHEN pFrame ); void vMgrEncodeDeauthen( - IN PWLAN_FR_DEAUTHEN pFrame + PWLAN_FR_DEAUTHEN pFrame ); void vMgrDecodeDeauthen( - IN PWLAN_FR_DEAUTHEN pFrame + PWLAN_FR_DEAUTHEN pFrame ); void vMgrEncodeReassocResponse( - IN PWLAN_FR_REASSOCRESP pFrame + PWLAN_FR_REASSOCRESP pFrame ); void vMgrDecodeReassocResponse( - IN PWLAN_FR_REASSOCRESP pFrame + PWLAN_FR_REASSOCRESP pFrame ); #endif// __80211MGR_H__ diff --git a/drivers/staging/vt6655/IEEE11h.c b/drivers/staging/vt6655/IEEE11h.c index 77813002d2f..22f12f5ef90 100644 --- a/drivers/staging/vt6655/IEEE11h.c +++ b/drivers/staging/vt6655/IEEE11h.c @@ -203,8 +203,8 @@ static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, BYTE byR -*/ BOOL IEEE11hbMgrRxAction ( - IN void *pMgmtHandle, - IN void *pRxPacket + void *pMgmtHandle, + void *pRxPacket ) { PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle; @@ -265,7 +265,7 @@ IEEE11hbMgrRxAction ( BOOL IEEE11hbMSRRepTx ( - IN void *pMgmtHandle + void *pMgmtHandle ) { PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle; diff --git a/drivers/staging/vt6655/IEEE11h.h b/drivers/staging/vt6655/IEEE11h.h index 1707388e7cf..ae32498a511 100644 --- a/drivers/staging/vt6655/IEEE11h.h +++ b/drivers/staging/vt6655/IEEE11h.h @@ -46,7 +46,7 @@ /*--------------------- Export Functions --------------------------*/ BOOL IEEE11hbMSRRepTx ( - IN void *pMgmtHandle + void *pMgmtHandle ); #endif // __IEEE11h_H__ diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index 7a69490fc7e..2931a0ffcf3 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -1725,13 +1725,13 @@ s_ulGetRatio(PSDevice pDevice); static void s_vChangeAntenna( - IN PSDevice pDevice + PSDevice pDevice ); static void s_vChangeAntenna ( - IN PSDevice pDevice + PSDevice pDevice ) { @@ -1778,10 +1778,10 @@ s_vChangeAntenna ( */ UINT BBuGetFrameTime ( - IN BYTE byPreambleType, - IN BYTE byPktType, - IN UINT cbFrameLength, - IN WORD wRate + BYTE byPreambleType, + BYTE byPktType, + UINT cbFrameLength, + WORD wRate ) { UINT uFrameTime; @@ -1845,10 +1845,10 @@ BBuGetFrameTime ( */ void BBvCaculateParameter ( - IN PSDevice pDevice, - IN UINT cbFrameLength, - IN WORD wRate, - IN BYTE byPacketType, + PSDevice pDevice, + UINT cbFrameLength, + WORD wRate, + BYTE byPacketType, OUT PWORD pwPhyLen, OUT PBYTE pbyPhySrv, OUT PBYTE pbyPhySgn @@ -2878,7 +2878,7 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3) void TimerSQ3CallBack ( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -2926,7 +2926,7 @@ TimerSQ3CallBack ( void TimerState1CallBack ( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; diff --git a/drivers/staging/vt6655/baseband.h b/drivers/staging/vt6655/baseband.h index 23f7ad151d1..3eea7aa2fba 100644 --- a/drivers/staging/vt6655/baseband.h +++ b/drivers/staging/vt6655/baseband.h @@ -120,18 +120,18 @@ UINT BBuGetFrameTime( - IN BYTE byPreambleType, - IN BYTE byPktType, - IN UINT cbFrameLength, - IN WORD wRate + BYTE byPreambleType, + BYTE byPktType, + UINT cbFrameLength, + WORD wRate ); void BBvCaculateParameter ( - IN PSDevice pDevice, - IN UINT cbFrameLength, - IN WORD wRate, - IN BYTE byPacketType, + PSDevice pDevice, + UINT cbFrameLength, + WORD wRate, + BYTE byPacketType, OUT PWORD pwPhyLen, OUT PBYTE pbyPhySrv, OUT PBYTE pbyPhySgn @@ -162,12 +162,12 @@ void BBvExitDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID); void TimerSQ3CallBack ( - IN void *hDeviceContext + void *hDeviceContext ); void TimerState1CallBack( - IN void *hDeviceContext + void *hDeviceContext ); void BBvAntennaDiversity(PSDevice pDevice, BYTE byRxRate, BYTE bySQ3); diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c index 3af0ccb25d0..e64238e5e8c 100644 --- a/drivers/staging/vt6655/bssdb.c +++ b/drivers/staging/vt6655/bssdb.c @@ -91,18 +91,18 @@ const WORD awHWRetry1[5][5] = { /*--------------------- Static Functions --------------------------*/ void s_vCheckSensitivity( - IN void *hDeviceContext + void *hDeviceContext ); #ifdef Calcu_LinkQual void s_uCalculateLinkQual( - IN void *hDeviceContext + void *hDeviceContext ); #endif void s_vCheckPreEDThreshold( - IN void *hDeviceContext + void *hDeviceContext ); /*--------------------- Export Variables --------------------------*/ @@ -125,10 +125,10 @@ void s_vCheckPreEDThreshold( PKnownBSS BSSpSearchBSSList( - IN void *hDeviceContext, - IN PBYTE pbyDesireBSSID, - IN PBYTE pbyDesireSSID, - IN CARD_PHY_TYPE ePhyType + void *hDeviceContext, + PBYTE pbyDesireBSSID, + PBYTE pbyDesireSSID, + CARD_PHY_TYPE ePhyType ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -282,8 +282,8 @@ if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE; void BSSvClearBSSList( - IN void *hDeviceContext, - IN BOOL bKeepCurrBSSID + void *hDeviceContext, + BOOL bKeepCurrBSSID ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -325,9 +325,9 @@ BSSvClearBSSList( -*/ PKnownBSS BSSpAddrIsInBSSList( - IN void *hDeviceContext, - IN PBYTE abyBSSID, - IN PWLAN_IE_SSID pSSID + void *hDeviceContext, + PBYTE abyBSSID, + PWLAN_IE_SSID pSSID ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -368,23 +368,23 @@ BSSpAddrIsInBSSList( BOOL BSSbInsertToBSSList ( - IN void *hDeviceContext, - IN PBYTE abyBSSIDAddr, - IN QWORD qwTimestamp, - IN WORD wBeaconInterval, - IN WORD wCapInfo, - IN BYTE byCurrChannel, - IN PWLAN_IE_SSID pSSID, - IN PWLAN_IE_SUPP_RATES pSuppRates, - IN PWLAN_IE_SUPP_RATES pExtSuppRates, - IN PERPObject psERP, - IN PWLAN_IE_RSN pRSN, - IN PWLAN_IE_RSN_EXT pRSNWPA, - IN PWLAN_IE_COUNTRY pIE_Country, - IN PWLAN_IE_QUIET pIE_Quiet, - IN UINT uIELength, - IN PBYTE pbyIEs, - IN void *pRxPacketContext + void *hDeviceContext, + PBYTE abyBSSIDAddr, + QWORD qwTimestamp, + WORD wBeaconInterval, + WORD wCapInfo, + BYTE byCurrChannel, + PWLAN_IE_SSID pSSID, + PWLAN_IE_SUPP_RATES pSuppRates, + PWLAN_IE_SUPP_RATES pExtSuppRates, + PERPObject psERP, + PWLAN_IE_RSN pRSN, + PWLAN_IE_RSN_EXT pRSNWPA, + PWLAN_IE_COUNTRY pIE_Country, + PWLAN_IE_QUIET pIE_Quiet, + UINT uIELength, + PBYTE pbyIEs, + void *pRxPacketContext ) { @@ -585,24 +585,24 @@ BSSbInsertToBSSList ( BOOL BSSbUpdateToBSSList ( - IN void *hDeviceContext, - IN QWORD qwTimestamp, - IN WORD wBeaconInterval, - IN WORD wCapInfo, - IN BYTE byCurrChannel, - IN BOOL bChannelHit, - IN PWLAN_IE_SSID pSSID, - IN PWLAN_IE_SUPP_RATES pSuppRates, - IN PWLAN_IE_SUPP_RATES pExtSuppRates, - IN PERPObject psERP, - IN PWLAN_IE_RSN pRSN, - IN PWLAN_IE_RSN_EXT pRSNWPA, - IN PWLAN_IE_COUNTRY pIE_Country, - IN PWLAN_IE_QUIET pIE_Quiet, - IN PKnownBSS pBSSList, - IN UINT uIELength, - IN PBYTE pbyIEs, - IN void *pRxPacketContext + void *hDeviceContext, + QWORD qwTimestamp, + WORD wBeaconInterval, + WORD wCapInfo, + BYTE byCurrChannel, + BOOL bChannelHit, + PWLAN_IE_SSID pSSID, + PWLAN_IE_SUPP_RATES pSuppRates, + PWLAN_IE_SUPP_RATES pExtSuppRates, + PERPObject psERP, + PWLAN_IE_RSN pRSN, + PWLAN_IE_RSN_EXT pRSNWPA, + PWLAN_IE_COUNTRY pIE_Country, + PWLAN_IE_QUIET pIE_Quiet, + PKnownBSS pBSSList, + UINT uIELength, + PBYTE pbyIEs, + void *pRxPacketContext ) { int ii; @@ -764,8 +764,8 @@ BSSbUpdateToBSSList ( BOOL BSSDBbIsSTAInNodeDB( - IN void *pMgmtObject, - IN PBYTE abyDstAddr, + void *pMgmtObject, + PBYTE abyDstAddr, OUT PUINT puNodeIndex ) { @@ -799,7 +799,7 @@ BSSDBbIsSTAInNodeDB( -*/ void BSSvCreateOneNode( - IN void *hDeviceContext, + void *hDeviceContext, OUT PUINT puNodeIndex ) { @@ -864,8 +864,8 @@ BSSvCreateOneNode( -*/ void BSSvRemoveOneNode( - IN void *hDeviceContext, - IN UINT uNodeIndex + void *hDeviceContext, + UINT uNodeIndex ) { @@ -897,10 +897,10 @@ BSSvRemoveOneNode( void BSSvUpdateAPNode( - IN void *hDeviceContext, - IN PWORD pwCapInfo, - IN PWLAN_IE_SUPP_RATES pSuppRates, - IN PWLAN_IE_SUPP_RATES pExtSuppRates + void *hDeviceContext, + PWORD pwCapInfo, + PWLAN_IE_SUPP_RATES pSuppRates, + PWLAN_IE_SUPP_RATES pExtSuppRates ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -960,7 +960,7 @@ BSSvUpdateAPNode( void BSSvAddMulticastNode( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -1013,7 +1013,7 @@ UINT status; #endif void BSSvSecondCallBack( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -1390,11 +1390,11 @@ start: void BSSvUpdateNodeTxCounter( - IN void *hDeviceContext, - IN BYTE byTsr0, - IN BYTE byTsr1, - IN PBYTE pbyBuffer, - IN UINT uFIFOHeaderSize + void *hDeviceContext, + BYTE byTsr0, + BYTE byTsr1, + PBYTE pbyBuffer, + UINT uFIFOHeaderSize ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -1583,8 +1583,8 @@ BSSvUpdateNodeTxCounter( void BSSvClearNodeDBTable( - IN void *hDeviceContext, - IN UINT uStartIndex + void *hDeviceContext, + UINT uStartIndex ) { @@ -1611,7 +1611,7 @@ BSSvClearNodeDBTable( void s_vCheckSensitivity( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -1661,7 +1661,7 @@ void s_vCheckSensitivity( void BSSvClearAnyBSSJoinRecord ( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -1676,7 +1676,7 @@ BSSvClearAnyBSSJoinRecord ( #ifdef Calcu_LinkQual void s_uCalculateLinkQual( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -1724,7 +1724,7 @@ else #endif void s_vCheckPreEDThreshold( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; diff --git a/drivers/staging/vt6655/bssdb.h b/drivers/staging/vt6655/bssdb.h index a66e14f0a82..ec1e32bf35b 100644 --- a/drivers/staging/vt6655/bssdb.h +++ b/drivers/staging/vt6655/bssdb.h @@ -244,128 +244,128 @@ typedef struct tagKnownNodeDB { PKnownBSS BSSpSearchBSSList( - IN void *hDeviceContext, - IN PBYTE pbyDesireBSSID, - IN PBYTE pbyDesireSSID, - IN CARD_PHY_TYPE ePhyType + void *hDeviceContext, + PBYTE pbyDesireBSSID, + PBYTE pbyDesireSSID, + CARD_PHY_TYPE ePhyType ); PKnownBSS BSSpAddrIsInBSSList( - IN void *hDeviceContext, - IN PBYTE abyBSSID, - IN PWLAN_IE_SSID pSSID + void *hDeviceContext, + PBYTE abyBSSID, + PWLAN_IE_SSID pSSID ); void BSSvClearBSSList( - IN void *hDeviceContext, - IN BOOL bKeepCurrBSSID + void *hDeviceContext, + BOOL bKeepCurrBSSID ); BOOL BSSbInsertToBSSList( - IN void *hDeviceContext, - IN PBYTE abyBSSIDAddr, - IN QWORD qwTimestamp, - IN WORD wBeaconInterval, - IN WORD wCapInfo, - IN BYTE byCurrChannel, - IN PWLAN_IE_SSID pSSID, - IN PWLAN_IE_SUPP_RATES pSuppRates, - IN PWLAN_IE_SUPP_RATES pExtSuppRates, - IN PERPObject psERP, - IN PWLAN_IE_RSN pRSN, - IN PWLAN_IE_RSN_EXT pRSNWPA, - IN PWLAN_IE_COUNTRY pIE_Country, - IN PWLAN_IE_QUIET pIE_Quiet, - IN UINT uIELength, - IN PBYTE pbyIEs, - IN void *pRxPacketContext + void *hDeviceContext, + PBYTE abyBSSIDAddr, + QWORD qwTimestamp, + WORD wBeaconInterval, + WORD wCapInfo, + BYTE byCurrChannel, + PWLAN_IE_SSID pSSID, + PWLAN_IE_SUPP_RATES pSuppRates, + PWLAN_IE_SUPP_RATES pExtSuppRates, + PERPObject psERP, + PWLAN_IE_RSN pRSN, + PWLAN_IE_RSN_EXT pRSNWPA, + PWLAN_IE_COUNTRY pIE_Country, + PWLAN_IE_QUIET pIE_Quiet, + UINT uIELength, + PBYTE pbyIEs, + void *pRxPacketContext ); BOOL BSSbUpdateToBSSList( - IN void *hDeviceContext, - IN QWORD qwTimestamp, - IN WORD wBeaconInterval, - IN WORD wCapInfo, - IN BYTE byCurrChannel, - IN BOOL bChannelHit, - IN PWLAN_IE_SSID pSSID, - IN PWLAN_IE_SUPP_RATES pSuppRates, - IN PWLAN_IE_SUPP_RATES pExtSuppRates, - IN PERPObject psERP, - IN PWLAN_IE_RSN pRSN, - IN PWLAN_IE_RSN_EXT pRSNWPA, - IN PWLAN_IE_COUNTRY pIE_Country, - IN PWLAN_IE_QUIET pIE_Quiet, - IN PKnownBSS pBSSList, - IN UINT uIELength, - IN PBYTE pbyIEs, - IN void *pRxPacketContext + void *hDeviceContext, + QWORD qwTimestamp, + WORD wBeaconInterval, + WORD wCapInfo, + BYTE byCurrChannel, + BOOL bChannelHit, + PWLAN_IE_SSID pSSID, + PWLAN_IE_SUPP_RATES pSuppRates, + PWLAN_IE_SUPP_RATES pExtSuppRates, + PERPObject psERP, + PWLAN_IE_RSN pRSN, + PWLAN_IE_RSN_EXT pRSNWPA, + PWLAN_IE_COUNTRY pIE_Country, + PWLAN_IE_QUIET pIE_Quiet, + PKnownBSS pBSSList, + UINT uIELength, + PBYTE pbyIEs, + void *pRxPacketContext ); BOOL BSSDBbIsSTAInNodeDB( - IN void *hDeviceContext, - IN PBYTE abyDstAddr, + void *hDeviceContext, + PBYTE abyDstAddr, OUT PUINT puNodeIndex ); void BSSvCreateOneNode( - IN void *hDeviceContext, + void *hDeviceContext, OUT PUINT puNodeIndex ); void BSSvUpdateAPNode( - IN void *hDeviceContext, - IN PWORD pwCapInfo, - IN PWLAN_IE_SUPP_RATES pItemRates, - IN PWLAN_IE_SUPP_RATES pExtSuppRates + void *hDeviceContext, + PWORD pwCapInfo, + PWLAN_IE_SUPP_RATES pItemRates, + PWLAN_IE_SUPP_RATES pExtSuppRates ); void BSSvSecondCallBack( - IN void *hDeviceContext + void *hDeviceContext ); void BSSvUpdateNodeTxCounter( - IN void *hDeviceContext, - IN BYTE byTsr0, - IN BYTE byTsr1, - IN PBYTE pbyBuffer, - IN UINT uFIFOHeaderSize + void *hDeviceContext, + BYTE byTsr0, + BYTE byTsr1, + PBYTE pbyBuffer, + UINT uFIFOHeaderSize ); void BSSvRemoveOneNode( - IN void *hDeviceContext, - IN UINT uNodeIndex + void *hDeviceContext, + UINT uNodeIndex ); void BSSvAddMulticastNode( - IN void *hDeviceContext + void *hDeviceContext ); void BSSvClearNodeDBTable( - IN void *hDeviceContext, - IN UINT uStartIndex + void *hDeviceContext, + UINT uStartIndex ); void BSSvClearAnyBSSJoinRecord( - IN void *hDeviceContext + void *hDeviceContext ); #endif //__BSSDB_H__ diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index e767044ba0d..bc61ca912cb 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -425,8 +425,8 @@ SCountryTable ChannelRuleTab[CCODE_MAX+1] = static void s_vCaculateOFDMRParameter( - IN BYTE byRate, - IN CARD_PHY_TYPE ePHYType, + BYTE byRate, + CARD_PHY_TYPE ePHYType, OUT PBYTE pbyTxRate, OUT PBYTE pbyRsvTime ); @@ -498,8 +498,8 @@ exit: static void s_vCaculateOFDMRParameter ( - IN BYTE byRate, - IN CARD_PHY_TYPE ePHYType, + BYTE byRate, + CARD_PHY_TYPE ePHYType, OUT PBYTE pbyTxRate, OUT PBYTE pbyRsvTime ) @@ -1550,10 +1550,10 @@ BOOL CARDbRemoveKey (void *pDeviceHandler, PBYTE pbyBSSID) -*/ BOOL CARDbAdd_PMKID_Candidate ( - IN void *pDeviceHandler, - IN PBYTE pbyBSSID, - IN BOOL bRSNCapExist, - IN WORD wRSNCap + void *pDeviceHandler, + PBYTE pbyBSSID, + BOOL bRSNCapExist, + WORD wRSNCap ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -1601,7 +1601,7 @@ CARDbAdd_PMKID_Candidate ( void * CARDpGetCurrentAddress ( - IN void *pDeviceHandler + void *pDeviceHandler ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -1708,9 +1708,9 @@ void CARDvInitChannelTable (void *pDeviceHandler) -*/ BOOL CARDbStartMeasure ( - IN void *pDeviceHandler, - IN void *pvMeasureEIDs, - IN UINT uNumOfMeasureEIDs + void *pDeviceHandler, + void *pvMeasureEIDs, + UINT uNumOfMeasureEIDs ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -1835,10 +1835,10 @@ CARDbStartMeasure ( -*/ BOOL CARDbChannelSwitch ( - IN void *pDeviceHandler, - IN BYTE byMode, - IN BYTE byNewChannel, - IN BYTE byCount + void *pDeviceHandler, + BYTE byMode, + BYTE byNewChannel, + BYTE byCount ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -1878,12 +1878,12 @@ CARDbChannelSwitch ( -*/ BOOL CARDbSetQuiet ( - IN void *pDeviceHandler, - IN BOOL bResetQuiet, - IN BYTE byQuietCount, - IN BYTE byQuietPeriod, - IN WORD wQuietDuration, - IN WORD wQuietOffset + void *pDeviceHandler, + BOOL bResetQuiet, + BYTE byQuietCount, + BYTE byQuietPeriod, + WORD wQuietDuration, + WORD wQuietOffset ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -1934,7 +1934,7 @@ CARDbSetQuiet ( -*/ BOOL CARDbStartQuiet ( - IN void *pDeviceHandler + void *pDeviceHandler ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -2035,9 +2035,9 @@ CARDbStartQuiet ( -*/ void CARDvSetCountryInfo ( - IN void *pDeviceHandler, - IN CARD_PHY_TYPE ePHYType, - IN void *pIE + void *pDeviceHandler, + CARD_PHY_TYPE ePHYType, + void *pIE ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -2094,9 +2094,9 @@ CARDvSetCountryInfo ( -*/ void CARDvSetPowerConstraint ( - IN void *pDeviceHandler, - IN BYTE byChannel, - IN I8 byPower + void *pDeviceHandler, + BYTE byChannel, + I8 byPower ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -2129,7 +2129,7 @@ CARDvSetPowerConstraint ( -*/ void CARDvGetPowerCapability ( - IN void *pDeviceHandler, + void *pDeviceHandler, OUT PBYTE pbyMinPower, OUT PBYTE pbyMaxPower ) @@ -2165,8 +2165,8 @@ CARDvGetPowerCapability ( -*/ BYTE CARDbySetSupportChannels ( - IN void *pDeviceHandler, - IN OUT PBYTE pbyIEs + void *pDeviceHandler, + OUT PBYTE pbyIEs ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -2256,7 +2256,7 @@ CARDbySetSupportChannels ( -*/ I8 CARDbyGetTransmitPower ( - IN void *pDeviceHandler + void *pDeviceHandler ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -2267,7 +2267,7 @@ CARDbyGetTransmitPower ( BOOL CARDbChannelGetList ( - IN UINT uCountryCodeIdx, + UINT uCountryCodeIdx, OUT PBYTE pbyChannelTable ) { @@ -2281,8 +2281,8 @@ CARDbChannelGetList ( void CARDvSetCountryIE( - IN void *pDeviceHandler, - IN void *pIE + void *pDeviceHandler, + void *pIE ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -2307,8 +2307,8 @@ CARDvSetCountryIE( BOOL CARDbGetChannelMapInfo( - IN void *pDeviceHandler, - IN UINT uChannelIndex, + void *pDeviceHandler, + UINT uChannelIndex, OUT PBYTE pbyChannelNumber, OUT PBYTE pbyMap ) @@ -2326,9 +2326,9 @@ CARDbGetChannelMapInfo( void CARDvSetChannelMapInfo( - IN void *pDeviceHandler, - IN UINT uChannelIndex, - IN BYTE byMap + void *pDeviceHandler, + UINT uChannelIndex, + BYTE byMap ) { // PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -2342,7 +2342,7 @@ CARDvSetChannelMapInfo( void CARDvClearChannelMapInfo( - IN void *pDeviceHandler + void *pDeviceHandler ) { // PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -2356,7 +2356,7 @@ CARDvClearChannelMapInfo( BYTE CARDbyAutoChannelSelect( - IN void *pDeviceHandler, + void *pDeviceHandler, CARD_PHY_TYPE ePHYType ) { @@ -2422,7 +2422,7 @@ CARDbyAutoChannelSelect( //xxx void CARDvSafeResetTx ( - IN void *pDeviceHandler + void *pDeviceHandler ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -2478,7 +2478,7 @@ CARDvSafeResetTx ( -*/ void CARDvSafeResetRx ( - IN void *pDeviceHandler + void *pDeviceHandler ) { PSDevice pDevice = (PSDevice) pDeviceHandler; diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h index 2114e99b584..f52a8e0d48c 100644 --- a/drivers/staging/vt6655/card.h +++ b/drivers/staging/vt6655/card.h @@ -133,15 +133,15 @@ BOOL CARDbRemoveKey (void *pDeviceHandler, PBYTE pbyBSSID); BOOL CARDbAdd_PMKID_Candidate ( - IN void *pDeviceHandler, - IN PBYTE pbyBSSID, - IN BOOL bRSNCapExist, - IN WORD wRSNCap + void *pDeviceHandler, + PBYTE pbyBSSID, + BOOL bRSNCapExist, + WORD wRSNCap ); void * CARDpGetCurrentAddress ( - IN void *pDeviceHandler + void *pDeviceHandler ); @@ -150,101 +150,101 @@ BYTE CARDbyGetChannelMapping(void *pDeviceHandler, BYTE byChannelNumber, CARD_PH BOOL CARDbStartMeasure ( - IN void *pDeviceHandler, - IN void *pvMeasureEIDs, - IN UINT uNumOfMeasureEIDs + void *pDeviceHandler, + void *pvMeasureEIDs, + UINT uNumOfMeasureEIDs ); BOOL CARDbChannelSwitch ( - IN void *pDeviceHandler, - IN BYTE byMode, - IN BYTE byNewChannel, - IN BYTE byCount + void *pDeviceHandler, + BYTE byMode, + BYTE byNewChannel, + BYTE byCount ); BOOL CARDbSetQuiet ( - IN void *pDeviceHandler, - IN BOOL bResetQuiet, - IN BYTE byQuietCount, - IN BYTE byQuietPeriod, - IN WORD wQuietDuration, - IN WORD wQuietOffset + void *pDeviceHandler, + BOOL bResetQuiet, + BYTE byQuietCount, + BYTE byQuietPeriod, + WORD wQuietDuration, + WORD wQuietOffset ); BOOL CARDbStartQuiet ( - IN void *pDeviceHandler + void *pDeviceHandler ); void CARDvSetCountryInfo ( - IN void *pDeviceHandler, - IN CARD_PHY_TYPE ePHYType, - IN void *pIE + void *pDeviceHandler, + CARD_PHY_TYPE ePHYType, + void *pIE ); void CARDvSetPowerConstraint ( - IN void *pDeviceHandler, - IN BYTE byChannel, - IN I8 byPower + void *pDeviceHandler, + BYTE byChannel, + I8 byPower ); void CARDvGetPowerCapability ( - IN void *pDeviceHandler, + void *pDeviceHandler, OUT PBYTE pbyMinPower, OUT PBYTE pbyMaxPower ); BYTE CARDbySetSupportChannels ( - IN void *pDeviceHandler, - IN OUT PBYTE pbyIEs + void *pDeviceHandler, + OUT PBYTE pbyIEs ); I8 CARDbyGetTransmitPower ( - IN void *pDeviceHandler + void *pDeviceHandler ); BOOL CARDbChannelGetList ( - IN UINT uCountryCodeIdx, + UINT uCountryCodeIdx, OUT PBYTE pbyChannelTable ); void CARDvSetCountryIE( - IN void *pDeviceHandler, - IN void *pIE + void *pDeviceHandler, + void *pIE ); BOOL CARDbGetChannelMapInfo( - IN void *pDeviceHandler, - IN UINT uChannelIndex, + void *pDeviceHandler, + UINT uChannelIndex, OUT PBYTE pbyChannelNumber, OUT PBYTE pbyMap ); void CARDvSetChannelMapInfo( - IN void *pDeviceHandler, - IN UINT uChannelIndex, - IN BYTE byMap + void *pDeviceHandler, + UINT uChannelIndex, + BYTE byMap ); void CARDvClearChannelMapInfo( - IN void *pDeviceHandler + void *pDeviceHandler ); BYTE CARDbyAutoChannelSelect( - IN void *pDeviceHandler, + void *pDeviceHandler, CARD_PHY_TYPE ePHYType ); diff --git a/drivers/staging/vt6655/datarate.c b/drivers/staging/vt6655/datarate.c index e0d1a94f732..42b008a428d 100644 --- a/drivers/staging/vt6655/datarate.c +++ b/drivers/staging/vt6655/datarate.c @@ -65,14 +65,14 @@ const BYTE acbyIERate[MAX_RATE] = /*--------------------- Static Functions --------------------------*/ void s_vResetCounter ( - IN PKnownNodeDB psNodeDBTable + PKnownNodeDB psNodeDBTable ); void s_vResetCounter ( - IN PKnownNodeDB psNodeDBTable + PKnownNodeDB psNodeDBTable ) { BYTE ii; @@ -106,7 +106,7 @@ s_vResetCounter ( -*/ BYTE DATARATEbyGetRateIdx ( - IN BYTE byRate + BYTE byRate ) { BYTE ii; @@ -160,7 +160,7 @@ DATARATEbyGetRateIdx ( -*/ WORD wGetRateIdx( - IN BYTE byRate + BYTE byRate ) { WORD ii; @@ -196,10 +196,10 @@ wGetRateIdx( -*/ void RATEvParseMaxRate ( - IN void *pDeviceHandler, - IN PWLAN_IE_SUPP_RATES pItemRates, - IN PWLAN_IE_SUPP_RATES pItemExtRates, - IN BOOL bUpdateBasicRate, + void *pDeviceHandler, + PWLAN_IE_SUPP_RATES pItemRates, + PWLAN_IE_SUPP_RATES pItemExtRates, + BOOL bUpdateBasicRate, OUT PWORD pwMaxBasicRate, OUT PWORD pwMaxSuppRate, OUT PWORD pwSuppRate, @@ -309,8 +309,8 @@ UINT uRateLen; void RATEvTxRateFallBack ( - IN void *pDeviceHandler, - IN PKnownNodeDB psNodeDBTable + void *pDeviceHandler, + PKnownNodeDB psNodeDBTable ) { PSDevice pDevice = (PSDevice) pDeviceHandler; @@ -411,9 +411,9 @@ TxRate_iwconfig=psNodeDBTable->wTxDataRate; -*/ BYTE RATEuSetIE ( - IN PWLAN_IE_SUPP_RATES pSrcRates, - IN PWLAN_IE_SUPP_RATES pDstRates, - IN UINT uRateLen + PWLAN_IE_SUPP_RATES pSrcRates, + PWLAN_IE_SUPP_RATES pDstRates, + UINT uRateLen ) { UINT ii, uu, uRateCnt = 0; diff --git a/drivers/staging/vt6655/datarate.h b/drivers/staging/vt6655/datarate.h index bba4a16d004..abf7a3884fc 100644 --- a/drivers/staging/vt6655/datarate.h +++ b/drivers/staging/vt6655/datarate.h @@ -56,10 +56,10 @@ void RATEvParseMaxRate( - IN void *pDeviceHandler, - IN PWLAN_IE_SUPP_RATES pItemRates, - IN PWLAN_IE_SUPP_RATES pItemExtRates, - IN BOOL bUpdateBasicRate, + void *pDeviceHandler, + PWLAN_IE_SUPP_RATES pItemRates, + PWLAN_IE_SUPP_RATES pItemExtRates, + BOOL bUpdateBasicRate, OUT PWORD pwMaxBasicRate, OUT PWORD pwMaxSuppRate, OUT PWORD pwSuppRate, @@ -69,26 +69,26 @@ RATEvParseMaxRate( void RATEvTxRateFallBack( - IN void *pDeviceHandler, - IN PKnownNodeDB psNodeDBTable + void *pDeviceHandler, + PKnownNodeDB psNodeDBTable ); BYTE RATEuSetIE( - IN PWLAN_IE_SUPP_RATES pSrcRates, - IN PWLAN_IE_SUPP_RATES pDstRates, - IN UINT uRateLen + PWLAN_IE_SUPP_RATES pSrcRates, + PWLAN_IE_SUPP_RATES pDstRates, + UINT uRateLen ); WORD wGetRateIdx( - IN BYTE byRate + BYTE byRate ); BYTE DATARATEbyGetRateIdx( - IN BYTE byRate + BYTE byRate ); diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 454277b96ee..a401f2ad62c 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -478,7 +478,7 @@ pDevice->bUpdateBBVGA = TRUE; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pDevice->bDiversityRegCtlON= %d\n",(INT)pDevice->bDiversityRegCtlON); } -static void s_vCompleteCurrentMeasure (IN PSDevice pDevice, IN BYTE byResult) +static void s_vCompleteCurrentMeasure (PSDevice pDevice, BYTE byResult) { UINT ii; DWORD dwDuration = 0; diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c index d90104a1e6b..69368392466 100644 --- a/drivers/staging/vt6655/dpc.c +++ b/drivers/staging/vt6655/dpc.c @@ -76,13 +76,13 @@ const BYTE acbyRxRate[MAX_RATE] = /*--------------------- Static Functions --------------------------*/ -static BYTE s_byGetRateIdx(IN BYTE byRate); +static BYTE s_byGetRateIdx(BYTE byRate); static void s_vGetDASA( - IN PBYTE pbyRxBufferAddr, + PBYTE pbyRxBufferAddr, OUT PUINT pcbHeaderSize, OUT PSEthernetHeader psEthHeader ); @@ -90,37 +90,37 @@ s_vGetDASA( static void s_vProcessRxMACHeader ( - IN PSDevice pDevice, - IN PBYTE pbyRxBufferAddr, - IN UINT cbPacketSize, - IN BOOL bIsWEP, - IN BOOL bExtIV, + PSDevice pDevice, + PBYTE pbyRxBufferAddr, + UINT cbPacketSize, + BOOL bIsWEP, + BOOL bExtIV, OUT PUINT pcbHeadSize ); static BOOL s_bAPModeRxCtl( - IN PSDevice pDevice, - IN PBYTE pbyFrame, - IN INT iSANodeIndex + PSDevice pDevice, + PBYTE pbyFrame, + INT iSANodeIndex ); static BOOL s_bAPModeRxData ( - IN PSDevice pDevice, - IN struct sk_buff* skb, - IN UINT FrameSize, - IN UINT cbHeaderOffset, - IN INT iSANodeIndex, - IN INT iDANodeIndex + PSDevice pDevice, + struct sk_buff* skb, + UINT FrameSize, + UINT cbHeaderOffset, + INT iSANodeIndex, + INT iDANodeIndex ); static BOOL s_bHandleRxEncryption( - IN PSDevice pDevice, - IN PBYTE pbyFrame, - IN UINT FrameSize, - IN PBYTE pbyRsr, + PSDevice pDevice, + PBYTE pbyFrame, + UINT FrameSize, + PBYTE pbyRsr, OUT PBYTE pbyNewRsr, OUT PSKeyItem *pKeyOut, int * pbExtIV, @@ -130,12 +130,12 @@ static BOOL s_bHandleRxEncryption( static BOOL s_bHostWepRxEncryption( - IN PSDevice pDevice, - IN PBYTE pbyFrame, - IN UINT FrameSize, - IN PBYTE pbyRsr, - IN BOOL bOnFly, - IN PSKeyItem pKey, + PSDevice pDevice, + PBYTE pbyFrame, + UINT FrameSize, + PBYTE pbyRsr, + BOOL bOnFly, + PSKeyItem pKey, OUT PBYTE pbyNewRsr, int * pbExtIV, OUT PWORD pwRxTSC15_0, @@ -165,11 +165,11 @@ static BOOL s_bHostWepRxEncryption( static void s_vProcessRxMACHeader ( - IN PSDevice pDevice, - IN PBYTE pbyRxBufferAddr, - IN UINT cbPacketSize, - IN BOOL bIsWEP, - IN BOOL bExtIV, + PSDevice pDevice, + PBYTE pbyRxBufferAddr, + UINT cbPacketSize, + BOOL bIsWEP, + BOOL bExtIV, OUT PUINT pcbHeadSize ) { @@ -249,7 +249,7 @@ s_vProcessRxMACHeader ( -static BYTE s_byGetRateIdx (IN BYTE byRate) +static BYTE s_byGetRateIdx (BYTE byRate) { BYTE byRateIdx; @@ -264,7 +264,7 @@ static BYTE s_byGetRateIdx (IN BYTE byRate) static void s_vGetDASA ( - IN PBYTE pbyRxBufferAddr, + PBYTE pbyRxBufferAddr, OUT PUINT pcbHeaderSize, OUT PSEthernetHeader psEthHeader ) @@ -335,8 +335,8 @@ void MngWorkItem(void *Context) BOOL device_receive_frame ( - IN PSDevice pDevice, - IN PSRxDesc pCurrRD + PSDevice pDevice, + PSRxDesc pCurrRD ) { @@ -1039,9 +1039,9 @@ device_receive_frame ( static BOOL s_bAPModeRxCtl ( - IN PSDevice pDevice, - IN PBYTE pbyFrame, - IN INT iSANodeIndex + PSDevice pDevice, + PBYTE pbyFrame, + INT iSANodeIndex ) { PS802_11Header p802_11Header; @@ -1163,10 +1163,10 @@ static BOOL s_bAPModeRxCtl ( } static BOOL s_bHandleRxEncryption ( - IN PSDevice pDevice, - IN PBYTE pbyFrame, - IN UINT FrameSize, - IN PBYTE pbyRsr, + PSDevice pDevice, + PBYTE pbyFrame, + UINT FrameSize, + PBYTE pbyRsr, OUT PBYTE pbyNewRsr, OUT PSKeyItem *pKeyOut, int * pbExtIV, @@ -1309,12 +1309,12 @@ static BOOL s_bHandleRxEncryption ( static BOOL s_bHostWepRxEncryption ( - IN PSDevice pDevice, - IN PBYTE pbyFrame, - IN UINT FrameSize, - IN PBYTE pbyRsr, - IN BOOL bOnFly, - IN PSKeyItem pKey, + PSDevice pDevice, + PBYTE pbyFrame, + UINT FrameSize, + PBYTE pbyRsr, + BOOL bOnFly, + PSKeyItem pKey, OUT PBYTE pbyNewRsr, int * pbExtIV, OUT PWORD pwRxTSC15_0, @@ -1440,12 +1440,12 @@ static BOOL s_bHostWepRxEncryption ( static BOOL s_bAPModeRxData ( - IN PSDevice pDevice, - IN struct sk_buff* skb, - IN UINT FrameSize, - IN UINT cbHeaderOffset, - IN INT iSANodeIndex, - IN INT iDANodeIndex + PSDevice pDevice, + struct sk_buff* skb, + UINT FrameSize, + UINT cbHeaderOffset, + INT iSANodeIndex, + INT iDANodeIndex ) { PSMgmtObject pMgmt = pDevice->pMgmt; diff --git a/drivers/staging/vt6655/dpc.h b/drivers/staging/vt6655/dpc.h index 4129c11e011..e574963fee0 100644 --- a/drivers/staging/vt6655/dpc.h +++ b/drivers/staging/vt6655/dpc.h @@ -43,8 +43,8 @@ BOOL device_receive_frame ( - IN PSDevice pDevice, - IN PSRxDesc pCurrRD + PSDevice pDevice, + PSRxDesc pCurrRD ); void MngWorkItem(void *Context); diff --git a/drivers/staging/vt6655/ioctl.c b/drivers/staging/vt6655/ioctl.c index 1bd819946b8..e36cd30f642 100644 --- a/drivers/staging/vt6655/ioctl.c +++ b/drivers/staging/vt6655/ioctl.c @@ -716,10 +716,10 @@ if(wpa_Result.authenticated==TRUE) { /* void vConfigWEPKey ( - IN PSDevice pDevice, - IN DWORD dwKeyIndex, - IN PBYTE pbyKey, - IN ULONG uKeyLength + PSDevice pDevice, + DWORD dwKeyIndex, + PBYTE pbyKey, + ULONG uKeyLength ) { int ii; diff --git a/drivers/staging/vt6655/ioctl.h b/drivers/staging/vt6655/ioctl.h index dc278aeb7ea..0d10c2a923c 100644 --- a/drivers/staging/vt6655/ioctl.h +++ b/drivers/staging/vt6655/ioctl.h @@ -44,10 +44,10 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq); /* void vConfigWEPKey ( - IN PSDevice pDevice, - IN DWORD dwKeyIndex, - IN PBYTE pbyKey, - IN ULONG uKeyLength + PSDevice pDevice, + DWORD dwKeyIndex, + PBYTE pbyKey, + ULONG uKeyLength ); */ diff --git a/drivers/staging/vt6655/key.c b/drivers/staging/vt6655/key.c index b40c400a23c..c702d509605 100644 --- a/drivers/staging/vt6655/key.c +++ b/drivers/staging/vt6655/key.c @@ -132,9 +132,9 @@ void KeyvInitTable (PSKeyManagement pTable, DWORD_PTR dwIoBase) * */ BOOL KeybGetKey ( - IN PSKeyManagement pTable, - IN PBYTE pbyBSSID, - IN DWORD dwKeyIndex, + PSKeyManagement pTable, + PBYTE pbyBSSID, + DWORD dwKeyIndex, OUT PSKeyItem *pKey ) { @@ -518,9 +518,9 @@ void KeyvRemoveAllWEPKey ( * */ BOOL KeybGetTransmitKey ( - IN PSKeyManagement pTable, - IN PBYTE pbyBSSID, - IN DWORD dwKeyType, + PSKeyManagement pTable, + PBYTE pbyBSSID, + DWORD dwKeyType, OUT PSKeyItem *pKey ) { @@ -598,7 +598,7 @@ BOOL KeybGetTransmitKey ( * */ BOOL KeybCheckPairewiseKey ( - IN PSKeyManagement pTable, + PSKeyManagement pTable, OUT PSKeyItem *pKey ) { diff --git a/drivers/staging/vt6655/key.h b/drivers/staging/vt6655/key.h index 4cbd82f76e4..88be5b4f392 100644 --- a/drivers/staging/vt6655/key.h +++ b/drivers/staging/vt6655/key.h @@ -104,9 +104,9 @@ typedef struct tagSKeyManagement void KeyvInitTable(PSKeyManagement pTable, DWORD_PTR dwIoBase); BOOL KeybGetKey( - IN PSKeyManagement pTable, - IN PBYTE pbyBSSID, - IN DWORD dwKeyIndex, + PSKeyManagement pTable, + PBYTE pbyBSSID, + DWORD dwKeyIndex, OUT PSKeyItem *pKey ); @@ -141,14 +141,14 @@ BOOL KeybRemoveKey( ); BOOL KeybGetTransmitKey( - IN PSKeyManagement pTable, - IN PBYTE pbyBSSID, - IN DWORD dwKeyType, + PSKeyManagement pTable, + PBYTE pbyBSSID, + DWORD dwKeyType, OUT PSKeyItem *pKey ); BOOL KeybCheckPairewiseKey( - IN PSKeyManagement pTable, + PSKeyManagement pTable, OUT PSKeyItem *pKey ); diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c index 166e7fb638c..64c22c3e4bb 100644 --- a/drivers/staging/vt6655/power.c +++ b/drivers/staging/vt6655/power.c @@ -76,8 +76,8 @@ static int msglevel =MSG_LEVEL_INFO; void PSvEnablePowerSaving( - IN void *hDeviceContext, - IN WORD wListenInterval + void *hDeviceContext, + WORD wListenInterval ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -118,7 +118,7 @@ PSvEnablePowerSaving( pDevice->bEnablePSMode = TRUE; if (pDevice->eOPMode == OP_MODE_ADHOC) { -// bMgrPrepareBeaconToSend((HANDLE)pDevice, pMgmt); +// bMgrPrepareBeaconToSend((void *)pDevice, pMgmt); } // We don't send null pkt in ad hoc mode since beacon will handle this. else if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) { @@ -146,7 +146,7 @@ PSvEnablePowerSaving( void PSvDisablePowerSaving( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -184,9 +184,9 @@ PSvDisablePowerSaving( BOOL PSbConsiderPowerDown( - IN void *hDeviceContext, - IN BOOL bCheckRxDMA, - IN BOOL bCheckCountToWakeUp + void *hDeviceContext, + BOOL bCheckRxDMA, + BOOL bCheckCountToWakeUp ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -252,7 +252,7 @@ PSbConsiderPowerDown( void PSvSendPSPOLL( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -298,7 +298,7 @@ PSvSendPSPOLL( -*/ BOOL PSbSendNullPacket( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -384,7 +384,7 @@ PSbSendNullPacket( BOOL PSbIsNextTBTTWakeUp( - IN void *hDeviceContext + void *hDeviceContext ) { diff --git a/drivers/staging/vt6655/power.h b/drivers/staging/vt6655/power.h index 769e0d1acd2..c0dbe216e97 100644 --- a/drivers/staging/vt6655/power.h +++ b/drivers/staging/vt6655/power.h @@ -45,40 +45,40 @@ /*--------------------- Export Functions --------------------------*/ -// IN PSDevice pDevice -// IN PSDevice hDeviceContext +// PSDevice pDevice +// PSDevice hDeviceContext BOOL PSbConsiderPowerDown( - IN void *hDeviceContext, - IN BOOL bCheckRxDMA, - IN BOOL bCheckCountToWakeUp + void *hDeviceContext, + BOOL bCheckRxDMA, + BOOL bCheckCountToWakeUp ); void PSvDisablePowerSaving( - IN void *hDeviceContext + void *hDeviceContext ); void PSvEnablePowerSaving( - IN void *hDeviceContext, - IN WORD wListenInterval + void *hDeviceContext, + WORD wListenInterval ); void PSvSendPSPOLL( - IN void *hDeviceContext + void *hDeviceContext ); BOOL PSbSendNullPacket( - IN void *hDeviceContext + void *hDeviceContext ); BOOL PSbIsNextTBTTWakeUp( - IN void *hDeviceContext + void *hDeviceContext ); #endif //__POWER_H__ diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index 29eb758c9e7..7cb86fe2eeb 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -808,7 +808,7 @@ BOOL RFbAL2230SelectChannel (DWORD_PTR dwIoBase, BYTE byChannel) * */ BOOL RFbInit ( - IN PSDevice pDevice + PSDevice pDevice ) { BOOL bResult = TRUE; @@ -846,7 +846,7 @@ BOOL bResult = TRUE; * */ BOOL RFbShutDown ( - IN PSDevice pDevice + PSDevice pDevice ) { BOOL bResult = TRUE; @@ -997,9 +997,9 @@ BOOL RFvWriteWakeProgSyn (DWORD_PTR dwIoBase, BYTE byRFType, UINT uChannel) * */ BOOL RFbSetPower ( - IN PSDevice pDevice, - IN UINT uRATE, - IN UINT uCH + PSDevice pDevice, + UINT uRATE, + UINT uCH ) { BOOL bResult = TRUE; @@ -1136,9 +1136,9 @@ BYTE byPwrdBm = 0; */ BOOL RFbRawSetPower ( - IN PSDevice pDevice, - IN BYTE byPwr, - IN UINT uRATE + PSDevice pDevice, + BYTE byPwr, + UINT uRATE ) { BOOL bResult = TRUE; @@ -1203,8 +1203,8 @@ DWORD dwMax7230Pwr = 0; -*/ void RFvRSSITodBm ( - IN PSDevice pDevice, - IN BYTE byCurrRSSI, + PSDevice pDevice, + BYTE byCurrRSSI, long * pldBm ) { diff --git a/drivers/staging/vt6655/rf.h b/drivers/staging/vt6655/rf.h index e6e6ca58633..25dfc7942f6 100644 --- a/drivers/staging/vt6655/rf.h +++ b/drivers/staging/vt6655/rf.h @@ -79,20 +79,20 @@ BOOL IFRFbWriteEmbeded(DWORD_PTR dwIoBase, DWORD dwData); BOOL RFbSelectChannel(DWORD_PTR dwIoBase, BYTE byRFType, BYTE byChannel); BOOL RFbInit ( - IN PSDevice pDevice + PSDevice pDevice ); BOOL RFvWriteWakeProgSyn(DWORD_PTR dwIoBase, BYTE byRFType, UINT uChannel); BOOL RFbSetPower(PSDevice pDevice, UINT uRATE, UINT uCH); BOOL RFbRawSetPower( - IN PSDevice pDevice, - IN BYTE byPwr, - IN UINT uRATE + PSDevice pDevice, + BYTE byPwr, + UINT uRATE ); void RFvRSSITodBm( - IN PSDevice pDevice, - IN BYTE byCurrRSSI, + PSDevice pDevice, + BYTE byCurrRSSI, long *pldBm ); diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 8d1772e70ab..885741a774b 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -117,12 +117,12 @@ const WORD wFB_Opt1[2][5] = { static void s_vFillTxKey( - IN PSDevice pDevice, - IN PBYTE pbyBuf, - IN PBYTE pbyIVHead, - IN PSKeyItem pTransmitKey, - IN PBYTE pbyHdrBuf, - IN WORD wPayloadLen, + PSDevice pDevice, + PBYTE pbyBuf, + PBYTE pbyIVHead, + PSKeyItem pTransmitKey, + PBYTE pbyHdrBuf, + WORD wPayloadLen, OUT PBYTE pMICHDR ); @@ -131,59 +131,59 @@ s_vFillTxKey( static void s_vFillRTSHead( - IN PSDevice pDevice, - IN BYTE byPktType, - IN void * pvRTS, - IN UINT cbFrameLength, - IN BOOL bNeedAck, - IN BOOL bDisCRC, - IN PSEthernetHeader psEthHeader, - IN WORD wCurrentRate, - IN BYTE byFBOption + PSDevice pDevice, + BYTE byPktType, + void * pvRTS, + UINT cbFrameLength, + BOOL bNeedAck, + BOOL bDisCRC, + PSEthernetHeader psEthHeader, + WORD wCurrentRate, + BYTE byFBOption ); static void s_vGenerateTxParameter( - IN PSDevice pDevice, - IN BYTE byPktType, - IN void * pTxBufHead, - IN void * pvRrvTime, - IN void * pvRTS, - IN void * pvCTS, - IN UINT cbFrameSize, - IN BOOL bNeedACK, - IN UINT uDMAIdx, - IN PSEthernetHeader psEthHeader, - IN WORD wCurrentRate + PSDevice pDevice, + BYTE byPktType, + void * pTxBufHead, + void * pvRrvTime, + void * pvRTS, + void * pvCTS, + UINT cbFrameSize, + BOOL bNeedACK, + UINT uDMAIdx, + PSEthernetHeader psEthHeader, + WORD wCurrentRate ); static void s_vFillFragParameter( - IN PSDevice pDevice, - IN PBYTE pbyBuffer, - IN UINT uTxType, - IN void * pvtdCurr, - IN WORD wFragType, - IN UINT cbReqCount + PSDevice pDevice, + PBYTE pbyBuffer, + UINT uTxType, + void * pvtdCurr, + WORD wFragType, + UINT cbReqCount ); static UINT s_cbFillTxBufHead ( - IN PSDevice pDevice, - IN BYTE byPktType, - IN PBYTE pbyTxBufferAddr, - IN UINT cbFrameBodySize, - IN UINT uDMAIdx, - IN PSTxDesc pHeadTD, - IN PSEthernetHeader psEthHeader, - IN PBYTE pPacket, - IN BOOL bNeedEncrypt, - IN PSKeyItem pTransmitKey, - IN UINT uNodeIndex, + PSDevice pDevice, + BYTE byPktType, + PBYTE pbyTxBufferAddr, + UINT cbFrameBodySize, + UINT uDMAIdx, + PSTxDesc pHeadTD, + PSEthernetHeader psEthHeader, + PBYTE pPacket, + BOOL bNeedEncrypt, + PSKeyItem pTransmitKey, + UINT uNodeIndex, OUT PUINT puMACfragNum ); @@ -191,17 +191,17 @@ s_cbFillTxBufHead ( static UINT s_uFillDataHead ( - IN PSDevice pDevice, - IN BYTE byPktType, - IN void * pTxDataHead, - IN UINT cbFrameLength, - IN UINT uDMAIdx, - IN BOOL bNeedAck, - IN UINT uFragIdx, - IN UINT cbLastFragmentSize, - IN UINT uMACfragNum, - IN BYTE byFBOption, - IN WORD wCurrentRate + PSDevice pDevice, + BYTE byPktType, + void * pTxDataHead, + UINT cbFrameLength, + UINT uDMAIdx, + BOOL bNeedAck, + UINT uFragIdx, + UINT cbLastFragmentSize, + UINT uMACfragNum, + BYTE byFBOption, + WORD wCurrentRate ); @@ -212,12 +212,12 @@ s_uFillDataHead ( static void s_vFillTxKey ( - IN PSDevice pDevice, - IN PBYTE pbyBuf, - IN PBYTE pbyIVHead, - IN PSKeyItem pTransmitKey, - IN PBYTE pbyHdrBuf, - IN WORD wPayloadLen, + PSDevice pDevice, + PBYTE pbyBuf, + PBYTE pbyIVHead, + PSKeyItem pTransmitKey, + PBYTE pbyHdrBuf, + WORD wPayloadLen, OUT PBYTE pMICHDR ) { @@ -330,10 +330,10 @@ s_vFillTxKey ( static void s_vSWencryption ( - IN PSDevice pDevice, - IN PSKeyItem pTransmitKey, - IN PBYTE pbyPayloadHead, - IN WORD wPayloadSize + PSDevice pDevice, + PSKeyItem pTransmitKey, + PBYTE pbyPayloadHead, + WORD wPayloadSize ) { UINT cbICVlen = 4; @@ -379,11 +379,11 @@ s_vSWencryption ( static UINT s_uGetTxRsvTime ( - IN PSDevice pDevice, - IN BYTE byPktType, - IN UINT cbFrameLength, - IN WORD wRate, - IN BOOL bNeedAck + PSDevice pDevice, + BYTE byPktType, + UINT cbFrameLength, + WORD wRate, + BOOL bNeedAck ) { UINT uDataTime, uAckTime; @@ -410,11 +410,11 @@ s_uGetTxRsvTime ( static UINT s_uGetRTSCTSRsvTime ( - IN PSDevice pDevice, - IN BYTE byRTSRsvType, - IN BYTE byPktType, - IN UINT cbFrameLength, - IN WORD wCurrentRate + PSDevice pDevice, + BYTE byRTSRsvType, + BYTE byPktType, + UINT cbFrameLength, + WORD wCurrentRate ) { UINT uRrvTime , uRTSTime, uCTSTime, uAckTime, uDataTime; @@ -452,16 +452,16 @@ s_uGetRTSCTSRsvTime ( static UINT s_uGetDataDuration ( - IN PSDevice pDevice, - IN BYTE byDurType, - IN UINT cbFrameLength, - IN BYTE byPktType, - IN WORD wRate, - IN BOOL bNeedAck, - IN UINT uFragIdx, - IN UINT cbLastFragmentSize, - IN UINT uMACfragNum, - IN BYTE byFBOption + PSDevice pDevice, + BYTE byDurType, + UINT cbFrameLength, + BYTE byPktType, + WORD wRate, + BOOL bNeedAck, + UINT uFragIdx, + UINT cbLastFragmentSize, + UINT uMACfragNum, + BYTE byFBOption ) { BOOL bLastFrag = 0; @@ -623,13 +623,13 @@ s_uGetDataDuration ( static UINT s_uGetRTSCTSDuration ( - IN PSDevice pDevice, - IN BYTE byDurType, - IN UINT cbFrameLength, - IN BYTE byPktType, - IN WORD wRate, - IN BOOL bNeedAck, - IN BYTE byFBOption + PSDevice pDevice, + BYTE byDurType, + UINT cbFrameLength, + BYTE byPktType, + WORD wRate, + BOOL bNeedAck, + BYTE byFBOption ) { UINT uCTSTime = 0, uDurTime = 0; @@ -721,17 +721,17 @@ s_uGetRTSCTSDuration ( static UINT s_uFillDataHead ( - IN PSDevice pDevice, - IN BYTE byPktType, - IN void * pTxDataHead, - IN UINT cbFrameLength, - IN UINT uDMAIdx, - IN BOOL bNeedAck, - IN UINT uFragIdx, - IN UINT cbLastFragmentSize, - IN UINT uMACfragNum, - IN BYTE byFBOption, - IN WORD wCurrentRate + PSDevice pDevice, + BYTE byPktType, + void * pTxDataHead, + UINT cbFrameLength, + UINT uDMAIdx, + BOOL bNeedAck, + UINT uFragIdx, + UINT cbLastFragmentSize, + UINT uMACfragNum, + BYTE byFBOption, + WORD wCurrentRate ) { WORD wLen = 0x0000; @@ -853,15 +853,15 @@ s_uFillDataHead ( static void s_vFillRTSHead ( - IN PSDevice pDevice, - IN BYTE byPktType, - IN void * pvRTS, - IN UINT cbFrameLength, - IN BOOL bNeedAck, - IN BOOL bDisCRC, - IN PSEthernetHeader psEthHeader, - IN WORD wCurrentRate, - IN BYTE byFBOption + PSDevice pDevice, + BYTE byPktType, + void * pvRTS, + UINT cbFrameLength, + BOOL bNeedAck, + BOOL bDisCRC, + PSEthernetHeader psEthHeader, + WORD wCurrentRate, + BYTE byFBOption ) { UINT uRTSFrameLen = 20; @@ -1047,15 +1047,15 @@ s_vFillRTSHead ( static void s_vFillCTSHead ( - IN PSDevice pDevice, - IN UINT uDMAIdx, - IN BYTE byPktType, - IN void * pvCTS, - IN UINT cbFrameLength, - IN BOOL bNeedAck, - IN BOOL bDisCRC, - IN WORD wCurrentRate, - IN BYTE byFBOption + PSDevice pDevice, + UINT uDMAIdx, + BYTE byPktType, + void * pvCTS, + UINT cbFrameLength, + BOOL bNeedAck, + BOOL bDisCRC, + WORD wCurrentRate, + BYTE byFBOption ) { UINT uCTSFrameLen = 14; @@ -1152,17 +1152,17 @@ s_vFillCTSHead ( static void s_vGenerateTxParameter ( - IN PSDevice pDevice, - IN BYTE byPktType, - IN void * pTxBufHead, - IN void * pvRrvTime, - IN void * pvRTS, - IN void * pvCTS, - IN UINT cbFrameSize, - IN BOOL bNeedACK, - IN UINT uDMAIdx, - IN PSEthernetHeader psEthHeader, - IN WORD wCurrentRate + PSDevice pDevice, + BYTE byPktType, + void * pTxBufHead, + void * pvRrvTime, + void * pvRTS, + void * pvCTS, + UINT cbFrameSize, + BOOL bNeedACK, + UINT uDMAIdx, + PSEthernetHeader psEthHeader, + WORD wCurrentRate ) { UINT cbMACHdLen = WLAN_HDR_ADDR3_LEN; //24 @@ -1270,12 +1270,12 @@ s_vGenerateTxParameter ( static void s_vFillFragParameter( - IN PSDevice pDevice, - IN PBYTE pbyBuffer, - IN UINT uTxType, - IN void * pvtdCurr, - IN WORD wFragType, - IN UINT cbReqCount + PSDevice pDevice, + PBYTE pbyBuffer, + UINT uTxType, + void * pvtdCurr, + WORD wFragType, + UINT cbReqCount ) { PSTxBufHead pTxBufHead = (PSTxBufHead) pbyBuffer; @@ -1318,17 +1318,17 @@ s_vFillFragParameter( static UINT s_cbFillTxBufHead ( - IN PSDevice pDevice, - IN BYTE byPktType, - IN PBYTE pbyTxBufferAddr, - IN UINT cbFrameBodySize, - IN UINT uDMAIdx, - IN PSTxDesc pHeadTD, - IN PSEthernetHeader psEthHeader, - IN PBYTE pPacket, - IN BOOL bNeedEncrypt, - IN PSKeyItem pTransmitKey, - IN UINT uNodeIndex, + PSDevice pDevice, + BYTE byPktType, + PBYTE pbyTxBufferAddr, + UINT cbFrameBodySize, + UINT uDMAIdx, + PSTxDesc pHeadTD, + PSEthernetHeader psEthHeader, + PBYTE pPacket, + BOOL bNeedEncrypt, + PSKeyItem pTransmitKey, + UINT uNodeIndex, OUT PUINT puMACfragNum ) { @@ -2095,17 +2095,17 @@ s_cbFillTxBufHead ( void vGenerateFIFOHeader ( - IN PSDevice pDevice, - IN BYTE byPktType, - IN PBYTE pbyTxBufferAddr, - IN BOOL bNeedEncrypt, - IN UINT cbPayloadSize, - IN UINT uDMAIdx, - IN PSTxDesc pHeadTD, - IN PSEthernetHeader psEthHeader, - IN PBYTE pPacket, - IN PSKeyItem pTransmitKey, - IN UINT uNodeIndex, + PSDevice pDevice, + BYTE byPktType, + PBYTE pbyTxBufferAddr, + BOOL bNeedEncrypt, + UINT cbPayloadSize, + UINT uDMAIdx, + PSTxDesc pHeadTD, + PSEthernetHeader psEthHeader, + PBYTE pPacket, + PSKeyItem pTransmitKey, + UINT uNodeIndex, OUT PUINT puMACfragNum, OUT PUINT pcbHeaderSize ) @@ -2266,14 +2266,14 @@ vGenerateFIFOHeader ( void vGenerateMACHeader ( - IN PSDevice pDevice, - IN PBYTE pbyBufferAddr, - IN WORD wDuration, - IN PSEthernetHeader psEthHeader, - IN BOOL bNeedEncrypt, - IN WORD wFragType, - IN UINT uDMAIdx, - IN UINT uFragIdx + PSDevice pDevice, + PBYTE pbyBufferAddr, + WORD wDuration, + PSEthernetHeader psEthHeader, + BOOL bNeedEncrypt, + WORD wFragType, + UINT uDMAIdx, + UINT uFragIdx ) { PS802_11Header pMACHeader = (PS802_11Header)pbyBufferAddr; @@ -2738,10 +2738,10 @@ CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { UINT cbGetFragCount ( - IN PSDevice pDevice, - IN PSKeyItem pTransmitKey, - IN UINT cbFrameBodySize, - IN PSEthernetHeader psEthHeader + PSDevice pDevice, + PSKeyItem pTransmitKey, + UINT cbFrameBodySize, + PSEthernetHeader psEthHeader ) { UINT cbMACHdLen; diff --git a/drivers/staging/vt6655/rxtx.h b/drivers/staging/vt6655/rxtx.h index 4c2df48be37..75988c74a18 100644 --- a/drivers/staging/vt6655/rxtx.h +++ b/drivers/staging/vt6655/rxtx.h @@ -41,20 +41,20 @@ /* void vGenerateMACHeader( - IN PSDevice pDevice, - IN DWORD dwTxBufferAddr, - IN PBYTE pbySkbData, - IN UINT cbPacketSize, - IN BOOL bDMA0Used, + PSDevice pDevice, + DWORD dwTxBufferAddr, + PBYTE pbySkbData, + UINT cbPacketSize, + BOOL bDMA0Used, OUT PUINT pcbHeadSize, OUT PUINT pcbAppendPayload ); void vProcessRxMACHeader ( - IN PSDevice pDevice, - IN DWORD dwRxBufferAddr, - IN UINT cbPacketSize, - IN BOOL bIsWEP, + PSDevice pDevice, + DWORD dwRxBufferAddr, + UINT cbPacketSize, + BOOL bIsWEP, OUT PUINT pcbHeadSize ); */ @@ -62,39 +62,39 @@ void vProcessRxMACHeader ( void vGenerateMACHeader ( - IN PSDevice pDevice, - IN PBYTE pbyBufferAddr, - IN WORD wDuration, - IN PSEthernetHeader psEthHeader, - IN BOOL bNeedEncrypt, - IN WORD wFragType, - IN UINT uDMAIdx, - IN UINT uFragIdx + PSDevice pDevice, + PBYTE pbyBufferAddr, + WORD wDuration, + PSEthernetHeader psEthHeader, + BOOL bNeedEncrypt, + WORD wFragType, + UINT uDMAIdx, + UINT uFragIdx ); UINT cbGetFragCount( - IN PSDevice pDevice, - IN PSKeyItem pTransmitKey, - IN UINT cbFrameBodySize, - IN PSEthernetHeader psEthHeader + PSDevice pDevice, + PSKeyItem pTransmitKey, + UINT cbFrameBodySize, + PSEthernetHeader psEthHeader ); void vGenerateFIFOHeader ( - IN PSDevice pDevice, - IN BYTE byPktTyp, - IN PBYTE pbyTxBufferAddr, - IN BOOL bNeedEncrypt, - IN UINT cbPayloadSize, - IN UINT uDMAIdx, - IN PSTxDesc pHeadTD, - IN PSEthernetHeader psEthHeader, - IN PBYTE pPacket, - IN PSKeyItem pTransmitKey, - IN UINT uNodeIndex, + PSDevice pDevice, + BYTE byPktTyp, + PBYTE pbyTxBufferAddr, + BOOL bNeedEncrypt, + UINT cbPayloadSize, + UINT uDMAIdx, + PSTxDesc pHeadTD, + PSEthernetHeader psEthHeader, + PBYTE pPacket, + PSKeyItem pTransmitKey, + UINT uNodeIndex, OUT PUINT puMACfragNum, OUT PUINT pcbHeaderSize ); diff --git a/drivers/staging/vt6655/ttype.h b/drivers/staging/vt6655/ttype.h index b2dff3a7b77..2921083a9f2 100644 --- a/drivers/staging/vt6655/ttype.h +++ b/drivers/staging/vt6655/ttype.h @@ -33,10 +33,6 @@ /******* Common definitions and typedefs ***********************************/ -#ifndef IN -#define IN -#endif - #ifndef OUT #define OUT #endif diff --git a/drivers/staging/vt6655/vntwifi.c b/drivers/staging/vt6655/vntwifi.c index 03975dabb8d..bd3b2afe2cf 100644 --- a/drivers/staging/vt6655/vntwifi.c +++ b/drivers/staging/vt6655/vntwifi.c @@ -71,8 +71,8 @@ -*/ void VNTWIFIvSetOPMode ( - IN void *pMgmtHandle, - IN WMAC_CONFIG_MODE eOPMode + void *pMgmtHandle, + WMAC_CONFIG_MODE eOPMode ) { PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; @@ -100,10 +100,10 @@ VNTWIFIvSetOPMode ( -*/ void VNTWIFIvSetIBSSParameter ( - IN void *pMgmtHandle, - IN WORD wBeaconPeriod, - IN WORD wATIMWindow, - IN UINT uChannel + void *pMgmtHandle, + WORD wBeaconPeriod, + WORD wATIMWindow, + UINT uChannel ) { PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; @@ -129,7 +129,7 @@ VNTWIFIvSetIBSSParameter ( -*/ PWLAN_IE_SSID VNTWIFIpGetCurrentSSID ( - IN void *pMgmtHandle + void *pMgmtHandle ) { PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; @@ -152,7 +152,7 @@ VNTWIFIpGetCurrentSSID ( -*/ UINT VNTWIFIpGetCurrentChannel ( - IN void *pMgmtHandle + void *pMgmtHandle ) { PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; @@ -178,7 +178,7 @@ VNTWIFIpGetCurrentChannel ( -*/ WORD VNTWIFIwGetAssocID ( - IN void *pMgmtHandle + void *pMgmtHandle ) { PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; @@ -204,8 +204,8 @@ VNTWIFIwGetAssocID ( -*/ BYTE VNTWIFIbyGetMaxSupportRate ( - IN PWLAN_IE_SUPP_RATES pSupportRateIEs, - IN PWLAN_IE_SUPP_RATES pExtSupportRateIEs + PWLAN_IE_SUPP_RATES pSupportRateIEs, + PWLAN_IE_SUPP_RATES pExtSupportRateIEs ) { BYTE byMaxSupportRate = RATE_1M; @@ -250,9 +250,9 @@ VNTWIFIbyGetMaxSupportRate ( -*/ BYTE VNTWIFIbyGetACKTxRate ( - IN BYTE byRxDataRate, - IN PWLAN_IE_SUPP_RATES pSupportRateIEs, - IN PWLAN_IE_SUPP_RATES pExtSupportRateIEs + BYTE byRxDataRate, + PWLAN_IE_SUPP_RATES pSupportRateIEs, + PWLAN_IE_SUPP_RATES pExtSupportRateIEs ) { BYTE byMaxAckRate; @@ -308,8 +308,8 @@ VNTWIFIbyGetACKTxRate ( -*/ void VNTWIFIvSetAuthenticationMode ( - IN void *pMgmtHandle, - IN WMAC_AUTHENTICATION_MODE eAuthMode + void *pMgmtHandle, + WMAC_AUTHENTICATION_MODE eAuthMode ) { PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; @@ -340,8 +340,8 @@ VNTWIFIvSetAuthenticationMode ( -*/ void VNTWIFIvSetEncryptionMode ( - IN void *pMgmtHandle, - IN WMAC_ENCRYPTION_MODE eEncryptionMode + void *pMgmtHandle, + WMAC_ENCRYPTION_MODE eEncryptionMode ) { PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; @@ -360,8 +360,8 @@ VNTWIFIvSetEncryptionMode ( BOOL VNTWIFIbConfigPhyMode ( - IN void *pMgmtHandle, - IN CARD_PHY_TYPE ePhyType + void *pMgmtHandle, + CARD_PHY_TYPE ePhyType ) { PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; @@ -381,7 +381,7 @@ VNTWIFIbConfigPhyMode ( void VNTWIFIbGetConfigPhyMode ( - IN void *pMgmtHandle, + void *pMgmtHandle, OUT void *pePhyType ) { @@ -426,7 +426,7 @@ VNTWIFIbGetConfigPhyMode ( void VNTWIFIvQueryBSSList ( - IN void *pMgmtHandle, + void *pMgmtHandle, OUT PUINT puBSSCount, OUT void **pvFirstBSS ) @@ -456,8 +456,8 @@ VNTWIFIvQueryBSSList ( void VNTWIFIvGetNextBSS ( - IN void *pMgmtHandle, - IN void *pvCurrentBSS, + void *pMgmtHandle, + void *pvCurrentBSS, OUT void **pvNextBSS ) { @@ -496,11 +496,11 @@ VNTWIFIvGetNextBSS ( -*/ void VNTWIFIvUpdateNodeTxCounter( - IN void *pMgmtHandle, - IN PBYTE pbyDestAddress, - IN BOOL bTxOk, - IN WORD wRate, - IN PBYTE pbyTxFailCount + void *pMgmtHandle, + PBYTE pbyDestAddress, + BOOL bTxOk, + WORD wRate, + PBYTE pbyTxFailCount ) { PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; @@ -531,8 +531,8 @@ VNTWIFIvUpdateNodeTxCounter( void VNTWIFIvGetTxRate( - IN void *pMgmtHandle, - IN PBYTE pbyDestAddress, + void *pMgmtHandle, + PBYTE pbyDestAddress, OUT PWORD pwTxDataRate, OUT PBYTE pbyACKRate, OUT PBYTE pbyCCKBasicRate, @@ -603,8 +603,8 @@ VNTWIFIvGetTxRate( BYTE VNTWIFIbyGetKeyCypher( - IN void *pMgmtHandle, - IN BOOL bGroupKey + void *pMgmtHandle, + BOOL bGroupKey ) { PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; @@ -620,7 +620,7 @@ VNTWIFIbyGetKeyCypher( /* BOOL VNTWIFIbInit( - IN void *pAdapterHandler, + void *pAdapterHandler, OUT void **pMgmtHandler ) { @@ -664,9 +664,9 @@ VNTWIFIbInit( BOOL VNTWIFIbSetPMKIDCache ( - IN void *pMgmtObject, - IN ULONG ulCount, - IN void *pPMKIDInfo + void *pMgmtObject, + ULONG ulCount, + void *pPMKIDInfo ) { PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; @@ -683,7 +683,7 @@ VNTWIFIbSetPMKIDCache ( WORD VNTWIFIwGetMaxSupportRate( - IN void *pMgmtObject + void *pMgmtObject ) { WORD wRate = RATE_54M; @@ -704,8 +704,8 @@ VNTWIFIwGetMaxSupportRate( void VNTWIFIvSet11h ( - IN void *pMgmtObject, - IN BOOL b11hEnable + void *pMgmtObject, + BOOL b11hEnable ) { PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; @@ -715,13 +715,13 @@ VNTWIFIvSet11h ( BOOL VNTWIFIbMeasureReport( - IN void *pMgmtObject, - IN BOOL bEndOfReport, - IN void *pvMeasureEID, - IN BYTE byReportMode, - IN BYTE byBasicMap, - IN BYTE byCCAFraction, - IN PBYTE pbyRPIs + void *pMgmtObject, + BOOL bEndOfReport, + void *pvMeasureEID, + BYTE byReportMode, + BYTE byBasicMap, + BYTE byCCAFraction, + PBYTE pbyRPIs ) { PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; @@ -775,8 +775,8 @@ VNTWIFIbMeasureReport( BOOL VNTWIFIbChannelSwitch( - IN void *pMgmtObject, - IN BYTE byNewChannel + void *pMgmtObject, + BYTE byNewChannel ) { PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; @@ -791,8 +791,8 @@ VNTWIFIbChannelSwitch( /* BOOL VNTWIFIbRadarPresent( - IN void *pMgmtObject, - IN BYTE byChannel + void *pMgmtObject, + BYTE byChannel ) { PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; diff --git a/drivers/staging/vt6655/vntwifi.h b/drivers/staging/vt6655/vntwifi.h index 666684af5cd..ca1ee0e4446 100644 --- a/drivers/staging/vt6655/vntwifi.h +++ b/drivers/staging/vt6655/vntwifi.h @@ -142,74 +142,74 @@ typedef enum tagWMAC_POWER_MODE { void VNTWIFIvSetIBSSParameter ( - IN void *pMgmtHandle, - IN WORD wBeaconPeriod, - IN WORD wATIMWindow, - IN UINT uChannel + void *pMgmtHandle, + WORD wBeaconPeriod, + WORD wATIMWindow, + UINT uChannel ); void VNTWIFIvSetOPMode ( - IN void *pMgmtHandle, - IN WMAC_CONFIG_MODE eOPMode + void *pMgmtHandle, + WMAC_CONFIG_MODE eOPMode ); PWLAN_IE_SSID VNTWIFIpGetCurrentSSID( - IN void *pMgmtHandle + void *pMgmtHandle ); UINT VNTWIFIpGetCurrentChannel( - IN void *pMgmtHandle + void *pMgmtHandle ); WORD VNTWIFIwGetAssocID ( - IN void *pMgmtHandle + void *pMgmtHandle ); BYTE VNTWIFIbyGetMaxSupportRate ( - IN PWLAN_IE_SUPP_RATES pSupportRateIEs, - IN PWLAN_IE_SUPP_RATES pExtSupportRateIEs + PWLAN_IE_SUPP_RATES pSupportRateIEs, + PWLAN_IE_SUPP_RATES pExtSupportRateIEs ); BYTE VNTWIFIbyGetACKTxRate ( - IN BYTE byRxDataRate, - IN PWLAN_IE_SUPP_RATES pSupportRateIEs, - IN PWLAN_IE_SUPP_RATES pExtSupportRateIEs + BYTE byRxDataRate, + PWLAN_IE_SUPP_RATES pSupportRateIEs, + PWLAN_IE_SUPP_RATES pExtSupportRateIEs ); void VNTWIFIvSetAuthenticationMode ( - IN void *pMgmtHandle, - IN WMAC_AUTHENTICATION_MODE eAuthMode + void *pMgmtHandle, + WMAC_AUTHENTICATION_MODE eAuthMode ); void VNTWIFIvSetEncryptionMode ( - IN void *pMgmtHandle, - IN WMAC_ENCRYPTION_MODE eEncryptionMode + void *pMgmtHandle, + WMAC_ENCRYPTION_MODE eEncryptionMode ); BOOL VNTWIFIbConfigPhyMode( - IN void *pMgmtHandle, - IN CARD_PHY_TYPE ePhyType + void *pMgmtHandle, + CARD_PHY_TYPE ePhyType ); void VNTWIFIbGetConfigPhyMode( - IN void *pMgmtHandle, + void *pMgmtHandle, OUT void *pePhyType ); void VNTWIFIvQueryBSSList( - IN void *pMgmtHandle, + void *pMgmtHandle, OUT PUINT puBSSCount, OUT void **pvFirstBSS ); @@ -219,8 +219,8 @@ VNTWIFIvQueryBSSList( void VNTWIFIvGetNextBSS ( - IN void *pMgmtHandle, - IN void *pvCurrentBSS, + void *pMgmtHandle, + void *pvCurrentBSS, OUT void **pvNextBSS ); @@ -228,18 +228,18 @@ VNTWIFIvGetNextBSS ( void VNTWIFIvUpdateNodeTxCounter( - IN void *pMgmtHandle, - IN PBYTE pbyDestAddress, - IN BOOL bTxOk, - IN WORD wRate, - IN PBYTE pbyTxFailCount + void *pMgmtHandle, + PBYTE pbyDestAddress, + BOOL bTxOk, + WORD wRate, + PBYTE pbyTxFailCount ); void VNTWIFIvGetTxRate( - IN void *pMgmtHandle, - IN PBYTE pbyDestAddress, + void *pMgmtHandle, + PBYTE pbyDestAddress, OUT PWORD pwTxDataRate, OUT PBYTE pbyACKRate, OUT PBYTE pbyCCKBasicRate, @@ -248,15 +248,15 @@ VNTWIFIvGetTxRate( /* BOOL VNTWIFIbInit( - IN void *pAdapterHandler, + void *pAdapterHandler, OUT void **pMgmtHandler ); */ BYTE VNTWIFIbyGetKeyCypher( - IN void *pMgmtHandle, - IN BOOL bGroupKey + void *pMgmtHandle, + BOOL bGroupKey ); @@ -264,49 +264,49 @@ VNTWIFIbyGetKeyCypher( BOOL VNTWIFIbSetPMKIDCache ( - IN void *pMgmtObject, - IN ULONG ulCount, - IN void *pPMKIDInfo + void *pMgmtObject, + ULONG ulCount, + void *pPMKIDInfo ); BOOL VNTWIFIbCommandRunning ( - IN void *pMgmtObject + void *pMgmtObject ); WORD VNTWIFIwGetMaxSupportRate( - IN void *pMgmtObject + void *pMgmtObject ); // for 802.11h void VNTWIFIvSet11h ( - IN void *pMgmtObject, - IN BOOL b11hEnable + void *pMgmtObject, + BOOL b11hEnable ); BOOL VNTWIFIbMeasureReport( - IN void *pMgmtObject, - IN BOOL bEndOfReport, - IN void *pvMeasureEID, - IN BYTE byReportMode, - IN BYTE byBasicMap, - IN BYTE byCCAFraction, - IN PBYTE pbyRPIs + void *pMgmtObject, + BOOL bEndOfReport, + void *pvMeasureEID, + BYTE byReportMode, + BYTE byBasicMap, + BYTE byCCAFraction, + PBYTE pbyRPIs ); BOOL VNTWIFIbChannelSwitch( - IN void *pMgmtObject, - IN BYTE byNewChannel + void *pMgmtObject, + BYTE byNewChannel ); /* BOOL VNTWIFIbRadarPresent( - IN void *pMgmtObject, - IN BYTE byChannel + void *pMgmtObject, + BYTE byChannel ); */ diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c index 6e460409f98..28665d870f5 100644 --- a/drivers/staging/vt6655/wcmd.c +++ b/drivers/staging/vt6655/wcmd.c @@ -68,19 +68,19 @@ static int msglevel =MSG_LEVEL_INFO; static void s_vProbeChannel( - IN PSDevice pDevice + PSDevice pDevice ); static PSTxMgmtPacket s_MgrMakeProbeRequest( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PBYTE pScanBSSID, - IN PWLAN_IE_SSID pSSID, - IN PWLAN_IE_SUPP_RATES pCurrRates, - IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates + PSDevice pDevice, + PSMgmtObject pMgmt, + PBYTE pScanBSSID, + PWLAN_IE_SSID pSSID, + PWLAN_IE_SUPP_RATES pCurrRates, + PWLAN_IE_SUPP_RATES pCurrExtSuppRates ); @@ -204,7 +204,7 @@ vAdHocBeaconRestart(PSDevice pDevice) static void s_vProbeChannel( - IN PSDevice pDevice + PSDevice pDevice ) { //1M, 2M, 5M, 11M, 18M, 24M, 36M, 54M @@ -267,12 +267,12 @@ s_vProbeChannel( PSTxMgmtPacket s_MgrMakeProbeRequest( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PBYTE pScanBSSID, - IN PWLAN_IE_SSID pSSID, - IN PWLAN_IE_SUPP_RATES pCurrRates, - IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates + PSDevice pDevice, + PSMgmtObject pMgmt, + PBYTE pScanBSSID, + PWLAN_IE_SSID pSSID, + PWLAN_IE_SUPP_RATES pCurrRates, + PWLAN_IE_SUPP_RATES pCurrExtSuppRates ) { @@ -319,8 +319,8 @@ s_MgrMakeProbeRequest( void vCommandTimerWait( - IN void *hDeviceContext, - IN UINT MSecond + void *hDeviceContext, + UINT MSecond ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -339,7 +339,7 @@ vCommandTimerWait( void vCommandTimer ( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -980,9 +980,9 @@ s_bCommandComplete ( BOOL bScheduleCommand ( - IN void *hDeviceContext, - IN CMD_CODE eCommand, - IN PBYTE pbyItem0 + void *hDeviceContext, + CMD_CODE eCommand, + PBYTE pbyItem0 ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -1061,7 +1061,7 @@ BOOL bScheduleCommand ( * */ BOOL bClearBSSID_SCAN ( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -1083,7 +1083,7 @@ BOOL bClearBSSID_SCAN ( //mike add:reset command timer void vResetCommandTimer( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -1107,7 +1107,7 @@ vResetCommandTimer( #ifdef TxInSleep void BSSvSecondTxData( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; diff --git a/drivers/staging/vt6655/wcmd.h b/drivers/staging/vt6655/wcmd.h index 67b08f61edc..c3c41808951 100644 --- a/drivers/staging/vt6655/wcmd.h +++ b/drivers/staging/vt6655/wcmd.h @@ -111,34 +111,34 @@ typedef enum tagCMD_STATE { /*--------------------- Export Functions --------------------------*/ void vResetCommandTimer( - IN void *hDeviceContext + void *hDeviceContext ); void vCommandTimer ( - IN void *hDeviceContext + void *hDeviceContext ); BOOL bClearBSSID_SCAN( - IN void *hDeviceContext + void *hDeviceContext ); BOOL bScheduleCommand( - IN void *hDeviceContext, - IN CMD_CODE eCommand, - IN PBYTE pbyItem0 + void *hDeviceContext, + CMD_CODE eCommand, + PBYTE pbyItem0 ); void vCommandTimerWait( - IN void *hDeviceContext, - IN UINT MSecond + void *hDeviceContext, + UINT MSecond ); #ifdef TxInSleep void BSSvSecondTxData( - IN void *hDeviceContext + void *hDeviceContext ); #endif diff --git a/drivers/staging/vt6655/wmgr.c b/drivers/staging/vt6655/wmgr.c index 614850a7b91..19a16cae175 100644 --- a/drivers/staging/vt6655/wmgr.c +++ b/drivers/staging/vt6655/wmgr.c @@ -94,110 +94,110 @@ static int msglevel =MSG_LEVEL_INFO; /*--------------------- Static Functions --------------------------*/ //2008-8-4 <add> by chester static BOOL ChannelExceedZoneType( - IN PSDevice pDevice, - IN BYTE byCurrChannel + PSDevice pDevice, + BYTE byCurrChannel ); // Association/diassociation functions static PSTxMgmtPacket s_MgrMakeAssocRequest( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PBYTE pDAddr, - IN WORD wCurrCapInfo, - IN WORD wListenInterval, - IN PWLAN_IE_SSID pCurrSSID, - IN PWLAN_IE_SUPP_RATES pCurrRates, - IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates + PSDevice pDevice, + PSMgmtObject pMgmt, + PBYTE pDAddr, + WORD wCurrCapInfo, + WORD wListenInterval, + PWLAN_IE_SSID pCurrSSID, + PWLAN_IE_SUPP_RATES pCurrRates, + PWLAN_IE_SUPP_RATES pCurrExtSuppRates ); static void s_vMgrRxAssocRequest( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket, - IN UINT uNodeIndex + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket, + UINT uNodeIndex ); static PSTxMgmtPacket s_MgrMakeReAssocRequest( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PBYTE pDAddr, - IN WORD wCurrCapInfo, - IN WORD wListenInterval, - IN PWLAN_IE_SSID pCurrSSID, - IN PWLAN_IE_SUPP_RATES pCurrRates, - IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates + PSDevice pDevice, + PSMgmtObject pMgmt, + PBYTE pDAddr, + WORD wCurrCapInfo, + WORD wListenInterval, + PWLAN_IE_SSID pCurrSSID, + PWLAN_IE_SUPP_RATES pCurrRates, + PWLAN_IE_SUPP_RATES pCurrExtSuppRates ); static void s_vMgrRxAssocResponse( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket, - IN BOOL bReAssocType + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket, + BOOL bReAssocType ); static void s_vMgrRxDisassociation( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket ); // Authentication/deauthen functions static void s_vMgrRxAuthenSequence_1( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PWLAN_FR_AUTHEN pFrame + PSDevice pDevice, + PSMgmtObject pMgmt, + PWLAN_FR_AUTHEN pFrame ); static void s_vMgrRxAuthenSequence_2( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PWLAN_FR_AUTHEN pFrame + PSDevice pDevice, + PSMgmtObject pMgmt, + PWLAN_FR_AUTHEN pFrame ); static void s_vMgrRxAuthenSequence_3( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PWLAN_FR_AUTHEN pFrame + PSDevice pDevice, + PSMgmtObject pMgmt, + PWLAN_FR_AUTHEN pFrame ); static void s_vMgrRxAuthenSequence_4( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PWLAN_FR_AUTHEN pFrame + PSDevice pDevice, + PSMgmtObject pMgmt, + PWLAN_FR_AUTHEN pFrame ); static void s_vMgrRxAuthentication( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket ); static void s_vMgrRxDeauthentication( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket ); // Scan functions @@ -205,49 +205,49 @@ s_vMgrRxDeauthentication( static void s_vMgrRxProbeRequest( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket ); static void s_vMgrRxProbeResponse( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket ); // beacon functions static void s_vMgrRxBeacon( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket, - IN BOOL bInScan + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket, + BOOL bInScan ); static void s_vMgrFormatTIM( - IN PSMgmtObject pMgmt, - IN PWLAN_IE_TIM pTIM + PSMgmtObject pMgmt, + PWLAN_IE_TIM pTIM ); static PSTxMgmtPacket s_MgrMakeBeacon( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN WORD wCurrCapInfo, - IN WORD wCurrBeaconPeriod, - IN UINT uCurrChannel, - IN WORD wCurrATIMWinodw, - IN PWLAN_IE_SSID pCurrSSID, - IN PBYTE pCurrBSSID, - IN PWLAN_IE_SUPP_RATES pCurrSuppRates, - IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates + PSDevice pDevice, + PSMgmtObject pMgmt, + WORD wCurrCapInfo, + WORD wCurrBeaconPeriod, + UINT uCurrChannel, + WORD wCurrATIMWinodw, + PWLAN_IE_SSID pCurrSSID, + PBYTE pCurrBSSID, + PWLAN_IE_SUPP_RATES pCurrSuppRates, + PWLAN_IE_SUPP_RATES pCurrExtSuppRates ); @@ -255,78 +255,78 @@ s_MgrMakeBeacon( static PSTxMgmtPacket s_MgrMakeAssocResponse( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN WORD wCurrCapInfo, - IN WORD wAssocStatus, - IN WORD wAssocAID, - IN PBYTE pDstAddr, - IN PWLAN_IE_SUPP_RATES pCurrSuppRates, - IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates + PSDevice pDevice, + PSMgmtObject pMgmt, + WORD wCurrCapInfo, + WORD wAssocStatus, + WORD wAssocAID, + PBYTE pDstAddr, + PWLAN_IE_SUPP_RATES pCurrSuppRates, + PWLAN_IE_SUPP_RATES pCurrExtSuppRates ); // ReAssociation response static PSTxMgmtPacket s_MgrMakeReAssocResponse( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN WORD wCurrCapInfo, - IN WORD wAssocStatus, - IN WORD wAssocAID, - IN PBYTE pDstAddr, - IN PWLAN_IE_SUPP_RATES pCurrSuppRates, - IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates + PSDevice pDevice, + PSMgmtObject pMgmt, + WORD wCurrCapInfo, + WORD wAssocStatus, + WORD wAssocAID, + PBYTE pDstAddr, + PWLAN_IE_SUPP_RATES pCurrSuppRates, + PWLAN_IE_SUPP_RATES pCurrExtSuppRates ); // Probe response static PSTxMgmtPacket s_MgrMakeProbeResponse( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN WORD wCurrCapInfo, - IN WORD wCurrBeaconPeriod, - IN UINT uCurrChannel, - IN WORD wCurrATIMWinodw, - IN PBYTE pDstAddr, - IN PWLAN_IE_SSID pCurrSSID, - IN PBYTE pCurrBSSID, - IN PWLAN_IE_SUPP_RATES pCurrSuppRates, - IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates, - IN BYTE byPHYType + PSDevice pDevice, + PSMgmtObject pMgmt, + WORD wCurrCapInfo, + WORD wCurrBeaconPeriod, + UINT uCurrChannel, + WORD wCurrATIMWinodw, + PBYTE pDstAddr, + PWLAN_IE_SSID pCurrSSID, + PBYTE pCurrBSSID, + PWLAN_IE_SUPP_RATES pCurrSuppRates, + PWLAN_IE_SUPP_RATES pCurrExtSuppRates, + BYTE byPHYType ); // received status static void s_vMgrLogStatus( - IN PSMgmtObject pMgmt, - IN WORD wStatus + PSMgmtObject pMgmt, + WORD wStatus ); static void s_vMgrSynchBSS ( - IN PSDevice pDevice, - IN UINT uBSSMode, - IN PKnownBSS pCurr, + PSDevice pDevice, + UINT uBSSMode, + PKnownBSS pCurr, OUT PCMD_STATUS pStatus ); static BOOL s_bCipherMatch ( - IN PKnownBSS pBSSNode, - IN NDIS_802_11_ENCRYPTION_STATUS EncStatus, + PKnownBSS pBSSNode, + NDIS_802_11_ENCRYPTION_STATUS EncStatus, OUT PBYTE pbyCCSPK, OUT PBYTE pbyCCSGK ); static void Encyption_Rebuild( - IN PSDevice pDevice, - IN PKnownBSS pCurr + PSDevice pDevice, + PKnownBSS pCurr ); @@ -349,7 +349,7 @@ s_bCipherMatch ( void vMgrObjectInit( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -385,7 +385,7 @@ vMgrObjectInit( void vMgrTimerInit( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -433,7 +433,7 @@ vMgrTimerInit( void vMgrObjectReset( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -462,8 +462,8 @@ vMgrObjectReset( void vMgrAssocBeginSta( - IN void *hDeviceContext, - IN PSMgmtObject pMgmt, + void *hDeviceContext, + PSMgmtObject pMgmt, OUT PCMD_STATUS pStatus ) { @@ -538,8 +538,8 @@ vMgrAssocBeginSta( void vMgrReAssocBeginSta( - IN void *hDeviceContext, - IN PSMgmtObject pMgmt, + void *hDeviceContext, + PSMgmtObject pMgmt, OUT PCMD_STATUS pStatus ) { @@ -617,10 +617,10 @@ vMgrReAssocBeginSta( void vMgrDisassocBeginSta( - IN void *hDeviceContext, - IN PSMgmtObject pMgmt, - IN PBYTE abyDestAddress, - IN WORD wReason, + void *hDeviceContext, + PSMgmtObject pMgmt, + PBYTE abyDestAddress, + WORD wReason, OUT PCMD_STATUS pStatus ) { @@ -680,10 +680,10 @@ vMgrDisassocBeginSta( static void s_vMgrRxAssocRequest( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket, - IN UINT uNodeIndex + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket, + UINT uNodeIndex ) { WLAN_FR_ASSOCREQ sFrame; @@ -842,10 +842,10 @@ s_vMgrRxAssocRequest( static void s_vMgrRxReAssocRequest( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket, - IN UINT uNodeIndex + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket, + UINT uNodeIndex ) { WLAN_FR_REASSOCREQ sFrame; @@ -992,10 +992,10 @@ s_vMgrRxReAssocRequest( static void s_vMgrRxAssocResponse( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket, - IN BOOL bReAssocType + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket, + BOOL bReAssocType ) { WLAN_FR_ASSOCRESP sFrame; @@ -1152,8 +1152,8 @@ if(pMgmt->eCurrState == WMAC_STATE_ASSOC) void vMgrAuthenBeginSta( - IN void *hDeviceContext, - IN PSMgmtObject pMgmt, + void *hDeviceContext, + PSMgmtObject pMgmt, OUT PCMD_STATUS pStatus ) { @@ -1210,10 +1210,10 @@ vMgrAuthenBeginSta( void vMgrDeAuthenBeginSta( - IN void *hDeviceContext, - IN PSMgmtObject pMgmt, - IN PBYTE abyDestAddress, - IN WORD wReason, + void *hDeviceContext, + PSMgmtObject pMgmt, + PBYTE abyDestAddress, + WORD wReason, OUT PCMD_STATUS pStatus ) { @@ -1267,9 +1267,9 @@ vMgrDeAuthenBeginSta( static void s_vMgrRxAuthentication( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket ) { WLAN_FR_AUTHEN sFrame; @@ -1325,9 +1325,9 @@ s_vMgrRxAuthentication( static void s_vMgrRxAuthenSequence_1( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PWLAN_FR_AUTHEN pFrame + PSDevice pDevice, + PSMgmtObject pMgmt, + PWLAN_FR_AUTHEN pFrame ) { PSTxMgmtPacket pTxPacket = NULL; @@ -1431,9 +1431,9 @@ s_vMgrRxAuthenSequence_1( static void s_vMgrRxAuthenSequence_2( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PWLAN_FR_AUTHEN pFrame + PSDevice pDevice, + PSMgmtObject pMgmt, + PWLAN_FR_AUTHEN pFrame ) { WLAN_FR_AUTHEN sFrame; @@ -1533,9 +1533,9 @@ s_vMgrRxAuthenSequence_2( static void s_vMgrRxAuthenSequence_3( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PWLAN_FR_AUTHEN pFrame + PSDevice pDevice, + PSMgmtObject pMgmt, + PWLAN_FR_AUTHEN pFrame ) { PSTxMgmtPacket pTxPacket = NULL; @@ -1621,9 +1621,9 @@ reply: static void s_vMgrRxAuthenSequence_4( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PWLAN_FR_AUTHEN pFrame + PSDevice pDevice, + PSMgmtObject pMgmt, + PWLAN_FR_AUTHEN pFrame ) { @@ -1660,9 +1660,9 @@ s_vMgrRxAuthenSequence_4( static void s_vMgrRxDisassociation( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket ) { WLAN_FR_DISASSOC sFrame; @@ -1739,9 +1739,9 @@ s_vMgrRxDisassociation( static void s_vMgrRxDeauthentication( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket ) { WLAN_FR_DEAUTHEN sFrame; @@ -1827,8 +1827,8 @@ s_vMgrRxDeauthentication( -*/ static BOOL ChannelExceedZoneType( - IN PSDevice pDevice, - IN BYTE byCurrChannel + PSDevice pDevice, + BYTE byCurrChannel ) { BOOL exceed=FALSE; @@ -1865,10 +1865,10 @@ ChannelExceedZoneType( static void s_vMgrRxBeacon( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket, - IN BOOL bInScan + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket, + BOOL bInScan ) { @@ -2386,7 +2386,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) -*/ void vMgrCreateOwnIBSS( - IN void *hDeviceContext, + void *hDeviceContext, OUT PCMD_STATUS pStatus ) { @@ -2653,7 +2653,7 @@ vMgrCreateOwnIBSS( void vMgrJoinBSSBegin( - IN void *hDeviceContext, + void *hDeviceContext, OUT PCMD_STATUS pStatus ) { @@ -2922,9 +2922,9 @@ vMgrJoinBSSBegin( static void s_vMgrSynchBSS ( - IN PSDevice pDevice, - IN UINT uBSSMode, - IN PKnownBSS pCurr, + PSDevice pDevice, + UINT uBSSMode, + PKnownBSS pCurr, OUT PCMD_STATUS pStatus ) { @@ -3089,8 +3089,8 @@ s_vMgrSynchBSS ( //mike add: fix NetworkManager 0.7.0 hidden ssid mode in WPA encryption // ,need reset eAuthenMode and eEncryptionStatus static void Encyption_Rebuild( - IN PSDevice pDevice, - IN PKnownBSS pCurr + PSDevice pDevice, + PKnownBSS pCurr ) { PSMgmtObject pMgmt = &(pDevice->sMgmtObj); @@ -3147,8 +3147,8 @@ s_vMgrSynchBSS ( static void s_vMgrFormatTIM( - IN PSMgmtObject pMgmt, - IN PWLAN_IE_TIM pTIM + PSMgmtObject pMgmt, + PWLAN_IE_TIM pTIM ) { BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; @@ -3222,16 +3222,16 @@ s_vMgrFormatTIM( static PSTxMgmtPacket s_MgrMakeBeacon( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN WORD wCurrCapInfo, - IN WORD wCurrBeaconPeriod, - IN UINT uCurrChannel, - IN WORD wCurrATIMWinodw, - IN PWLAN_IE_SSID pCurrSSID, - IN PBYTE pCurrBSSID, - IN PWLAN_IE_SUPP_RATES pCurrSuppRates, - IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates + PSDevice pDevice, + PSMgmtObject pMgmt, + WORD wCurrCapInfo, + WORD wCurrBeaconPeriod, + UINT uCurrChannel, + WORD wCurrATIMWinodw, + PWLAN_IE_SSID pCurrSSID, + PBYTE pCurrBSSID, + PWLAN_IE_SUPP_RATES pCurrSuppRates, + PWLAN_IE_SUPP_RATES pCurrExtSuppRates ) { PSTxMgmtPacket pTxPacket = NULL; @@ -3451,18 +3451,18 @@ s_MgrMakeBeacon( PSTxMgmtPacket s_MgrMakeProbeResponse( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN WORD wCurrCapInfo, - IN WORD wCurrBeaconPeriod, - IN UINT uCurrChannel, - IN WORD wCurrATIMWinodw, - IN PBYTE pDstAddr, - IN PWLAN_IE_SSID pCurrSSID, - IN PBYTE pCurrBSSID, - IN PWLAN_IE_SUPP_RATES pCurrSuppRates, - IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates, - IN BYTE byPHYType + PSDevice pDevice, + PSMgmtObject pMgmt, + WORD wCurrCapInfo, + WORD wCurrBeaconPeriod, + UINT uCurrChannel, + WORD wCurrATIMWinodw, + PBYTE pDstAddr, + PWLAN_IE_SSID pCurrSSID, + PBYTE pCurrBSSID, + PWLAN_IE_SUPP_RATES pCurrSuppRates, + PWLAN_IE_SUPP_RATES pCurrExtSuppRates, + BYTE byPHYType ) { PSTxMgmtPacket pTxPacket = NULL; @@ -3640,14 +3640,14 @@ s_MgrMakeProbeResponse( PSTxMgmtPacket s_MgrMakeAssocRequest( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PBYTE pDAddr, - IN WORD wCurrCapInfo, - IN WORD wListenInterval, - IN PWLAN_IE_SSID pCurrSSID, - IN PWLAN_IE_SUPP_RATES pCurrRates, - IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates + PSDevice pDevice, + PSMgmtObject pMgmt, + PBYTE pDAddr, + WORD wCurrCapInfo, + WORD wListenInterval, + PWLAN_IE_SSID pCurrSSID, + PWLAN_IE_SUPP_RATES pCurrRates, + PWLAN_IE_SUPP_RATES pCurrExtSuppRates ) { PSTxMgmtPacket pTxPacket = NULL; @@ -3915,14 +3915,14 @@ s_MgrMakeAssocRequest( PSTxMgmtPacket s_MgrMakeReAssocRequest( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PBYTE pDAddr, - IN WORD wCurrCapInfo, - IN WORD wListenInterval, - IN PWLAN_IE_SSID pCurrSSID, - IN PWLAN_IE_SUPP_RATES pCurrRates, - IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates + PSDevice pDevice, + PSMgmtObject pMgmt, + PBYTE pDAddr, + WORD wCurrCapInfo, + WORD wListenInterval, + PWLAN_IE_SSID pCurrSSID, + PWLAN_IE_SUPP_RATES pCurrRates, + PWLAN_IE_SUPP_RATES pCurrExtSuppRates ) { PSTxMgmtPacket pTxPacket = NULL; @@ -4167,14 +4167,14 @@ s_MgrMakeReAssocRequest( PSTxMgmtPacket s_MgrMakeAssocResponse( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN WORD wCurrCapInfo, - IN WORD wAssocStatus, - IN WORD wAssocAID, - IN PBYTE pDstAddr, - IN PWLAN_IE_SUPP_RATES pCurrSuppRates, - IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates + PSDevice pDevice, + PSMgmtObject pMgmt, + WORD wCurrCapInfo, + WORD wAssocStatus, + WORD wAssocAID, + PBYTE pDstAddr, + PWLAN_IE_SUPP_RATES pCurrSuppRates, + PWLAN_IE_SUPP_RATES pCurrExtSuppRates ) { PSTxMgmtPacket pTxPacket = NULL; @@ -4241,14 +4241,14 @@ s_MgrMakeAssocResponse( PSTxMgmtPacket s_MgrMakeReAssocResponse( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN WORD wCurrCapInfo, - IN WORD wAssocStatus, - IN WORD wAssocAID, - IN PBYTE pDstAddr, - IN PWLAN_IE_SUPP_RATES pCurrSuppRates, - IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates + PSDevice pDevice, + PSMgmtObject pMgmt, + WORD wCurrCapInfo, + WORD wAssocStatus, + WORD wAssocAID, + PBYTE pDstAddr, + PWLAN_IE_SUPP_RATES pCurrSuppRates, + PWLAN_IE_SUPP_RATES pCurrExtSuppRates ) { PSTxMgmtPacket pTxPacket = NULL; @@ -4315,9 +4315,9 @@ s_MgrMakeReAssocResponse( static void s_vMgrRxProbeResponse( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket ) { PKnownBSS pBSSList = NULL; @@ -4440,9 +4440,9 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) static void s_vMgrRxProbeRequest( - IN PSDevice pDevice, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket + PSDevice pDevice, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket ) { WLAN_FR_PROBEREQ sFrame; @@ -4536,9 +4536,9 @@ s_vMgrRxProbeRequest( void vMgrRxManagePacket( - IN void *hDeviceContext, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket + void *hDeviceContext, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -4685,8 +4685,8 @@ vMgrRxManagePacket( -*/ BOOL bMgrPrepareBeaconToSend( - IN void *hDeviceContext, - IN PSMgmtObject pMgmt + void *hDeviceContext, + PSMgmtObject pMgmt ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -4740,8 +4740,8 @@ bMgrPrepareBeaconToSend( static void s_vMgrLogStatus( - IN PSMgmtObject pMgmt, - IN WORD wStatus + PSMgmtObject pMgmt, + WORD wStatus ) { switch( wStatus ){ @@ -4809,9 +4809,9 @@ s_vMgrLogStatus( -*/ BOOL bAdd_PMKID_Candidate ( - IN void *hDeviceContext, - IN PBYTE pbyBSSID, - IN PSRSNCapObject psRSNCapObj + void *hDeviceContext, + PBYTE pbyBSSID, + PSRSNCapObject psRSNCapObj ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -4870,7 +4870,7 @@ bAdd_PMKID_Candidate ( -*/ void vFlush_PMKID_Candidate ( - IN void *hDeviceContext + void *hDeviceContext ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -4883,8 +4883,8 @@ vFlush_PMKID_Candidate ( static BOOL s_bCipherMatch ( - IN PKnownBSS pBSSNode, - IN NDIS_802_11_ENCRYPTION_STATUS EncStatus, + PKnownBSS pBSSNode, + NDIS_802_11_ENCRYPTION_STATUS EncStatus, OUT PBYTE pbyCCSPK, OUT PBYTE pbyCCSGK ) diff --git a/drivers/staging/vt6655/wmgr.h b/drivers/staging/vt6655/wmgr.h index cee86028181..a86406e63bc 100644 --- a/drivers/staging/vt6655/wmgr.h +++ b/drivers/staging/vt6655/wmgr.h @@ -401,102 +401,102 @@ typedef struct tagSMgmtObject void vMgrObjectInit( - IN void *hDeviceContext + void *hDeviceContext ); void vMgrTimerInit( - IN void *hDeviceContext + void *hDeviceContext ); void vMgrObjectReset( - IN void *hDeviceContext + void *hDeviceContext ); void vMgrAssocBeginSta( - IN void *hDeviceContext, - IN PSMgmtObject pMgmt, + void *hDeviceContext, + PSMgmtObject pMgmt, OUT PCMD_STATUS pStatus ); void vMgrReAssocBeginSta( - IN void *hDeviceContext, - IN PSMgmtObject pMgmt, + void *hDeviceContext, + PSMgmtObject pMgmt, OUT PCMD_STATUS pStatus ); void vMgrDisassocBeginSta( - IN void *hDeviceContext, - IN PSMgmtObject pMgmt, - IN PBYTE abyDestAddress, - IN WORD wReason, + void *hDeviceContext, + PSMgmtObject pMgmt, + PBYTE abyDestAddress, + WORD wReason, OUT PCMD_STATUS pStatus ); void vMgrAuthenBeginSta( - IN void *hDeviceContext, - IN PSMgmtObject pMgmt, + void *hDeviceContext, + PSMgmtObject pMgmt, OUT PCMD_STATUS pStatus ); void vMgrCreateOwnIBSS( - IN void *hDeviceContext, + void *hDeviceContext, OUT PCMD_STATUS pStatus ); void vMgrJoinBSSBegin( - IN void *hDeviceContext, + void *hDeviceContext, OUT PCMD_STATUS pStatus ); void vMgrRxManagePacket( - IN void *hDeviceContext, - IN PSMgmtObject pMgmt, - IN PSRxMgmtPacket pRxPacket + void *hDeviceContext, + PSMgmtObject pMgmt, + PSRxMgmtPacket pRxPacket ); /* void vMgrScanBegin( - IN void *hDeviceContext, + void *hDeviceContext, OUT PCMD_STATUS pStatus ); */ void vMgrDeAuthenBeginSta( - IN void *hDeviceContext, - IN PSMgmtObject pMgmt, - IN PBYTE abyDestAddress, - IN WORD wReason, + void *hDeviceContext, + PSMgmtObject pMgmt, + PBYTE abyDestAddress, + WORD wReason, OUT PCMD_STATUS pStatus ); BOOL bMgrPrepareBeaconToSend( - IN void *hDeviceContext, - IN PSMgmtObject pMgmt + void *hDeviceContext, + PSMgmtObject pMgmt ); BOOL bAdd_PMKID_Candidate ( - IN void *hDeviceContext, - IN PBYTE pbyBSSID, - IN PSRSNCapObject psRSNCapObj + void *hDeviceContext, + PBYTE pbyBSSID, + PSRSNCapObject psRSNCapObj ); void vFlush_PMKID_Candidate ( - IN void *hDeviceContext + void *hDeviceContext ); #endif // __WMGR_H__ diff --git a/drivers/staging/vt6655/wpa.c b/drivers/staging/vt6655/wpa.c index 75ae83814d8..da5c814e200 100644 --- a/drivers/staging/vt6655/wpa.c +++ b/drivers/staging/vt6655/wpa.c @@ -70,7 +70,7 @@ const BYTE abyOUI05[4] = { 0x00, 0x50, 0xf2, 0x05 }; void WPA_ClearRSN ( - IN PKnownBSS pBSSList + PKnownBSS pBSSList ) { int ii; @@ -106,8 +106,8 @@ WPA_ClearRSN ( -*/ void WPA_ParseRSN ( - IN PKnownBSS pBSSList, - IN PWLAN_IE_RSN_EXT pRSN + PKnownBSS pBSSList, + PWLAN_IE_RSN_EXT pRSN ) { PWLAN_IE_RSN_AUTH pIE_RSN_Auth = NULL; @@ -241,7 +241,7 @@ BOOL WPA_SearchRSN ( BYTE byCmd, BYTE byEncrypt, - IN PKnownBSS pBSSList + PKnownBSS pBSSList ) { int ii; @@ -299,7 +299,7 @@ WPA_SearchRSN ( -*/ BOOL WPAb_Is_RSN ( - IN PWLAN_IE_RSN_EXT pRSN + PWLAN_IE_RSN_EXT pRSN ) { if (pRSN == NULL) diff --git a/drivers/staging/vt6655/wpa.h b/drivers/staging/vt6655/wpa.h index d77c7bb2274..80d990b09d2 100644 --- a/drivers/staging/vt6655/wpa.h +++ b/drivers/staging/vt6655/wpa.h @@ -60,25 +60,25 @@ void WPA_ClearRSN( - IN PKnownBSS pBSSList + PKnownBSS pBSSList ); void WPA_ParseRSN( - IN PKnownBSS pBSSList, - IN PWLAN_IE_RSN_EXT pRSN + PKnownBSS pBSSList, + PWLAN_IE_RSN_EXT pRSN ); BOOL WPA_SearchRSN( BYTE byCmd, BYTE byEncrypt, - IN PKnownBSS pBSSList + PKnownBSS pBSSList ); BOOL WPAb_Is_RSN( - IN PWLAN_IE_RSN_EXT pRSN + PWLAN_IE_RSN_EXT pRSN ); #endif // __WPA_H__ diff --git a/drivers/staging/vt6655/wpa2.c b/drivers/staging/vt6655/wpa2.c index 3f377b6a2ba..102a18a835b 100644 --- a/drivers/staging/vt6655/wpa2.c +++ b/drivers/staging/vt6655/wpa2.c @@ -74,7 +74,7 @@ const BYTE abyOUIPSK[4] = { 0x00, 0x0F, 0xAC, 0x02 }; -*/ void WPA2_ClearRSN ( - IN PKnownBSS pBSSNode + PKnownBSS pBSSNode ) { int ii; @@ -109,8 +109,8 @@ WPA2_ClearRSN ( -*/ void WPA2vParseRSN ( - IN PKnownBSS pBSSNode, - IN PWLAN_IE_RSN pRSN + PKnownBSS pBSSNode, + PWLAN_IE_RSN pRSN ) { int i, j; @@ -263,7 +263,7 @@ WPA2vParseRSN ( -*/ UINT WPA2uSetIEs( - IN void *pMgmtHandle, + void *pMgmtHandle, OUT PWLAN_IE_RSN pRSNIEs ) { diff --git a/drivers/staging/vt6655/wpa2.h b/drivers/staging/vt6655/wpa2.h index 7becc749c9f..1f2a02d2a57 100644 --- a/drivers/staging/vt6655/wpa2.h +++ b/drivers/staging/vt6655/wpa2.h @@ -60,18 +60,18 @@ typedef struct tagSPMKIDCache { void WPA2_ClearRSN ( - IN PKnownBSS pBSSNode + PKnownBSS pBSSNode ); void WPA2vParseRSN ( - IN PKnownBSS pBSSNode, - IN PWLAN_IE_RSN pRSN + PKnownBSS pBSSNode, + PWLAN_IE_RSN pRSN ); UINT WPA2uSetIEs( - IN void *pMgmtHandle, + void *pMgmtHandle, OUT PWLAN_IE_RSN pRSNIEs ); |