From fe4f34bde28f5a9f3793cced5b4029eda5b78be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charles=20Cl=C3=A9ment?= Date: Fri, 25 Jun 2010 10:48:53 -0700 Subject: Staging: vt6655: remove PUINT typedef MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Charles Clément Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/bssdb.c | 12 ++------ drivers/staging/vt6655/bssdb.h | 12 ++------ drivers/staging/vt6655/dpc.c | 48 +++++++++---------------------- drivers/staging/vt6655/rxtx.c | 62 ++++++++++------------------------------ drivers/staging/vt6655/rxtx.h | 44 ++++++++-------------------- drivers/staging/vt6655/ttype.h | 3 -- drivers/staging/vt6655/vntwifi.c | 6 +--- drivers/staging/vt6655/vntwifi.h | 10 ++----- 8 files changed, 50 insertions(+), 147 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c index 37a3f18..bcee662 100644 --- a/drivers/staging/vt6655/bssdb.c +++ b/drivers/staging/vt6655/bssdb.c @@ -762,11 +762,8 @@ BSSbUpdateToBSSList ( -*/ BOOL -BSSDBbIsSTAInNodeDB( - void *pMgmtObject, - unsigned char *abyDstAddr, - PUINT puNodeIndex - ) +BSSDBbIsSTAInNodeDB(void *pMgmtObject, unsigned char *abyDstAddr, + unsigned int *puNodeIndex) { PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; unsigned int ii; @@ -797,10 +794,7 @@ BSSDBbIsSTAInNodeDB( * -*/ void -BSSvCreateOneNode( - void *hDeviceContext, - PUINT puNodeIndex - ) +BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex) { PSDevice pDevice = (PSDevice)hDeviceContext; diff --git a/drivers/staging/vt6655/bssdb.h b/drivers/staging/vt6655/bssdb.h index 50a0171..b69af4d 100644 --- a/drivers/staging/vt6655/bssdb.h +++ b/drivers/staging/vt6655/bssdb.h @@ -309,17 +309,11 @@ BSSbUpdateToBSSList( BOOL -BSSDBbIsSTAInNodeDB( - void *hDeviceContext, - unsigned char *abyDstAddr, - PUINT puNodeIndex - ); +BSSDBbIsSTAInNodeDB(void *hDeviceContext, unsigned char *abyDstAddr, + unsigned int *puNodeIndex); void -BSSvCreateOneNode( - void *hDeviceContext, - PUINT puNodeIndex - ); +BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex); void BSSvUpdateAPNode( diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c index 8b5310a..882c2f6 100644 --- a/drivers/staging/vt6655/dpc.c +++ b/drivers/staging/vt6655/dpc.c @@ -79,24 +79,14 @@ const unsigned char acbyRxRate[MAX_RATE] = static unsigned char s_byGetRateIdx(unsigned char byRate); -static -void -s_vGetDASA( - unsigned char *pbyRxBufferAddr, - PUINT pcbHeaderSize, - PSEthernetHeader psEthHeader - ); +static void +s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize, + PSEthernetHeader psEthHeader); -static -void -s_vProcessRxMACHeader ( - PSDevice pDevice, - unsigned char *pbyRxBufferAddr, - unsigned int cbPacketSize, - BOOL bIsWEP, - BOOL bExtIV, - PUINT pcbHeadSize - ); +static void +s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr, + unsigned int cbPacketSize, BOOL bIsWEP, BOOL bExtIV, + unsigned int *pcbHeadSize); static BOOL s_bAPModeRxCtl( PSDevice pDevice, @@ -162,16 +152,10 @@ static BOOL s_bHostWepRxEncryption( * Return Value: None * -*/ -static -void -s_vProcessRxMACHeader ( - PSDevice pDevice, - unsigned char *pbyRxBufferAddr, - unsigned int cbPacketSize, - BOOL bIsWEP, - BOOL bExtIV, - PUINT pcbHeadSize - ) +static void +s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr, + unsigned int cbPacketSize, BOOL bIsWEP, BOOL bExtIV, + unsigned int *pcbHeadSize) { unsigned char *pbyRxBuffer; unsigned int cbHeaderSize = 0; @@ -261,13 +245,9 @@ static unsigned char s_byGetRateIdx (unsigned char byRate) } -static -void -s_vGetDASA ( - unsigned char *pbyRxBufferAddr, - PUINT pcbHeaderSize, - PSEthernetHeader psEthHeader - ) +static void +s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize, + PSEthernetHeader psEthHeader) { unsigned int cbHeaderSize = 0; PS802_11Header pMACHeader; diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 8b5e210..8703635 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -170,22 +170,11 @@ static void s_vFillFragParameter( ); -static -unsigned int -s_cbFillTxBufHead ( - PSDevice pDevice, - unsigned char byPktType, - unsigned char *pbyTxBufferAddr, - unsigned int cbFrameBodySize, - unsigned int uDMAIdx, - PSTxDesc pHeadTD, - PSEthernetHeader psEthHeader, - unsigned char *pPacket, - BOOL bNeedEncrypt, - PSKeyItem pTransmitKey, - unsigned int uNodeIndex, - PUINT puMACfragNum - ); +static unsigned int +s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, + unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD, + PSEthernetHeader psEthHeader, unsigned char *pPacket, BOOL bNeedEncrypt, + PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum); static @@ -1315,22 +1304,11 @@ s_vFillFragParameter( //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vFillFragParameter END\n"); } -static -unsigned int -s_cbFillTxBufHead ( - PSDevice pDevice, - unsigned char byPktType, - unsigned char *pbyTxBufferAddr, - unsigned int cbFrameBodySize, - unsigned int uDMAIdx, - PSTxDesc pHeadTD, - PSEthernetHeader psEthHeader, - unsigned char *pPacket, - BOOL bNeedEncrypt, - PSKeyItem pTransmitKey, - unsigned int uNodeIndex, - PUINT puMACfragNum - ) +static unsigned int +s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, + unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD, + PSEthernetHeader psEthHeader, unsigned char *pPacket, BOOL bNeedEncrypt, + PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum) { unsigned int cbMACHdLen; unsigned int cbFrameSize; @@ -2094,21 +2072,11 @@ s_cbFillTxBufHead ( void -vGenerateFIFOHeader ( - PSDevice pDevice, - unsigned char byPktType, - unsigned char *pbyTxBufferAddr, - BOOL bNeedEncrypt, - unsigned int cbPayloadSize, - unsigned int uDMAIdx, - PSTxDesc pHeadTD, - PSEthernetHeader psEthHeader, - unsigned char *pPacket, - PSKeyItem pTransmitKey, - unsigned int uNodeIndex, - PUINT puMACfragNum, - PUINT pcbHeaderSize - ) +vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, + BOOL bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx, + PSTxDesc pHeadTD, PSEthernetHeader psEthHeader, unsigned char *pPacket, + PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum, + unsigned int *pcbHeaderSize) { unsigned int wTxBufSize; // FFinfo size BOOL bNeedACK; diff --git a/drivers/staging/vt6655/rxtx.h b/drivers/staging/vt6655/rxtx.h index 146da09..d488333 100644 --- a/drivers/staging/vt6655/rxtx.h +++ b/drivers/staging/vt6655/rxtx.h @@ -40,23 +40,14 @@ /*--------------------- Export Functions --------------------------*/ /* -void vGenerateMACHeader( - PSDevice pDevice, - unsigned long dwTxBufferAddr, - unsigned char *pbySkbData, - unsigned int cbPacketSize, - BOOL bDMA0Used, - PUINT pcbHeadSize, - PUINT pcbAppendPayload - ); - -void vProcessRxMACHeader ( - PSDevice pDevice, - unsigned long dwRxBufferAddr, - unsigned int cbPacketSize, - BOOL bIsWEP, - PUINT pcbHeadSize - ); +void +vGenerateMACHeader(PSDevice pDevice, unsigned long dwTxBufferAddr, unsigned char *pbySkbData, + unsigned int cbPacketSize, BOOL bDMA0Used, unsigned int *pcbHeadSize, + unsigned int *pcbAppendPayload); + +void +vProcessRxMACHeader(PSDevice pDevice, unsigned long dwRxBufferAddr, unsigned int cbPacketSize, + BOOL bIsWEP, unsigned int *pcbHeadSize); */ @@ -83,21 +74,10 @@ cbGetFragCount( void -vGenerateFIFOHeader ( - PSDevice pDevice, - unsigned char byPktTyp, - unsigned char *pbyTxBufferAddr, - BOOL bNeedEncrypt, - unsigned int cbPayloadSize, - unsigned int uDMAIdx, - PSTxDesc pHeadTD, - PSEthernetHeader psEthHeader, - unsigned char *pPacket, - PSKeyItem pTransmitKey, - unsigned int uNodeIndex, - PUINT puMACfragNum, - PUINT pcbHeaderSize - ); +vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktTyp, unsigned char *pbyTxBufferAddr, + BOOL bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx, PSTxDesc pHeadTD, + PSEthernetHeader psEthHeader, unsigned char *pPacket, PSKeyItem pTransmitKey, + unsigned int uNodeIndex, unsigned int *puMACfragNum, unsigned int *pcbHeaderSize); void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, unsigned int cbMPDULen); diff --git a/drivers/staging/vt6655/ttype.h b/drivers/staging/vt6655/ttype.h index ed6d747..5032c22 100644 --- a/drivers/staging/vt6655/ttype.h +++ b/drivers/staging/vt6655/ttype.h @@ -82,9 +82,6 @@ typedef UQuadWord QWORD; // 64-bit /****** Common pointer types ***********************************************/ -// boolean pointer -typedef unsigned int * PUINT; - typedef QWORD * PQWORD; #endif // __TTYPE_H__ diff --git a/drivers/staging/vt6655/vntwifi.c b/drivers/staging/vt6655/vntwifi.c index e8678fc..4783d34 100644 --- a/drivers/staging/vt6655/vntwifi.c +++ b/drivers/staging/vt6655/vntwifi.c @@ -425,11 +425,7 @@ VNTWIFIbGetConfigPhyMode ( -*/ void -VNTWIFIvQueryBSSList ( - void *pMgmtHandle, - PUINT puBSSCount, - void **pvFirstBSS - ) +VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount, void **pvFirstBSS) { unsigned int ii = 0; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; diff --git a/drivers/staging/vt6655/vntwifi.h b/drivers/staging/vt6655/vntwifi.h index 25f90f3..d832f2d 100644 --- a/drivers/staging/vt6655/vntwifi.h +++ b/drivers/staging/vt6655/vntwifi.h @@ -208,14 +208,8 @@ VNTWIFIbGetConfigPhyMode( ); void -VNTWIFIvQueryBSSList( - void *pMgmtHandle, - PUINT puBSSCount, - void **pvFirstBSS - ); - - - +VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount, + void **pvFirstBSS); void VNTWIFIvGetNextBSS ( -- cgit v1.1