Code cleanup, removed OUT defined used to denote output parameters. Signed-off-by: Andres More <more.andres@xxxxxxxxx> --- drivers/staging/vt6656/baseband.c | 6 ++-- drivers/staging/vt6656/baseband.h | 6 ++-- drivers/staging/vt6656/bssdb.c | 4 +- drivers/staging/vt6656/bssdb.h | 4 +- drivers/staging/vt6656/card.c | 4 +- drivers/staging/vt6656/channel.c | 2 +- drivers/staging/vt6656/channel.h | 2 +- drivers/staging/vt6656/datarate.c | 10 ++++---- drivers/staging/vt6656/datarate.h | 10 ++++---- drivers/staging/vt6656/dpc.c | 40 ++++++++++++++++++------------------ drivers/staging/vt6656/key.c | 6 ++-- drivers/staging/vt6656/key.h | 6 ++-- drivers/staging/vt6656/rxtx.c | 8 +++--- drivers/staging/vt6656/rxtx.h | 4 +- drivers/staging/vt6656/ttype.h | 4 --- drivers/staging/vt6656/usbpipe.c | 2 +- drivers/staging/vt6656/usbpipe.h | 2 +- drivers/staging/vt6656/wmgr.c | 26 ++++++++++++------------ drivers/staging/vt6656/wmgr.h | 16 +++++++------- drivers/staging/vt6656/wpa2.c | 2 +- drivers/staging/vt6656/wpa2.h | 2 +- 21 files changed, 81 insertions(+), 85 deletions(-) diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c index 7dc01db..e680ac9 100644 --- a/drivers/staging/vt6656/baseband.c +++ b/drivers/staging/vt6656/baseband.c @@ -762,9 +762,9 @@ BBvCaculateParameter ( IN UINT cbFrameLength, IN WORD wRate, IN BYTE byPacketType, - OUT PWORD pwPhyLen, - OUT PBYTE pbyPhySrv, - OUT PBYTE pbyPhySgn + PWORD pwPhyLen, + PBYTE pbyPhySrv, + PBYTE pbyPhySgn ) { UINT cbBitCount; diff --git a/drivers/staging/vt6656/baseband.h b/drivers/staging/vt6656/baseband.h index e991a7e..006762e 100644 --- a/drivers/staging/vt6656/baseband.h +++ b/drivers/staging/vt6656/baseband.h @@ -110,9 +110,9 @@ BBvCaculateParameter ( IN UINT cbFrameLength, IN WORD wRate, IN BYTE byPacketType, - OUT PWORD pwPhyLen, - OUT PBYTE pbyPhySrv, - OUT PBYTE pbyPhySgn + PWORD pwPhyLen, + PBYTE pbyPhySrv, + PBYTE pbyPhySgn ); // timer for antenna diversity diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c index 6b1678b..e2261f1 100644 --- a/drivers/staging/vt6656/bssdb.c +++ b/drivers/staging/vt6656/bssdb.c @@ -772,7 +772,7 @@ BOOL BSSbIsSTAInNodeDB( IN HANDLE hDeviceContext, IN PBYTE abyDstAddr, - OUT PUINT puNodeIndex + PUINT puNodeIndex ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -807,7 +807,7 @@ BSSbIsSTAInNodeDB( VOID BSSvCreateOneNode( IN HANDLE hDeviceContext, - OUT PUINT puNodeIndex + PUINT puNodeIndex ) { diff --git a/drivers/staging/vt6656/bssdb.h b/drivers/staging/vt6656/bssdb.h index f365b6b..1a8a447 100644 --- a/drivers/staging/vt6656/bssdb.h +++ b/drivers/staging/vt6656/bssdb.h @@ -301,13 +301,13 @@ BOOL BSSbIsSTAInNodeDB( IN HANDLE hDeviceContext, IN PBYTE abyDstAddr, - OUT PUINT puNodeIndex + PUINT puNodeIndex ); VOID BSSvCreateOneNode( IN HANDLE hDeviceContext, - OUT PUINT puNodeIndex + PUINT puNodeIndex ); VOID diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index d73efee..0f94551 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -226,8 +226,8 @@ VOID CARDvCaculateOFDMRParameter ( IN WORD wRate, IN BYTE byBBType, - OUT PBYTE pbyTxRate, - OUT PBYTE pbyRsvTime + PBYTE pbyTxRate, + PBYTE pbyRsvTime ) { switch (wRate) { diff --git a/drivers/staging/vt6656/channel.c b/drivers/staging/vt6656/channel.c index f7136b0..04486d5 100644 --- a/drivers/staging/vt6656/channel.c +++ b/drivers/staging/vt6656/channel.c @@ -426,7 +426,7 @@ exit: BOOL CHvChannelGetList ( IN UINT uCountryCodeIdx, - OUT PBYTE pbyChannelTable + PBYTE pbyChannelTable ) { if (uCountryCodeIdx >= CCODE_MAX) { diff --git a/drivers/staging/vt6656/channel.h b/drivers/staging/vt6656/channel.h index 2306b20..c369dcd 100644 --- a/drivers/staging/vt6656/channel.h +++ b/drivers/staging/vt6656/channel.h @@ -51,7 +51,7 @@ BYTE CHbyGetChannelMapping(BYTE byChannelNumber); BOOL CHvChannelGetList ( IN UINT uCountryCodeIdx, - OUT PBYTE pbyChannelTable + PBYTE pbyChannelTable ); #endif /* _REGULATE_H_ */ diff --git a/drivers/staging/vt6656/datarate.c b/drivers/staging/vt6656/datarate.c index 968feb4..40d9534 100644 --- a/drivers/staging/vt6656/datarate.c +++ b/drivers/staging/vt6656/datarate.c @@ -201,11 +201,11 @@ RATEvParseMaxRate ( IN PWLAN_IE_SUPP_RATES pItemRates, IN PWLAN_IE_SUPP_RATES pItemExtRates, IN BOOL bUpdateBasicRate, - OUT PWORD pwMaxBasicRate, - OUT PWORD pwMaxSuppRate, - OUT PWORD pwSuppRate, - OUT PBYTE pbyTopCCKRate, - OUT PBYTE pbyTopOFDMRate + PWORD pwMaxBasicRate, + PWORD pwMaxSuppRate, + PWORD pwSuppRate, + PBYTE pbyTopCCKRate, + PBYTE pbyTopOFDMRate ) { PSDevice pDevice = (PSDevice) pDeviceHandler; diff --git a/drivers/staging/vt6656/datarate.h b/drivers/staging/vt6656/datarate.h index 68f206e..e74a129 100644 --- a/drivers/staging/vt6656/datarate.h +++ b/drivers/staging/vt6656/datarate.h @@ -75,11 +75,11 @@ RATEvParseMaxRate( IN PWLAN_IE_SUPP_RATES pItemRates, IN PWLAN_IE_SUPP_RATES pItemExtRates, IN BOOL bUpdateBasicRate, - OUT PWORD pwMaxBasicRate, - OUT PWORD pwMaxSuppRate, - OUT PWORD pwSuppRate, - OUT PBYTE pbyTopCCKRate, - OUT PBYTE pbyTopOFDMRate + PWORD pwMaxBasicRate, + PWORD pwMaxSuppRate, + PWORD pwSuppRate, + PBYTE pbyTopCCKRate, + PBYTE pbyTopOFDMRate ); VOID diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index 835c6d6..dcfdf72 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/drivers/staging/vt6656/dpc.c @@ -81,8 +81,8 @@ static VOID s_vGetDASA( IN PBYTE pbyRxBufferAddr, - OUT PUINT pcbHeaderSize, - OUT PSEthernetHeader psEthHeader + PUINT pcbHeaderSize, + PSEthernetHeader psEthHeader ); static @@ -93,7 +93,7 @@ s_vProcessRxMACHeader ( IN UINT cbPacketSize, IN BOOL bIsWEP, IN BOOL bExtIV, - OUT PUINT pcbHeadSize + PUINT pcbHeadSize ); static BOOL s_bAPModeRxCtl( @@ -119,11 +119,11 @@ static BOOL s_bHandleRxEncryption( IN PBYTE pbyFrame, IN UINT FrameSize, IN PBYTE pbyRsr, - OUT PBYTE pbyNewRsr, - OUT PSKeyItem *pKeyOut, + PBYTE pbyNewRsr, + PSKeyItem * pKeyOut, int * pbExtIV, - OUT PWORD pwRxTSC15_0, - OUT PDWORD pdwRxTSC47_16 + PWORD pwRxTSC15_0, + PDWORD pdwRxTSC47_16 ); static BOOL s_bHostWepRxEncryption( @@ -134,10 +134,10 @@ static BOOL s_bHostWepRxEncryption( IN PBYTE pbyRsr, IN BOOL bOnFly, IN PSKeyItem pKey, - OUT PBYTE pbyNewRsr, + PBYTE pbyNewRsr, int * pbExtIV, - OUT PWORD pwRxTSC15_0, - OUT PDWORD pdwRxTSC47_16 + PWORD pwRxTSC15_0, + PDWORD pdwRxTSC47_16 ); @@ -168,7 +168,7 @@ s_vProcessRxMACHeader ( IN UINT cbPacketSize, IN BOOL bIsWEP, IN BOOL bExtIV, - OUT PUINT pcbHeadSize + PUINT pcbHeadSize ) { PBYTE pbyRxBuffer; @@ -263,8 +263,8 @@ static VOID s_vGetDASA ( IN PBYTE pbyRxBufferAddr, - OUT PUINT pcbHeaderSize, - OUT PSEthernetHeader psEthHeader + PUINT pcbHeaderSize, + PSEthernetHeader psEthHeader ) { UINT cbHeaderSize = 0; @@ -1143,11 +1143,11 @@ static BOOL s_bHandleRxEncryption ( IN PBYTE pbyFrame, IN UINT FrameSize, IN PBYTE pbyRsr, - OUT PBYTE pbyNewRsr, - OUT PSKeyItem *pKeyOut, + PBYTE pbyNewRsr, + PSKeyItem * pKeyOut, int * pbExtIV, - OUT PWORD pwRxTSC15_0, - OUT PDWORD pdwRxTSC47_16 + PWORD pwRxTSC15_0, + PDWORD pdwRxTSC47_16 ) { UINT PayloadLen = FrameSize; @@ -1291,10 +1291,10 @@ static BOOL s_bHostWepRxEncryption ( IN PBYTE pbyRsr, IN BOOL bOnFly, IN PSKeyItem pKey, - OUT PBYTE pbyNewRsr, + PBYTE pbyNewRsr, int * pbExtIV, - OUT PWORD pwRxTSC15_0, - OUT PDWORD pdwRxTSC47_16 + PWORD pwRxTSC15_0, + PDWORD pdwRxTSC47_16 ) { PSMgmtObject pMgmt = &(pDevice->sMgmtObj); diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c index 13fc69a..7220b49 100644 --- a/drivers/staging/vt6656/key.c +++ b/drivers/staging/vt6656/key.c @@ -166,7 +166,7 @@ BOOL KeybGetKey ( IN PSKeyManagement pTable, IN PBYTE pbyBSSID, IN DWORD dwKeyIndex, - OUT PSKeyItem *pKey + PSKeyItem * pKey ) { int i; @@ -565,7 +565,7 @@ BOOL KeybGetTransmitKey ( IN PSKeyManagement pTable, IN PBYTE pbyBSSID, IN DWORD dwKeyType, - OUT PSKeyItem *pKey + PSKeyItem * pKey ) { int i, ii; @@ -643,7 +643,7 @@ BOOL KeybGetTransmitKey ( */ BOOL KeybCheckPairewiseKey ( IN PSKeyManagement pTable, - OUT PSKeyItem *pKey + PSKeyItem * pKey ) { int i; diff --git a/drivers/staging/vt6656/key.h b/drivers/staging/vt6656/key.h index b15a64c..919669d 100644 --- a/drivers/staging/vt6656/key.h +++ b/drivers/staging/vt6656/key.h @@ -103,7 +103,7 @@ BOOL KeybGetKey( IN PSKeyManagement pTable, IN PBYTE pbyBSSID, IN DWORD dwKeyIndex, - OUT PSKeyItem *pKey + PSKeyItem * pKey ); BOOL KeybSetKey( @@ -145,12 +145,12 @@ BOOL KeybGetTransmitKey( IN PSKeyManagement pTable, IN PBYTE pbyBSSID, IN DWORD dwKeyType, - OUT PSKeyItem *pKey + PSKeyItem * pKey ); BOOL KeybCheckPairewiseKey( IN PSKeyManagement pTable, - OUT PSKeyItem *pKey + PSKeyItem * pKey ); BOOL KeybSetDefaultKey ( diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index d9fa36c..f152a11 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -187,7 +187,7 @@ s_vFillTxKey( IN PSKeyItem pTransmitKey, IN PBYTE pbyHdrBuf, IN WORD wPayloadLen, - OUT PBYTE pMICHDR + PBYTE pMICHDR ); static @@ -337,7 +337,7 @@ s_vFillTxKey ( IN PSKeyItem pTransmitKey, IN PBYTE pbyHdrBuf, IN WORD wPayloadLen, - OUT PBYTE pMICHDR + PBYTE pMICHDR ) { PDWORD pdwIV = (PDWORD) pbyIVHead; @@ -1403,8 +1403,8 @@ s_bPacketToWirelessUsb( IN PSKeyItem pTransmitKey, IN UINT uNodeIndex, IN WORD wCurrentRate, - OUT UINT *pcbHeaderLen, - OUT UINT *pcbTotalLen + UINT *pcbHeaderLen, + UINT *pcbTotalLen ) { PSMgmtObject pMgmt = &(pDevice->sMgmtObj); diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index 6bc22d3..20744b3 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h @@ -678,8 +678,8 @@ bPacketToWirelessUsb( IN PSKeyItem pTransmitKey, IN UINT uNodeIndex, IN WORD wCurrentRate, - OUT UINT *pcbHeaderLen, - OUT UINT *pcbTotalLen + UINT *pcbHeaderLen, + UINT *pcbTotalLen ); VOID vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb); diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h index 9ee3f43..d5d1257 100644 --- a/drivers/staging/vt6656/ttype.h +++ b/drivers/staging/vt6656/ttype.h @@ -41,10 +41,6 @@ #define IN #endif -#ifndef OUT -#define OUT -#endif - //2007-0115-05<Add>by MikeLiu #ifndef TxInSleep #define TxInSleep diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index 65e91a3..2af06ce 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -228,7 +228,7 @@ PIPEnsControlIn( IN WORD wValue, IN WORD wIndex, IN WORD wLength, - IN OUT PBYTE pbyBuffer + IN PBYTE pbyBuffer ) { NTSTATUS ntStatus = 0; diff --git a/drivers/staging/vt6656/usbpipe.h b/drivers/staging/vt6656/usbpipe.h index c422d1d..96400fa 100644 --- a/drivers/staging/vt6656/usbpipe.h +++ b/drivers/staging/vt6656/usbpipe.h @@ -70,7 +70,7 @@ PIPEnsControlIn( IN WORD wValue, IN WORD wIndex, IN WORD wLength, - IN OUT PBYTE pbyBuffer + IN PBYTE pbyBuffer ); diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index 330aea6..6c6478a 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -312,7 +312,7 @@ s_vMgrSynchBSS ( IN PSDevice pDevice, IN UINT uBSSMode, IN PKnownBSS pCurr, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ); @@ -320,8 +320,8 @@ static BOOL s_bCipherMatch ( IN PKnownBSS pBSSNode, IN NDIS_802_11_ENCRYPTION_STATUS EncStatus, - OUT PBYTE pbyCCSPK, - OUT PBYTE pbyCCSGK + PBYTE pbyCCSPK, + PBYTE pbyCCSGK ); static VOID Encyption_Rebuild( @@ -419,7 +419,7 @@ VOID vMgrAssocBeginSta( IN HANDLE hDeviceContext, IN PSMgmtObject pMgmt, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -495,7 +495,7 @@ VOID vMgrReAssocBeginSta( IN HANDLE hDeviceContext, IN PSMgmtObject pMgmt, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -576,7 +576,7 @@ vMgrDisassocBeginSta( IN PSMgmtObject pMgmt, IN PBYTE abyDestAddress, IN WORD wReason, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -1106,7 +1106,7 @@ VOID vMgrAuthenBeginSta( IN HANDLE hDeviceContext, IN PSMgmtObject pMgmt, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -1166,7 +1166,7 @@ vMgrDeAuthenBeginSta( IN PSMgmtObject pMgmt, IN PBYTE abyDestAddress, IN WORD wReason, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -2358,7 +2358,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) VOID vMgrCreateOwnIBSS( IN HANDLE hDeviceContext, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -2632,7 +2632,7 @@ vMgrCreateOwnIBSS( VOID vMgrJoinBSSBegin( IN HANDLE hDeviceContext, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ) { @@ -2965,7 +2965,7 @@ s_vMgrSynchBSS ( IN PSDevice pDevice, IN UINT uBSSMode, IN PKnownBSS pCurr, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ) { PSMgmtObject pMgmt = &(pDevice->sMgmtObj); @@ -4800,8 +4800,8 @@ static BOOL s_bCipherMatch ( IN PKnownBSS pBSSNode, IN NDIS_802_11_ENCRYPTION_STATUS EncStatus, - OUT PBYTE pbyCCSPK, - OUT PBYTE pbyCCSGK + PBYTE pbyCCSPK, + PBYTE pbyCCSGK ) { BYTE byMulticastCipher = KEY_CTL_INVALID; diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h index c682a7f..c68cb11 100644 --- a/drivers/staging/vt6656/wmgr.h +++ b/drivers/staging/vt6656/wmgr.h @@ -418,14 +418,14 @@ void vMgrAssocBeginSta( IN HANDLE hDeviceContext, IN PSMgmtObject pMgmt, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ); VOID vMgrReAssocBeginSta( IN HANDLE hDeviceContext, IN PSMgmtObject pMgmt, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ); VOID @@ -434,26 +434,26 @@ vMgrDisassocBeginSta( IN PSMgmtObject pMgmt, IN PBYTE abyDestAddress, IN WORD wReason, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ); VOID vMgrAuthenBeginSta( IN HANDLE hDeviceContext, IN PSMgmtObject pMgmt, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ); VOID vMgrCreateOwnIBSS( IN HANDLE hDeviceContext, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ); VOID vMgrJoinBSSBegin( IN HANDLE hDeviceContext, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ); VOID @@ -467,7 +467,7 @@ vMgrRxManagePacket( VOID vMgrScanBegin( IN HANDLE hDeviceContext, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ); */ @@ -477,7 +477,7 @@ vMgrDeAuthenBeginSta( IN PSMgmtObject pMgmt, IN PBYTE abyDestAddress, IN WORD wReason, - OUT PCMD_STATUS pStatus + PCMD_STATUS pStatus ); BOOL diff --git a/drivers/staging/vt6656/wpa2.c b/drivers/staging/vt6656/wpa2.c index fa3aeed..e3eb5f3 100644 --- a/drivers/staging/vt6656/wpa2.c +++ b/drivers/staging/vt6656/wpa2.c @@ -263,7 +263,7 @@ WPA2vParseRSN ( UINT WPA2uSetIEs( IN PVOID pMgmtHandle, - OUT PWLAN_IE_RSN pRSNIEs + PWLAN_IE_RSN pRSNIEs ) { PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle; diff --git a/drivers/staging/vt6656/wpa2.h b/drivers/staging/vt6656/wpa2.h index e553b38..bc0a68f 100644 --- a/drivers/staging/vt6656/wpa2.h +++ b/drivers/staging/vt6656/wpa2.h @@ -72,7 +72,7 @@ WPA2vParseRSN ( UINT WPA2uSetIEs( IN PVOID pMgmtHandle, - OUT PWLAN_IE_RSN pRSNIEs + PWLAN_IE_RSN pRSNIEs ); #endif // __WPA2_H__ -- 1.6.4.4 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel