Staging: vt6656: code cleanup, removed OUT definition

Remoted empty OUT define in ttype.h and its usage across the code.

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Andres More 2010-05-04 20:40:10 -03:00 committed by Greg Kroah-Hartman
parent fa10b25f8d
commit 6f8c13c7db
21 changed files with 85 additions and 111 deletions

View File

@ -762,9 +762,9 @@ BBvCaculateParameter (
UINT cbFrameLength, UINT cbFrameLength,
WORD wRate, WORD wRate,
BYTE byPacketType, BYTE byPacketType,
OUT PWORD pwPhyLen, PWORD pwPhyLen,
OUT PBYTE pbyPhySrv, PBYTE pbyPhySrv,
OUT PBYTE pbyPhySgn PBYTE pbyPhySgn
) )
{ {
UINT cbBitCount; UINT cbBitCount;

View File

@ -110,9 +110,9 @@ BBvCaculateParameter (
UINT cbFrameLength, UINT cbFrameLength,
WORD wRate, WORD wRate,
BYTE byPacketType, BYTE byPacketType,
OUT PWORD pwPhyLen, PWORD pwPhyLen,
OUT PBYTE pbyPhySrv, PBYTE pbyPhySrv,
OUT PBYTE pbyPhySgn PBYTE pbyPhySgn
); );
// timer for antenna diversity // timer for antenna diversity

View File

@ -772,7 +772,7 @@ BOOL
BSSbIsSTAInNodeDB( BSSbIsSTAInNodeDB(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PBYTE abyDstAddr, PBYTE abyDstAddr,
OUT PUINT puNodeIndex PUINT puNodeIndex
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
@ -807,7 +807,7 @@ BSSbIsSTAInNodeDB(
void void
BSSvCreateOneNode( BSSvCreateOneNode(
HANDLE hDeviceContext, HANDLE hDeviceContext,
OUT PUINT puNodeIndex PUINT puNodeIndex
) )
{ {

View File

@ -301,13 +301,13 @@ BOOL
BSSbIsSTAInNodeDB( BSSbIsSTAInNodeDB(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PBYTE abyDstAddr, PBYTE abyDstAddr,
OUT PUINT puNodeIndex PUINT puNodeIndex
); );
void void
BSSvCreateOneNode( BSSvCreateOneNode(
HANDLE hDeviceContext, HANDLE hDeviceContext,
OUT PUINT puNodeIndex PUINT puNodeIndex
); );
void void

View File

@ -224,8 +224,8 @@ void
CARDvCaculateOFDMRParameter ( CARDvCaculateOFDMRParameter (
WORD wRate, WORD wRate,
BYTE byBBType, BYTE byBBType,
OUT PBYTE pbyTxRate, PBYTE pbyTxRate,
OUT PBYTE pbyRsvTime PBYTE pbyRsvTime
) )
{ {
switch (wRate) { switch (wRate) {

View File

@ -426,7 +426,7 @@ exit:
BOOL BOOL
CHvChannelGetList ( CHvChannelGetList (
UINT uCountryCodeIdx, UINT uCountryCodeIdx,
OUT PBYTE pbyChannelTable PBYTE pbyChannelTable
) )
{ {
if (uCountryCodeIdx >= CCODE_MAX) { if (uCountryCodeIdx >= CCODE_MAX) {

View File

@ -51,7 +51,7 @@ BYTE CHbyGetChannelMapping(BYTE byChannelNumber);
BOOL BOOL
CHvChannelGetList ( CHvChannelGetList (
UINT uCountryCodeIdx, UINT uCountryCodeIdx,
OUT PBYTE pbyChannelTable PBYTE pbyChannelTable
); );
#endif /* _REGULATE_H_ */ #endif /* _REGULATE_H_ */

View File

@ -193,11 +193,11 @@ void RATEvParseMaxRate(
PWLAN_IE_SUPP_RATES pItemRates, PWLAN_IE_SUPP_RATES pItemRates,
PWLAN_IE_SUPP_RATES pItemExtRates, PWLAN_IE_SUPP_RATES pItemExtRates,
BOOL bUpdateBasicRate, BOOL bUpdateBasicRate,
OUT PWORD pwMaxBasicRate, PWORD pwMaxBasicRate,
OUT PWORD pwMaxSuppRate, PWORD pwMaxSuppRate,
OUT PWORD pwSuppRate, PWORD pwSuppRate,
OUT PBYTE pbyTopCCKRate, PBYTE pbyTopCCKRate,
OUT PBYTE pbyTopOFDMRate PBYTE pbyTopOFDMRate
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;

View File

@ -75,11 +75,11 @@ RATEvParseMaxRate(
PWLAN_IE_SUPP_RATES pItemRates, PWLAN_IE_SUPP_RATES pItemRates,
PWLAN_IE_SUPP_RATES pItemExtRates, PWLAN_IE_SUPP_RATES pItemExtRates,
BOOL bUpdateBasicRate, BOOL bUpdateBasicRate,
OUT PWORD pwMaxBasicRate, PWORD pwMaxBasicRate,
OUT PWORD pwMaxSuppRate, PWORD pwMaxSuppRate,
OUT PWORD pwSuppRate, PWORD pwSuppRate,
OUT PBYTE pbyTopCCKRate, PBYTE pbyTopCCKRate,
OUT PBYTE pbyTopOFDMRate PBYTE pbyTopOFDMRate
); );
void void

View File

@ -80,8 +80,8 @@ static
void void
s_vGetDASA( s_vGetDASA(
PBYTE pbyRxBufferAddr, PBYTE pbyRxBufferAddr,
OUT PUINT pcbHeaderSize, PUINT pcbHeaderSize,
OUT PSEthernetHeader psEthHeader PSEthernetHeader psEthHeader
); );
static static
@ -92,7 +92,7 @@ s_vProcessRxMACHeader (
UINT cbPacketSize, UINT cbPacketSize,
BOOL bIsWEP, BOOL bIsWEP,
BOOL bExtIV, BOOL bExtIV,
OUT PUINT pcbHeadSize PUINT pcbHeadSize
); );
static BOOL s_bAPModeRxCtl( static BOOL s_bAPModeRxCtl(
@ -118,11 +118,11 @@ static BOOL s_bHandleRxEncryption(
PBYTE pbyFrame, PBYTE pbyFrame,
UINT FrameSize, UINT FrameSize,
PBYTE pbyRsr, PBYTE pbyRsr,
OUT PBYTE pbyNewRsr, PBYTE pbyNewRsr,
OUT PSKeyItem *pKeyOut, PSKeyItem * pKeyOut,
int * pbExtIV, int * pbExtIV,
OUT PWORD pwRxTSC15_0, PWORD pwRxTSC15_0,
OUT PDWORD pdwRxTSC47_16 PDWORD pdwRxTSC47_16
); );
static BOOL s_bHostWepRxEncryption( static BOOL s_bHostWepRxEncryption(
@ -133,10 +133,10 @@ static BOOL s_bHostWepRxEncryption(
PBYTE pbyRsr, PBYTE pbyRsr,
BOOL bOnFly, BOOL bOnFly,
PSKeyItem pKey, PSKeyItem pKey,
OUT PBYTE pbyNewRsr, PBYTE pbyNewRsr,
int * pbExtIV, int * pbExtIV,
OUT PWORD pwRxTSC15_0, PWORD pwRxTSC15_0,
OUT PDWORD pdwRxTSC47_16 PDWORD pdwRxTSC47_16
); );
@ -167,7 +167,7 @@ s_vProcessRxMACHeader (
UINT cbPacketSize, UINT cbPacketSize,
BOOL bIsWEP, BOOL bIsWEP,
BOOL bExtIV, BOOL bExtIV,
OUT PUINT pcbHeadSize PUINT pcbHeadSize
) )
{ {
PBYTE pbyRxBuffer; PBYTE pbyRxBuffer;
@ -262,8 +262,8 @@ static
void void
s_vGetDASA ( s_vGetDASA (
PBYTE pbyRxBufferAddr, PBYTE pbyRxBufferAddr,
OUT PUINT pcbHeaderSize, PUINT pcbHeaderSize,
OUT PSEthernetHeader psEthHeader PSEthernetHeader psEthHeader
) )
{ {
UINT cbHeaderSize = 0; UINT cbHeaderSize = 0;
@ -1147,11 +1147,11 @@ static BOOL s_bHandleRxEncryption (
PBYTE pbyFrame, PBYTE pbyFrame,
UINT FrameSize, UINT FrameSize,
PBYTE pbyRsr, PBYTE pbyRsr,
OUT PBYTE pbyNewRsr, PBYTE pbyNewRsr,
OUT PSKeyItem *pKeyOut, PSKeyItem * pKeyOut,
int * pbExtIV, int * pbExtIV,
OUT PWORD pwRxTSC15_0, PWORD pwRxTSC15_0,
OUT PDWORD pdwRxTSC47_16 PDWORD pdwRxTSC47_16
) )
{ {
UINT PayloadLen = FrameSize; UINT PayloadLen = FrameSize;
@ -1295,10 +1295,10 @@ static BOOL s_bHostWepRxEncryption (
PBYTE pbyRsr, PBYTE pbyRsr,
BOOL bOnFly, BOOL bOnFly,
PSKeyItem pKey, PSKeyItem pKey,
OUT PBYTE pbyNewRsr, PBYTE pbyNewRsr,
int * pbExtIV, int * pbExtIV,
OUT PWORD pwRxTSC15_0, PWORD pwRxTSC15_0,
OUT PDWORD pdwRxTSC47_16 PDWORD pdwRxTSC47_16
) )
{ {
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

View File

@ -164,12 +164,8 @@ void KeyvInitTable(void *pDeviceHandler, PSKeyManagement pTable)
* Return Value: TRUE if found otherwise FALSE * Return Value: TRUE if found otherwise FALSE
* *
*/ */
BOOL KeybGetKey ( BOOL KeybGetKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyIndex,
PSKeyManagement pTable, PSKeyItem *pKey)
PBYTE pbyBSSID,
DWORD dwKeyIndex,
OUT PSKeyItem *pKey
)
{ {
int i; int i;
@ -563,12 +559,8 @@ void KeyvRemoveAllWEPKey(
* Return Value: TRUE if found otherwise FALSE * Return Value: TRUE if found otherwise FALSE
* *
*/ */
BOOL KeybGetTransmitKey ( BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType,
PSKeyManagement pTable, PSKeyItem *pKey)
PBYTE pbyBSSID,
DWORD dwKeyType,
OUT PSKeyItem *pKey
)
{ {
int i, ii; int i, ii;
@ -643,10 +635,7 @@ BOOL KeybGetTransmitKey (
* Return Value: TRUE if found otherwise FALSE * Return Value: TRUE if found otherwise FALSE
* *
*/ */
BOOL KeybCheckPairewiseKey ( BOOL KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey)
PSKeyManagement pTable,
OUT PSKeyItem *pKey
)
{ {
int i; int i;

View File

@ -99,12 +99,8 @@ typedef struct tagSKeyManagement
void KeyvInitTable(void *pDeviceHandler, PSKeyManagement pTable); void KeyvInitTable(void *pDeviceHandler, PSKeyManagement pTable);
BOOL KeybGetKey( BOOL KeybGetKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyIndex,
PSKeyManagement pTable, PSKeyItem *pKey);
PBYTE pbyBSSID,
DWORD dwKeyIndex,
OUT PSKeyItem *pKey
);
BOOL KeybSetKey( BOOL KeybSetKey(
void *pDeviceHandler, void *pDeviceHandler,
@ -141,17 +137,10 @@ void KeyvRemoveAllWEPKey(
PSKeyManagement pTable PSKeyManagement pTable
); );
BOOL KeybGetTransmitKey( BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType,
PSKeyManagement pTable, PSKeyItem *pKey);
PBYTE pbyBSSID,
DWORD dwKeyType,
OUT PSKeyItem *pKey
);
BOOL KeybCheckPairewiseKey( BOOL KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey);
PSKeyManagement pTable,
OUT PSKeyItem *pKey
);
BOOL KeybSetDefaultKey( BOOL KeybSetDefaultKey(
void *pDeviceHandler, void *pDeviceHandler,

View File

@ -187,7 +187,7 @@ s_vFillTxKey(
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
PBYTE pbyHdrBuf, PBYTE pbyHdrBuf,
WORD wPayloadLen, WORD wPayloadLen,
OUT PBYTE pMICHDR PBYTE pMICHDR
); );
static static
@ -339,7 +339,7 @@ s_vFillTxKey (
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
PBYTE pbyHdrBuf, PBYTE pbyHdrBuf,
WORD wPayloadLen, WORD wPayloadLen,
OUT PBYTE pMICHDR PBYTE pMICHDR
) )
{ {
PDWORD pdwIV = (PDWORD) pbyIVHead; PDWORD pdwIV = (PDWORD) pbyIVHead;
@ -1439,8 +1439,8 @@ s_bPacketToWirelessUsb(
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
UINT uNodeIndex, UINT uNodeIndex,
WORD wCurrentRate, WORD wCurrentRate,
OUT UINT *pcbHeaderLen, UINT *pcbHeaderLen,
OUT UINT *pcbTotalLen UINT *pcbTotalLen
) )
{ {
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

View File

@ -678,8 +678,8 @@ bPacketToWirelessUsb(
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
UINT uNodeIndex, UINT uNodeIndex,
WORD wCurrentRate, WORD wCurrentRate,
OUT UINT *pcbHeaderLen, UINT *pcbHeaderLen,
OUT UINT *pcbTotalLen UINT *pcbTotalLen
); );
void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb); void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb);

View File

@ -33,10 +33,6 @@
/******* Common definitions and typedefs ***********************************/ /******* Common definitions and typedefs ***********************************/
#ifndef OUT
#define OUT
#endif
//2007-0115-05<Add>by MikeLiu //2007-0115-05<Add>by MikeLiu
#ifndef TxInSleep #ifndef TxInSleep
#define TxInSleep #define TxInSleep

View File

@ -229,7 +229,7 @@ PIPEnsControlIn(
WORD wValue, WORD wValue,
WORD wIndex, WORD wIndex,
WORD wLength, WORD wLength,
OUT PBYTE pbyBuffer PBYTE pbyBuffer
) )
{ {
NTSTATUS ntStatus = 0; NTSTATUS ntStatus = 0;

View File

@ -70,7 +70,7 @@ PIPEnsControlIn(
WORD wValue, WORD wValue,
WORD wIndex, WORD wIndex,
WORD wLength, WORD wLength,
OUT PBYTE pbyBuffer PBYTE pbyBuffer
); );

View File

@ -312,7 +312,7 @@ s_vMgrSynchBSS (
PSDevice pDevice, PSDevice pDevice,
UINT uBSSMode, UINT uBSSMode,
PKnownBSS pCurr, PKnownBSS pCurr,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
); );
@ -320,8 +320,8 @@ static BOOL
s_bCipherMatch ( s_bCipherMatch (
PKnownBSS pBSSNode, PKnownBSS pBSSNode,
NDIS_802_11_ENCRYPTION_STATUS EncStatus, NDIS_802_11_ENCRYPTION_STATUS EncStatus,
OUT PBYTE pbyCCSPK, PBYTE pbyCCSPK,
OUT PBYTE pbyCCSGK PBYTE pbyCCSGK
); );
static void Encyption_Rebuild( static void Encyption_Rebuild(
@ -419,7 +419,7 @@ void
vMgrAssocBeginSta( vMgrAssocBeginSta(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
@ -495,7 +495,7 @@ void
vMgrReAssocBeginSta( vMgrReAssocBeginSta(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
@ -576,7 +576,7 @@ vMgrDisassocBeginSta(
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PBYTE abyDestAddress, PBYTE abyDestAddress,
WORD wReason, WORD wReason,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
@ -1106,7 +1106,7 @@ void
vMgrAuthenBeginSta( vMgrAuthenBeginSta(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
@ -1166,7 +1166,7 @@ vMgrDeAuthenBeginSta(
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PBYTE abyDestAddress, PBYTE abyDestAddress,
WORD wReason, WORD wReason,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
@ -2358,7 +2358,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
void void
vMgrCreateOwnIBSS( vMgrCreateOwnIBSS(
HANDLE hDeviceContext, HANDLE hDeviceContext,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
@ -2633,7 +2633,7 @@ vMgrCreateOwnIBSS(
void void
vMgrJoinBSSBegin( vMgrJoinBSSBegin(
HANDLE hDeviceContext, HANDLE hDeviceContext,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
{ {
@ -2967,7 +2967,7 @@ s_vMgrSynchBSS (
PSDevice pDevice, PSDevice pDevice,
UINT uBSSMode, UINT uBSSMode,
PKnownBSS pCurr, PKnownBSS pCurr,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
{ {
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
@ -4810,8 +4810,8 @@ static BOOL
s_bCipherMatch ( s_bCipherMatch (
PKnownBSS pBSSNode, PKnownBSS pBSSNode,
NDIS_802_11_ENCRYPTION_STATUS EncStatus, NDIS_802_11_ENCRYPTION_STATUS EncStatus,
OUT PBYTE pbyCCSPK, PBYTE pbyCCSPK,
OUT PBYTE pbyCCSGK PBYTE pbyCCSGK
) )
{ {
BYTE byMulticastCipher = KEY_CTL_INVALID; BYTE byMulticastCipher = KEY_CTL_INVALID;

View File

@ -417,14 +417,14 @@ void
vMgrAssocBeginSta( vMgrAssocBeginSta(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
); );
void void
vMgrReAssocBeginSta( vMgrReAssocBeginSta(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
); );
void void
@ -433,26 +433,26 @@ vMgrDisassocBeginSta(
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PBYTE abyDestAddress, PBYTE abyDestAddress,
WORD wReason, WORD wReason,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
); );
void void
vMgrAuthenBeginSta( vMgrAuthenBeginSta(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
); );
void void
vMgrCreateOwnIBSS( vMgrCreateOwnIBSS(
HANDLE hDeviceContext, HANDLE hDeviceContext,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
); );
void void
vMgrJoinBSSBegin( vMgrJoinBSSBegin(
HANDLE hDeviceContext, HANDLE hDeviceContext,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
); );
void void
@ -466,7 +466,7 @@ vMgrRxManagePacket(
void void
vMgrScanBegin( vMgrScanBegin(
HANDLE hDeviceContext, HANDLE hDeviceContext,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
); );
*/ */
@ -476,7 +476,7 @@ vMgrDeAuthenBeginSta(
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PBYTE abyDestAddress, PBYTE abyDestAddress,
WORD wReason, WORD wReason,
OUT PCMD_STATUS pStatus PCMD_STATUS pStatus
); );
BOOL BOOL

View File

@ -262,7 +262,7 @@ WPA2vParseRSN (
-*/ -*/
UINT UINT
WPA2uSetIEs(void *pMgmtHandle, WPA2uSetIEs(void *pMgmtHandle,
OUT PWLAN_IE_RSN pRSNIEs PWLAN_IE_RSN pRSNIEs
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;

View File

@ -72,7 +72,7 @@ WPA2vParseRSN (
UINT UINT
WPA2uSetIEs( WPA2uSetIEs(
void *pMgmtHandle, void *pMgmtHandle,
OUT PWLAN_IE_RSN pRSNIEs PWLAN_IE_RSN pRSNIEs
); );
#endif /* __WPA2_H__ */ #endif /* __WPA2_H__ */