Staging: vt6655: remove PUINT typedef
authorCharles Clément <caratorn@gmail.com>
Fri, 25 Jun 2010 17:48:53 +0000 (10:48 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 25 Jun 2010 18:11:21 +0000 (11:11 -0700)
Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/vt6655/bssdb.c
drivers/staging/vt6655/bssdb.h
drivers/staging/vt6655/dpc.c
drivers/staging/vt6655/rxtx.c
drivers/staging/vt6655/rxtx.h
drivers/staging/vt6655/ttype.h
drivers/staging/vt6655/vntwifi.c
drivers/staging/vt6655/vntwifi.h

index 37a3f18bc51ef116a4fc57aa596b898253a5d37a..bcee662185a68d2edb9ed09b9be5ceecc80eae6e 100644 (file)
@@ -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;
index 50a0171d00bed0f43436d5f9632745a65857d772..b69af4dc307d8fdac86316dd0bf52579c75f5886 100644 (file)
@@ -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(
index 8b5310ad183da3662b075899959cc60a8cdd2442..882c2f6c3413c98ce04f186f54d59e17ef7d0638 100644 (file)
@@ -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;
index 8b5e2104d7bca1133b7a635a43ffd6c49b4c7a75..870363559f857465423e4153f39a0f2854f5fe1c 100644 (file)
@@ -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;
index 146da0993f47ee7c1b12b436e4fd8eee9d976ab8..d4883337eaac02a274251c09d55d37f1d6134d38 100644 (file)
 /*---------------------  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);
index ed6d74783e153b212da4d2842e3cdd837ffbe415..5032c22b6c6bda153c67291ae49df2a5763ffeda 100644 (file)
@@ -82,9 +82,6 @@ typedef UQuadWord       QWORD;          // 64-bit
 
 /****** Common pointer types ***********************************************/
 
-// boolean pointer
-typedef unsigned int *   PUINT;
-
 typedef QWORD *          PQWORD;
 
 #endif // __TTYPE_H__
index e8678fc10e82378f016fccb27dbffdcd6930ad7a..4783d34cef6d2c2e33d674b02547ca1035d3883d 100644 (file)
@@ -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;
index 25f90f39ce89a65524c7802f2ce37f842bde6564..d832f2d17814ef3049add7cda2f0e6dab9096fb7 100644 (file)
@@ -208,14 +208,8 @@ VNTWIFIbGetConfigPhyMode(
     );
 
 void
-VNTWIFIvQueryBSSList(
-    void *pMgmtHandle,
-    PUINT   puBSSCount,
-    void **pvFirstBSS
-    );
-
-
-
+VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount,
+               void **pvFirstBSS);
 
 void
 VNTWIFIvGetNextBSS (