Skip to content

Commit

Permalink
Staging: vt6656: code cleanup, removed OUT definition
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Andres More authored and Greg Kroah-Hartman committed May 11, 2010
1 parent fa10b25 commit 6f8c13c
Show file tree
Hide file tree
Showing 21 changed files with 85 additions and 111 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/vt6656/baseband.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -762,9 +762,9 @@ BBvCaculateParameter (
UINT cbFrameLength,
WORD wRate,
BYTE byPacketType,
OUT PWORD pwPhyLen,
OUT PBYTE pbyPhySrv,
OUT PBYTE pbyPhySgn
PWORD pwPhyLen,
PBYTE pbyPhySrv,
PBYTE pbyPhySgn
)
{
UINT cbBitCount;
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/vt6656/baseband.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ BBvCaculateParameter (
UINT cbFrameLength,
WORD wRate,
BYTE byPacketType,
OUT PWORD pwPhyLen,
OUT PBYTE pbyPhySrv,
OUT PBYTE pbyPhySgn
PWORD pwPhyLen,
PBYTE pbyPhySrv,
PBYTE pbyPhySgn
);

// timer for antenna diversity
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/vt6656/bssdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ BOOL
BSSbIsSTAInNodeDB(
HANDLE hDeviceContext,
PBYTE abyDstAddr,
OUT PUINT puNodeIndex
PUINT puNodeIndex
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
Expand Down Expand Up @@ -807,7 +807,7 @@ BSSbIsSTAInNodeDB(
void
BSSvCreateOneNode(
HANDLE hDeviceContext,
OUT PUINT puNodeIndex
PUINT puNodeIndex
)
{

Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/vt6656/bssdb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,13 +301,13 @@ BOOL
BSSbIsSTAInNodeDB(
HANDLE hDeviceContext,
PBYTE abyDstAddr,
OUT PUINT puNodeIndex
PUINT puNodeIndex
);

void
BSSvCreateOneNode(
HANDLE hDeviceContext,
OUT PUINT puNodeIndex
PUINT puNodeIndex
);

void
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/vt6656/card.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@ void
CARDvCaculateOFDMRParameter (
WORD wRate,
BYTE byBBType,
OUT PBYTE pbyTxRate,
OUT PBYTE pbyRsvTime
PBYTE pbyTxRate,
PBYTE pbyRsvTime
)
{
switch (wRate) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/vt6656/channel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ ChannelValid(UINT CountryCode, UINT ChannelIndex)
BOOL
CHvChannelGetList (
UINT uCountryCodeIdx,
OUT PBYTE pbyChannelTable
PBYTE pbyChannelTable
)
{
if (uCountryCodeIdx >= CCODE_MAX) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/vt6656/channel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ BYTE CHbyGetChannelMapping(BYTE byChannelNumber);
BOOL
CHvChannelGetList (
UINT uCountryCodeIdx,
OUT PBYTE pbyChannelTable
PBYTE pbyChannelTable
);

#endif /* _REGULATE_H_ */
10 changes: 5 additions & 5 deletions drivers/staging/vt6656/datarate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,11 @@ void RATEvParseMaxRate(
PWLAN_IE_SUPP_RATES pItemRates,
PWLAN_IE_SUPP_RATES pItemExtRates,
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;
Expand Down
10 changes: 5 additions & 5 deletions drivers/staging/vt6656/datarate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ RATEvParseMaxRate(
PWLAN_IE_SUPP_RATES pItemRates,
PWLAN_IE_SUPP_RATES pItemExtRates,
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
Expand Down
40 changes: 20 additions & 20 deletions drivers/staging/vt6656/dpc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ static
void
s_vGetDASA(
PBYTE pbyRxBufferAddr,
OUT PUINT pcbHeaderSize,
OUT PSEthernetHeader psEthHeader
PUINT pcbHeaderSize,
PSEthernetHeader psEthHeader
);

static
Expand All @@ -92,7 +92,7 @@ s_vProcessRxMACHeader (
UINT cbPacketSize,
BOOL bIsWEP,
BOOL bExtIV,
OUT PUINT pcbHeadSize
PUINT pcbHeadSize
);

static BOOL s_bAPModeRxCtl(
Expand All @@ -118,11 +118,11 @@ static BOOL s_bHandleRxEncryption(
PBYTE pbyFrame,
UINT FrameSize,
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(
Expand All @@ -133,10 +133,10 @@ static BOOL s_bHostWepRxEncryption(
PBYTE pbyRsr,
BOOL bOnFly,
PSKeyItem pKey,
OUT PBYTE pbyNewRsr,
PBYTE pbyNewRsr,
int * pbExtIV,
OUT PWORD pwRxTSC15_0,
OUT PDWORD pdwRxTSC47_16
PWORD pwRxTSC15_0,
PDWORD pdwRxTSC47_16

);

Expand Down Expand Up @@ -167,7 +167,7 @@ s_vProcessRxMACHeader (
UINT cbPacketSize,
BOOL bIsWEP,
BOOL bExtIV,
OUT PUINT pcbHeadSize
PUINT pcbHeadSize
)
{
PBYTE pbyRxBuffer;
Expand Down Expand Up @@ -262,8 +262,8 @@ static
void
s_vGetDASA (
PBYTE pbyRxBufferAddr,
OUT PUINT pcbHeaderSize,
OUT PSEthernetHeader psEthHeader
PUINT pcbHeaderSize,
PSEthernetHeader psEthHeader
)
{
UINT cbHeaderSize = 0;
Expand Down Expand Up @@ -1147,11 +1147,11 @@ static BOOL s_bHandleRxEncryption (
PBYTE pbyFrame,
UINT FrameSize,
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;
Expand Down Expand Up @@ -1295,10 +1295,10 @@ static BOOL s_bHostWepRxEncryption (
PBYTE pbyRsr,
BOOL bOnFly,
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);
Expand Down
21 changes: 5 additions & 16 deletions drivers/staging/vt6656/key.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,8 @@ void KeyvInitTable(void *pDeviceHandler, PSKeyManagement pTable)
* Return Value: TRUE if found otherwise FALSE
*
*/
BOOL KeybGetKey (
PSKeyManagement pTable,
PBYTE pbyBSSID,
DWORD dwKeyIndex,
OUT PSKeyItem *pKey
)
BOOL KeybGetKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyIndex,
PSKeyItem *pKey)
{
int i;

Expand Down Expand Up @@ -563,12 +559,8 @@ void KeyvRemoveAllWEPKey(
* Return Value: TRUE if found otherwise FALSE
*
*/
BOOL KeybGetTransmitKey (
PSKeyManagement pTable,
PBYTE pbyBSSID,
DWORD dwKeyType,
OUT PSKeyItem *pKey
)
BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType,
PSKeyItem *pKey)
{
int i, ii;

Expand Down Expand Up @@ -643,10 +635,7 @@ BOOL KeybGetTransmitKey (
* Return Value: TRUE if found otherwise FALSE
*
*/
BOOL KeybCheckPairewiseKey (
PSKeyManagement pTable,
OUT PSKeyItem *pKey
)
BOOL KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey)
{
int i;

Expand Down
21 changes: 5 additions & 16 deletions drivers/staging/vt6656/key.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,8 @@ typedef struct tagSKeyManagement

void KeyvInitTable(void *pDeviceHandler, PSKeyManagement pTable);

BOOL KeybGetKey(
PSKeyManagement pTable,
PBYTE pbyBSSID,
DWORD dwKeyIndex,
OUT PSKeyItem *pKey
);
BOOL KeybGetKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyIndex,
PSKeyItem *pKey);

BOOL KeybSetKey(
void *pDeviceHandler,
Expand Down Expand Up @@ -141,17 +137,10 @@ void KeyvRemoveAllWEPKey(
PSKeyManagement pTable
);

BOOL KeybGetTransmitKey(
PSKeyManagement pTable,
PBYTE pbyBSSID,
DWORD dwKeyType,
OUT PSKeyItem *pKey
);
BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType,
PSKeyItem *pKey);

BOOL KeybCheckPairewiseKey(
PSKeyManagement pTable,
OUT PSKeyItem *pKey
);
BOOL KeybCheckPairewiseKey(PSKeyManagement pTable, PSKeyItem *pKey);

BOOL KeybSetDefaultKey(
void *pDeviceHandler,
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/vt6656/rxtx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ s_vFillTxKey(
PSKeyItem pTransmitKey,
PBYTE pbyHdrBuf,
WORD wPayloadLen,
OUT PBYTE pMICHDR
PBYTE pMICHDR
);

static
Expand Down Expand Up @@ -339,7 +339,7 @@ s_vFillTxKey (
PSKeyItem pTransmitKey,
PBYTE pbyHdrBuf,
WORD wPayloadLen,
OUT PBYTE pMICHDR
PBYTE pMICHDR
)
{
PDWORD pdwIV = (PDWORD) pbyIVHead;
Expand Down Expand Up @@ -1439,8 +1439,8 @@ s_bPacketToWirelessUsb(
PSKeyItem pTransmitKey,
UINT uNodeIndex,
WORD wCurrentRate,
OUT UINT *pcbHeaderLen,
OUT UINT *pcbTotalLen
UINT *pcbHeaderLen,
UINT *pcbTotalLen
)
{
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/vt6656/rxtx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -678,8 +678,8 @@ bPacketToWirelessUsb(
PSKeyItem pTransmitKey,
UINT uNodeIndex,
WORD wCurrentRate,
OUT UINT *pcbHeaderLen,
OUT UINT *pcbTotalLen
UINT *pcbHeaderLen,
UINT *pcbTotalLen
);

void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb);
Expand Down
4 changes: 0 additions & 4 deletions drivers/staging/vt6656/ttype.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@

/******* Common definitions and typedefs ***********************************/

#ifndef OUT
#define OUT
#endif

//2007-0115-05<Add>by MikeLiu
#ifndef TxInSleep
#define TxInSleep
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/vt6656/usbpipe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ PIPEnsControlIn(
WORD wValue,
WORD wIndex,
WORD wLength,
OUT PBYTE pbyBuffer
PBYTE pbyBuffer
)
{
NTSTATUS ntStatus = 0;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/vt6656/usbpipe.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ PIPEnsControlIn(
WORD wValue,
WORD wIndex,
WORD wLength,
OUT PBYTE pbyBuffer
PBYTE pbyBuffer
);


Expand Down
Loading

0 comments on commit 6f8c13c

Please sign in to comment.