UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: vt6656: removed VOID/PVOID definitions 

Warnings about the usage of externs in .c files were not resolved here.

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-01 14:25:00 -03:00 committed by Greg Kroah-Hartman
parent 8a9e77b665
commit 8611a29ab9
45 changed files with 409 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/staging/vt6656/80211mgr.c
View File

@ -89,7 +89,7 @@ static int msglevel =MSG_LEVEL_INFO;
* *
-*/ -*/
VOID void
vMgrEncodeBeacon( vMgrEncodeBeacon(
PWLAN_FR_BEACON pFrame PWLAN_FR_BEACON pFrame
) )
@ -121,7 +121,7 @@ vMgrEncodeBeacon(
-*/ -*/
VOID void
vMgrDecodeBeacon( vMgrDecodeBeacon(
PWLAN_FR_BEACON pFrame PWLAN_FR_BEACON pFrame
) )
@ -242,7 +242,7 @@ vMgrDecodeBeacon(
-*/ -*/
VOID void
vMgrEncodeIBSSATIM( vMgrEncodeIBSSATIM(
PWLAN_FR_IBSSATIM pFrame PWLAN_FR_IBSSATIM pFrame
) )
@ -265,7 +265,7 @@ vMgrEncodeIBSSATIM(
* *
-*/ -*/
VOID void
vMgrDecodeIBSSATIM( vMgrDecodeIBSSATIM(
PWLAN_FR_IBSSATIM pFrame PWLAN_FR_IBSSATIM pFrame
) )
@ -287,7 +287,7 @@ vMgrDecodeIBSSATIM(
* *
-*/ -*/
VOID void
vMgrEncodeDisassociation( vMgrEncodeDisassociation(
PWLAN_FR_DISASSOC pFrame PWLAN_FR_DISASSOC pFrame
) )
@ -315,7 +315,7 @@ vMgrEncodeDisassociation(
* *
-*/ -*/
VOID void
vMgrDecodeDisassociation( vMgrDecodeDisassociation(
PWLAN_FR_DISASSOC pFrame PWLAN_FR_DISASSOC pFrame
) )
@ -341,7 +341,7 @@ vMgrDecodeDisassociation(
-*/ -*/
VOID void
vMgrEncodeAssocRequest( vMgrEncodeAssocRequest(
PWLAN_FR_ASSOCREQ pFrame PWLAN_FR_ASSOCREQ pFrame
) )
@ -368,7 +368,7 @@ vMgrEncodeAssocRequest(
* *
-*/ -*/
VOID void
vMgrDecodeAssocRequest( vMgrDecodeAssocRequest(
PWLAN_FR_ASSOCREQ pFrame PWLAN_FR_ASSOCREQ pFrame
) )
@ -434,7 +434,7 @@ vMgrDecodeAssocRequest(
* *
-*/ -*/
VOID void
vMgrEncodeAssocResponse( vMgrEncodeAssocResponse(
PWLAN_FR_ASSOCRESP pFrame PWLAN_FR_ASSOCRESP pFrame
) )
@ -466,7 +466,7 @@ vMgrEncodeAssocResponse(
* *
-*/ -*/
VOID void
vMgrDecodeAssocResponse( vMgrDecodeAssocResponse(
PWLAN_FR_ASSOCRESP pFrame PWLAN_FR_ASSOCRESP pFrame
) )
@ -512,7 +512,7 @@ vMgrDecodeAssocResponse(
* *
-*/ -*/
VOID void
vMgrEncodeReassocRequest( vMgrEncodeReassocRequest(
PWLAN_FR_REASSOCREQ pFrame PWLAN_FR_REASSOCREQ pFrame
) )
@ -544,7 +544,7 @@ vMgrEncodeReassocRequest(
-*/ -*/
VOID void
vMgrDecodeReassocRequest( vMgrDecodeReassocRequest(
PWLAN_FR_REASSOCREQ pFrame PWLAN_FR_REASSOCREQ pFrame
) )
@ -616,7 +616,7 @@ vMgrDecodeReassocRequest(
-*/ -*/
VOID void
vMgrEncodeProbeRequest( vMgrEncodeProbeRequest(
PWLAN_FR_PROBEREQ pFrame PWLAN_FR_PROBEREQ pFrame
) )
@ -637,7 +637,7 @@ vMgrEncodeProbeRequest(
* *
-*/ -*/
VOID void
vMgrDecodeProbeRequest( vMgrDecodeProbeRequest(
PWLAN_FR_PROBEREQ pFrame PWLAN_FR_PROBEREQ pFrame
) )
@ -690,7 +690,7 @@ vMgrDecodeProbeRequest(
-*/ -*/
VOID void
vMgrEncodeProbeResponse( vMgrEncodeProbeResponse(
PWLAN_FR_PROBERESP pFrame PWLAN_FR_PROBERESP pFrame
) )
@ -724,7 +724,7 @@ vMgrEncodeProbeResponse(
* *
-*/ -*/
VOID void
vMgrDecodeProbeResponse( vMgrDecodeProbeResponse(
PWLAN_FR_PROBERESP pFrame PWLAN_FR_PROBERESP pFrame
) )
@ -838,7 +838,7 @@ vMgrDecodeProbeResponse(
* *
-*/ -*/
VOID void
vMgrEncodeAuthen( vMgrEncodeAuthen(
PWLAN_FR_AUTHEN pFrame PWLAN_FR_AUTHEN pFrame
) )
@ -869,7 +869,7 @@ vMgrEncodeAuthen(
* *
-*/ -*/
VOID void
vMgrDecodeAuthen( vMgrDecodeAuthen(
PWLAN_FR_AUTHEN pFrame PWLAN_FR_AUTHEN pFrame
) )
@ -909,7 +909,7 @@ vMgrDecodeAuthen(
* *
-*/ -*/
VOID void
vMgrEncodeDeauthen( vMgrEncodeDeauthen(
PWLAN_FR_DEAUTHEN pFrame PWLAN_FR_DEAUTHEN pFrame
) )
@ -936,7 +936,7 @@ vMgrEncodeDeauthen(
* *
-*/ -*/
VOID void
vMgrDecodeDeauthen( vMgrDecodeDeauthen(
PWLAN_FR_DEAUTHEN pFrame PWLAN_FR_DEAUTHEN pFrame
) )
@ -962,7 +962,7 @@ vMgrDecodeDeauthen(
* *
-*/ -*/
VOID void
vMgrEncodeReassocResponse( vMgrEncodeReassocResponse(
PWLAN_FR_REASSOCRESP pFrame PWLAN_FR_REASSOCRESP pFrame
) )
@ -995,7 +995,7 @@ vMgrEncodeReassocResponse(
-*/ -*/
VOID void
vMgrDecodeReassocResponse( vMgrDecodeReassocResponse(
PWLAN_FR_REASSOCRESP pFrame PWLAN_FR_REASSOCRESP pFrame
) )

44
drivers/staging/vt6656/80211mgr.h
View File

@ -748,112 +748,112 @@ typedef struct tagWLAN_FR_DEAUTHEN {
} WLAN_FR_DEAUTHEN, *PWLAN_FR_DEAUTHEN; } WLAN_FR_DEAUTHEN, *PWLAN_FR_DEAUTHEN;
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
VOID void
vMgrEncodeBeacon( vMgrEncodeBeacon(
PWLAN_FR_BEACON pFrame PWLAN_FR_BEACON pFrame
); );
VOID void
vMgrDecodeBeacon( vMgrDecodeBeacon(
PWLAN_FR_BEACON pFrame PWLAN_FR_BEACON pFrame
); );
VOID void
vMgrEncodeIBSSATIM( vMgrEncodeIBSSATIM(
PWLAN_FR_IBSSATIM pFrame PWLAN_FR_IBSSATIM pFrame
); );
VOID void
vMgrDecodeIBSSATIM( vMgrDecodeIBSSATIM(
PWLAN_FR_IBSSATIM pFrame PWLAN_FR_IBSSATIM pFrame
); );
VOID void
vMgrEncodeDisassociation( vMgrEncodeDisassociation(
PWLAN_FR_DISASSOC pFrame PWLAN_FR_DISASSOC pFrame
); );
VOID void
vMgrDecodeDisassociation( vMgrDecodeDisassociation(
PWLAN_FR_DISASSOC pFrame PWLAN_FR_DISASSOC pFrame
); );
VOID void
vMgrEncodeAssocRequest( vMgrEncodeAssocRequest(
PWLAN_FR_ASSOCREQ pFrame PWLAN_FR_ASSOCREQ pFrame
); );
VOID void
vMgrDecodeAssocRequest( vMgrDecodeAssocRequest(
PWLAN_FR_ASSOCREQ pFrame PWLAN_FR_ASSOCREQ pFrame
); );
VOID void
vMgrEncodeAssocResponse( vMgrEncodeAssocResponse(
PWLAN_FR_ASSOCRESP pFrame PWLAN_FR_ASSOCRESP pFrame
); );
VOID void
vMgrDecodeAssocResponse( vMgrDecodeAssocResponse(
PWLAN_FR_ASSOCRESP pFrame PWLAN_FR_ASSOCRESP pFrame
); );
VOID void
vMgrEncodeReassocRequest( vMgrEncodeReassocRequest(
PWLAN_FR_REASSOCREQ pFrame PWLAN_FR_REASSOCREQ pFrame
); );
VOID void
vMgrDecodeReassocRequest( vMgrDecodeReassocRequest(
PWLAN_FR_REASSOCREQ pFrame PWLAN_FR_REASSOCREQ pFrame
); );
VOID void
vMgrEncodeProbeRequest( vMgrEncodeProbeRequest(
PWLAN_FR_PROBEREQ pFrame PWLAN_FR_PROBEREQ pFrame
); );
VOID void
vMgrDecodeProbeRequest( vMgrDecodeProbeRequest(
PWLAN_FR_PROBEREQ pFrame PWLAN_FR_PROBEREQ pFrame
); );
VOID void
vMgrEncodeProbeResponse( vMgrEncodeProbeResponse(
PWLAN_FR_PROBERESP pFrame PWLAN_FR_PROBERESP pFrame
); );
VOID void
vMgrDecodeProbeResponse( vMgrDecodeProbeResponse(
PWLAN_FR_PROBERESP pFrame PWLAN_FR_PROBERESP pFrame
); );
VOID void
vMgrEncodeAuthen( vMgrEncodeAuthen(
PWLAN_FR_AUTHEN pFrame PWLAN_FR_AUTHEN pFrame
); );
VOID void
vMgrDecodeAuthen( vMgrDecodeAuthen(
PWLAN_FR_AUTHEN pFrame PWLAN_FR_AUTHEN pFrame
); );
VOID void
vMgrEncodeDeauthen( vMgrEncodeDeauthen(
PWLAN_FR_DEAUTHEN pFrame PWLAN_FR_DEAUTHEN pFrame
); );
VOID void
vMgrDecodeDeauthen( vMgrDecodeDeauthen(
PWLAN_FR_DEAUTHEN pFrame PWLAN_FR_DEAUTHEN pFrame
); );
VOID void
vMgrEncodeReassocResponse( vMgrEncodeReassocResponse(
PWLAN_FR_REASSOCRESP pFrame PWLAN_FR_REASSOCRESP pFrame
); );
VOID void
vMgrDecodeReassocResponse( vMgrDecodeReassocResponse(
PWLAN_FR_REASSOCRESP pFrame PWLAN_FR_REASSOCRESP pFrame
); );

22
drivers/staging/vt6656/baseband.c
View File

@ -756,7 +756,7 @@ BBuGetFrameTime (
* Return Value: none * Return Value: none
* *
*/ */
VOID void
BBvCaculateParameter ( BBvCaculateParameter (
PSDevice pDevice, PSDevice pDevice,
UINT cbFrameLength, UINT cbFrameLength,
@ -929,7 +929,7 @@ BBvCaculateParameter (
* Return Value: none * Return Value: none
* *
*/ */
VOID void
BBvSetAntennaMode (PSDevice pDevice, BYTE byAntennaMode) BBvSetAntennaMode (PSDevice pDevice, BYTE byAntennaMode)
{ {
//{{ RobertYu: 20041124, ABG Mode, VC1/VC2 define, make the ANT_A, ANT_B inverted //{{ 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 * Return Value: none
* *
*/ */
VOID void
BBvSetShortSlotTime (PSDevice pDevice) BBvSetShortSlotTime (PSDevice pDevice)
{ {
BYTE byBBVGA=0; 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); ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0xE7, byData);
@ -1324,7 +1324,7 @@ VOID BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData)
* Return Value: none * Return Value: none
* *
*/ */
VOID void
BBvSoftwareReset (PSDevice pDevice) BBvSoftwareReset (PSDevice pDevice)
{ {
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x50, 0x40); ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x50, 0x40);
@ -1345,14 +1345,14 @@ BBvSoftwareReset (PSDevice pDevice)
* Return Value: none * Return Value: none
* *
*/ */
VOID void
BBvSetDeepSleep (PSDevice pDevice) BBvSetDeepSleep (PSDevice pDevice)
{ {
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0c, 0x17);//CR12 ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0c, 0x17);//CR12
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0D, 0xB9);//CR13 ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0D, 0xB9);//CR13
} }
VOID void
BBvExitDeepSleep (PSDevice pDevice) BBvExitDeepSleep (PSDevice pDevice)
{ {
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0C, 0x00);//CR12 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) BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3)
{ {
@ -1576,7 +1576,7 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3)
* *
-*/ -*/
VOID void
TimerSQ3CallBack ( TimerSQ3CallBack (
HANDLE hDeviceContext HANDLE hDeviceContext
) )
@ -1618,7 +1618,7 @@ TimerSQ3CallBack (
* *
-*/ -*/
VOID void
TimerSQ3Tmax3CallBack ( TimerSQ3Tmax3CallBack (
HANDLE hDeviceContext HANDLE hDeviceContext
) )
@ -1650,7 +1650,7 @@ TimerSQ3Tmax3CallBack (
return; return;
} }
VOID void
BBvUpdatePreEDThreshold( BBvUpdatePreEDThreshold(
PSDevice pDevice, PSDevice pDevice,
BOOL bScanning) BOOL bScanning)

22
drivers/staging/vt6656/baseband.h
View File

@ -104,7 +104,7 @@ BBuGetFrameTime(
WORD wRate WORD wRate
); );
VOID void
BBvCaculateParameter ( BBvCaculateParameter (
PSDevice pDevice, PSDevice pDevice,
UINT cbFrameLength, UINT cbFrameLength,
@ -117,28 +117,28 @@ BBvCaculateParameter (
// timer for antenna diversity // timer for antenna diversity
VOID void
TimerSQ3CallBack ( TimerSQ3CallBack (
HANDLE hDeviceContext HANDLE hDeviceContext
); );
VOID void
TimerSQ3Tmax3CallBack ( TimerSQ3Tmax3CallBack (
HANDLE hDeviceContext HANDLE hDeviceContext
); );
VOID BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3); void BBvAntennaDiversity(PSDevice pDevice, BYTE byRxRate, BYTE bySQ3);
void BBvLoopbackOn (PSDevice pDevice); void BBvLoopbackOn(PSDevice pDevice);
void BBvLoopbackOff (PSDevice pDevice); void BBvLoopbackOff(PSDevice pDevice);
void BBvSoftwareReset (PSDevice pDevice); void BBvSoftwareReset(PSDevice pDevice);
void BBvSetShortSlotTime(PSDevice pDevice); void BBvSetShortSlotTime(PSDevice pDevice);
VOID BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData); void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData);
void BBvSetAntennaMode(PSDevice pDevice, BYTE byAntennaMode); void BBvSetAntennaMode(PSDevice pDevice, BYTE byAntennaMode);
BOOL BBbVT3184Init (PSDevice pDevice); BOOL BBbVT3184Init (PSDevice pDevice);
VOID BBvSetDeepSleep (PSDevice pDevice); void BBvSetDeepSleep(PSDevice pDevice);
VOID BBvExitDeepSleep (PSDevice pDevice); void BBvExitDeepSleep(PSDevice pDevice);
VOID BBvUpdatePreEDThreshold( void BBvUpdatePreEDThreshold(
PSDevice pDevice, PSDevice pDevice,
BOOL bScanning BOOL bScanning
); );

46
drivers/staging/vt6656/bssdb.c
View File

@ -91,16 +91,16 @@ const WORD awHWRetry1[5][5] = {
/*--------------------- Static Functions --------------------------*/ /*--------------------- Static Functions --------------------------*/
VOID s_vCheckSensitivity( void s_vCheckSensitivity(
HANDLE hDeviceContext HANDLE hDeviceContext
); );
VOID s_vCheckPreEDThreshold( void s_vCheckPreEDThreshold(
HANDLE hDeviceContext HANDLE hDeviceContext
); );
#ifdef Calcu_LinkQual #ifdef Calcu_LinkQual
VOID s_uCalculateLinkQual( void s_uCalculateLinkQual(
HANDLE hDeviceContext HANDLE hDeviceContext
); );
#endif #endif
@ -296,7 +296,7 @@ pDevice->bSameBSSMaxNum = jj;
-*/ -*/
VOID void
BSSvClearBSSList( BSSvClearBSSList(
HANDLE hDeviceContext, HANDLE hDeviceContext,
BOOL bKeepCurrBSSID BOOL bKeepCurrBSSID
@ -804,7 +804,7 @@ BSSbIsSTAInNodeDB(
* None * None
* *
-*/ -*/
VOID void
BSSvCreateOneNode( BSSvCreateOneNode(
HANDLE hDeviceContext, HANDLE hDeviceContext,
OUT PUINT puNodeIndex OUT PUINT puNodeIndex
@ -869,7 +869,7 @@ BSSvCreateOneNode(
* None * None
* *
-*/ -*/
VOID void
BSSvRemoveOneNode( BSSvRemoveOneNode(
HANDLE hDeviceContext, HANDLE hDeviceContext,
UINT uNodeIndex UINT uNodeIndex
@ -902,7 +902,7 @@ BSSvRemoveOneNode(
* *
-*/ -*/
VOID void
BSSvUpdateAPNode( BSSvUpdateAPNode(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PWORD pwCapInfo, PWORD pwCapInfo,
@ -926,7 +926,7 @@ BSSvUpdateAPNode(
pMgmt->abyCurrExtSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)pExtSuppRates, pMgmt->abyCurrExtSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)pExtSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates,
uRateLen); uRateLen);
RATEvParseMaxRate((PVOID) pDevice, RATEvParseMaxRate((void *) pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates,
TRUE, TRUE,
@ -962,7 +962,7 @@ BSSvUpdateAPNode(
-*/ -*/
VOID void
BSSvAddMulticastNode( BSSvAddMulticastNode(
HANDLE hDeviceContext HANDLE hDeviceContext
) )
@ -976,7 +976,7 @@ BSSvAddMulticastNode(
pMgmt->sNodeDBTable[0].bActive = TRUE; pMgmt->sNodeDBTable[0].bActive = TRUE;
pMgmt->sNodeDBTable[0].bPSEnable = FALSE; pMgmt->sNodeDBTable[0].bPSEnable = FALSE;
skb_queue_head_init(&pMgmt->sNodeDBTable[0].sTxPSQueue); skb_queue_head_init(&pMgmt->sNodeDBTable[0].sTxPSQueue);
RATEvParseMaxRate((PVOID) pDevice, RATEvParseMaxRate((void *) pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates,
TRUE, TRUE,
@ -1009,7 +1009,7 @@ BSSvAddMulticastNode(
-*/ -*/
VOID void
BSSvSecondCallBack( BSSvSecondCallBack(
HANDLE hDeviceContext HANDLE hDeviceContext
) )
@ -1131,12 +1131,14 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
*/ */
if (ii > 0) { if (ii > 0) {
// ii = 0 for multicast node (AP & Adhoc) // ii = 0 for multicast node (AP & Adhoc)
RATEvTxRateFallBack((PVOID)pDevice, &(pMgmt->sNodeDBTable[ii])); RATEvTxRateFallBack((void *)pDevice,
&(pMgmt->sNodeDBTable[ii]));
} }
else { else {
// ii = 0 reserved for unicast AP node (Infra STA) // ii = 0 reserved for unicast AP node (Infra STA)
if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA) if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA)
RATEvTxRateFallBack((PVOID)pDevice, &(pMgmt->sNodeDBTable[ii])); RATEvTxRateFallBack((void *)pDevice,
&(pMgmt->sNodeDBTable[ii]));
} }
} }
@ -1177,14 +1179,14 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
if (pDevice->bShortSlotTime) { if (pDevice->bShortSlotTime) {
pDevice->bShortSlotTime = FALSE; pDevice->bShortSlotTime = FALSE;
BBvSetShortSlotTime(pDevice); BBvSetShortSlotTime(pDevice);
vUpdateIFS((PVOID)pDevice); vUpdateIFS((void *)pDevice);
} }
} }
else { else {
if (!pDevice->bShortSlotTime) { if (!pDevice->bShortSlotTime) {
pDevice->bShortSlotTime = TRUE; pDevice->bShortSlotTime = TRUE;
BBvSetShortSlotTime(pDevice); BBvSetShortSlotTime(pDevice);
vUpdateIFS((PVOID)pDevice); vUpdateIFS((void *)pDevice);
} }
} }
@ -1395,7 +1397,7 @@ else {
VOID void
BSSvUpdateNodeTxCounter( BSSvUpdateNodeTxCounter(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSStatCounter pStatistic, PSStatCounter pStatistic,
@ -1564,7 +1566,7 @@ BSSvUpdateNodeTxCounter(
-*/ -*/
VOID void
BSSvClearNodeDBTable( BSSvClearNodeDBTable(
HANDLE hDeviceContext, HANDLE hDeviceContext,
UINT uStartIndex UINT uStartIndex
@ -1593,7 +1595,7 @@ BSSvClearNodeDBTable(
}; };
VOID s_vCheckSensitivity( void s_vCheckSensitivity(
HANDLE hDeviceContext HANDLE hDeviceContext
) )
{ {
@ -1637,7 +1639,7 @@ VOID s_vCheckSensitivity(
} }
#ifdef Calcu_LinkQual #ifdef Calcu_LinkQual
VOID s_uCalculateLinkQual( void s_uCalculateLinkQual(
HANDLE hDeviceContext HANDLE hDeviceContext
) )
{ {
@ -1685,7 +1687,7 @@ else
} }
#endif #endif
VOID void
BSSvClearAnyBSSJoinRecord ( BSSvClearAnyBSSJoinRecord (
HANDLE hDeviceContext HANDLE hDeviceContext
) )
@ -1700,7 +1702,7 @@ BSSvClearAnyBSSJoinRecord (
return; return;
} }
VOID s_vCheckPreEDThreshold( void s_vCheckPreEDThreshold(
HANDLE hDeviceContext HANDLE hDeviceContext
) )
{ {

18
drivers/staging/vt6656/bssdb.h
View File

@ -246,7 +246,7 @@ BSSpAddrIsInBSSList(
PWLAN_IE_SSID pSSID PWLAN_IE_SSID pSSID
); );
VOID void
BSSvClearBSSList( BSSvClearBSSList(
HANDLE hDeviceContext, HANDLE hDeviceContext,
BOOL bKeepCurrBSSID BOOL bKeepCurrBSSID
@ -304,13 +304,13 @@ BSSbIsSTAInNodeDB(
OUT PUINT puNodeIndex OUT PUINT puNodeIndex
); );
VOID void
BSSvCreateOneNode( BSSvCreateOneNode(
HANDLE hDeviceContext, HANDLE hDeviceContext,
OUT PUINT puNodeIndex OUT PUINT puNodeIndex
); );
VOID void
BSSvUpdateAPNode( BSSvUpdateAPNode(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PWORD pwCapInfo, PWORD pwCapInfo,
@ -319,13 +319,13 @@ BSSvUpdateAPNode(
); );
VOID void
BSSvSecondCallBack( BSSvSecondCallBack(
HANDLE hDeviceContext HANDLE hDeviceContext
); );
VOID void
BSSvUpdateNodeTxCounter( BSSvUpdateNodeTxCounter(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSStatCounter pStatistic, PSStatCounter pStatistic,
@ -333,25 +333,25 @@ BSSvUpdateNodeTxCounter(
BYTE byPktNO BYTE byPktNO
); );
VOID void
BSSvRemoveOneNode( BSSvRemoveOneNode(
HANDLE hDeviceContext, HANDLE hDeviceContext,
UINT uNodeIndex UINT uNodeIndex
); );
VOID void
BSSvAddMulticastNode( BSSvAddMulticastNode(
HANDLE hDeviceContext HANDLE hDeviceContext
); );
VOID void
BSSvClearNodeDBTable( BSSvClearNodeDBTable(
HANDLE hDeviceContext, HANDLE hDeviceContext,
UINT uStartIndex UINT uStartIndex
); );
VOID void
BSSvClearAnyBSSJoinRecord( BSSvClearAnyBSSJoinRecord(
HANDLE hDeviceContext HANDLE hDeviceContext
); );

42
drivers/staging/vt6656/card.c
View File

@ -95,7 +95,7 @@ const WORD cwRXBCNTSFOff[MAX_RATE] =
* Return Value: TRUE if succeeded; FALSE if failed. * Return Value: TRUE if succeeded; FALSE if failed.
* *
*/ */
BOOL CARDbSetMediaChannel (PVOID pDeviceHandler, UINT uConnectionChannel) BOOL CARDbSetMediaChannel(void *pDeviceHandler, UINT uConnectionChannel)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
BOOL bResult = TRUE; BOOL bResult = TRUE;
@ -156,8 +156,7 @@ BOOL bResult = TRUE;
* Return Value: response Control frame rate * Return Value: response Control frame rate
* *
*/ */
static static WORD swGetCCKControlRate(void *pDeviceHandler, WORD wRateIdx)
WORD swGetCCKControlRate(PVOID pDeviceHandler, WORD wRateIdx)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT ui = (UINT)wRateIdx; UINT ui = (UINT)wRateIdx;
@ -183,8 +182,7 @@ WORD swGetCCKControlRate(PVOID pDeviceHandler, WORD wRateIdx)
* Return Value: response Control frame rate * Return Value: response Control frame rate
* *
*/ */
static static WORD swGetOFDMControlRate(void *pDeviceHandler, WORD wRateIdx)
WORD swGetOFDMControlRate (PVOID pDeviceHandler, WORD wRateIdx)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT ui = (UINT)wRateIdx; UINT ui = (UINT)wRateIdx;
@ -222,7 +220,7 @@ WORD swGetOFDMControlRate (PVOID pDeviceHandler, WORD wRateIdx)
* Return Value: none * Return Value: none
* *
*/ */
VOID void
CARDvCaculateOFDMRParameter ( CARDvCaculateOFDMRParameter (
WORD wRate, WORD wRate,
BYTE byBBType, BYTE byBBType,
@ -334,7 +332,7 @@ CARDvCaculateOFDMRParameter (
* Return Value: None. * Return Value: None.
* *
*/ */
void CARDvSetRSPINF (PVOID pDeviceHandler, BYTE byBBType) void CARDvSetRSPINF(void *pDeviceHandler, BYTE byBBType)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
BYTE abyServ[4] = {0,0,0,0}; // For CCK BYTE abyServ[4] = {0,0,0,0}; // For CCK
@ -486,7 +484,7 @@ void CARDvSetRSPINF (PVOID pDeviceHandler, BYTE byBBType)
* Return Value: None. * Return Value: None.
* *
*/ */
void vUpdateIFS (PVOID pDeviceHandler) void vUpdateIFS(void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
//Set SIFS, DIFS, EIFS, SlotTime, CwMin //Set SIFS, DIFS, EIFS, SlotTime, CwMin
@ -571,7 +569,7 @@ void vUpdateIFS (PVOID pDeviceHandler)
&byMaxMin); &byMaxMin);
} }
void CARDvUpdateBasicTopRate (PVOID pDeviceHandler) void CARDvUpdateBasicTopRate(void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
BYTE byTopOFDM = RATE_24M, byTopCCK = RATE_1M; BYTE byTopOFDM = RATE_24M, byTopCCK = RATE_1M;
@ -610,7 +608,7 @@ BYTE ii;
* Return Value: TRUE if succeeded; FALSE if failed. * Return Value: TRUE if succeeded; FALSE if failed.
* *
*/ */
BOOL CARDbAddBasicRate (PVOID pDeviceHandler, WORD wRateIdx) BOOL CARDbAddBasicRate(void *pDeviceHandler, WORD wRateIdx)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
WORD wRate = (WORD)(1<<wRateIdx); WORD wRate = (WORD)(1<<wRateIdx);
@ -623,7 +621,7 @@ WORD wRate = (WORD)(1<<wRateIdx);
return(TRUE); return(TRUE);
} }
BOOL CARDbIsOFDMinBasicRate (PVOID pDeviceHandler) BOOL CARDbIsOFDMinBasicRate(void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
int ii; int ii;
@ -635,7 +633,7 @@ int ii;
return FALSE; return FALSE;
} }
BYTE CARDbyGetPktType (PVOID pDeviceHandler) BYTE CARDbyGetPktType(void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -707,7 +705,8 @@ QWORD CARDqGetTSFOffset (BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2)
* Return Value: none * Return Value: none
* *
*/ */
void CARDvAdjustTSF (PVOID pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF) void CARDvAdjustTSF(void *pDeviceHandler, BYTE byRxRate,
QWORD qwBSSTimestamp, QWORD qwLocalTSF)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -756,7 +755,7 @@ void CARDvAdjustTSF (PVOID pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp,
* Return Value: TRUE if success; otherwise FALSE * Return Value: TRUE if success; otherwise FALSE
* *
*/ */
BOOL CARDbGetCurrentTSF (PVOID pDeviceHandler, PQWORD pqwCurrTSF) BOOL CARDbGetCurrentTSF(void *pDeviceHandler, PQWORD pqwCurrTSF)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -778,7 +777,7 @@ BOOL CARDbGetCurrentTSF (PVOID pDeviceHandler, PQWORD pqwCurrTSF)
* Return Value: TRUE if success; otherwise FALSE * Return Value: TRUE if success; otherwise FALSE
* *
*/ */
BOOL CARDbClearCurrentTSF(PVOID pDeviceHandler) BOOL CARDbClearCurrentTSF(void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -844,7 +843,7 @@ QWORD CARDqGetNextTBTT (QWORD qwTSF, WORD wBeaconInterval)
* Return Value: none * Return Value: none
* *
*/ */
void CARDvSetFirstNextTBTT (PVOID pDeviceHandler, WORD wBeaconInterval) void CARDvSetFirstNextTBTT(void *pDeviceHandler, WORD wBeaconInterval)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -898,7 +897,8 @@ void CARDvSetFirstNextTBTT (PVOID pDeviceHandler, WORD wBeaconInterval)
* Return Value: none * Return Value: none
* *
*/ */
void CARDvUpdateNextTBTT (PVOID pDeviceHandler, QWORD qwTSF, WORD wBeaconInterval) void CARDvUpdateNextTBTT(void *pDeviceHandler, QWORD qwTSF,
WORD wBeaconInterval)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
DWORD dwLoTBTT,dwHiTBTT; DWORD dwLoTBTT,dwHiTBTT;
@ -945,7 +945,7 @@ void CARDvUpdateNextTBTT (PVOID pDeviceHandler, QWORD qwTSF, WORD wBeaconInterva
* Return Value: TRUE if success; otherwise FALSE * Return Value: TRUE if success; otherwise FALSE
* *
*/ */
BOOL CARDbRadioPowerOff (PVOID pDeviceHandler) BOOL CARDbRadioPowerOff(void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
BOOL bResult = TRUE; BOOL bResult = TRUE;
@ -986,7 +986,7 @@ BOOL bResult = TRUE;
* Return Value: TRUE if success; otherwise FALSE * Return Value: TRUE if success; otherwise FALSE
* *
*/ */
BOOL CARDbRadioPowerOn (PVOID pDeviceHandler) BOOL CARDbRadioPowerOn(void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
BOOL bResult = TRUE; BOOL bResult = TRUE;
@ -1019,7 +1019,7 @@ BOOL bResult = TRUE;
return bResult; return bResult;
} }
void CARDvSetBSSMode (PVOID pDeviceHandler) void CARDvSetBSSMode(void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
// Set BB and packet type at the same time.//{{RobertYu:20050222, AL7230 have two TX PA output, only connet to b/g now // Set BB and packet type at the same time.//{{RobertYu:20050222, AL7230 have two TX PA output, only connet to b/g now
@ -1080,7 +1080,7 @@ void CARDvSetBSSMode (PVOID pDeviceHandler)
-*/ -*/
BOOL BOOL
CARDbChannelSwitch ( CARDbChannelSwitch (
PVOID pDeviceHandler, void *pDeviceHandler,
BYTE byMode, BYTE byMode,
BYTE byNewChannel, BYTE byNewChannel,
BYTE byCount BYTE byCount

34
drivers/staging/vt6656/card.h
View File

@ -63,27 +63,29 @@ typedef enum _CARD_OP_MODE {
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
BOOL CARDbSetMediaChannel(PVOID pDeviceHandler, UINT uConnectionChannel); BOOL CARDbSetMediaChannel(void *pDeviceHandler, UINT uConnectionChannel);
void CARDvSetRSPINF(PVOID pDeviceHandler, BYTE byBBType); void CARDvSetRSPINF(void *pDeviceHandler, BYTE byBBType);
void vUpdateIFS(PVOID pDeviceHandler); void vUpdateIFS(void *pDeviceHandler);
void CARDvUpdateBasicTopRate(PVOID pDeviceHandler); void CARDvUpdateBasicTopRate(void *pDeviceHandler);
BOOL CARDbAddBasicRate(PVOID pDeviceHandler, WORD wRateIdx); BOOL CARDbAddBasicRate(void *pDeviceHandler, WORD wRateIdx);
BOOL CARDbIsOFDMinBasicRate(PVOID pDeviceHandler); BOOL CARDbIsOFDMinBasicRate(void *pDeviceHandler);
void CARDvAdjustTSF(PVOID pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF); void CARDvAdjustTSF(void *pDeviceHandler, BYTE byRxRate,
BOOL CARDbGetCurrentTSF (PVOID pDeviceHandler, PQWORD pqwCurrTSF); QWORD qwBSSTimestamp, QWORD qwLocalTSF);
BOOL CARDbClearCurrentTSF(PVOID pDeviceHandler); BOOL CARDbGetCurrentTSF(void *pDeviceHandler, PQWORD pqwCurrTSF);
void CARDvSetFirstNextTBTT(PVOID pDeviceHandler, WORD wBeaconInterval); BOOL CARDbClearCurrentTSF(void *pDeviceHandler);
void CARDvUpdateNextTBTT(PVOID pDeviceHandler, QWORD qwTSF, WORD wBeaconInterval); void CARDvSetFirstNextTBTT(void *pDeviceHandler, WORD wBeaconInterval);
void CARDvUpdateNextTBTT(void *pDeviceHandler, QWORD qwTSF,
WORD wBeaconInterval);
QWORD CARDqGetNextTBTT(QWORD qwTSF, WORD wBeaconInterval); QWORD CARDqGetNextTBTT(QWORD qwTSF, WORD wBeaconInterval);
QWORD CARDqGetTSFOffset(BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2); QWORD CARDqGetTSFOffset(BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2);
BOOL CARDbRadioPowerOff(PVOID pDeviceHandler); BOOL CARDbRadioPowerOff(void *pDeviceHandler);
BOOL CARDbRadioPowerOn(PVOID pDeviceHandler); BOOL CARDbRadioPowerOn(void *pDeviceHandler);
BYTE CARDbyGetPktType(PVOID pDeviceHandler); BYTE CARDbyGetPktType(void *pDeviceHandler);
void CARDvSetBSSMode(PVOID pDeviceHandler); void CARDvSetBSSMode(void *pDeviceHandler);
BOOL BOOL
CARDbChannelSwitch ( CARDbChannelSwitch (
PVOID pDeviceHandler, void *pDeviceHandler,
BYTE byMode, BYTE byMode,
BYTE byNewChannel, BYTE byNewChannel,
BYTE byCount BYTE byCount

2
drivers/staging/vt6656/channel.c
View File

@ -437,7 +437,7 @@ CHvChannelGetList (
} }
VOID CHvInitChannelTable (PVOID pDeviceHandler) void CHvInitChannelTable(void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
BOOL bMultiBand = FALSE; BOOL bMultiBand = FALSE;

2
drivers/staging/vt6656/channel.h
View File

@ -45,7 +45,7 @@ typedef struct tagSChannelTblElement {
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
BOOL ChannelValid(UINT CountryCode, UINT ChannelNum); BOOL ChannelValid(UINT CountryCode, UINT ChannelNum);
VOID CHvInitChannelTable (PVOID pDeviceHandler); void CHvInitChannelTable(void *pDeviceHandler);
BYTE CHbyGetChannelMapping(BYTE byChannelNumber); BYTE CHbyGetChannelMapping(BYTE byChannelNumber);
BOOL BOOL

31
drivers/staging/vt6656/datarate.c
View File

@ -65,16 +65,9 @@ const BYTE acbyIERate[MAX_RATE] =
/*--------------------- Static Functions --------------------------*/ /*--------------------- Static Functions --------------------------*/
VOID s_vResetCounter ( void s_vResetCounter(PKnownNodeDB psNodeDBTable);
PKnownNodeDB psNodeDBTable
);
void s_vResetCounter(PKnownNodeDB psNodeDBTable)
VOID
s_vResetCounter (
PKnownNodeDB psNodeDBTable
)
{ {
BYTE ii; BYTE ii;
@ -195,9 +188,8 @@ RATEwGetRateIdx(
* Return Value: none * Return Value: none
* *
-*/ -*/
VOID void RATEvParseMaxRate(
RATEvParseMaxRate ( void *pDeviceHandler,
PVOID pDeviceHandler,
PWLAN_IE_SUPP_RATES pItemRates, PWLAN_IE_SUPP_RATES pItemRates,
PWLAN_IE_SUPP_RATES pItemExtRates, PWLAN_IE_SUPP_RATES pItemExtRates,
BOOL bUpdateBasicRate, BOOL bUpdateBasicRate,
@ -236,7 +228,7 @@ UINT uRateLen;
if (WLAN_MGMT_IS_BASICRATE(byRate) && if (WLAN_MGMT_IS_BASICRATE(byRate) &&
(bUpdateBasicRate == TRUE)) { (bUpdateBasicRate == TRUE)) {
// Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate // Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate
CARDbAddBasicRate((PVOID)pDevice, RATEwGetRateIdx(byRate)); CARDbAddBasicRate((void *)pDevice, RATEwGetRateIdx(byRate));
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", RATEwGetRateIdx(byRate)); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", RATEwGetRateIdx(byRate));
} }
byRate = (BYTE)(pItemRates->abyRates[ii]&0x7F); byRate = (BYTE)(pItemRates->abyRates[ii]&0x7F);
@ -259,7 +251,7 @@ UINT uRateLen;
// select highest basic rate // select highest basic rate
if (WLAN_MGMT_IS_BASICRATE(pItemExtRates->abyRates[ii])) { if (WLAN_MGMT_IS_BASICRATE(pItemExtRates->abyRates[ii])) {
// Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate // Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate
CARDbAddBasicRate((PVOID)pDevice, RATEwGetRateIdx(byRate)); CARDbAddBasicRate((void *)pDevice, RATEwGetRateIdx(byRate));
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", RATEwGetRateIdx(byRate)); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", RATEwGetRateIdx(byRate));
} }
byRate = (BYTE)(pItemExtRates->abyRates[ii]&0x7F); byRate = (BYTE)(pItemExtRates->abyRates[ii]&0x7F);
@ -272,7 +264,8 @@ UINT uRateLen;
} }
} //if(pItemExtRates != NULL) } //if(pItemExtRates != NULL)
if ((pDevice->byPacketType == PK_TYPE_11GB) && CARDbIsOFDMinBasicRate((PVOID)pDevice)) { if ((pDevice->byPacketType == PK_TYPE_11GB)
&& CARDbIsOFDMinBasicRate((void *)pDevice)) {
pDevice->byPacketType = PK_TYPE_11GA; pDevice->byPacketType = PK_TYPE_11GA;
} }
@ -284,7 +277,7 @@ UINT uRateLen;
else else
*pwMaxBasicRate = pDevice->byTopOFDMBasicRate; *pwMaxBasicRate = pDevice->byTopOFDMBasicRate;
if (wOldBasicRate != pDevice->wBasicRate) if (wOldBasicRate != pDevice->wBasicRate)
CARDvSetRSPINF((PVOID)pDevice, pDevice->byBBType); CARDvSetRSPINF((void *)pDevice, pDevice->byBBType);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Exit ParseMaxRate\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Exit ParseMaxRate\n");
} }
@ -308,9 +301,9 @@ UINT uRateLen;
#define AUTORATE_TXCNT_THRESHOLD 20 #define AUTORATE_TXCNT_THRESHOLD 20
#define AUTORATE_INC_THRESHOLD 30 #define AUTORATE_INC_THRESHOLD 30
VOID void
RATEvTxRateFallBack ( RATEvTxRateFallBack(
PVOID pDeviceHandler, void *pDeviceHandler,
PKnownNodeDB psNodeDBTable PKnownNodeDB psNodeDBTable
) )
{ {

8
drivers/staging/vt6656/datarate.h
View File

@ -69,9 +69,9 @@
VOID void
RATEvParseMaxRate( RATEvParseMaxRate(
PVOID pDeviceHandler, void *pDeviceHandler,
PWLAN_IE_SUPP_RATES pItemRates, PWLAN_IE_SUPP_RATES pItemRates,
PWLAN_IE_SUPP_RATES pItemExtRates, PWLAN_IE_SUPP_RATES pItemExtRates,
BOOL bUpdateBasicRate, BOOL bUpdateBasicRate,
@ -82,9 +82,9 @@ RATEvParseMaxRate(
OUT PBYTE pbyTopOFDMRate OUT PBYTE pbyTopOFDMRate
); );
VOID void
RATEvTxRateFallBack( RATEvTxRateFallBack(
PVOID pDeviceHandler, void *pDeviceHandler,
PKnownNodeDB psNodeDBTable PKnownNodeDB psNodeDBTable
); );

8
drivers/staging/vt6656/device.h
View File

@ -209,9 +209,9 @@ typedef enum _CONTEXT_TYPE {
// RCB (Receive Control Block) // RCB (Receive Control Block)
typedef struct _RCB typedef struct _RCB
{ {
PVOID Next; void *Next;
LONG Ref; LONG Ref;
PVOID pDevice; void *pDevice;
struct urb *pUrb; struct urb *pUrb;
SRxMgmtPacket sMngPacket; SRxMgmtPacket sMngPacket;
struct sk_buff* skb; struct sk_buff* skb;
@ -222,13 +222,13 @@ typedef struct _RCB
// used to track bulk out irps // used to track bulk out irps
typedef struct _USB_SEND_CONTEXT { typedef struct _USB_SEND_CONTEXT {
PVOID pDevice; void *pDevice;
struct sk_buff *pPacket; struct sk_buff *pPacket;
struct urb *pUrb; struct urb *pUrb;
UINT uBufLen; UINT uBufLen;
CONTEXT_TYPE Type; CONTEXT_TYPE Type;
SEthernetHeader sEthHeader; SEthernetHeader sEthHeader;
PVOID Next; void *Next;
BOOL bBoolInUse; BOOL bBoolInUse;
UCHAR Data[MAX_TOTAL_SIZE_WITH_ALL_HEADERS]; UCHAR Data[MAX_TOTAL_SIZE_WITH_ALL_HEADERS];
} USB_SEND_CONTEXT, *PUSB_SEND_CONTEXT; } USB_SEND_CONTEXT, *PUSB_SEND_CONTEXT;

20
drivers/staging/vt6656/dpc.c
View File

@ -77,7 +77,7 @@ const BYTE acbyRxRate[MAX_RATE] =
static BYTE s_byGetRateIdx(BYTE byRate); static BYTE s_byGetRateIdx(BYTE byRate);
static static
VOID void
s_vGetDASA( s_vGetDASA(
PBYTE pbyRxBufferAddr, PBYTE pbyRxBufferAddr,
OUT PUINT pcbHeaderSize, OUT PUINT pcbHeaderSize,
@ -85,7 +85,7 @@ s_vGetDASA(
); );
static static
VOID void
s_vProcessRxMACHeader ( s_vProcessRxMACHeader (
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyRxBufferAddr, PBYTE pbyRxBufferAddr,
@ -160,7 +160,7 @@ static BOOL s_bHostWepRxEncryption(
* *
-*/ -*/
static static
VOID void
s_vProcessRxMACHeader ( s_vProcessRxMACHeader (
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyRxBufferAddr, PBYTE pbyRxBufferAddr,
@ -259,7 +259,7 @@ static BYTE s_byGetRateIdx(BYTE byRate)
static static
VOID void
s_vGetDASA ( s_vGetDASA (
PBYTE pbyRxBufferAddr, PBYTE pbyRxBufferAddr,
OUT PUINT pcbHeaderSize, OUT PUINT pcbHeaderSize,
@ -1513,10 +1513,7 @@ static BOOL s_bAPModeRxData (
VOID void RXvWorkItem(void *Context)
RXvWorkItem(
PVOID Context
)
{ {
PSDevice pDevice = (PSDevice) Context; PSDevice pDevice = (PSDevice) Context;
NTSTATUS ntStatus; NTSTATUS ntStatus;
@ -1539,7 +1536,7 @@ RXvWorkItem(
} }
VOID void
RXvFreeRCB( RXvFreeRCB(
PRCB pRCB, PRCB pRCB,
BOOL bReAllocSkb BOOL bReAllocSkb
@ -1579,10 +1576,7 @@ RXvFreeRCB(
} }
VOID void RXvMngWorkItem(void *Context)
RXvMngWorkItem(
PVOID Context
)
{ {
PSDevice pDevice = (PSDevice) Context; PSDevice pDevice = (PSDevice) Context;
PRCB pRCB=NULL; PRCB pRCB=NULL;

12
drivers/staging/vt6656/dpc.h
View File

@ -41,17 +41,11 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
VOID void RXvWorkItem(void *Context);
RXvWorkItem(
PVOID Context
);
VOID void RXvMngWorkItem(void *Context);
RXvMngWorkItem(
PVOID Context
);
VOID void
RXvFreeRCB( RXvFreeRCB(
PRCB pRCB, PRCB pRCB,
BOOL bReAllocSkb BOOL bReAllocSkb

3
drivers/staging/vt6656/int.c
View File

@ -79,8 +79,7 @@ static int msglevel = MSG_LEVEL_INFO;
* if we've gotten no data * if we've gotten no data
* *
-*/ -*/
VOID void INTvWorkItem(void *Context)
INTvWorkItem(PVOID Context)
{ {
PSDevice pDevice = (PSDevice) Context; PSDevice pDevice = (PSDevice) Context;
NTSTATUS ntStatus; NTSTATUS ntStatus;

5
drivers/staging/vt6656/int.h
View File

@ -67,10 +67,7 @@ SINTData, *PSINTData;
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
VOID void INTvWorkItem(void *Context);
INTvWorkItem(
PVOID Context
);
NTSTATUS NTSTATUS
INTnsProcessData( INTnsProcessData(

2
drivers/staging/vt6656/ioctl.h
View File

@ -43,7 +43,7 @@
int private_ioctl(PSDevice pDevice, struct ifreq *rq); int private_ioctl(PSDevice pDevice, struct ifreq *rq);
/* /*
VOID vConfigWEPKey ( void vConfigWEPKey (
PSDevice pDevice, PSDevice pDevice,
DWORD dwKeyIndex, DWORD dwKeyIndex,
PBYTE pbyKey, PBYTE pbyKey,

40
drivers/staging/vt6656/key.c
View File

@ -60,8 +60,8 @@ static int msglevel =MSG_LEVEL_INFO;
/*--------------------- Static Variables --------------------------*/ /*--------------------- Static Variables --------------------------*/
/*--------------------- Static Functions --------------------------*/ /*--------------------- Static Functions --------------------------*/
static VOID static void s_vCheckKeyTableValid(void *pDeviceHandler,
s_vCheckKeyTableValid (PVOID pDeviceHandler, PSKeyManagement pTable) PSKeyManagement pTable)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
int i; int i;
@ -112,7 +112,7 @@ s_vCheckKeyTableValid (PVOID pDeviceHandler, PSKeyManagement pTable)
* Return Value: none * Return Value: none
* *
*/ */
VOID KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable) void KeyvInitTable(void *pDeviceHandler, PSKeyManagement pTable)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
int i; int i;
@ -123,10 +123,12 @@ VOID KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable)
for (i=0;i<MAX_KEY_TABLE;i++) { for (i=0;i<MAX_KEY_TABLE;i++) {
pTable->KeyTable[i].bInUse = FALSE; pTable->KeyTable[i].bInUse = FALSE;
pTable->KeyTable[i].PairwiseKey.bKeyValid = FALSE; pTable->KeyTable[i].PairwiseKey.bKeyValid = FALSE;
pTable->KeyTable[i].PairwiseKey.pvKeyTable = (PVOID)&pTable->KeyTable[i]; pTable->KeyTable[i].PairwiseKey.pvKeyTable =
(void *)&pTable->KeyTable[i];
for (jj=0; jj < MAX_GROUP_KEY; jj++) { for (jj=0; jj < MAX_GROUP_KEY; jj++) {
pTable->KeyTable[i].GroupKey[jj].bKeyValid = FALSE; pTable->KeyTable[i].GroupKey[jj].bKeyValid = FALSE;
pTable->KeyTable[i].GroupKey[jj].pvKeyTable = (PVOID) &(pTable->KeyTable[i]); pTable->KeyTable[i].GroupKey[jj].pvKeyTable =
(void *) &(pTable->KeyTable[i]);
} }
pTable->KeyTable[i].wKeyCtl = 0; pTable->KeyTable[i].wKeyCtl = 0;
pTable->KeyTable[i].dwGTKeyIndex = 0; pTable->KeyTable[i].dwGTKeyIndex = 0;
@ -220,8 +222,8 @@ BOOL KeybGetKey (
* Return Value: TRUE if success otherwise FALSE * Return Value: TRUE if success otherwise FALSE
* *
*/ */
BOOL KeybSetKey ( BOOL KeybSetKey(
PVOID pDeviceHandler, void *pDeviceHandler,
PSKeyManagement pTable, PSKeyManagement pTable,
PBYTE pbyBSSID, PBYTE pbyBSSID,
DWORD dwKeyIndex, DWORD dwKeyIndex,
@ -393,8 +395,8 @@ BOOL KeybSetKey (
* Return Value: TRUE if success otherwise FALSE * Return Value: TRUE if success otherwise FALSE
* *
*/ */
BOOL KeybRemoveKey ( BOOL KeybRemoveKey(
PVOID pDeviceHandler, void *pDeviceHandler,
PSKeyManagement pTable, PSKeyManagement pTable,
PBYTE pbyBSSID, PBYTE pbyBSSID,
DWORD dwKeyIndex DWORD dwKeyIndex
@ -474,8 +476,8 @@ BOOL KeybRemoveKey (
* Return Value: TRUE if success otherwise FALSE * Return Value: TRUE if success otherwise FALSE
* *
*/ */
BOOL KeybRemoveAllKey ( BOOL KeybRemoveAllKey(
PVOID pDeviceHandler, void *pDeviceHandler,
PSKeyManagement pTable, PSKeyManagement pTable,
PBYTE pbyBSSID PBYTE pbyBSSID
) )
@ -510,8 +512,8 @@ BOOL KeybRemoveAllKey (
* Return Value: TRUE if success otherwise FALSE * Return Value: TRUE if success otherwise FALSE
* *
*/ */
VOID KeyvRemoveWEPKey ( void KeyvRemoveWEPKey(
PVOID pDeviceHandler, void *pDeviceHandler,
PSKeyManagement pTable, PSKeyManagement pTable,
DWORD dwKeyIndex DWORD dwKeyIndex
) )
@ -533,8 +535,8 @@ VOID KeyvRemoveWEPKey (
return; return;
} }
VOID KeyvRemoveAllWEPKey ( void KeyvRemoveAllWEPKey(
PVOID pDeviceHandler, void *pDeviceHandler,
PSKeyManagement pTable PSKeyManagement pTable
) )
{ {
@ -675,8 +677,8 @@ BOOL KeybCheckPairewiseKey (
* Return Value: TRUE if success otherwise FALSE * Return Value: TRUE if success otherwise FALSE
* *
*/ */
BOOL KeybSetDefaultKey ( BOOL KeybSetDefaultKey(
PVOID pDeviceHandler, void *pDeviceHandler,
PSKeyManagement pTable, PSKeyManagement pTable,
DWORD dwKeyIndex, DWORD dwKeyIndex,
ULONG uKeyLength, ULONG uKeyLength,
@ -783,8 +785,8 @@ BOOL KeybSetDefaultKey (
* Return Value: TRUE if success otherwise FALSE * Return Value: TRUE if success otherwise FALSE
* *
*/ */
BOOL KeybSetAllGroupKey ( BOOL KeybSetAllGroupKey(
PVOID pDeviceHandler, void *pDeviceHandler,
PSKeyManagement pTable, PSKeyManagement pTable,
DWORD dwKeyIndex, DWORD dwKeyIndex,
ULONG uKeyLength, ULONG uKeyLength,

28
drivers/staging/vt6656/key.h
View File

@ -66,7 +66,7 @@ typedef struct tagSKeyItem
BYTE byCipherSuite; BYTE byCipherSuite;
BYTE byReserved0; BYTE byReserved0;
DWORD dwKeyIndex; DWORD dwKeyIndex;
PVOID pvKeyTable; void *pvKeyTable;
} SKeyItem, *PSKeyItem; //64 } SKeyItem, *PSKeyItem; //64
typedef struct tagSKeyTable typedef struct tagSKeyTable
@ -97,7 +97,7 @@ typedef struct tagSKeyManagement
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
VOID KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable); void KeyvInitTable(void *pDeviceHandler, PSKeyManagement pTable);
BOOL KeybGetKey( BOOL KeybGetKey(
PSKeyManagement pTable, PSKeyManagement pTable,
@ -107,7 +107,7 @@ BOOL KeybGetKey(
); );
BOOL KeybSetKey( BOOL KeybSetKey(
PVOID pDeviceHandler, void *pDeviceHandler,
PSKeyManagement pTable, PSKeyManagement pTable,
PBYTE pbyBSSID, PBYTE pbyBSSID,
DWORD dwKeyIndex, DWORD dwKeyIndex,
@ -118,26 +118,26 @@ BOOL KeybSetKey(
); );
BOOL KeybRemoveKey( BOOL KeybRemoveKey(
PVOID pDeviceHandler, void *pDeviceHandler,
PSKeyManagement pTable, PSKeyManagement pTable,
PBYTE pbyBSSID, PBYTE pbyBSSID,
DWORD dwKeyIndex DWORD dwKeyIndex
); );
BOOL KeybRemoveAllKey ( BOOL KeybRemoveAllKey(
PVOID pDeviceHandler, void *pDeviceHandler,
PSKeyManagement pTable, PSKeyManagement pTable,
PBYTE pbyBSSID PBYTE pbyBSSID
); );
VOID KeyvRemoveWEPKey( void KeyvRemoveWEPKey(
PVOID pDeviceHandler, void *pDeviceHandler,
PSKeyManagement pTable, PSKeyManagement pTable,
DWORD dwKeyIndex DWORD dwKeyIndex
); );
VOID KeyvRemoveAllWEPKey( void KeyvRemoveAllWEPKey(
PVOID pDeviceHandler, void *pDeviceHandler,
PSKeyManagement pTable PSKeyManagement pTable
); );
@ -153,8 +153,8 @@ BOOL KeybCheckPairewiseKey(
OUT PSKeyItem *pKey OUT PSKeyItem *pKey
); );
BOOL KeybSetDefaultKey ( BOOL KeybSetDefaultKey(
PVOID pDeviceHandler, void *pDeviceHandler,
PSKeyManagement pTable, PSKeyManagement pTable,
DWORD dwKeyIndex, DWORD dwKeyIndex,
ULONG uKeyLength, ULONG uKeyLength,
@ -163,8 +163,8 @@ BOOL KeybSetDefaultKey (
BYTE byKeyDecMode BYTE byKeyDecMode
); );
BOOL KeybSetAllGroupKey ( BOOL KeybSetAllGroupKey(
PVOID pDeviceHandler, void *pDeviceHandler,
PSKeyManagement pTable, PSKeyManagement pTable,
DWORD dwKeyIndex, DWORD dwKeyIndex,
ULONG uKeyLength, ULONG uKeyLength,

2
drivers/staging/vt6656/mac.c
View File

@ -110,7 +110,7 @@ void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx)
* Return Value: none * Return Value: none
* *
*/ */
VOID MACvWriteMultiAddr (PSDevice pDevice, UINT uByteIdx, BYTE byData) void MACvWriteMultiAddr(PSDevice pDevice, UINT uByteIdx, BYTE byData)
{ {
BYTE byData1; BYTE byData1;

2
drivers/staging/vt6656/mac.h
View File

@ -421,7 +421,7 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx); void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx);
VOID MACvWriteMultiAddr (PSDevice pDevice, UINT uByteIdx, BYTE byData); void MACvWriteMultiAddr(PSDevice pDevice, UINT uByteIdx, BYTE byData);
BOOL MACbShutdown(PSDevice pDevice);; BOOL MACbShutdown(PSDevice pDevice);;
void MACvSetBBType(PSDevice pDevice,BYTE byType); void MACvSetBBType(PSDevice pDevice,BYTE byType);
void MACvSetMISCFifo (PSDevice pDevice, WORD wOffset, DWORD dwData); void MACvSetMISCFifo (PSDevice pDevice, WORD wOffset, DWORD dwData);

20
drivers/staging/vt6656/main_usb.c
View File

@ -331,8 +331,8 @@ device_set_options(PSDevice pDevice) {
} }
static VOID device_init_diversity_timer(PSDevice pDevice) { static void device_init_diversity_timer(PSDevice pDevice)
{
init_timer(&pDevice->TimerSQ3Tmax1); init_timer(&pDevice->TimerSQ3Tmax1);
pDevice->TimerSQ3Tmax1.data = (ULONG)pDevice; pDevice->TimerSQ3Tmax1.data = (ULONG)pDevice;
pDevice->TimerSQ3Tmax1.function = (TimerFunction)TimerSQ3CallBack; pDevice->TimerSQ3Tmax1.function = (TimerFunction)TimerSQ3CallBack;
@ -791,7 +791,7 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
spin_lock_init(&pDevice->lock); spin_lock_init(&pDevice->lock);
pDevice->tx_80211 = device_dma0_tx_80211; pDevice->tx_80211 = device_dma0_tx_80211;
pDevice->sMgmtObj.pAdapter = (PVOID)pDevice; pDevice->sMgmtObj.pAdapter = (void *)pDevice;
netdev->netdev_ops = &device_netdev_ops; netdev->netdev_ops = &device_netdev_ops;
@ -843,7 +843,8 @@ err_nomem:
} }
static VOID device_free_tx_bufs(PSDevice pDevice) { static void device_free_tx_bufs(PSDevice pDevice)
{
PUSB_SEND_CONTEXT pTxContext; PUSB_SEND_CONTEXT pTxContext;
int ii; int ii;
@ -862,7 +863,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; PRCB pRCB;
int ii; int ii;
@ -894,8 +896,8 @@ static void usb_device_reset(PSDevice pDevice)
return ; return ;
} }
static VOID device_free_int_bufs(PSDevice pDevice) { static void device_free_int_bufs(PSDevice pDevice)
{
if (pDevice->intBuf.pDataBuf != NULL) if (pDevice->intBuf.pDataBuf != NULL)
kfree(pDevice->intBuf.pDataBuf); kfree(pDevice->intBuf.pDataBuf);
return; return;
@ -917,7 +919,7 @@ static BOOL device_alloc_bufs(PSDevice pDevice) {
goto free_tx; goto free_tx;
} }
pDevice->apTD[ii] = pTxContext; pDevice->apTD[ii] = pTxContext;
pTxContext->pDevice = (PVOID) pDevice; pTxContext->pDevice = (void *) pDevice;
//allocate URBs //allocate URBs
pTxContext->pUrb = usb_alloc_urb(0, GFP_ATOMIC); pTxContext->pUrb = usb_alloc_urb(0, GFP_ATOMIC);
if (pTxContext->pUrb == NULL) { if (pTxContext->pUrb == NULL) {
@ -946,7 +948,7 @@ static BOOL device_alloc_bufs(PSDevice pDevice) {
for (ii = 0; ii < pDevice->cbRD; ii++) { for (ii = 0; ii < pDevice->cbRD; ii++) {
pDevice->apRCB[ii] = pRCB; pDevice->apRCB[ii] = pRCB;
pRCB->pDevice = (PVOID) pDevice; pRCB->pDevice = (void *) pDevice;
//allocate URBs //allocate URBs
pRCB->pUrb = usb_alloc_urb(0, GFP_ATOMIC); pRCB->pUrb = usb_alloc_urb(0, GFP_ATOMIC);

24
drivers/staging/vt6656/michael.c
View File

@ -50,14 +50,14 @@
/* /*
* static DWORD s_dwGetUINT32(BYTE * p); Get DWORD from * static DWORD s_dwGetUINT32(BYTE * p); Get DWORD from
* 4 bytes LSByte first * 4 bytes LSByte first
* static VOID s_vPutUINT32(BYTE* p, DWORD val); Put DWORD into * static void s_vPutUINT32(BYTE* p, DWORD val); Put DWORD into
* 4 bytes LSByte first * 4 bytes LSByte first
*/ */
static VOID s_vClear(void); /* Clear the internal message, static void s_vClear(void); /* Clear the internal message,
* resets the object to the * resets the object to the
* state just after construction. */ * state just after construction. */
static VOID s_vSetKey(DWORD dwK0, DWORD dwK1); static void s_vSetKey(DWORD dwK0, DWORD dwK1);
static VOID s_vAppendByte(BYTE b); /* Add a single byte to the internal static void s_vAppendByte(BYTE b); /* Add a single byte to the internal
* message */ * message */
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
@ -79,7 +79,7 @@ static DWORD s_dwGetUINT32 (BYTE * p)
return res; 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 // Convert from DWORD to BYTE[] in a portable way
{ {
UINT i; UINT i;
@ -90,7 +90,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. */ /* Reset the state to the empty message. */
L = K0; L = K0;
@ -99,7 +99,7 @@ static VOID s_vClear(void)
M = 0; M = 0;
} }
static VOID s_vSetKey(DWORD dwK0, DWORD dwK1) static void s_vSetKey(DWORD dwK0, DWORD dwK1)
{ {
/* Set the key */ /* Set the key */
K0 = dwK0; K0 = dwK0;
@ -108,7 +108,7 @@ static VOID s_vSetKey(DWORD dwK0, DWORD dwK1)
s_vClear(); s_vClear();
} }
static VOID s_vAppendByte(BYTE b) static void s_vAppendByte(BYTE b)
{ {
/* Append the byte to our word-sized buffer */ /* Append the byte to our word-sized buffer */
M |= b << (8*nBytesInM); M |= b << (8*nBytesInM);
@ -130,14 +130,14 @@ static VOID s_vAppendByte(BYTE b)
} }
} }
VOID MIC_vInit(DWORD dwK0, DWORD dwK1) void MIC_vInit(DWORD dwK0, DWORD dwK1)
{ {
/* Set the key */ /* Set the key */
s_vSetKey(dwK0, dwK1); s_vSetKey(dwK0, dwK1);
} }
VOID MIC_vUnInit(void) void MIC_vUnInit(void)
{ {
/* Wipe the key material */ /* Wipe the key material */
K0 = 0; K0 = 0;
@ -148,7 +148,7 @@ VOID MIC_vUnInit(void)
s_vClear(); s_vClear();
} }
VOID MIC_vAppend(PBYTE src, UINT nBytes) void MIC_vAppend(PBYTE src, UINT nBytes)
{ {
/* This is simple */ /* This is simple */
while (nBytes > 0) { while (nBytes > 0) {
@ -157,7 +157,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 */ /* Append the minimum padding */
s_vAppendByte(0x5a); s_vAppendByte(0x5a);

8
drivers/staging/vt6656/michael.h
View File

@ -35,16 +35,16 @@
/*--------------------- Export Types ------------------------------*/ /*--------------------- 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 // 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. // Get the MIC result. Destination should accept 8 bytes of result.
// This also resets the message to empty. // This also resets the message to empty.
VOID MIC_vGetMIC(PDWORD pdwL, PDWORD pdwR); void MIC_vGetMIC(PDWORD pdwL, PDWORD pdwR);
/*--------------------- Export Macros ------------------------------*/ /*--------------------- Export Macros ------------------------------*/

6
drivers/staging/vt6656/power.c
View File

@ -76,7 +76,7 @@ static int msglevel =MSG_LEVEL_INFO;
-*/ -*/
VOID void
PSvEnablePowerSaving( PSvEnablePowerSaving(
HANDLE hDeviceContext, HANDLE hDeviceContext,
WORD wListenInterval WORD wListenInterval
@ -154,7 +154,7 @@ PSvEnablePowerSaving(
* *
-*/ -*/
VOID void
PSvDisablePowerSaving( PSvDisablePowerSaving(
HANDLE hDeviceContext HANDLE hDeviceContext
) )
@ -262,7 +262,7 @@ PSbConsiderPowerDown(
VOID void
PSvSendPSPOLL( PSvSendPSPOLL(
HANDLE hDeviceContext HANDLE hDeviceContext
) )

6
drivers/staging/vt6656/power.h
View File

@ -55,18 +55,18 @@ PSbConsiderPowerDown(
BOOL bCheckCountToWakeUp BOOL bCheckCountToWakeUp
); );
VOID void
PSvDisablePowerSaving( PSvDisablePowerSaving(
HANDLE hDeviceContext HANDLE hDeviceContext
); );
VOID void
PSvEnablePowerSaving( PSvEnablePowerSaving(
HANDLE hDeviceContext, HANDLE hDeviceContext,
WORD wListenInterval WORD wListenInterval
); );
VOID void
PSvSendPSPOLL( PSvSendPSPOLL(
HANDLE hDeviceContext HANDLE hDeviceContext
); );

4
drivers/staging/vt6656/rc4.c
View File

@ -32,7 +32,7 @@
#include "rc4.h" #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 ust1, ust2;
UINT keyindex; UINT keyindex;
@ -78,7 +78,7 @@ UINT rc4_byte(PRC4Ext pRC4)
return pbyst[(ustx + usty) & 0xff]; return pbyst[(ustx + usty) & 0xff];
} }
VOID rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest,
PBYTE pbySrc, UINT cbData_len) PBYTE pbySrc, UINT cbData_len)
{ {
UINT ii; UINT ii;

2
drivers/staging/vt6656/rc4.h
View File

@ -40,7 +40,7 @@ typedef struct {
BYTE abystate[256]; BYTE abystate[256];
} RC4Ext, *PRC4Ext; } 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); UINT rc4_byte(PRC4Ext pRC4);
void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, PBYTE pbySrc, UINT cbData_len); void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, PBYTE pbySrc, UINT cbData_len);

4
drivers/staging/vt6656/rf.c
View File

@ -954,7 +954,7 @@ BOOL bResult = TRUE;
* Return Value: none * Return Value: none
* *
-*/ -*/
VOID void
RFvRSSITodBm ( RFvRSSITodBm (
PSDevice pDevice, PSDevice pDevice,
BYTE byCurrRSSI, BYTE byCurrRSSI,
@ -984,7 +984,7 @@ RFvRSSITodBm (
VOID void
RFbRFTableDownload ( RFbRFTableDownload (
PSDevice pDevice PSDevice pDevice
) )

4
drivers/staging/vt6656/rf.h
View File

@ -76,14 +76,14 @@ BOOL RFbRawSetPower(
UINT uRATE UINT uRATE
); );
VOID void
RFvRSSITodBm ( RFvRSSITodBm (
PSDevice pDevice, PSDevice pDevice,
BYTE byCurrRSSI, BYTE byCurrRSSI,
long * pldBm long * pldBm
); );
VOID void
RFbRFTableDownload ( RFbRFTableDownload (
PSDevice pDevice PSDevice pDevice
); );

99
drivers/staging/vt6656/rxtx.c
View File

@ -113,7 +113,7 @@ const WORD wFB_Opt1[2][5] = {
/*--------------------- Static Functions --------------------------*/ /*--------------------- Static Functions --------------------------*/
static static
VOID void
s_vSaveTxPktInfo( s_vSaveTxPktInfo(
PSDevice pDevice, PSDevice pDevice,
BYTE byPktNum, BYTE byPktNum,
@ -123,22 +123,22 @@ s_vSaveTxPktInfo(
); );
static static
PVOID void *
s_vGetFreeContext( s_vGetFreeContext(
PSDevice pDevice PSDevice pDevice
); );
static static
VOID void
s_vGenerateTxParameter( s_vGenerateTxParameter(
PSDevice pDevice, PSDevice pDevice,
BYTE byPktType, BYTE byPktType,
WORD wCurrentRate, WORD wCurrentRate,
PVOID pTxBufHead, void *pTxBufHead,
PVOID pvRrvTime, void *pvRrvTime,
PVOID pvRTS, void *pvRTS,
PVOID pvCTS, void *pvCTS,
UINT cbFrameSize, UINT cbFrameSize,
BOOL bNeedACK, BOOL bNeedACK,
UINT uDMAIdx, UINT uDMAIdx,
@ -152,7 +152,7 @@ s_uFillDataHead (
PSDevice pDevice, PSDevice pDevice,
BYTE byPktType, BYTE byPktType,
WORD wCurrentRate, WORD wCurrentRate,
PVOID pTxDataHead, void *pTxDataHead,
UINT cbFrameLength, UINT cbFrameLength,
UINT uDMAIdx, UINT uDMAIdx,
BOOL bNeedAck, BOOL bNeedAck,
@ -166,7 +166,7 @@ s_uFillDataHead (
static static
VOID void
s_vGenerateMACHeader ( s_vGenerateMACHeader (
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyBufferAddr, PBYTE pbyBufferAddr,
@ -179,7 +179,7 @@ s_vGenerateMACHeader (
); );
static static
VOID void
s_vFillTxKey( s_vFillTxKey(
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyBuf, PBYTE pbyBuf,
@ -191,7 +191,7 @@ s_vFillTxKey(
); );
static static
VOID void
s_vSWencryption ( s_vSWencryption (
PSDevice pDevice, PSDevice pDevice,
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
@ -221,12 +221,12 @@ s_uGetRTSCTSRsvTime (
); );
static static
VOID void
s_vFillCTSHead ( s_vFillCTSHead (
PSDevice pDevice, PSDevice pDevice,
UINT uDMAIdx, UINT uDMAIdx,
BYTE byPktType, BYTE byPktType,
PVOID pvCTS, void *pvCTS,
UINT cbFrameLength, UINT cbFrameLength,
BOOL bNeedAck, BOOL bNeedAck,
BOOL bDisCRC, BOOL bDisCRC,
@ -235,11 +235,11 @@ s_vFillCTSHead (
); );
static static
VOID void
s_vFillRTSHead( s_vFillRTSHead(
PSDevice pDevice, PSDevice pDevice,
BYTE byPktType, BYTE byPktType,
PVOID pvRTS, void *pvRTS,
UINT cbFrameLength, UINT cbFrameLength,
BOOL bNeedAck, BOOL bNeedAck,
BOOL bDisCRC, BOOL bDisCRC,
@ -280,7 +280,7 @@ s_uGetRTSCTSDuration (
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
static static
PVOID void *
s_vGetFreeContext( s_vGetFreeContext(
PSDevice pDevice PSDevice pDevice
) )
@ -302,12 +302,12 @@ s_vGetFreeContext(
if ( ii == pDevice->cbTD ) { if ( ii == pDevice->cbTD ) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No Free Tx Context\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No Free Tx Context\n");
} }
return ((PVOID) pReturnContext); return (void *) pReturnContext;
} }
static static
VOID void
s_vSaveTxPktInfo(PSDevice pDevice, BYTE byPktNum, PBYTE pbyDestAddr, WORD wPktLength, WORD wFIFOCtl) s_vSaveTxPktInfo(PSDevice pDevice, BYTE byPktNum, PBYTE pbyDestAddr, WORD wPktLength, WORD wFIFOCtl)
{ {
PSStatCounter pStatistic=&(pDevice->scStatistic); PSStatCounter pStatistic=&(pDevice->scStatistic);
@ -331,7 +331,7 @@ s_vSaveTxPktInfo(PSDevice pDevice, BYTE byPktNum, PBYTE pbyDestAddr, WORD wPktLe
static static
VOID void
s_vFillTxKey ( s_vFillTxKey (
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyBuf, PBYTE pbyBuf,
@ -448,7 +448,7 @@ s_vFillTxKey (
static static
VOID void
s_vSWencryption ( s_vSWencryption (
PSDevice pDevice, PSDevice pDevice,
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
@ -841,7 +841,7 @@ s_uFillDataHead (
PSDevice pDevice, PSDevice pDevice,
BYTE byPktType, BYTE byPktType,
WORD wCurrentRate, WORD wCurrentRate,
PVOID pTxDataHead, void *pTxDataHead,
UINT cbFrameLength, UINT cbFrameLength,
UINT uDMAIdx, UINT uDMAIdx,
BOOL bNeedAck, BOOL bNeedAck,
@ -981,11 +981,11 @@ s_uFillDataHead (
static static
VOID void
s_vFillRTSHead ( s_vFillRTSHead (
PSDevice pDevice, PSDevice pDevice,
BYTE byPktType, BYTE byPktType,
PVOID pvRTS, void *pvRTS,
UINT cbFrameLength, UINT cbFrameLength,
BOOL bNeedAck, BOOL bNeedAck,
BOOL bDisCRC, BOOL bDisCRC,
@ -1209,12 +1209,12 @@ s_vFillRTSHead (
} }
static static
VOID void
s_vFillCTSHead ( s_vFillCTSHead (
PSDevice pDevice, PSDevice pDevice,
UINT uDMAIdx, UINT uDMAIdx,
BYTE byPktType, BYTE byPktType,
PVOID pvCTS, void *pvCTS,
UINT cbFrameLength, UINT cbFrameLength,
BOOL bNeedAck, BOOL bNeedAck,
BOOL bDisCRC, BOOL bDisCRC,
@ -1309,15 +1309,15 @@ s_vFillCTSHead (
-*/ -*/
// UINT cbFrameSize,//Hdr+Payload+FCS // UINT cbFrameSize,//Hdr+Payload+FCS
static static
VOID void
s_vGenerateTxParameter ( s_vGenerateTxParameter (
PSDevice pDevice, PSDevice pDevice,
BYTE byPktType, BYTE byPktType,
WORD wCurrentRate, WORD wCurrentRate,
PVOID pTxBufHead, void *pTxBufHead,
PVOID pvRrvTime, void *pvRrvTime,
PVOID pvRTS, void *pvRTS,
PVOID pvCTS, void *pvCTS,
UINT cbFrameSize, UINT cbFrameSize,
BOOL bNeedACK, BOOL bNeedACK,
UINT uDMAIdx, UINT uDMAIdx,
@ -1455,11 +1455,11 @@ s_bPacketToWirelessUsb(
BYTE abySNAP_Bridgetunnel[6] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0xF8}; BYTE abySNAP_Bridgetunnel[6] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0xF8};
UINT uDuration; UINT uDuration;
UINT cbHeaderLength= 0,uPadding = 0; UINT cbHeaderLength= 0,uPadding = 0;
PVOID pvRrvTime; void *pvRrvTime;
PSMICHDRHead pMICHDR; PSMICHDRHead pMICHDR;
PVOID pvRTS; void *pvRTS;
PVOID pvCTS; void *pvCTS;
PVOID pvTxDataHd; void *pvTxDataHd;
BYTE byFBOption = AUTO_FB_NONE,byFragType; BYTE byFBOption = AUTO_FB_NONE,byFragType;
WORD wTxBufSize; WORD wTxBufSize;
DWORD dwMICKey0,dwMICKey1,dwMIC_Priority,dwCRC; DWORD dwMICKey0,dwMICKey1,dwMIC_Priority,dwCRC;
@ -1694,7 +1694,8 @@ s_bPacketToWirelessUsb(
//Fill FIFO,RrvTime,RTS,and CTS //Fill FIFO,RrvTime,RTS,and CTS
s_vGenerateTxParameter(pDevice, byPktType, wCurrentRate, (PVOID)pbyTxBufferAddr, pvRrvTime, pvRTS, pvCTS, s_vGenerateTxParameter(pDevice, byPktType, wCurrentRate,
(void *)pbyTxBufferAddr, pvRrvTime, pvRTS, pvCTS,
cbFrameSize, bNeedACK, uDMAIdx, psEthHeader); cbFrameSize, bNeedACK, uDMAIdx, psEthHeader);
//Fill DataHead //Fill DataHead
uDuration = s_uFillDataHead(pDevice, byPktType, wCurrentRate, pvTxDataHd, cbFrameSize, uDMAIdx, bNeedACK, uDuration = s_uFillDataHead(pDevice, byPktType, wCurrentRate, pvTxDataHd, cbFrameSize, uDMAIdx, bNeedACK,
@ -1856,7 +1857,7 @@ s_bPacketToWirelessUsb(
* *
-*/ -*/
VOID void
s_vGenerateMACHeader ( s_vGenerateMACHeader (
PSDevice pDevice, PSDevice pDevice,
PBYTE pbyBufferAddr, PBYTE pbyBufferAddr,
@ -1964,9 +1965,9 @@ CMD_STATUS csMgmt_xmit(
{ {
BYTE byPktType; BYTE byPktType;
PBYTE pbyTxBufferAddr; PBYTE pbyTxBufferAddr;
PVOID pvRTS; void *pvRTS;
PSCTS pCTS; PSCTS pCTS;
PVOID pvTxDataHd; void *pvTxDataHd;
UINT uDuration; UINT uDuration;
UINT cbReqCount; UINT cbReqCount;
PS802_11Header pMACHeader; PS802_11Header pMACHeader;
@ -1984,8 +1985,8 @@ CMD_STATUS csMgmt_xmit(
WORD wTxBufSize; WORD wTxBufSize;
UINT cbMacHdLen; UINT cbMacHdLen;
SEthernetHeader sEthHeader; SEthernetHeader sEthHeader;
PVOID pvRrvTime; void *pvRrvTime;
PVOID pMICHDR; void *pMICHDR;
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
WORD wCurrentRate = RATE_1M; WORD wCurrentRate = RATE_1M;
PTX_BUFFER pTX_Buffer; PTX_BUFFER pTX_Buffer;
@ -2137,7 +2138,8 @@ CMD_STATUS csMgmt_xmit(
cbHeaderSize = wTxBufSize + sizeof(SRrvTime_ab) + sizeof(STxDataHead_ab); cbHeaderSize = wTxBufSize + sizeof(SRrvTime_ab) + sizeof(STxDataHead_ab);
} }
memset((PVOID)(pbyTxBufferAddr + wTxBufSize), 0, (cbHeaderSize - wTxBufSize)); memset((void *)(pbyTxBufferAddr + wTxBufSize), 0,
(cbHeaderSize - wTxBufSize));
memcpy(&(sEthHeader.abyDstAddr[0]), memcpy(&(sEthHeader.abyDstAddr[0]),
&(pPacket->p80211Header->sA3.abyAddr1[0]), &(pPacket->p80211Header->sA3.abyAddr1[0]),
@ -2342,15 +2344,15 @@ csBeacon_xmit(
VOID void
vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) { vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) {
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
BYTE byPktType; BYTE byPktType;
PBYTE pbyTxBufferAddr; PBYTE pbyTxBufferAddr;
PVOID pvRTS; void *pvRTS;
PVOID pvCTS; void *pvCTS;
PVOID pvTxDataHd; void *pvTxDataHd;
UINT uDuration; UINT uDuration;
UINT cbReqCount; UINT cbReqCount;
PS802_11Header pMACHeader; PS802_11Header pMACHeader;
@ -2374,8 +2376,8 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) {
WORD wTxBufSize; WORD wTxBufSize;
UINT cbMacHdLen; UINT cbMacHdLen;
SEthernetHeader sEthHeader; SEthernetHeader sEthHeader;
PVOID pvRrvTime; void *pvRrvTime;
PVOID pMICHDR; void *pMICHDR;
WORD wCurrentRate = RATE_1M; WORD wCurrentRate = RATE_1M;
PUWLAN_80211HDR p80211Header; PUWLAN_80211HDR p80211Header;
UINT uNodeIndex = 0; UINT uNodeIndex = 0;
@ -2574,7 +2576,8 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) {
pvTxDataHd = (PSTxDataHead_ab) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_ab) + cbMICHDR); pvTxDataHd = (PSTxDataHead_ab) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_ab) + cbMICHDR);
cbHeaderSize = wTxBufSize + sizeof(SRrvTime_ab) + cbMICHDR + sizeof(STxDataHead_ab); cbHeaderSize = wTxBufSize + sizeof(SRrvTime_ab) + cbMICHDR + sizeof(STxDataHead_ab);
} }
memset((PVOID)(pbyTxBufferAddr + wTxBufSize), 0, (cbHeaderSize - wTxBufSize)); memset((void *)(pbyTxBufferAddr + wTxBufSize), 0,
(cbHeaderSize - wTxBufSize));
memcpy(&(sEthHeader.abyDstAddr[0]), memcpy(&(sEthHeader.abyDstAddr[0]),
&(p80211Header->sA3.abyAddr1[0]), &(p80211Header->sA3.abyAddr1[0]),
ETH_ALEN); ETH_ALEN);

2
drivers/staging/vt6656/rxtx.h
View File

@ -682,7 +682,7 @@ bPacketToWirelessUsb(
OUT UINT *pcbTotalLen 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); NTSTATUS nsDMA_tx_packet(PSDevice pDevice, UINT uDMAIdx, struct sk_buff *skb);
CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);

2
drivers/staging/vt6656/tkip.c
View File

@ -183,7 +183,7 @@ unsigned int rotr1(unsigned int a)
* Return Value: none * Return Value: none
* *
*/ */
VOID TKIPvMixKey( void TKIPvMixKey(
PBYTE pbyTKey, PBYTE pbyTKey,
PBYTE pbyTA, PBYTE pbyTA,
WORD wTSC15_0, WORD wTSC15_0,

2
drivers/staging/vt6656/tkip.h
View File

@ -46,7 +46,7 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
VOID TKIPvMixKey( void TKIPvMixKey(
PBYTE pbyTKey, PBYTE pbyTKey,
PBYTE pbyTA, PBYTE pbyTA,
WORD wTSC15_0, WORD wTSC15_0,

8
drivers/staging/vt6656/ttype.h
View File

@ -33,10 +33,6 @@
/******* Common definitions and typedefs ***********************************/ /******* Common definitions and typedefs ***********************************/
#ifndef VOID
#define VOID void
#endif
#ifndef OUT #ifndef OUT
#define OUT #define OUT
#endif #endif
@ -146,13 +142,11 @@ typedef DWORD * PDWORD;
typedef QWORD * PQWORD; typedef QWORD * PQWORD;
typedef void * PVOID;
// handle declaration // handle declaration
#ifdef STRICT #ifdef STRICT
typedef void *HANDLE; typedef void *HANDLE;
#else #else
typedef PVOID HANDLE; typedef void *HANDLE;
#endif #endif
#endif // __TTYPE_H__ #endif // __TTYPE_H__

36
drivers/staging/vt6656/usbpipe.c
View File

@ -71,34 +71,34 @@ static int msglevel =MSG_LEVEL_INFO;
/*--------------------- Static Functions --------------------------*/ /*--------------------- Static Functions --------------------------*/
static static
VOID void
s_nsInterruptUsbIoCompleteRead( s_nsInterruptUsbIoCompleteRead(
struct urb *urb struct urb *urb
); );
static static
VOID void
s_nsBulkInUsbIoCompleteRead( s_nsBulkInUsbIoCompleteRead(
struct urb *urb struct urb *urb
); );
static static
VOID void
s_nsBulkOutIoCompleteWrite( s_nsBulkOutIoCompleteWrite(
struct urb *urb struct urb *urb
); );
static static
VOID void
s_nsControlInUsbIoCompleteRead( s_nsControlInUsbIoCompleteRead(
struct urb *urb struct urb *urb
); );
static static
VOID void
s_nsControlInUsbIoCompleteWrite( s_nsControlInUsbIoCompleteWrite(
struct urb *urb struct urb *urb
); );
@ -142,7 +142,7 @@ PIPEnsControlOutAsyn(
0x40, // RequestType 0x40, // RequestType
wValue, wValue,
wIndex, wIndex,
(PVOID) pbyBuffer, (void *) pbyBuffer,
wLength, wLength,
HZ HZ
); );
@ -279,7 +279,7 @@ PIPEnsControlIn(
} }
static static
VOID void
s_nsControlInUsbIoCompleteWrite( s_nsControlInUsbIoCompleteWrite(
struct urb *urb struct urb *urb
) )
@ -320,7 +320,7 @@ s_nsControlInUsbIoCompleteWrite(
* *
*/ */
static static
VOID void
s_nsControlInUsbIoCompleteRead( s_nsControlInUsbIoCompleteRead(
struct urb *urb struct urb *urb
) )
@ -385,7 +385,7 @@ PIPEnsInterruptRead(
usb_fill_int_urb(pDevice->pInterruptURB, usb_fill_int_urb(pDevice->pInterruptURB,
pDevice->usb, pDevice->usb,
usb_rcvintpipe(pDevice->usb, 1), usb_rcvintpipe(pDevice->usb, 1),
(PVOID) pDevice->intBuf.pDataBuf, (void *) pDevice->intBuf.pDataBuf,
MAX_INTERRUPT_SIZE, MAX_INTERRUPT_SIZE,
s_nsInterruptUsbIoCompleteRead, s_nsInterruptUsbIoCompleteRead,
pDevice, pDevice,
@ -396,7 +396,7 @@ PIPEnsInterruptRead(
usb_fill_int_urb(pDevice->pInterruptURB, usb_fill_int_urb(pDevice->pInterruptURB,
pDevice->usb, pDevice->usb,
usb_rcvintpipe(pDevice->usb, 1), usb_rcvintpipe(pDevice->usb, 1),
(PVOID) pDevice->intBuf.pDataBuf, (void *) pDevice->intBuf.pDataBuf,
MAX_INTERRUPT_SIZE, MAX_INTERRUPT_SIZE,
s_nsInterruptUsbIoCompleteRead, s_nsInterruptUsbIoCompleteRead,
pDevice, pDevice,
@ -409,7 +409,7 @@ PIPEnsInterruptRead(
usb_fill_bulk_urb(pDevice->pInterruptURB, usb_fill_bulk_urb(pDevice->pInterruptURB,
pDevice->usb, pDevice->usb,
usb_rcvbulkpipe(pDevice->usb, 1), usb_rcvbulkpipe(pDevice->usb, 1),
(PVOID) pDevice->intBuf.pDataBuf, (void *) pDevice->intBuf.pDataBuf,
MAX_INTERRUPT_SIZE, MAX_INTERRUPT_SIZE,
s_nsInterruptUsbIoCompleteRead, s_nsInterruptUsbIoCompleteRead,
pDevice); pDevice);
@ -441,7 +441,7 @@ usb_fill_bulk_urb(pDevice->pInterruptURB,
* *
*/ */
static static
VOID void
s_nsInterruptUsbIoCompleteRead( s_nsInterruptUsbIoCompleteRead(
struct urb *urb struct urb *urb
) )
@ -506,7 +506,7 @@ s_nsInterruptUsbIoCompleteRead(
usb_fill_bulk_urb(pDevice->pInterruptURB, usb_fill_bulk_urb(pDevice->pInterruptURB,
pDevice->usb, pDevice->usb,
usb_rcvbulkpipe(pDevice->usb, 1), usb_rcvbulkpipe(pDevice->usb, 1),
(PVOID) pDevice->intBuf.pDataBuf, (void *) pDevice->intBuf.pDataBuf,
MAX_INTERRUPT_SIZE, MAX_INTERRUPT_SIZE,
s_nsInterruptUsbIoCompleteRead, s_nsInterruptUsbIoCompleteRead,
pDevice); pDevice);
@ -572,7 +572,7 @@ PIPEnsBulkInUsbRead(
usb_fill_bulk_urb(pUrb, usb_fill_bulk_urb(pUrb,
pDevice->usb, pDevice->usb,
usb_rcvbulkpipe(pDevice->usb, 2), usb_rcvbulkpipe(pDevice->usb, 2),
(PVOID) (pRCB->skb->data), (void *) (pRCB->skb->data),
MAX_TOTAL_SIZE_WITH_ALL_HEADERS, MAX_TOTAL_SIZE_WITH_ALL_HEADERS,
s_nsBulkInUsbIoCompleteRead, s_nsBulkInUsbIoCompleteRead,
pRCB); pRCB);
@ -606,7 +606,7 @@ PIPEnsBulkInUsbRead(
* *
*/ */
static static
VOID void
s_nsBulkInUsbIoCompleteRead( s_nsBulkInUsbIoCompleteRead(
struct urb *urb struct urb *urb
) )
@ -718,8 +718,8 @@ PIPEnsSendBulkOut(
usb_fill_bulk_urb( usb_fill_bulk_urb(
pUrb, pUrb,
pDevice->usb, pDevice->usb,
usb_sndbulkpipe(pDevice->usb, 3), usb_sndbulkpipe(pDevice->usb, 3),
(PVOID) &(pContext->Data[0]), (void *) &(pContext->Data[0]),
pContext->uBufLen, pContext->uBufLen,
s_nsBulkOutIoCompleteWrite, s_nsBulkOutIoCompleteWrite,
pContext); pContext);
@ -766,7 +766,7 @@ PIPEnsSendBulkOut(
* *
*/ */
static static
VOID void
s_nsBulkOutIoCompleteWrite( s_nsBulkOutIoCompleteWrite(
struct urb *urb struct urb *urb
) )

12
drivers/staging/vt6656/wcmd.c
View File

@ -69,7 +69,7 @@ static int msglevel =MSG_LEVEL_INFO;
/*--------------------- Static Functions --------------------------*/ /*--------------------- Static Functions --------------------------*/
static static
VOID void
s_vProbeChannel( s_vProbeChannel(
PSDevice pDevice PSDevice pDevice
); );
@ -210,7 +210,7 @@ vAdHocBeaconRestart(PSDevice pDevice)
-*/ -*/
static static
VOID void
s_vProbeChannel( s_vProbeChannel(
PSDevice pDevice PSDevice pDevice
) )
@ -325,7 +325,7 @@ s_MgrMakeProbeRequest(
VOID void
vCommandTimerWait( vCommandTimerWait(
HANDLE hDeviceContext, HANDLE hDeviceContext,
UINT MSecond UINT MSecond
@ -345,7 +345,7 @@ vCommandTimerWait(
VOID void
vRunCommand( vRunCommand(
HANDLE hDeviceContext HANDLE hDeviceContext
) )
@ -1287,7 +1287,7 @@ BOOL s_bClearBSSID_SCAN (
//mike add:reset command timer //mike add:reset command timer
VOID void
vResetCommandTimer( vResetCommandTimer(
HANDLE hDeviceContext HANDLE hDeviceContext
) )
@ -1311,7 +1311,7 @@ vResetCommandTimer(
//2007-0115-08<Add>by MikeLiu //2007-0115-08<Add>by MikeLiu
#ifdef TxInSleep #ifdef TxInSleep
VOID void
BSSvSecondTxData( BSSvSecondTxData(
HANDLE hDeviceContext HANDLE hDeviceContext
) )

10
drivers/staging/vt6656/wcmd.h
View File

@ -116,7 +116,7 @@ typedef enum tagCMD_STATE {
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
VOID void
vResetCommandTimer( vResetCommandTimer(
HANDLE hDeviceContext HANDLE hDeviceContext
); );
@ -128,20 +128,20 @@ bScheduleCommand(
PBYTE pbyItem0 PBYTE pbyItem0
); );
VOID void
vRunCommand( vRunCommand(
HANDLE hDeviceContext HANDLE hDeviceContext
); );
/* /*
VOID void
WCMDvCommandThread( WCMDvCommandThread(
PVOID Context void * Context
); );
*/ */
//2007-0115-09<Add>by MikeLiu //2007-0115-09<Add>by MikeLiu
#ifdef TxInSleep #ifdef TxInSleep
VOID void
BSSvSecondTxData( BSSvSecondTxData(
HANDLE hDeviceContext HANDLE hDeviceContext
); );

108
drivers/staging/vt6656/wmgr.c
View File

@ -113,7 +113,7 @@ s_MgrMakeAssocRequest(
); );
static static
VOID void
s_vMgrRxAssocRequest( s_vMgrRxAssocRequest(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -135,7 +135,7 @@ s_MgrMakeReAssocRequest(
); );
static static
VOID void
s_vMgrRxAssocResponse( s_vMgrRxAssocResponse(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -144,7 +144,7 @@ s_vMgrRxAssocResponse(
); );
static static
VOID void
s_vMgrRxDisassociation( s_vMgrRxDisassociation(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -153,7 +153,7 @@ s_vMgrRxDisassociation(
// Authentication/deauthen functions // Authentication/deauthen functions
static static
VOID void
s_vMgrRxAuthenSequence_1( s_vMgrRxAuthenSequence_1(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -161,7 +161,7 @@ s_vMgrRxAuthenSequence_1(
); );
static static
VOID void
s_vMgrRxAuthenSequence_2( s_vMgrRxAuthenSequence_2(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -169,7 +169,7 @@ s_vMgrRxAuthenSequence_2(
); );
static static
VOID void
s_vMgrRxAuthenSequence_3( s_vMgrRxAuthenSequence_3(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -177,7 +177,7 @@ s_vMgrRxAuthenSequence_3(
); );
static static
VOID void
s_vMgrRxAuthenSequence_4( s_vMgrRxAuthenSequence_4(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -185,7 +185,7 @@ s_vMgrRxAuthenSequence_4(
); );
static static
VOID void
s_vMgrRxAuthentication( s_vMgrRxAuthentication(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -193,7 +193,7 @@ s_vMgrRxAuthentication(
); );
static static
VOID void
s_vMgrRxDeauthentication( s_vMgrRxDeauthentication(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -203,7 +203,7 @@ s_vMgrRxDeauthentication(
// Scan functions // Scan functions
// probe request/response functions // probe request/response functions
static static
VOID void
s_vMgrRxProbeRequest( s_vMgrRxProbeRequest(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -211,7 +211,7 @@ s_vMgrRxProbeRequest(
); );
static static
VOID void
s_vMgrRxProbeResponse( s_vMgrRxProbeResponse(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -220,7 +220,7 @@ s_vMgrRxProbeResponse(
// beacon functions // beacon functions
static static
VOID void
s_vMgrRxBeacon( s_vMgrRxBeacon(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -229,7 +229,7 @@ s_vMgrRxBeacon(
); );
static static
VOID void
s_vMgrFormatTIM( s_vMgrFormatTIM(
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PWLAN_IE_TIM pTIM PWLAN_IE_TIM pTIM
@ -299,7 +299,7 @@ s_MgrMakeProbeResponse(
// received status // received status
static static
VOID void
s_vMgrLogStatus( s_vMgrLogStatus(
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
WORD wStatus WORD wStatus
@ -307,7 +307,7 @@ s_vMgrLogStatus(
static static
VOID void
s_vMgrSynchBSS ( s_vMgrSynchBSS (
PSDevice pDevice, PSDevice pDevice,
UINT uBSSMode, UINT uBSSMode,
@ -324,7 +324,7 @@ s_bCipherMatch (
OUT PBYTE pbyCCSGK OUT PBYTE pbyCCSGK
); );
static VOID Encyption_Rebuild( static void Encyption_Rebuild(
PSDevice pDevice, PSDevice pDevice,
PKnownBSS pCurr PKnownBSS pCurr
); );
@ -347,7 +347,7 @@ s_bCipherMatch (
* *
-*/ -*/
VOID void
vMgrObjectInit( vMgrObjectInit(
HANDLE hDeviceContext HANDLE hDeviceContext
) )
@ -415,7 +415,7 @@ vMgrObjectInit(
-*/ -*/
VOID void
vMgrAssocBeginSta( vMgrAssocBeginSta(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -491,7 +491,7 @@ vMgrAssocBeginSta(
* *
-*/ -*/
VOID void
vMgrReAssocBeginSta( vMgrReAssocBeginSta(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -570,7 +570,7 @@ vMgrReAssocBeginSta(
* *
-*/ -*/
VOID void
vMgrDisassocBeginSta( vMgrDisassocBeginSta(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -633,7 +633,7 @@ vMgrDisassocBeginSta(
-*/ -*/
static static
VOID void
s_vMgrRxAssocRequest( s_vMgrRxAssocRequest(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -691,7 +691,7 @@ s_vMgrRxAssocRequest(
} }
RATEvParseMaxRate((PVOID)pDevice, RATEvParseMaxRate((void *)pDevice,
(PWLAN_IE_SUPP_RATES)abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)abyCurrExtSuppRates, (PWLAN_IE_SUPP_RATES)abyCurrExtSuppRates,
FALSE, // do not change our basic rate FALSE, // do not change our basic rate
@ -789,7 +789,7 @@ s_vMgrRxAssocRequest(
-*/ -*/
static static
VOID void
s_vMgrRxReAssocRequest( s_vMgrRxReAssocRequest(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -844,7 +844,7 @@ s_vMgrRxReAssocRequest(
} }
RATEvParseMaxRate((PVOID)pDevice, RATEvParseMaxRate((void *)pDevice,
(PWLAN_IE_SUPP_RATES)abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)abyCurrExtSuppRates, (PWLAN_IE_SUPP_RATES)abyCurrExtSuppRates,
FALSE, // do not change our basic rate FALSE, // do not change our basic rate
@ -936,7 +936,7 @@ s_vMgrRxReAssocRequest(
-*/ -*/
static static
VOID void
s_vMgrRxAssocResponse( s_vMgrRxAssocResponse(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -1102,7 +1102,7 @@ if(pMgmt->eCurrState == WMAC_STATE_ASSOC)
* *
-*/ -*/
VOID void
vMgrAuthenBeginSta( vMgrAuthenBeginSta(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -1160,7 +1160,7 @@ vMgrAuthenBeginSta(
* *
-*/ -*/
VOID void
vMgrDeAuthenBeginSta( vMgrDeAuthenBeginSta(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -1217,7 +1217,7 @@ vMgrDeAuthenBeginSta(
-*/ -*/
static static
VOID void
s_vMgrRxAuthentication( s_vMgrRxAuthentication(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -1275,7 +1275,7 @@ s_vMgrRxAuthentication(
static static
VOID void
s_vMgrRxAuthenSequence_1( s_vMgrRxAuthenSequence_1(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -1381,7 +1381,7 @@ s_vMgrRxAuthenSequence_1(
-*/ -*/
static static
VOID void
s_vMgrRxAuthenSequence_2( s_vMgrRxAuthenSequence_2(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -1483,7 +1483,7 @@ s_vMgrRxAuthenSequence_2(
-*/ -*/
static static
VOID void
s_vMgrRxAuthenSequence_3( s_vMgrRxAuthenSequence_3(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -1571,7 +1571,7 @@ reply:
* *
-*/ -*/
static static
VOID void
s_vMgrRxAuthenSequence_4( s_vMgrRxAuthenSequence_4(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -1610,7 +1610,7 @@ s_vMgrRxAuthenSequence_4(
-*/ -*/
static static
VOID void
s_vMgrRxDisassociation( s_vMgrRxDisassociation(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -1700,7 +1700,7 @@ s_vMgrRxDisassociation(
-*/ -*/
static static
VOID void
s_vMgrRxDeauthentication( s_vMgrRxDeauthentication(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -1826,7 +1826,7 @@ ChannelExceedZoneType(
-*/ -*/
static static
VOID void
s_vMgrRxBeacon( s_vMgrRxBeacon(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -2089,7 +2089,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
pMgmt->abyCurrExtSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)pBSSList->abyExtSuppRates, pMgmt->abyCurrExtSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)pBSSList->abyExtSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates,
uRateLen); uRateLen);
RATEvParseMaxRate( (PVOID)pDevice, RATEvParseMaxRate((void *)pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates,
TRUE, TRUE,
@ -2227,7 +2227,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)sFrame.pSuppRates, pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)sFrame.pSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
WLAN_RATES_MAXLEN_11B); WLAN_RATES_MAXLEN_11B);
RATEvParseMaxRate( (PVOID)pDevice, RATEvParseMaxRate((void *)pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
NULL, NULL,
TRUE, TRUE,
@ -2248,7 +2248,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)sFrame.pSuppRates, pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)sFrame.pSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
WLAN_RATES_MAXLEN_11B); WLAN_RATES_MAXLEN_11B);
RATEvParseMaxRate( (PVOID)pDevice, RATEvParseMaxRate((void *)pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
NULL, NULL,
TRUE, TRUE,
@ -2355,7 +2355,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
* CMD_STATUS * CMD_STATUS
* *
-*/ -*/
VOID void
vMgrCreateOwnIBSS( vMgrCreateOwnIBSS(
HANDLE hDeviceContext, HANDLE hDeviceContext,
OUT PCMD_STATUS pStatus OUT PCMD_STATUS pStatus
@ -2466,7 +2466,8 @@ vMgrCreateOwnIBSS(
// set basic rate // set basic rate
RATEvParseMaxRate((PVOID)pDevice, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, RATEvParseMaxRate((void *)pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates, TRUE, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates, TRUE,
&wMaxBasicRate, &wMaxSuppRate, &wSuppRate, &wMaxBasicRate, &wMaxSuppRate, &wSuppRate,
&byTopCCKBasicRate, &byTopOFDMBasicRate); &byTopCCKBasicRate, &byTopOFDMBasicRate);
@ -2629,7 +2630,7 @@ vMgrCreateOwnIBSS(
* *
-*/ -*/
VOID void
vMgrJoinBSSBegin( vMgrJoinBSSBegin(
HANDLE hDeviceContext, HANDLE hDeviceContext,
OUT PCMD_STATUS pStatus OUT PCMD_STATUS pStatus
@ -2760,7 +2761,7 @@ vMgrJoinBSSBegin(
} }
} }
RATEvParseMaxRate((PVOID)pDevice, pItemRates, pItemExtRates, TRUE, RATEvParseMaxRate((void *)pDevice, pItemRates, pItemExtRates, TRUE,
&wMaxBasicRate, &wMaxSuppRate, &wSuppRate, &wMaxBasicRate, &wMaxSuppRate, &wSuppRate,
&byTopCCKBasicRate, &byTopOFDMBasicRate); &byTopCCKBasicRate, &byTopOFDMBasicRate);
vUpdateIFS(pDevice); vUpdateIFS(pDevice);
@ -2899,7 +2900,8 @@ vMgrJoinBSSBegin(
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
WLAN_RATES_MAXLEN_11B); WLAN_RATES_MAXLEN_11B);
// set basic rate // set basic rate
RATEvParseMaxRate((PVOID)pDevice, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, RATEvParseMaxRate((void *)pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
NULL, TRUE, &wMaxBasicRate, &wMaxSuppRate, &wSuppRate, NULL, TRUE, &wMaxBasicRate, &wMaxSuppRate, &wSuppRate,
&byTopCCKBasicRate, &byTopOFDMBasicRate); &byTopCCKBasicRate, &byTopOFDMBasicRate);
vUpdateIFS(pDevice); vUpdateIFS(pDevice);
@ -2960,7 +2962,7 @@ vMgrJoinBSSBegin(
* *
-*/ -*/
static static
VOID void
s_vMgrSynchBSS ( s_vMgrSynchBSS (
PSDevice pDevice, PSDevice pDevice,
UINT uBSSMode, UINT uBSSMode,
@ -3004,7 +3006,7 @@ s_vMgrSynchBSS (
pDevice->byPreambleType = 0; pDevice->byPreambleType = 0;
pDevice->wBasicRate = 0; pDevice->wBasicRate = 0;
// Set Basic Rate // Set Basic Rate
CARDbAddBasicRate((PVOID)pDevice, RATE_1M); CARDbAddBasicRate((void *)pDevice, RATE_1M);
// calculate TSF offset // calculate TSF offset
// TSF Offset = Received Timestamp TSF - Marked Local's TSF // TSF Offset = Received Timestamp TSF - Marked Local's TSF
@ -3122,7 +3124,7 @@ s_vMgrSynchBSS (
//mike add: fix NetworkManager 0.7.0 hidden ssid mode in WPA encryption //mike add: fix NetworkManager 0.7.0 hidden ssid mode in WPA encryption
// ,need reset eAuthenMode and eEncryptionStatus // ,need reset eAuthenMode and eEncryptionStatus
static VOID Encyption_Rebuild( static void Encyption_Rebuild(
PSDevice pDevice, PSDevice pDevice,
PKnownBSS pCurr PKnownBSS pCurr
) )
@ -3174,12 +3176,12 @@ s_vMgrSynchBSS (
* *
* *
* Return Value: * Return Value:
* VOID * void
* *
-*/ -*/
static static
VOID void
s_vMgrFormatTIM( s_vMgrFormatTIM(
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PWLAN_IE_TIM pTIM PWLAN_IE_TIM pTIM
@ -4224,7 +4226,7 @@ s_MgrMakeReAssocResponse(
-*/ -*/
static static
VOID void
s_vMgrRxProbeResponse( s_vMgrRxProbeResponse(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -4354,7 +4356,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
static static
VOID void
s_vMgrRxProbeRequest( s_vMgrRxProbeRequest(
PSDevice pDevice, PSDevice pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -4450,7 +4452,7 @@ s_vMgrRxProbeRequest(
-*/ -*/
VOID void
vMgrRxManagePacket( vMgrRxManagePacket(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -4658,7 +4660,7 @@ bMgrPrepareBeaconToSend(
* *
-*/ -*/
static static
VOID void
s_vMgrLogStatus( s_vMgrLogStatus(
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
WORD wStatus WORD wStatus
@ -4791,7 +4793,7 @@ bAdd_PMKID_Candidate (
* Return Value: none. * Return Value: none.
* *
-*/ -*/
VOID void
vFlush_PMKID_Candidate ( vFlush_PMKID_Candidate (
HANDLE hDeviceContext HANDLE hDeviceContext
) )

21
drivers/staging/vt6656/wmgr.h
View File

@ -246,8 +246,7 @@ typedef struct tagSRxMgmtPacket {
typedef struct tagSMgmtObject typedef struct tagSMgmtObject
{ {
void *pAdapter;
PVOID pAdapter;
// MAC address // MAC address
BYTE abyMACAddr[WLAN_ADDR_LEN]; BYTE abyMACAddr[WLAN_ADDR_LEN];
@ -421,14 +420,14 @@ vMgrAssocBeginSta(
OUT PCMD_STATUS pStatus OUT PCMD_STATUS pStatus
); );
VOID void
vMgrReAssocBeginSta( vMgrReAssocBeginSta(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
OUT PCMD_STATUS pStatus OUT PCMD_STATUS pStatus
); );
VOID void
vMgrDisassocBeginSta( vMgrDisassocBeginSta(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -437,26 +436,26 @@ vMgrDisassocBeginSta(
OUT PCMD_STATUS pStatus OUT PCMD_STATUS pStatus
); );
VOID void
vMgrAuthenBeginSta( vMgrAuthenBeginSta(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
OUT PCMD_STATUS pStatus OUT PCMD_STATUS pStatus
); );
VOID void
vMgrCreateOwnIBSS( vMgrCreateOwnIBSS(
HANDLE hDeviceContext, HANDLE hDeviceContext,
OUT PCMD_STATUS pStatus OUT PCMD_STATUS pStatus
); );
VOID void
vMgrJoinBSSBegin( vMgrJoinBSSBegin(
HANDLE hDeviceContext, HANDLE hDeviceContext,
OUT PCMD_STATUS pStatus OUT PCMD_STATUS pStatus
); );
VOID void
vMgrRxManagePacket( vMgrRxManagePacket(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -464,14 +463,14 @@ vMgrRxManagePacket(
); );
/* /*
VOID void
vMgrScanBegin( vMgrScanBegin(
HANDLE hDeviceContext, HANDLE hDeviceContext,
OUT PCMD_STATUS pStatus OUT PCMD_STATUS pStatus
); );
*/ */
VOID void
vMgrDeAuthenBeginSta( vMgrDeAuthenBeginSta(
HANDLE hDeviceContext, HANDLE hDeviceContext,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
@ -494,7 +493,7 @@ bAdd_PMKID_Candidate (
PSRSNCapObject psRSNCapObj PSRSNCapObject psRSNCapObj
); );
VOID void
vFlush_PMKID_Candidate ( vFlush_PMKID_Candidate (
HANDLE hDeviceContext HANDLE hDeviceContext
); );

4
drivers/staging/vt6656/wpa.c
View File

@ -68,7 +68,7 @@ const BYTE abyOUI05[4] = { 0x00, 0x50, 0xf2, 0x05 };
* *
-*/ -*/
VOID void
WPA_ClearRSN ( WPA_ClearRSN (
PKnownBSS pBSSList PKnownBSS pBSSList
) )
@ -104,7 +104,7 @@ WPA_ClearRSN (
* Return Value: none. * Return Value: none.
* *
-*/ -*/
VOID void
WPA_ParseRSN ( WPA_ParseRSN (
PKnownBSS pBSSList, PKnownBSS pBSSList,
PWLAN_IE_RSN_EXT pRSN PWLAN_IE_RSN_EXT pRSN

4
drivers/staging/vt6656/wpa.h
View File

@ -58,12 +58,12 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
VOID void
WPA_ClearRSN( WPA_ClearRSN(
PKnownBSS pBSSList PKnownBSS pBSSList
); );
VOID void
WPA_ParseRSN( WPA_ParseRSN(
PKnownBSS pBSSList, PKnownBSS pBSSList,
PWLAN_IE_RSN_EXT pRSN PWLAN_IE_RSN_EXT pRSN

7
drivers/staging/vt6656/wpa2.c
View File

@ -71,7 +71,7 @@ const BYTE abyOUIPSK[4] = { 0x00, 0x0F, 0xAC, 0x02 };
* Return Value: none. * Return Value: none.
* *
-*/ -*/
VOID void
WPA2_ClearRSN ( WPA2_ClearRSN (
PKnownBSS pBSSNode PKnownBSS pBSSNode
) )
@ -106,7 +106,7 @@ WPA2_ClearRSN (
* Return Value: none. * Return Value: none.
* *
-*/ -*/
VOID void
WPA2vParseRSN ( WPA2vParseRSN (
PKnownBSS pBSSNode, PKnownBSS pBSSNode,
PWLAN_IE_RSN pRSN PWLAN_IE_RSN pRSN
@ -261,8 +261,7 @@ WPA2vParseRSN (
* *
-*/ -*/
UINT UINT
WPA2uSetIEs( WPA2uSetIEs(void *pMgmtHandle,
PVOID pMgmtHandle,
OUT PWLAN_IE_RSN pRSNIEs OUT PWLAN_IE_RSN pRSNIEs
) )
{ {

6
drivers/staging/vt6656/wpa2.h
View File

@ -58,12 +58,12 @@ typedef struct tagSPMKIDCache {
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
VOID void
WPA2_ClearRSN ( WPA2_ClearRSN (
PKnownBSS pBSSNode PKnownBSS pBSSNode
); );
VOID void
WPA2vParseRSN ( WPA2vParseRSN (
PKnownBSS pBSSNode, PKnownBSS pBSSNode,
PWLAN_IE_RSN pRSN PWLAN_IE_RSN pRSN
@ -71,7 +71,7 @@ WPA2vParseRSN (
UINT UINT
WPA2uSetIEs( WPA2uSetIEs(
PVOID pMgmtHandle, void *pMgmtHandle,
OUT PWLAN_IE_RSN pRSNIEs OUT PWLAN_IE_RSN pRSNIEs
); );