[PATCH] Staging: vt6656: replaced 'VOID' definition by 'void'
Andres More
more.andres at gmail.com
Fri Apr 16 23:16:01 UTC 2010
Replaced custom 'void' definition, resolved scripts/checkpatch.pl errors.
Warnings about the usage of externs in .c files were not resolved here.
Signed-off-by: Andres More <more.andres at gmail.com>
---
drivers/staging/vt6656/80211mgr.c | 44 +++++++++---------
drivers/staging/vt6656/80211mgr.h | 44 +++++++++---------
drivers/staging/vt6656/baseband.c | 22 +++++-----
drivers/staging/vt6656/baseband.h | 25 +++++-----
drivers/staging/vt6656/bssdb.c | 30 ++++++------
drivers/staging/vt6656/bssdb.h | 18 ++++----
drivers/staging/vt6656/card.c | 2 +-
drivers/staging/vt6656/channel.c | 2 +-
drivers/staging/vt6656/channel.h | 2 +-
drivers/staging/vt6656/datarate.c | 10 ++--
drivers/staging/vt6656/datarate.h | 4 +-
drivers/staging/vt6656/dpc.c | 14 +++---
drivers/staging/vt6656/dpc.h | 6 +-
drivers/staging/vt6656/int.c | 2 +-
drivers/staging/vt6656/int.h | 2 +-
drivers/staging/vt6656/ioctl.h | 2 +-
drivers/staging/vt6656/key.c | 8 ++--
drivers/staging/vt6656/key.h | 6 +-
drivers/staging/vt6656/mac.c | 2 +-
drivers/staging/vt6656/mac.h | 4 +-
drivers/staging/vt6656/main_usb.c | 14 +++---
drivers/staging/vt6656/michael.c | 34 ++++++++------
drivers/staging/vt6656/michael.h | 8 ++--
drivers/staging/vt6656/power.c | 6 +-
drivers/staging/vt6656/power.h | 6 +-
drivers/staging/vt6656/rc4.c | 4 +-
drivers/staging/vt6656/rc4.h | 2 +-
drivers/staging/vt6656/rf.c | 4 +-
drivers/staging/vt6656/rf.h | 4 +-
drivers/staging/vt6656/rxtx.c | 30 ++++++------
drivers/staging/vt6656/rxtx.h | 2 +-
drivers/staging/vt6656/tkip.c | 2 +-
drivers/staging/vt6656/tkip.h | 2 +-
drivers/staging/vt6656/ttype.h | 4 --
drivers/staging/vt6656/usbpipe.c | 20 ++++----
drivers/staging/vt6656/wcmd.c | 12 +++---
drivers/staging/vt6656/wcmd.h | 8 ++--
drivers/staging/vt6656/wmgr.c | 88 ++++++++++++++++++------------------
drivers/staging/vt6656/wmgr.h | 18 ++++----
drivers/staging/vt6656/wpa.c | 4 +-
drivers/staging/vt6656/wpa.h | 4 +-
drivers/staging/vt6656/wpa2.c | 4 +-
drivers/staging/vt6656/wpa2.h | 4 +-
43 files changed, 267 insertions(+), 266 deletions(-)
diff --git a/drivers/staging/vt6656/80211mgr.c b/drivers/staging/vt6656/80211mgr.c
index 8fa1a8e..46a40a7 100644
--- a/drivers/staging/vt6656/80211mgr.c
+++ b/drivers/staging/vt6656/80211mgr.c
@@ -89,7 +89,7 @@ static int msglevel =MSG_LEVEL_INFO;
*
-*/
-VOID
+void
vMgrEncodeBeacon(
IN PWLAN_FR_BEACON pFrame
)
@@ -121,7 +121,7 @@ vMgrEncodeBeacon(
-*/
-VOID
+void
vMgrDecodeBeacon(
IN PWLAN_FR_BEACON pFrame
)
@@ -242,7 +242,7 @@ vMgrDecodeBeacon(
-*/
-VOID
+void
vMgrEncodeIBSSATIM(
IN PWLAN_FR_IBSSATIM pFrame
)
@@ -265,7 +265,7 @@ vMgrEncodeIBSSATIM(
*
-*/
-VOID
+void
vMgrDecodeIBSSATIM(
IN PWLAN_FR_IBSSATIM pFrame
)
@@ -287,7 +287,7 @@ vMgrDecodeIBSSATIM(
*
-*/
-VOID
+void
vMgrEncodeDisassociation(
IN PWLAN_FR_DISASSOC pFrame
)
@@ -315,7 +315,7 @@ vMgrEncodeDisassociation(
*
-*/
-VOID
+void
vMgrDecodeDisassociation(
IN PWLAN_FR_DISASSOC pFrame
)
@@ -341,7 +341,7 @@ vMgrDecodeDisassociation(
-*/
-VOID
+void
vMgrEncodeAssocRequest(
IN PWLAN_FR_ASSOCREQ pFrame
)
@@ -368,7 +368,7 @@ vMgrEncodeAssocRequest(
*
-*/
-VOID
+void
vMgrDecodeAssocRequest(
IN PWLAN_FR_ASSOCREQ pFrame
)
@@ -434,7 +434,7 @@ vMgrDecodeAssocRequest(
*
-*/
-VOID
+void
vMgrEncodeAssocResponse(
IN PWLAN_FR_ASSOCRESP pFrame
)
@@ -466,7 +466,7 @@ vMgrEncodeAssocResponse(
*
-*/
-VOID
+void
vMgrDecodeAssocResponse(
IN PWLAN_FR_ASSOCRESP pFrame
)
@@ -512,7 +512,7 @@ vMgrDecodeAssocResponse(
*
-*/
-VOID
+void
vMgrEncodeReassocRequest(
IN PWLAN_FR_REASSOCREQ pFrame
)
@@ -544,7 +544,7 @@ vMgrEncodeReassocRequest(
-*/
-VOID
+void
vMgrDecodeReassocRequest(
IN PWLAN_FR_REASSOCREQ pFrame
)
@@ -616,7 +616,7 @@ vMgrDecodeReassocRequest(
-*/
-VOID
+void
vMgrEncodeProbeRequest(
IN PWLAN_FR_PROBEREQ pFrame
)
@@ -637,7 +637,7 @@ vMgrEncodeProbeRequest(
*
-*/
-VOID
+void
vMgrDecodeProbeRequest(
IN PWLAN_FR_PROBEREQ pFrame
)
@@ -690,7 +690,7 @@ vMgrDecodeProbeRequest(
-*/
-VOID
+void
vMgrEncodeProbeResponse(
IN PWLAN_FR_PROBERESP pFrame
)
@@ -724,7 +724,7 @@ vMgrEncodeProbeResponse(
*
-*/
-VOID
+void
vMgrDecodeProbeResponse(
IN PWLAN_FR_PROBERESP pFrame
)
@@ -838,7 +838,7 @@ vMgrDecodeProbeResponse(
*
-*/
-VOID
+void
vMgrEncodeAuthen(
IN PWLAN_FR_AUTHEN pFrame
)
@@ -869,7 +869,7 @@ vMgrEncodeAuthen(
*
-*/
-VOID
+void
vMgrDecodeAuthen(
IN PWLAN_FR_AUTHEN pFrame
)
@@ -909,7 +909,7 @@ vMgrDecodeAuthen(
*
-*/
-VOID
+void
vMgrEncodeDeauthen(
IN PWLAN_FR_DEAUTHEN pFrame
)
@@ -936,7 +936,7 @@ vMgrEncodeDeauthen(
*
-*/
-VOID
+void
vMgrDecodeDeauthen(
IN PWLAN_FR_DEAUTHEN pFrame
)
@@ -962,7 +962,7 @@ vMgrDecodeDeauthen(
*
-*/
-VOID
+void
vMgrEncodeReassocResponse(
IN PWLAN_FR_REASSOCRESP pFrame
)
@@ -995,7 +995,7 @@ vMgrEncodeReassocResponse(
-*/
-VOID
+void
vMgrDecodeReassocResponse(
IN PWLAN_FR_REASSOCRESP pFrame
)
diff --git a/drivers/staging/vt6656/80211mgr.h b/drivers/staging/vt6656/80211mgr.h
index a4ea824..d60be94 100644
--- a/drivers/staging/vt6656/80211mgr.h
+++ b/drivers/staging/vt6656/80211mgr.h
@@ -748,112 +748,112 @@ typedef struct tagWLAN_FR_DEAUTHEN {
} WLAN_FR_DEAUTHEN, *PWLAN_FR_DEAUTHEN;
/*--------------------- Export Functions --------------------------*/
-VOID
+void
vMgrEncodeBeacon(
IN PWLAN_FR_BEACON pFrame
);
-VOID
+void
vMgrDecodeBeacon(
IN PWLAN_FR_BEACON pFrame
);
-VOID
+void
vMgrEncodeIBSSATIM(
IN PWLAN_FR_IBSSATIM pFrame
);
-VOID
+void
vMgrDecodeIBSSATIM(
IN PWLAN_FR_IBSSATIM pFrame
);
-VOID
+void
vMgrEncodeDisassociation(
IN PWLAN_FR_DISASSOC pFrame
);
-VOID
+void
vMgrDecodeDisassociation(
IN PWLAN_FR_DISASSOC pFrame
);
-VOID
+void
vMgrEncodeAssocRequest(
IN PWLAN_FR_ASSOCREQ pFrame
);
-VOID
+void
vMgrDecodeAssocRequest(
IN PWLAN_FR_ASSOCREQ pFrame
);
-VOID
+void
vMgrEncodeAssocResponse(
IN PWLAN_FR_ASSOCRESP pFrame
);
-VOID
+void
vMgrDecodeAssocResponse(
IN PWLAN_FR_ASSOCRESP pFrame
);
-VOID
+void
vMgrEncodeReassocRequest(
IN PWLAN_FR_REASSOCREQ pFrame
);
-VOID
+void
vMgrDecodeReassocRequest(
IN PWLAN_FR_REASSOCREQ pFrame
);
-VOID
+void
vMgrEncodeProbeRequest(
IN PWLAN_FR_PROBEREQ pFrame
);
-VOID
+void
vMgrDecodeProbeRequest(
IN PWLAN_FR_PROBEREQ pFrame
);
-VOID
+void
vMgrEncodeProbeResponse(
IN PWLAN_FR_PROBERESP pFrame
);
-VOID
+void
vMgrDecodeProbeResponse(
IN PWLAN_FR_PROBERESP pFrame
);
-VOID
+void
vMgrEncodeAuthen(
IN PWLAN_FR_AUTHEN pFrame
);
-VOID
+void
vMgrDecodeAuthen(
IN PWLAN_FR_AUTHEN pFrame
);
-VOID
+void
vMgrEncodeDeauthen(
IN PWLAN_FR_DEAUTHEN pFrame
);
-VOID
+void
vMgrDecodeDeauthen(
IN PWLAN_FR_DEAUTHEN pFrame
);
-VOID
+void
vMgrEncodeReassocResponse(
IN PWLAN_FR_REASSOCRESP pFrame
);
-VOID
+void
vMgrDecodeReassocResponse(
IN PWLAN_FR_REASSOCRESP pFrame
);
diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index 7dc01db..b00dabf 100644
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -756,7 +756,7 @@ BBuGetFrameTime (
* Return Value: none
*
*/
-VOID
+void
BBvCaculateParameter (
IN PSDevice pDevice,
IN UINT cbFrameLength,
@@ -929,7 +929,7 @@ BBvCaculateParameter (
* Return Value: none
*
*/
-VOID
+void
BBvSetAntennaMode (PSDevice pDevice, BYTE byAntennaMode)
{
//{{ RobertYu: 20041124, ABG Mode, VC1/VC2 define, make the ANT_A, ANT_B inverted
@@ -1274,7 +1274,7 @@ void BBvLoopbackOff (PSDevice pDevice)
* Return Value: none
*
*/
-VOID
+void
BBvSetShortSlotTime (PSDevice pDevice)
{
BYTE byBBVGA=0;
@@ -1295,7 +1295,7 @@ BBvSetShortSlotTime (PSDevice pDevice)
}
-VOID BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData)
+void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData)
{
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0xE7, byData);
@@ -1324,7 +1324,7 @@ VOID BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData)
* Return Value: none
*
*/
-VOID
+void
BBvSoftwareReset (PSDevice pDevice)
{
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x50, 0x40);
@@ -1345,14 +1345,14 @@ BBvSoftwareReset (PSDevice pDevice)
* Return Value: none
*
*/
-VOID
+void
BBvSetDeepSleep (PSDevice pDevice)
{
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0c, 0x17);//CR12
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0D, 0xB9);//CR13
}
-VOID
+void
BBvExitDeepSleep (PSDevice pDevice)
{
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0C, 0x00);//CR12
@@ -1445,7 +1445,7 @@ s_vClearSQ3Value (PSDevice pDevice)
*
*/
-VOID
+void
BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3)
{
@@ -1576,7 +1576,7 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3)
*
-*/
-VOID
+void
TimerSQ3CallBack (
IN HANDLE hDeviceContext
)
@@ -1618,7 +1618,7 @@ TimerSQ3CallBack (
*
-*/
-VOID
+void
TimerSQ3Tmax3CallBack (
IN HANDLE hDeviceContext
)
@@ -1650,7 +1650,7 @@ TimerSQ3Tmax3CallBack (
return;
}
-VOID
+void
BBvUpdatePreEDThreshold(
IN PSDevice pDevice,
IN BOOL bScanning)
diff --git a/drivers/staging/vt6656/baseband.h b/drivers/staging/vt6656/baseband.h
index e991a7e..7fca6af 100644
--- a/drivers/staging/vt6656/baseband.h
+++ b/drivers/staging/vt6656/baseband.h
@@ -104,7 +104,7 @@ BBuGetFrameTime(
IN WORD wRate
);
-VOID
+void
BBvCaculateParameter (
IN PSDevice pDevice,
IN UINT cbFrameLength,
@@ -117,28 +117,27 @@ BBvCaculateParameter (
// timer for antenna diversity
-VOID
+void
TimerSQ3CallBack (
IN HANDLE hDeviceContext
);
-VOID
+void
TimerSQ3Tmax3CallBack (
IN HANDLE hDeviceContext
);
-VOID BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3);
-void BBvLoopbackOn (PSDevice pDevice);
-void BBvLoopbackOff (PSDevice pDevice);
-void BBvSoftwareReset (PSDevice pDevice);
-
+void BBvAntennaDiversity(PSDevice pDevice, BYTE byRxRate, BYTE bySQ3);
+void BBvLoopbackOn(PSDevice pDevice);
+void BBvLoopbackOff(PSDevice pDevice);
+void BBvSoftwareReset(PSDevice pDevice);
void BBvSetShortSlotTime(PSDevice pDevice);
-VOID BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData);
+void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData);
void BBvSetAntennaMode(PSDevice pDevice, BYTE byAntennaMode);
-BOOL BBbVT3184Init (PSDevice pDevice);
-VOID BBvSetDeepSleep (PSDevice pDevice);
-VOID BBvExitDeepSleep (PSDevice pDevice);
-VOID BBvUpdatePreEDThreshold(
+BOOL BBbVT3184Init(PSDevice pDevice);
+void BBvSetDeepSleep(PSDevice pDevice);
+void BBvExitDeepSleep(PSDevice pDevice);
+void BBvUpdatePreEDThreshold(
IN PSDevice pDevice,
IN BOOL bScanning
);
diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c
index 6b1678b..b48b01f 100644
--- a/drivers/staging/vt6656/bssdb.c
+++ b/drivers/staging/vt6656/bssdb.c
@@ -91,16 +91,16 @@ const WORD awHWRetry1[5][5] = {
/*--------------------- Static Functions --------------------------*/
-VOID s_vCheckSensitivity(
+void s_vCheckSensitivity(
IN HANDLE hDeviceContext
);
-VOID s_vCheckPreEDThreshold(
+void s_vCheckPreEDThreshold(
IN HANDLE hDeviceContext
);
#ifdef Calcu_LinkQual
-VOID s_uCalculateLinkQual(
+void s_uCalculateLinkQual(
IN HANDLE hDeviceContext
);
#endif
@@ -296,7 +296,7 @@ pDevice->bSameBSSMaxNum = jj;
-*/
-VOID
+void
BSSvClearBSSList(
IN HANDLE hDeviceContext,
IN BOOL bKeepCurrBSSID
@@ -804,7 +804,7 @@ BSSbIsSTAInNodeDB(
* None
*
-*/
-VOID
+void
BSSvCreateOneNode(
IN HANDLE hDeviceContext,
OUT PUINT puNodeIndex
@@ -869,7 +869,7 @@ BSSvCreateOneNode(
* None
*
-*/
-VOID
+void
BSSvRemoveOneNode(
IN HANDLE hDeviceContext,
IN UINT uNodeIndex
@@ -902,7 +902,7 @@ BSSvRemoveOneNode(
*
-*/
-VOID
+void
BSSvUpdateAPNode(
IN HANDLE hDeviceContext,
IN PWORD pwCapInfo,
@@ -962,7 +962,7 @@ BSSvUpdateAPNode(
-*/
-VOID
+void
BSSvAddMulticastNode(
IN HANDLE hDeviceContext
)
@@ -1009,7 +1009,7 @@ BSSvAddMulticastNode(
-*/
-VOID
+void
BSSvSecondCallBack(
IN HANDLE hDeviceContext
)
@@ -1395,7 +1395,7 @@ else {
-VOID
+void
BSSvUpdateNodeTxCounter(
IN HANDLE hDeviceContext,
IN PSStatCounter pStatistic,
@@ -1564,7 +1564,7 @@ BSSvUpdateNodeTxCounter(
-*/
-VOID
+void
BSSvClearNodeDBTable(
IN HANDLE hDeviceContext,
IN UINT uStartIndex
@@ -1593,7 +1593,7 @@ BSSvClearNodeDBTable(
};
-VOID s_vCheckSensitivity(
+void s_vCheckSensitivity(
IN HANDLE hDeviceContext
)
{
@@ -1637,7 +1637,7 @@ VOID s_vCheckSensitivity(
}
#ifdef Calcu_LinkQual
-VOID s_uCalculateLinkQual(
+void s_uCalculateLinkQual(
IN HANDLE hDeviceContext
)
{
@@ -1685,7 +1685,7 @@ else
}
#endif
-VOID
+void
BSSvClearAnyBSSJoinRecord (
IN HANDLE hDeviceContext
)
@@ -1700,7 +1700,7 @@ BSSvClearAnyBSSJoinRecord (
return;
}
-VOID s_vCheckPreEDThreshold(
+void s_vCheckPreEDThreshold(
IN HANDLE hDeviceContext
)
{
diff --git a/drivers/staging/vt6656/bssdb.h b/drivers/staging/vt6656/bssdb.h
index f365b6b..0636f28 100644
--- a/drivers/staging/vt6656/bssdb.h
+++ b/drivers/staging/vt6656/bssdb.h
@@ -246,7 +246,7 @@ BSSpAddrIsInBSSList(
IN PWLAN_IE_SSID pSSID
);
-VOID
+void
BSSvClearBSSList(
IN HANDLE hDeviceContext,
IN BOOL bKeepCurrBSSID
@@ -304,13 +304,13 @@ BSSbIsSTAInNodeDB(
OUT PUINT puNodeIndex
);
-VOID
+void
BSSvCreateOneNode(
IN HANDLE hDeviceContext,
OUT PUINT puNodeIndex
);
-VOID
+void
BSSvUpdateAPNode(
IN HANDLE hDeviceContext,
IN PWORD pwCapInfo,
@@ -319,13 +319,13 @@ BSSvUpdateAPNode(
);
-VOID
+void
BSSvSecondCallBack(
IN HANDLE hDeviceContext
);
-VOID
+void
BSSvUpdateNodeTxCounter(
IN HANDLE hDeviceContext,
IN PSStatCounter pStatistic,
@@ -333,25 +333,25 @@ BSSvUpdateNodeTxCounter(
IN BYTE byPktNO
);
-VOID
+void
BSSvRemoveOneNode(
IN HANDLE hDeviceContext,
IN UINT uNodeIndex
);
-VOID
+void
BSSvAddMulticastNode(
IN HANDLE hDeviceContext
);
-VOID
+void
BSSvClearNodeDBTable(
IN HANDLE hDeviceContext,
IN UINT uStartIndex
);
-VOID
+void
BSSvClearAnyBSSJoinRecord(
IN HANDLE hDeviceContext
);
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index d73efee..6f1ab93 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -222,7 +222,7 @@ WORD swGetOFDMControlRate (PVOID pDeviceHandler, WORD wRateIdx)
* Return Value: none
*
*/
-VOID
+void
CARDvCaculateOFDMRParameter (
IN WORD wRate,
IN BYTE byBBType,
diff --git a/drivers/staging/vt6656/channel.c b/drivers/staging/vt6656/channel.c
index f7136b0..a8b6d39 100644
--- a/drivers/staging/vt6656/channel.c
+++ b/drivers/staging/vt6656/channel.c
@@ -437,7 +437,7 @@ CHvChannelGetList (
}
-VOID CHvInitChannelTable (PVOID pDeviceHandler)
+void CHvInitChannelTable(PVOID pDeviceHandler)
{
PSDevice pDevice = (PSDevice) pDeviceHandler;
BOOL bMultiBand = FALSE;
diff --git a/drivers/staging/vt6656/channel.h b/drivers/staging/vt6656/channel.h
index 2306b20..6981ab0 100644
--- a/drivers/staging/vt6656/channel.h
+++ b/drivers/staging/vt6656/channel.h
@@ -45,7 +45,7 @@ typedef struct tagSChannelTblElement {
/*--------------------- Export Functions --------------------------*/
BOOL ChannelValid(UINT CountryCode, UINT ChannelNum);
-VOID CHvInitChannelTable (PVOID pDeviceHandler);
+void CHvInitChannelTable(PVOID pDeviceHandler);
BYTE CHbyGetChannelMapping(BYTE byChannelNumber);
BOOL
diff --git a/drivers/staging/vt6656/datarate.c b/drivers/staging/vt6656/datarate.c
index 968feb4..82d7c67 100644
--- a/drivers/staging/vt6656/datarate.c
+++ b/drivers/staging/vt6656/datarate.c
@@ -65,14 +65,14 @@ const BYTE acbyIERate[MAX_RATE] =
/*--------------------- Static Functions --------------------------*/
-VOID s_vResetCounter (
+void s_vResetCounter(
IN PKnownNodeDB psNodeDBTable
);
-VOID
-s_vResetCounter (
+void
+s_vResetCounter(
IN PKnownNodeDB psNodeDBTable
)
{
@@ -195,7 +195,7 @@ RATEwGetRateIdx(
* Return Value: none
*
-*/
-VOID
+void
RATEvParseMaxRate (
IN PVOID pDeviceHandler,
IN PWLAN_IE_SUPP_RATES pItemRates,
@@ -308,7 +308,7 @@ UINT uRateLen;
#define AUTORATE_TXCNT_THRESHOLD 20
#define AUTORATE_INC_THRESHOLD 30
-VOID
+void
RATEvTxRateFallBack (
IN PVOID pDeviceHandler,
IN PKnownNodeDB psNodeDBTable
diff --git a/drivers/staging/vt6656/datarate.h b/drivers/staging/vt6656/datarate.h
index 68f206e..c7bbb0e 100644
--- a/drivers/staging/vt6656/datarate.h
+++ b/drivers/staging/vt6656/datarate.h
@@ -69,7 +69,7 @@
-VOID
+void
RATEvParseMaxRate(
IN PVOID pDeviceHandler,
IN PWLAN_IE_SUPP_RATES pItemRates,
@@ -82,7 +82,7 @@ RATEvParseMaxRate(
OUT PBYTE pbyTopOFDMRate
);
-VOID
+void
RATEvTxRateFallBack(
IN PVOID pDeviceHandler,
IN PKnownNodeDB psNodeDBTable
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
index 835c6d6..6caa3c3 100644
--- a/drivers/staging/vt6656/dpc.c
+++ b/drivers/staging/vt6656/dpc.c
@@ -78,7 +78,7 @@ static BYTE s_byGetRateIdx(IN BYTE byRate);
static
-VOID
+void
s_vGetDASA(
IN PBYTE pbyRxBufferAddr,
OUT PUINT pcbHeaderSize,
@@ -86,7 +86,7 @@ s_vGetDASA(
);
static
-VOID
+void
s_vProcessRxMACHeader (
IN PSDevice pDevice,
IN PBYTE pbyRxBufferAddr,
@@ -161,7 +161,7 @@ static BOOL s_bHostWepRxEncryption(
*
-*/
static
-VOID
+void
s_vProcessRxMACHeader (
IN PSDevice pDevice,
IN PBYTE pbyRxBufferAddr,
@@ -260,7 +260,7 @@ static BYTE s_byGetRateIdx (IN BYTE byRate)
static
-VOID
+void
s_vGetDASA (
IN PBYTE pbyRxBufferAddr,
OUT PUINT pcbHeaderSize,
@@ -1509,7 +1509,7 @@ static BOOL s_bAPModeRxData (
-VOID
+void
RXvWorkItem(
PVOID Context
)
@@ -1535,7 +1535,7 @@ RXvWorkItem(
}
-VOID
+void
RXvFreeRCB(
IN PRCB pRCB,
IN BOOL bReAllocSkb
@@ -1575,7 +1575,7 @@ RXvFreeRCB(
}
-VOID
+void
RXvMngWorkItem(
PVOID Context
)
diff --git a/drivers/staging/vt6656/dpc.h b/drivers/staging/vt6656/dpc.h
index df148b4..12a1229 100644
--- a/drivers/staging/vt6656/dpc.h
+++ b/drivers/staging/vt6656/dpc.h
@@ -41,17 +41,17 @@
/*--------------------- Export Functions --------------------------*/
-VOID
+void
RXvWorkItem(
PVOID Context
);
-VOID
+void
RXvMngWorkItem(
PVOID Context
);
-VOID
+void
RXvFreeRCB(
IN PRCB pRCB,
IN BOOL bReAllocSkb
diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index 35053be..06dc9c8 100644
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -78,7 +78,7 @@ static int msglevel =MSG_LEVEL_INFO;
* in a 'stall' condition, so we deliberately time out every second if we've gotten no data
*
-*/
-VOID
+void
INTvWorkItem(
PVOID Context
)
diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h
index 15e815a..e2a341d 100644
--- a/drivers/staging/vt6656/int.h
+++ b/drivers/staging/vt6656/int.h
@@ -67,7 +67,7 @@ SINTData, *PSINTData;
/*--------------------- Export Functions --------------------------*/
-VOID
+void
INTvWorkItem(
PVOID Context
);
diff --git a/drivers/staging/vt6656/ioctl.h b/drivers/staging/vt6656/ioctl.h
index 07d2283..dc278ae 100644
--- a/drivers/staging/vt6656/ioctl.h
+++ b/drivers/staging/vt6656/ioctl.h
@@ -43,7 +43,7 @@
int private_ioctl(PSDevice pDevice, struct ifreq *rq);
/*
-VOID vConfigWEPKey (
+void vConfigWEPKey (
IN PSDevice pDevice,
IN DWORD dwKeyIndex,
IN PBYTE pbyKey,
diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c
index 13fc69a..4ae8d5b 100644
--- a/drivers/staging/vt6656/key.c
+++ b/drivers/staging/vt6656/key.c
@@ -60,7 +60,7 @@ static int msglevel =MSG_LEVEL_INFO;
/*--------------------- Static Variables --------------------------*/
/*--------------------- Static Functions --------------------------*/
-static VOID
+static void
s_vCheckKeyTableValid (PVOID pDeviceHandler, PSKeyManagement pTable)
{
PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -112,7 +112,7 @@ s_vCheckKeyTableValid (PVOID pDeviceHandler, PSKeyManagement pTable)
* Return Value: none
*
*/
-VOID KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable)
+void KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable)
{
PSDevice pDevice = (PSDevice) pDeviceHandler;
int i;
@@ -510,7 +510,7 @@ BOOL KeybRemoveAllKey (
* Return Value: TRUE if success otherwise FALSE
*
*/
-VOID KeyvRemoveWEPKey (
+void KeyvRemoveWEPKey(
PVOID pDeviceHandler,
PSKeyManagement pTable,
DWORD dwKeyIndex
@@ -533,7 +533,7 @@ VOID KeyvRemoveWEPKey (
return;
}
-VOID KeyvRemoveAllWEPKey (
+void KeyvRemoveAllWEPKey(
PVOID pDeviceHandler,
PSKeyManagement pTable
)
diff --git a/drivers/staging/vt6656/key.h b/drivers/staging/vt6656/key.h
index b15a64c..bf9f554 100644
--- a/drivers/staging/vt6656/key.h
+++ b/drivers/staging/vt6656/key.h
@@ -97,7 +97,7 @@ typedef struct tagSKeyManagement
/*--------------------- Export Functions --------------------------*/
-VOID KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable);
+void KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable);
BOOL KeybGetKey(
IN PSKeyManagement pTable,
@@ -130,13 +130,13 @@ BOOL KeybRemoveAllKey (
PBYTE pbyBSSID
);
-VOID KeyvRemoveWEPKey(
+void KeyvRemoveWEPKey(
PVOID pDeviceHandler,
PSKeyManagement pTable,
DWORD dwKeyIndex
);
-VOID KeyvRemoveAllWEPKey(
+void KeyvRemoveAllWEPKey(
PVOID pDeviceHandler,
PSKeyManagement pTable
);
diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
index 55a7986..71f0966 100644
--- a/drivers/staging/vt6656/mac.c
+++ b/drivers/staging/vt6656/mac.c
@@ -110,7 +110,7 @@ void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx)
* Return Value: none
*
*/
-VOID MACvWriteMultiAddr (PSDevice pDevice, UINT uByteIdx, BYTE byData)
+void MACvWriteMultiAddr(PSDevice pDevice, UINT uByteIdx, BYTE byData)
{
BYTE byData1;
diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h
index fe99e3d..2584d25 100644
--- a/drivers/staging/vt6656/mac.h
+++ b/drivers/staging/vt6656/mac.h
@@ -420,8 +420,8 @@
/*--------------------- Export Functions --------------------------*/
-void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx);
-VOID MACvWriteMultiAddr (PSDevice pDevice, UINT uByteIdx, BYTE byData);
+void MACvSetMultiAddrByHash(PSDevice pDevice, BYTE byHashIdx);
+void MACvWriteMultiAddr(PSDevice pDevice, UINT uByteIdx, BYTE byData);
BOOL MACbShutdown(PSDevice pDevice);;
void MACvSetBBType(PSDevice pDevice,BYTE byType);
void MACvSetMISCFifo (PSDevice pDevice, WORD wOffset, DWORD dwData);
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index a8e1adb..7d5d369 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -333,9 +333,8 @@ device_set_options(PSDevice pDevice) {
pDevice->bDiversityRegCtlON = FALSE;
}
-
-static VOID device_init_diversity_timer(PSDevice pDevice) {
-
+static void device_init_diversity_timer(PSDevice pDevice)
+{
init_timer(&pDevice->TimerSQ3Tmax1);
pDevice->TimerSQ3Tmax1.data = (ULONG)pDevice;
pDevice->TimerSQ3Tmax1.function = (TimerFunction)TimerSQ3CallBack;
@@ -841,7 +840,8 @@ err_nomem:
}
-static VOID device_free_tx_bufs(PSDevice pDevice) {
+static void device_free_tx_bufs(PSDevice pDevice)
+{
PUSB_SEND_CONTEXT pTxContext;
int ii;
@@ -860,7 +860,8 @@ static VOID device_free_tx_bufs(PSDevice pDevice) {
}
-static VOID device_free_rx_bufs(PSDevice pDevice) {
+static void device_free_rx_bufs(PSDevice pDevice)
+{
PRCB pRCB;
int ii;
@@ -892,7 +893,8 @@ static void usb_device_reset(PSDevice pDevice)
return ;
}
-static VOID device_free_int_bufs(PSDevice pDevice) {
+static void device_free_int_bufs(PSDevice pDevice)
+{
if (pDevice->intBuf.pDataBuf != NULL)
kfree(pDevice->intBuf.pDataBuf);
diff --git a/drivers/staging/vt6656/michael.c b/drivers/staging/vt6656/michael.c
index c930e0c..3aef8e9 100644
--- a/drivers/staging/vt6656/michael.c
+++ b/drivers/staging/vt6656/michael.c
@@ -49,12 +49,17 @@
/*--------------------- Static Functions --------------------------*/
/*
static DWORD s_dwGetUINT32(BYTE * p); // Get DWORD from 4 bytes LSByte first
-static VOID s_vPutUINT32(BYTE* p, DWORD val); // Put DWORD into 4 bytes LSByte first
+static void s_vPutUINT32(BYTE* p, DWORD val);
+// Put DWORD into 4 bytes LSByte first
*/
-static VOID s_vClear(void); // Clear the internal message,
- // resets the object to the state just after construction.
-static VOID s_vSetKey(DWORD dwK0, DWORD dwK1);
-static VOID s_vAppendByte(BYTE b); // Add a single byte to the internal message
+static void s_vClear(void);
+/*
+ Clear the internal message,
+ resets the object to the state just after construction.
+*/
+static void s_vSetKey(DWORD dwK0, DWORD dwK1);
+static void s_vAppendByte(BYTE b);
+/* Add a single byte to the internal message */
/*--------------------- Export Variables --------------------------*/
static DWORD L, R; // Current state
@@ -66,7 +71,7 @@ static UINT nBytesInM; // # bytes in M
/*--------------------- Export Functions --------------------------*/
/*
-static DWORD s_dwGetUINT32 (BYTE * p)
+static DWORD s_dwGetUINT32(BYTE * p)
// Convert from BYTE[] to DWORD in a portable way
{
DWORD res = 0;
@@ -78,7 +83,7 @@ static DWORD s_dwGetUINT32 (BYTE * p)
return res;
}
-static VOID s_vPutUINT32 (BYTE* p, DWORD val)
+static void s_vPutUINT32(BYTE *p, DWORD val)
// Convert from DWORD to BYTE[] in a portable way
{
UINT i;
@@ -90,7 +95,7 @@ static VOID s_vPutUINT32 (BYTE* p, DWORD val)
}
*/
-static VOID s_vClear (void)
+static void s_vClear(void)
{
// Reset the state to the empty message.
L = K0;
@@ -99,7 +104,7 @@ static VOID s_vClear (void)
M = 0;
}
-static VOID s_vSetKey (DWORD dwK0, DWORD dwK1)
+static void s_vSetKey(DWORD dwK0, DWORD dwK1)
{
// Set the key
K0 = dwK0;
@@ -108,7 +113,7 @@ static VOID s_vSetKey (DWORD dwK0, DWORD dwK1)
s_vClear();
}
-static VOID s_vAppendByte (BYTE b)
+static void s_vAppendByte(BYTE b)
{
// Append the byte to our word-sized buffer
M |= b << (8*nBytesInM);
@@ -131,14 +136,14 @@ static VOID s_vAppendByte (BYTE b)
}
}
-VOID MIC_vInit (DWORD dwK0, DWORD dwK1)
+void MIC_vInit(DWORD dwK0, DWORD dwK1)
{
// Set the key
s_vSetKey(dwK0, dwK1);
}
-VOID MIC_vUnInit (void)
+void MIC_vUnInit(void)
{
// Wipe the key material
K0 = 0;
@@ -149,7 +154,7 @@ VOID MIC_vUnInit (void)
s_vClear();
}
-VOID MIC_vAppend (PBYTE src, UINT nBytes)
+void MIC_vAppend(PBYTE src, UINT nBytes)
{
// This is simple
while (nBytes > 0)
@@ -159,7 +164,7 @@ VOID MIC_vAppend (PBYTE src, UINT nBytes)
}
}
-VOID MIC_vGetMIC (PDWORD pdwL, PDWORD pdwR)
+void MIC_vGetMIC(PDWORD pdwL, PDWORD pdwR)
{
// Append the minimum padding
s_vAppendByte(0x5a);
@@ -178,4 +183,3 @@ VOID MIC_vGetMIC (PDWORD pdwL, PDWORD pdwR)
// Reset to the empty message.
s_vClear();
}
-
diff --git a/drivers/staging/vt6656/michael.h b/drivers/staging/vt6656/michael.h
index 3f79b52..97de77b 100644
--- a/drivers/staging/vt6656/michael.h
+++ b/drivers/staging/vt6656/michael.h
@@ -35,16 +35,16 @@
/*--------------------- Export Types ------------------------------*/
-VOID MIC_vInit(DWORD dwK0, DWORD dwK1);
+void MIC_vInit(DWORD dwK0, DWORD dwK1);
-VOID MIC_vUnInit(void);
+void MIC_vUnInit(void);
// Append bytes to the message to be MICed
-VOID MIC_vAppend(PBYTE src, UINT nBytes);
+void MIC_vAppend(PBYTE src, UINT nBytes);
// Get the MIC result. Destination should accept 8 bytes of result.
// This also resets the message to empty.
-VOID MIC_vGetMIC(PDWORD pdwL, PDWORD pdwR);
+void MIC_vGetMIC(PDWORD pdwL, PDWORD pdwR);
/*--------------------- Export Macros ------------------------------*/
diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c
index b5702b0..973425d 100644
--- a/drivers/staging/vt6656/power.c
+++ b/drivers/staging/vt6656/power.c
@@ -76,7 +76,7 @@ static int msglevel =MSG_LEVEL_INFO;
-*/
-VOID
+void
PSvEnablePowerSaving(
IN HANDLE hDeviceContext,
IN WORD wListenInterval
@@ -154,7 +154,7 @@ PSvEnablePowerSaving(
*
-*/
-VOID
+void
PSvDisablePowerSaving(
IN HANDLE hDeviceContext
)
@@ -262,7 +262,7 @@ PSbConsiderPowerDown(
-VOID
+void
PSvSendPSPOLL(
IN HANDLE hDeviceContext
)
diff --git a/drivers/staging/vt6656/power.h b/drivers/staging/vt6656/power.h
index c33c93a..fb09057 100644
--- a/drivers/staging/vt6656/power.h
+++ b/drivers/staging/vt6656/power.h
@@ -55,18 +55,18 @@ PSbConsiderPowerDown(
IN BOOL bCheckCountToWakeUp
);
-VOID
+void
PSvDisablePowerSaving(
IN HANDLE hDeviceContext
);
-VOID
+void
PSvEnablePowerSaving(
IN HANDLE hDeviceContext,
IN WORD wListenInterval
);
-VOID
+void
PSvSendPSPOLL(
IN HANDLE hDeviceContext
);
diff --git a/drivers/staging/vt6656/rc4.c b/drivers/staging/vt6656/rc4.c
index e6c6131..4a53f15 100644
--- a/drivers/staging/vt6656/rc4.c
+++ b/drivers/staging/vt6656/rc4.c
@@ -32,7 +32,7 @@
#include "rc4.h"
-VOID rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len)
+void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len)
{
UINT ust1, ust2;
UINT keyindex;
@@ -78,7 +78,7 @@ UINT rc4_byte(PRC4Ext pRC4)
return pbyst[(ustx + usty) & 0xff];
}
-VOID rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest,
+void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest,
PBYTE pbySrc, UINT cbData_len)
{
UINT ii;
diff --git a/drivers/staging/vt6656/rc4.h b/drivers/staging/vt6656/rc4.h
index bf607c9..e65cae6 100644
--- a/drivers/staging/vt6656/rc4.h
+++ b/drivers/staging/vt6656/rc4.h
@@ -40,7 +40,7 @@ typedef struct {
BYTE abystate[256];
} RC4Ext, *PRC4Ext;
-VOID rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len);
+void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len);
UINT rc4_byte(PRC4Ext pRC4);
void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, PBYTE pbySrc, UINT cbData_len);
diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c
index 405c4f7..1098101 100644
--- a/drivers/staging/vt6656/rf.c
+++ b/drivers/staging/vt6656/rf.c
@@ -954,7 +954,7 @@ BOOL bResult = TRUE;
* Return Value: none
*
-*/
-VOID
+void
RFvRSSITodBm (
IN PSDevice pDevice,
IN BYTE byCurrRSSI,
@@ -984,7 +984,7 @@ RFvRSSITodBm (
-VOID
+void
RFbRFTableDownload (
IN PSDevice pDevice
)
diff --git a/drivers/staging/vt6656/rf.h b/drivers/staging/vt6656/rf.h
index 55d882f..2fb30b7 100644
--- a/drivers/staging/vt6656/rf.h
+++ b/drivers/staging/vt6656/rf.h
@@ -76,14 +76,14 @@ BOOL RFbRawSetPower(
IN UINT uRATE
);
-VOID
+void
RFvRSSITodBm (
IN PSDevice pDevice,
IN BYTE byCurrRSSI,
long * pldBm
);
-VOID
+void
RFbRFTableDownload (
IN PSDevice pDevice
);
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index d9fa36c..2431d5c 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -113,7 +113,7 @@ const WORD wFB_Opt1[2][5] = {
/*--------------------- Static Functions --------------------------*/
static
-VOID
+void
s_vSaveTxPktInfo(
IN PSDevice pDevice,
IN BYTE byPktNum,
@@ -130,7 +130,7 @@ s_vGetFreeContext(
static
-VOID
+void
s_vGenerateTxParameter(
IN PSDevice pDevice,
IN BYTE byPktType,
@@ -166,7 +166,7 @@ s_uFillDataHead (
static
-VOID
+void
s_vGenerateMACHeader (
IN PSDevice pDevice,
IN PBYTE pbyBufferAddr,
@@ -179,7 +179,7 @@ s_vGenerateMACHeader (
);
static
-VOID
+void
s_vFillTxKey(
IN PSDevice pDevice,
IN PBYTE pbyBuf,
@@ -191,7 +191,7 @@ s_vFillTxKey(
);
static
-VOID
+void
s_vSWencryption (
IN PSDevice pDevice,
IN PSKeyItem pTransmitKey,
@@ -221,7 +221,7 @@ s_uGetRTSCTSRsvTime (
);
static
-VOID
+void
s_vFillCTSHead (
IN PSDevice pDevice,
IN UINT uDMAIdx,
@@ -235,7 +235,7 @@ s_vFillCTSHead (
);
static
-VOID
+void
s_vFillRTSHead(
IN PSDevice pDevice,
IN BYTE byPktType,
@@ -307,7 +307,7 @@ s_vGetFreeContext(
static
-VOID
+void
s_vSaveTxPktInfo(PSDevice pDevice, BYTE byPktNum, PBYTE pbyDestAddr, WORD wPktLength, WORD wFIFOCtl)
{
PSStatCounter pStatistic=&(pDevice->scStatistic);
@@ -329,7 +329,7 @@ s_vSaveTxPktInfo(PSDevice pDevice, BYTE byPktNum, PBYTE pbyDestAddr, WORD wPktLe
static
-VOID
+void
s_vFillTxKey (
IN PSDevice pDevice,
IN PBYTE pbyBuf,
@@ -446,7 +446,7 @@ s_vFillTxKey (
static
-VOID
+void
s_vSWencryption (
IN PSDevice pDevice,
IN PSKeyItem pTransmitKey,
@@ -979,7 +979,7 @@ s_uFillDataHead (
static
-VOID
+void
s_vFillRTSHead (
IN PSDevice pDevice,
IN BYTE byPktType,
@@ -1172,7 +1172,7 @@ s_vFillRTSHead (
}
static
-VOID
+void
s_vFillCTSHead (
IN PSDevice pDevice,
IN UINT uDMAIdx,
@@ -1273,7 +1273,7 @@ s_vFillCTSHead (
-*/
// UINT cbFrameSize,//Hdr+Payload+FCS
static
-VOID
+void
s_vGenerateTxParameter (
IN PSDevice pDevice,
IN BYTE byPktType,
@@ -1820,7 +1820,7 @@ s_bPacketToWirelessUsb(
*
-*/
-VOID
+void
s_vGenerateMACHeader (
IN PSDevice pDevice,
IN PBYTE pbyBufferAddr,
@@ -2288,7 +2288,7 @@ csBeacon_xmit(
-VOID
+void
vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) {
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index 6bc22d3..3892acd 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -682,7 +682,7 @@ bPacketToWirelessUsb(
OUT UINT *pcbTotalLen
);
-VOID vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb);
+void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb);
NTSTATUS nsDMA_tx_packet(PSDevice pDevice, UINT uDMAIdx, struct sk_buff *skb);
CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
diff --git a/drivers/staging/vt6656/tkip.c b/drivers/staging/vt6656/tkip.c
index 8ca1540..f83af59 100644
--- a/drivers/staging/vt6656/tkip.c
+++ b/drivers/staging/vt6656/tkip.c
@@ -183,7 +183,7 @@ unsigned int rotr1(unsigned int a)
* Return Value: none
*
*/
-VOID TKIPvMixKey(
+void TKIPvMixKey(
PBYTE pbyTKey,
PBYTE pbyTA,
WORD wTSC15_0,
diff --git a/drivers/staging/vt6656/tkip.h b/drivers/staging/vt6656/tkip.h
index 847ecdf..3dfa7f5 100644
--- a/drivers/staging/vt6656/tkip.h
+++ b/drivers/staging/vt6656/tkip.h
@@ -46,7 +46,7 @@
/*--------------------- Export Functions --------------------------*/
-VOID TKIPvMixKey(
+void TKIPvMixKey(
PBYTE pbyTKey,
PBYTE pbyTA,
WORD wTSC15_0,
diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h
index 9ee3f43..8ec0ea4 100644
--- a/drivers/staging/vt6656/ttype.h
+++ b/drivers/staging/vt6656/ttype.h
@@ -33,10 +33,6 @@
/******* Common definitions and typedefs ***********************************/
-#ifndef VOID
-#define VOID void
-#endif
-
#ifndef IN
#define IN
#endif
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index 65e91a3..32b938c 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -71,34 +71,34 @@ static int msglevel =MSG_LEVEL_INFO;
/*--------------------- Static Functions --------------------------*/
static
-VOID
+void
s_nsInterruptUsbIoCompleteRead(
IN struct urb *urb
);
static
-VOID
+void
s_nsBulkInUsbIoCompleteRead(
IN struct urb *urb
);
static
-VOID
+void
s_nsBulkOutIoCompleteWrite(
IN struct urb *urb
);
static
-VOID
+void
s_nsControlInUsbIoCompleteRead(
IN struct urb *urb
);
static
-VOID
+void
s_nsControlInUsbIoCompleteWrite(
IN struct urb *urb
);
@@ -277,7 +277,7 @@ PIPEnsControlIn(
}
static
-VOID
+void
s_nsControlInUsbIoCompleteWrite(
IN struct urb *urb
)
@@ -318,7 +318,7 @@ s_nsControlInUsbIoCompleteWrite(
*
*/
static
-VOID
+void
s_nsControlInUsbIoCompleteRead(
IN struct urb *urb
)
@@ -438,7 +438,7 @@ usb_fill_bulk_urb(pDevice->pInterruptURB,
*
*/
static
-VOID
+void
s_nsInterruptUsbIoCompleteRead(
IN struct urb *urb
)
@@ -600,7 +600,7 @@ PIPEnsBulkInUsbRead(
*
*/
static
-VOID
+void
s_nsBulkInUsbIoCompleteRead(
IN struct urb *urb
)
@@ -759,7 +759,7 @@ PIPEnsSendBulkOut(
*
*/
static
-VOID
+void
s_nsBulkOutIoCompleteWrite(
IN struct urb *urb
)
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index 51b2dcf..4ff79c6 100644
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -69,7 +69,7 @@ static int msglevel =MSG_LEVEL_INFO;
/*--------------------- Static Functions --------------------------*/
static
-VOID
+void
s_vProbeChannel(
IN PSDevice pDevice
);
@@ -210,7 +210,7 @@ vAdHocBeaconRestart(PSDevice pDevice)
-*/
static
-VOID
+void
s_vProbeChannel(
IN PSDevice pDevice
)
@@ -325,7 +325,7 @@ s_MgrMakeProbeRequest(
-VOID
+void
vCommandTimerWait(
IN HANDLE hDeviceContext,
IN UINT MSecond
@@ -345,7 +345,7 @@ vCommandTimerWait(
-VOID
+void
vRunCommand(
IN HANDLE hDeviceContext
)
@@ -1287,7 +1287,7 @@ BOOL s_bClearBSSID_SCAN (
//mike add:reset command timer
-VOID
+void
vResetCommandTimer(
IN HANDLE hDeviceContext
)
@@ -1311,7 +1311,7 @@ vResetCommandTimer(
//2007-0115-08<Add>by MikeLiu
#ifdef TxInSleep
-VOID
+void
BSSvSecondTxData(
IN HANDLE hDeviceContext
)
diff --git a/drivers/staging/vt6656/wcmd.h b/drivers/staging/vt6656/wcmd.h
index 90d672b..731a486 100644
--- a/drivers/staging/vt6656/wcmd.h
+++ b/drivers/staging/vt6656/wcmd.h
@@ -116,7 +116,7 @@ typedef enum tagCMD_STATE {
/*--------------------- Export Functions --------------------------*/
-VOID
+void
vResetCommandTimer(
IN HANDLE hDeviceContext
);
@@ -128,12 +128,12 @@ bScheduleCommand(
IN PBYTE pbyItem0
);
-VOID
+void
vRunCommand(
IN HANDLE hDeviceContext
);
/*
-VOID
+void
WCMDvCommandThread(
PVOID Context
);
@@ -141,7 +141,7 @@ WCMDvCommandThread(
//2007-0115-09<Add>by MikeLiu
#ifdef TxInSleep
-VOID
+void
BSSvSecondTxData(
IN HANDLE hDeviceContext
);
diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c
index 330aea6..a6945eb 100644
--- a/drivers/staging/vt6656/wmgr.c
+++ b/drivers/staging/vt6656/wmgr.c
@@ -113,7 +113,7 @@ s_MgrMakeAssocRequest(
);
static
-VOID
+void
s_vMgrRxAssocRequest(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -135,7 +135,7 @@ s_MgrMakeReAssocRequest(
);
static
-VOID
+void
s_vMgrRxAssocResponse(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -144,7 +144,7 @@ s_vMgrRxAssocResponse(
);
static
-VOID
+void
s_vMgrRxDisassociation(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -153,7 +153,7 @@ s_vMgrRxDisassociation(
// Authentication/deauthen functions
static
-VOID
+void
s_vMgrRxAuthenSequence_1(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -161,7 +161,7 @@ s_vMgrRxAuthenSequence_1(
);
static
-VOID
+void
s_vMgrRxAuthenSequence_2(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -169,7 +169,7 @@ s_vMgrRxAuthenSequence_2(
);
static
-VOID
+void
s_vMgrRxAuthenSequence_3(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -177,7 +177,7 @@ s_vMgrRxAuthenSequence_3(
);
static
-VOID
+void
s_vMgrRxAuthenSequence_4(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -185,7 +185,7 @@ s_vMgrRxAuthenSequence_4(
);
static
-VOID
+void
s_vMgrRxAuthentication(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -193,7 +193,7 @@ s_vMgrRxAuthentication(
);
static
-VOID
+void
s_vMgrRxDeauthentication(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -203,7 +203,7 @@ s_vMgrRxDeauthentication(
// Scan functions
// probe request/response functions
static
-VOID
+void
s_vMgrRxProbeRequest(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -211,7 +211,7 @@ s_vMgrRxProbeRequest(
);
static
-VOID
+void
s_vMgrRxProbeResponse(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -220,7 +220,7 @@ s_vMgrRxProbeResponse(
// beacon functions
static
-VOID
+void
s_vMgrRxBeacon(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -229,7 +229,7 @@ s_vMgrRxBeacon(
);
static
-VOID
+void
s_vMgrFormatTIM(
IN PSMgmtObject pMgmt,
IN PWLAN_IE_TIM pTIM
@@ -299,7 +299,7 @@ s_MgrMakeProbeResponse(
// received status
static
-VOID
+void
s_vMgrLogStatus(
IN PSMgmtObject pMgmt,
IN WORD wStatus
@@ -307,7 +307,7 @@ s_vMgrLogStatus(
static
-VOID
+void
s_vMgrSynchBSS (
IN PSDevice pDevice,
IN UINT uBSSMode,
@@ -324,7 +324,7 @@ s_bCipherMatch (
OUT PBYTE pbyCCSGK
);
- static VOID Encyption_Rebuild(
+ static void Encyption_Rebuild(
IN PSDevice pDevice,
IN PKnownBSS pCurr
);
@@ -347,7 +347,7 @@ s_bCipherMatch (
*
-*/
-VOID
+void
vMgrObjectInit(
IN HANDLE hDeviceContext
)
@@ -415,7 +415,7 @@ vMgrObjectInit(
-*/
-VOID
+void
vMgrAssocBeginSta(
IN HANDLE hDeviceContext,
IN PSMgmtObject pMgmt,
@@ -491,7 +491,7 @@ vMgrAssocBeginSta(
*
-*/
-VOID
+void
vMgrReAssocBeginSta(
IN HANDLE hDeviceContext,
IN PSMgmtObject pMgmt,
@@ -570,7 +570,7 @@ vMgrReAssocBeginSta(
*
-*/
-VOID
+void
vMgrDisassocBeginSta(
IN HANDLE hDeviceContext,
IN PSMgmtObject pMgmt,
@@ -633,7 +633,7 @@ vMgrDisassocBeginSta(
-*/
static
-VOID
+void
s_vMgrRxAssocRequest(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -789,7 +789,7 @@ s_vMgrRxAssocRequest(
-*/
static
-VOID
+void
s_vMgrRxReAssocRequest(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -936,7 +936,7 @@ s_vMgrRxReAssocRequest(
-*/
static
-VOID
+void
s_vMgrRxAssocResponse(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -1102,7 +1102,7 @@ if(pMgmt->eCurrState == WMAC_STATE_ASSOC)
*
-*/
-VOID
+void
vMgrAuthenBeginSta(
IN HANDLE hDeviceContext,
IN PSMgmtObject pMgmt,
@@ -1160,7 +1160,7 @@ vMgrAuthenBeginSta(
*
-*/
-VOID
+void
vMgrDeAuthenBeginSta(
IN HANDLE hDeviceContext,
IN PSMgmtObject pMgmt,
@@ -1217,7 +1217,7 @@ vMgrDeAuthenBeginSta(
-*/
static
-VOID
+void
s_vMgrRxAuthentication(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -1275,7 +1275,7 @@ s_vMgrRxAuthentication(
static
-VOID
+void
s_vMgrRxAuthenSequence_1(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -1381,7 +1381,7 @@ s_vMgrRxAuthenSequence_1(
-*/
static
-VOID
+void
s_vMgrRxAuthenSequence_2(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -1483,7 +1483,7 @@ s_vMgrRxAuthenSequence_2(
-*/
static
-VOID
+void
s_vMgrRxAuthenSequence_3(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -1571,7 +1571,7 @@ reply:
*
-*/
static
-VOID
+void
s_vMgrRxAuthenSequence_4(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -1610,7 +1610,7 @@ s_vMgrRxAuthenSequence_4(
-*/
static
-VOID
+void
s_vMgrRxDisassociation(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -1700,7 +1700,7 @@ s_vMgrRxDisassociation(
-*/
static
-VOID
+void
s_vMgrRxDeauthentication(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -1826,7 +1826,7 @@ ChannelExceedZoneType(
-*/
static
-VOID
+void
s_vMgrRxBeacon(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -2355,7 +2355,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
* CMD_STATUS
*
-*/
-VOID
+void
vMgrCreateOwnIBSS(
IN HANDLE hDeviceContext,
OUT PCMD_STATUS pStatus
@@ -2629,7 +2629,7 @@ vMgrCreateOwnIBSS(
*
-*/
-VOID
+void
vMgrJoinBSSBegin(
IN HANDLE hDeviceContext,
OUT PCMD_STATUS pStatus
@@ -2960,7 +2960,7 @@ vMgrJoinBSSBegin(
*
-*/
static
-VOID
+void
s_vMgrSynchBSS (
IN PSDevice pDevice,
IN UINT uBSSMode,
@@ -3122,7 +3122,7 @@ s_vMgrSynchBSS (
//mike add: fix NetworkManager 0.7.0 hidden ssid mode in WPA encryption
// ,need reset eAuthenMode and eEncryptionStatus
- static VOID Encyption_Rebuild(
+ static void Encyption_Rebuild(
IN PSDevice pDevice,
IN PKnownBSS pCurr
)
@@ -3174,12 +3174,12 @@ s_vMgrSynchBSS (
*
*
* Return Value:
- * VOID
+ * void
*
-*/
static
-VOID
+void
s_vMgrFormatTIM(
IN PSMgmtObject pMgmt,
IN PWLAN_IE_TIM pTIM
@@ -4219,7 +4219,7 @@ s_MgrMakeReAssocResponse(
-*/
static
-VOID
+void
s_vMgrRxProbeResponse(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -4349,7 +4349,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
static
-VOID
+void
s_vMgrRxProbeRequest(
IN PSDevice pDevice,
IN PSMgmtObject pMgmt,
@@ -4445,7 +4445,7 @@ s_vMgrRxProbeRequest(
-*/
-VOID
+void
vMgrRxManagePacket(
IN HANDLE hDeviceContext,
IN PSMgmtObject pMgmt,
@@ -4653,7 +4653,7 @@ bMgrPrepareBeaconToSend(
*
-*/
static
-VOID
+void
s_vMgrLogStatus(
IN PSMgmtObject pMgmt,
IN WORD wStatus
@@ -4783,7 +4783,7 @@ bAdd_PMKID_Candidate (
* Return Value: none.
*
-*/
-VOID
+void
vFlush_PMKID_Candidate (
IN HANDLE hDeviceContext
)
diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h
index c682a7f..b6c57c8 100644
--- a/drivers/staging/vt6656/wmgr.h
+++ b/drivers/staging/vt6656/wmgr.h
@@ -421,14 +421,14 @@ vMgrAssocBeginSta(
OUT PCMD_STATUS pStatus
);
-VOID
+void
vMgrReAssocBeginSta(
IN HANDLE hDeviceContext,
IN PSMgmtObject pMgmt,
OUT PCMD_STATUS pStatus
);
-VOID
+void
vMgrDisassocBeginSta(
IN HANDLE hDeviceContext,
IN PSMgmtObject pMgmt,
@@ -437,26 +437,26 @@ vMgrDisassocBeginSta(
OUT PCMD_STATUS pStatus
);
-VOID
+void
vMgrAuthenBeginSta(
IN HANDLE hDeviceContext,
IN PSMgmtObject pMgmt,
OUT PCMD_STATUS pStatus
);
-VOID
+void
vMgrCreateOwnIBSS(
IN HANDLE hDeviceContext,
OUT PCMD_STATUS pStatus
);
-VOID
+void
vMgrJoinBSSBegin(
IN HANDLE hDeviceContext,
OUT PCMD_STATUS pStatus
);
-VOID
+void
vMgrRxManagePacket(
IN HANDLE hDeviceContext,
IN PSMgmtObject pMgmt,
@@ -464,14 +464,14 @@ vMgrRxManagePacket(
);
/*
-VOID
+void
vMgrScanBegin(
IN HANDLE hDeviceContext,
OUT PCMD_STATUS pStatus
);
*/
-VOID
+void
vMgrDeAuthenBeginSta(
IN HANDLE hDeviceContext,
IN PSMgmtObject pMgmt,
@@ -494,7 +494,7 @@ bAdd_PMKID_Candidate (
IN PSRSNCapObject psRSNCapObj
);
-VOID
+void
vFlush_PMKID_Candidate (
IN HANDLE hDeviceContext
);
diff --git a/drivers/staging/vt6656/wpa.c b/drivers/staging/vt6656/wpa.c
index 5da6714..75ae838 100644
--- a/drivers/staging/vt6656/wpa.c
+++ b/drivers/staging/vt6656/wpa.c
@@ -68,7 +68,7 @@ const BYTE abyOUI05[4] = { 0x00, 0x50, 0xf2, 0x05 };
*
-*/
-VOID
+void
WPA_ClearRSN (
IN PKnownBSS pBSSList
)
@@ -104,7 +104,7 @@ WPA_ClearRSN (
* Return Value: none.
*
-*/
-VOID
+void
WPA_ParseRSN (
IN PKnownBSS pBSSList,
IN PWLAN_IE_RSN_EXT pRSN
diff --git a/drivers/staging/vt6656/wpa.h b/drivers/staging/vt6656/wpa.h
index 9d9ce01..d77c7bb 100644
--- a/drivers/staging/vt6656/wpa.h
+++ b/drivers/staging/vt6656/wpa.h
@@ -58,12 +58,12 @@
/*--------------------- Export Functions --------------------------*/
-VOID
+void
WPA_ClearRSN(
IN PKnownBSS pBSSList
);
-VOID
+void
WPA_ParseRSN(
IN PKnownBSS pBSSList,
IN PWLAN_IE_RSN_EXT pRSN
diff --git a/drivers/staging/vt6656/wpa2.c b/drivers/staging/vt6656/wpa2.c
index fa3aeed..ca3f01c 100644
--- a/drivers/staging/vt6656/wpa2.c
+++ b/drivers/staging/vt6656/wpa2.c
@@ -71,7 +71,7 @@ const BYTE abyOUIPSK[4] = { 0x00, 0x0F, 0xAC, 0x02 };
* Return Value: none.
*
-*/
-VOID
+void
WPA2_ClearRSN (
IN PKnownBSS pBSSNode
)
@@ -106,7 +106,7 @@ WPA2_ClearRSN (
* Return Value: none.
*
-*/
-VOID
+void
WPA2vParseRSN (
IN PKnownBSS pBSSNode,
IN PWLAN_IE_RSN pRSN
diff --git a/drivers/staging/vt6656/wpa2.h b/drivers/staging/vt6656/wpa2.h
index e553b38..cbd75d0 100644
--- a/drivers/staging/vt6656/wpa2.h
+++ b/drivers/staging/vt6656/wpa2.h
@@ -58,12 +58,12 @@ typedef struct tagSPMKIDCache {
/*--------------------- Export Functions --------------------------*/
-VOID
+void
WPA2_ClearRSN (
IN PKnownBSS pBSSNode
);
-VOID
+void
WPA2vParseRSN (
IN PKnownBSS pBSSNode,
IN PWLAN_IE_RSN pRSN
--
1.6.4.4
More information about the devel
mailing list