redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Staging: vt6655: remove PVOID definition and use

Browse source 
Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Charles Clément 2010-05-07 12:30:20 -07:00 committed by Greg Kroah-Hartman
parent 6b35b7b379
commit 830a619c02
20 changed files with 254 additions and 261 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/vt6655/IEEE11h.c
View file

@ -203,8 +203,8 @@ static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, BYTE byR
-*/ -*/
BOOL BOOL
IEEE11hbMgrRxAction ( IEEE11hbMgrRxAction (
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN PVOID pRxPacket IN void *pRxPacket
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
@ -265,7 +265,7 @@ IEEE11hbMgrRxAction (
BOOL IEEE11hbMSRRepTx ( BOOL IEEE11hbMSRRepTx (
IN PVOID pMgmtHandle IN void *pMgmtHandle
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;

2
drivers/staging/vt6655/IEEE11h.h
View file

@ -46,7 +46,7 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
BOOL IEEE11hbMSRRepTx ( BOOL IEEE11hbMSRRepTx (
IN PVOID pMgmtHandle IN void *pMgmtHandle
); );
#endif // __IEEE11h_H__ #endif // __IEEE11h_H__

14
drivers/staging/vt6655/bssdb.c
View file

@ -764,7 +764,7 @@ BSSbUpdateToBSSList (
BOOL BOOL
BSSDBbIsSTAInNodeDB( BSSDBbIsSTAInNodeDB(
IN PVOID pMgmtObject, IN void *pMgmtObject,
IN PBYTE abyDstAddr, IN PBYTE abyDstAddr,
OUT PUINT puNodeIndex OUT PUINT puNodeIndex
) )
@ -919,7 +919,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,
@ -972,7 +972,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,
@ -1162,7 +1162,7 @@ start:
*/ */
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)
@ -1170,7 +1170,7 @@ start:
#ifdef PLICE_DEBUG #ifdef PLICE_DEBUG
printk("SecondCallback:Before:TxDataRate is %d\n",pMgmt->sNodeDBTable[0].wTxDataRate); printk("SecondCallback:Before:TxDataRate is %d\n",pMgmt->sNodeDBTable[0].wTxDataRate);
#endif #endif
RATEvTxRateFallBack((PVOID)pDevice, &(pMgmt->sNodeDBTable[ii])); RATEvTxRateFallBack((void *)pDevice, &(pMgmt->sNodeDBTable[ii]));
#ifdef PLICE_DEBUG #ifdef PLICE_DEBUG
printk("SecondCallback:After:TxDataRate is %d\n",pMgmt->sNodeDBTable[0].wTxDataRate); printk("SecondCallback:After:TxDataRate is %d\n",pMgmt->sNodeDBTable[0].wTxDataRate);
#endif #endif
@ -1215,14 +1215,14 @@ start:
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);
} }
} }

122
drivers/staging/vt6655/card.c
View file

@ -612,7 +612,7 @@ s_vCaculateOFDMRParameter (
*/ */
static static
void void
s_vSetRSPINF (PSDevice pDevice, CARD_PHY_TYPE ePHYType, PVOID pvSupportRateIEs, PVOID pvExtSupportRateIEs) s_vSetRSPINF (PSDevice pDevice, CARD_PHY_TYPE ePHYType, void *pvSupportRateIEs, void *pvExtSupportRateIEs)
{ {
BYTE byServ = 0, bySignal = 0; // For CCK BYTE byServ = 0, bySignal = 0; // For CCK
WORD wLen = 0; WORD wLen = 0;
@ -728,7 +728,7 @@ s_vSetRSPINF (PSDevice pDevice, CARD_PHY_TYPE ePHYType, PVOID pvSupportRateIEs,
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
BYTE CARDbyGetChannelMapping (PVOID pDeviceHandler, BYTE byChannelNumber, CARD_PHY_TYPE ePhyType) BYTE CARDbyGetChannelMapping (void *pDeviceHandler, BYTE byChannelNumber, CARD_PHY_TYPE ePhyType)
{ {
UINT ii; UINT ii;
@ -746,7 +746,7 @@ BYTE CARDbyGetChannelMapping (PVOID pDeviceHandler, BYTE byChannelNumber, CARD_P
} }
BYTE CARDbyGetChannelNumber (PVOID pDeviceHandler, BYTE byChannelIndex) BYTE CARDbyGetChannelNumber (void *pDeviceHandler, BYTE byChannelIndex)
{ {
// PSDevice pDevice = (PSDevice) pDeviceHandler; // PSDevice pDevice = (PSDevice) pDeviceHandler;
return(sChannelTbl[byChannelIndex].byChannelNumber); return(sChannelTbl[byChannelIndex].byChannelNumber);
@ -765,7 +765,7 @@ BYTE CARDbyGetChannelNumber (PVOID pDeviceHandler, BYTE byChannelIndex)
* Return Value: TRUE if succeeded; FALSE if failed. * Return Value: TRUE if succeeded; FALSE if failed.
* *
*/ */
BOOL CARDbSetChannel (PVOID pDeviceHandler, UINT uConnectionChannel) BOOL CARDbSetChannel (void *pDeviceHandler, UINT uConnectionChannel)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
BOOL bResult = TRUE; BOOL bResult = TRUE;
@ -853,7 +853,7 @@ BOOL CARDbSetChannel (PVOID pDeviceHandler, UINT uConnectionChannel)
* *
*/ */
/* /*
BOOL CARDbSendPacket (PVOID pDeviceHandler, PVOID pPacket, CARD_PKT_TYPE ePktType, UINT uLength) BOOL CARDbSendPacket (void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, UINT uLength)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
if (ePktType == PKT_TYPE_802_11_MNG) { if (ePktType == PKT_TYPE_802_11_MNG) {
@ -881,7 +881,7 @@ BOOL CARDbSendPacket (PVOID pDeviceHandler, PVOID pPacket, CARD_PKT_TYPE ePktTyp
* Return Value: TRUE if short preamble; otherwise FALSE * Return Value: TRUE if short preamble; otherwise FALSE
* *
*/ */
BOOL CARDbIsShortPreamble (PVOID pDeviceHandler) BOOL CARDbIsShortPreamble (void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
if (pDevice->byPreambleType == 0) { if (pDevice->byPreambleType == 0) {
@ -902,7 +902,7 @@ BOOL CARDbIsShortPreamble (PVOID pDeviceHandler)
* Return Value: TRUE if short slot time; otherwise FALSE * Return Value: TRUE if short slot time; otherwise FALSE
* *
*/ */
BOOL CARDbIsShorSlotTime (PVOID pDeviceHandler) BOOL CARDbIsShorSlotTime (void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
return(pDevice->bShortSlotTime); return(pDevice->bShortSlotTime);
@ -921,7 +921,7 @@ BOOL CARDbIsShorSlotTime (PVOID pDeviceHandler)
* Return Value: None. * Return Value: None.
* *
*/ */
BOOL CARDbSetPhyParameter (PVOID pDeviceHandler, CARD_PHY_TYPE ePHYType, WORD wCapInfo, BYTE byERPField, PVOID pvSupportRateIEs, PVOID pvExtSupportRateIEs) BOOL CARDbSetPhyParameter (void *pDeviceHandler, CARD_PHY_TYPE ePHYType, WORD wCapInfo, BYTE byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
BYTE byCWMaxMin = 0; BYTE byCWMaxMin = 0;
@ -1108,7 +1108,7 @@ BOOL CARDbSetPhyParameter (PVOID pDeviceHandler, CARD_PHY_TYPE ePHYType, WORD wC
* Return Value: none * Return Value: none
* *
*/ */
BOOL CARDbUpdateTSF (PVOID pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF) BOOL CARDbUpdateTSF (void *pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
QWORD qwTSFOffset; QWORD qwTSFOffset;
@ -1143,7 +1143,7 @@ BOOL CARDbUpdateTSF (PVOID pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp,
* Return Value: TRUE if succeed; otherwise FALSE * Return Value: TRUE if succeed; otherwise FALSE
* *
*/ */
BOOL CARDbSetBeaconPeriod (PVOID pDeviceHandler, WORD wBeaconInterval) BOOL CARDbSetBeaconPeriod (void *pDeviceHandler, WORD wBeaconInterval)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT uBeaconInterval = 0; UINT uBeaconInterval = 0;
@ -1197,7 +1197,7 @@ BOOL CARDbSetBeaconPeriod (PVOID pDeviceHandler, WORD wBeaconInterval)
* Return Value: TRUE if all data packet complete; otherwise FALSE. * Return Value: TRUE if all data packet complete; otherwise FALSE.
* *
*/ */
BOOL CARDbStopTxPacket (PVOID pDeviceHandler, CARD_PKT_TYPE ePktType) BOOL CARDbStopTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -1255,7 +1255,7 @@ BOOL CARDbStopTxPacket (PVOID pDeviceHandler, CARD_PKT_TYPE ePktType)
* Return Value: TRUE if success; FALSE if failed. * Return Value: TRUE if success; FALSE if failed.
* *
*/ */
BOOL CARDbStartTxPacket (PVOID pDeviceHandler, CARD_PKT_TYPE ePktType) BOOL CARDbStartTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -1297,7 +1297,7 @@ BOOL CARDbStartTxPacket (PVOID pDeviceHandler, CARD_PKT_TYPE ePktType)
* Return Value: TRUE if success; FALSE if failed. * Return Value: TRUE if success; FALSE if failed.
* *
*/ */
BOOL CARDbSetBSSID(PVOID pDeviceHandler, PBYTE pbyBSSID, CARD_OP_MODE eOPMode) BOOL CARDbSetBSSID(void *pDeviceHandler, PBYTE pbyBSSID, CARD_OP_MODE eOPMode)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -1367,7 +1367,7 @@ BOOL CARDbSetBSSID(PVOID pDeviceHandler, PBYTE pbyBSSID, CARD_OP_MODE eOPMode)
* *
*/ */
BOOL CARDbSetTxDataRate( BOOL CARDbSetTxDataRate(
PVOID pDeviceHandler, void *pDeviceHandler,
WORD wDataRate WORD wDataRate
) )
{ {
@ -1393,7 +1393,7 @@ BOOL CARDbSetTxDataRate(
-*/ -*/
BOOL BOOL
CARDbPowerDown( CARDbPowerDown(
PVOID pDeviceHandler void *pDeviceHandler
) )
{ {
PSDevice pDevice = (PSDevice)pDeviceHandler; PSDevice pDevice = (PSDevice)pDeviceHandler;
@ -1430,7 +1430,7 @@ CARDbPowerDown(
* 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;
@ -1479,7 +1479,7 @@ MACvRegBitsOn(pDevice->PortOffset, MAC_REG_GPIOCTL0, LED_ACTSET); //LED issue
* 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;
@ -1523,7 +1523,7 @@ MACvRegBitsOff(pDevice->PortOffset, MAC_REG_GPIOCTL0, LED_ACTSET); //LED issue
BOOL CARDbRemoveKey (PVOID pDeviceHandler, PBYTE pbyBSSID) BOOL CARDbRemoveKey (void *pDeviceHandler, PBYTE pbyBSSID)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -1550,7 +1550,7 @@ BOOL CARDbRemoveKey (PVOID pDeviceHandler, PBYTE pbyBSSID)
-*/ -*/
BOOL BOOL
CARDbAdd_PMKID_Candidate ( CARDbAdd_PMKID_Candidate (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN PBYTE pbyBSSID, IN PBYTE pbyBSSID,
IN BOOL bRSNCapExist, IN BOOL bRSNCapExist,
IN WORD wRSNCap IN WORD wRSNCap
@ -1599,9 +1599,9 @@ CARDbAdd_PMKID_Candidate (
return TRUE; return TRUE;
} }
PVOID void *
CARDpGetCurrentAddress ( CARDpGetCurrentAddress (
IN PVOID pDeviceHandler IN void *pDeviceHandler
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -1611,7 +1611,7 @@ CARDpGetCurrentAddress (
void CARDvInitChannelTable (PVOID pDeviceHandler) void CARDvInitChannelTable (void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
BOOL bMultiBand = FALSE; BOOL bMultiBand = FALSE;
@ -1708,8 +1708,8 @@ void CARDvInitChannelTable (PVOID pDeviceHandler)
-*/ -*/
BOOL BOOL
CARDbStartMeasure ( CARDbStartMeasure (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN PVOID pvMeasureEIDs, IN void *pvMeasureEIDs,
IN UINT uNumOfMeasureEIDs IN UINT uNumOfMeasureEIDs
) )
{ {
@ -1835,7 +1835,7 @@ CARDbStartMeasure (
-*/ -*/
BOOL BOOL
CARDbChannelSwitch ( CARDbChannelSwitch (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN BYTE byMode, IN BYTE byMode,
IN BYTE byNewChannel, IN BYTE byNewChannel,
IN BYTE byCount IN BYTE byCount
@ -1878,7 +1878,7 @@ CARDbChannelSwitch (
-*/ -*/
BOOL BOOL
CARDbSetQuiet ( CARDbSetQuiet (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN BOOL bResetQuiet, IN BOOL bResetQuiet,
IN BYTE byQuietCount, IN BYTE byQuietCount,
IN BYTE byQuietPeriod, IN BYTE byQuietPeriod,
@ -1934,7 +1934,7 @@ CARDbSetQuiet (
-*/ -*/
BOOL BOOL
CARDbStartQuiet ( CARDbStartQuiet (
IN PVOID pDeviceHandler IN void *pDeviceHandler
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -2035,9 +2035,9 @@ CARDbStartQuiet (
-*/ -*/
void void
CARDvSetCountryInfo ( CARDvSetCountryInfo (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN CARD_PHY_TYPE ePHYType, IN CARD_PHY_TYPE ePHYType,
IN PVOID pIE IN void *pIE
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -2094,7 +2094,7 @@ CARDvSetCountryInfo (
-*/ -*/
void void
CARDvSetPowerConstraint ( CARDvSetPowerConstraint (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN BYTE byChannel, IN BYTE byChannel,
IN I8 byPower IN I8 byPower
) )
@ -2129,7 +2129,7 @@ CARDvSetPowerConstraint (
-*/ -*/
void void
CARDvGetPowerCapability ( CARDvGetPowerCapability (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
OUT PBYTE pbyMinPower, OUT PBYTE pbyMinPower,
OUT PBYTE pbyMaxPower OUT PBYTE pbyMaxPower
) )
@ -2165,7 +2165,7 @@ CARDvGetPowerCapability (
-*/ -*/
BYTE BYTE
CARDbySetSupportChannels ( CARDbySetSupportChannels (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN OUT PBYTE pbyIEs IN OUT PBYTE pbyIEs
) )
{ {
@ -2256,7 +2256,7 @@ CARDbySetSupportChannels (
-*/ -*/
I8 I8
CARDbyGetTransmitPower ( CARDbyGetTransmitPower (
IN PVOID pDeviceHandler IN void *pDeviceHandler
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -2281,8 +2281,8 @@ CARDbChannelGetList (
void void
CARDvSetCountryIE( CARDvSetCountryIE(
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN PVOID pIE IN void *pIE
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -2307,7 +2307,7 @@ CARDvSetCountryIE(
BOOL BOOL
CARDbGetChannelMapInfo( CARDbGetChannelMapInfo(
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN UINT uChannelIndex, IN UINT uChannelIndex,
OUT PBYTE pbyChannelNumber, OUT PBYTE pbyChannelNumber,
OUT PBYTE pbyMap OUT PBYTE pbyMap
@ -2326,7 +2326,7 @@ CARDbGetChannelMapInfo(
void void
CARDvSetChannelMapInfo( CARDvSetChannelMapInfo(
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN UINT uChannelIndex, IN UINT uChannelIndex,
IN BYTE byMap IN BYTE byMap
) )
@ -2342,7 +2342,7 @@ CARDvSetChannelMapInfo(
void void
CARDvClearChannelMapInfo( CARDvClearChannelMapInfo(
IN PVOID pDeviceHandler IN void *pDeviceHandler
) )
{ {
// PSDevice pDevice = (PSDevice) pDeviceHandler; // PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -2356,7 +2356,7 @@ CARDvClearChannelMapInfo(
BYTE BYTE
CARDbyAutoChannelSelect( CARDbyAutoChannelSelect(
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
CARD_PHY_TYPE ePHYType CARD_PHY_TYPE ePHYType
) )
{ {
@ -2422,7 +2422,7 @@ CARDbyAutoChannelSelect(
//xxx //xxx
void void
CARDvSafeResetTx ( CARDvSafeResetTx (
IN PVOID pDeviceHandler IN void *pDeviceHandler
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -2478,7 +2478,7 @@ CARDvSafeResetTx (
-*/ -*/
void void
CARDvSafeResetRx ( CARDvSafeResetRx (
IN PVOID pDeviceHandler IN void *pDeviceHandler
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -2537,7 +2537,7 @@ CARDvSafeResetRx (
* Return Value: response Control frame rate * Return Value: response Control frame rate
* *
*/ */
WORD CARDwGetCCKControlRate(PVOID pDeviceHandler, WORD wRateIdx) WORD CARDwGetCCKControlRate(void *pDeviceHandler, WORD wRateIdx)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT ui = (UINT)wRateIdx; UINT ui = (UINT)wRateIdx;
@ -2564,14 +2564,14 @@ WORD CARDwGetCCKControlRate(PVOID pDeviceHandler, WORD wRateIdx)
* Return Value: response Control frame rate * Return Value: response Control frame rate
* *
*/ */
WORD CARDwGetOFDMControlRate (PVOID pDeviceHandler, WORD wRateIdx) WORD CARDwGetOFDMControlRate (void *pDeviceHandler, WORD wRateIdx)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
UINT ui = (UINT)wRateIdx; UINT ui = (UINT)wRateIdx;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BASIC RATE: %X\n", pDevice->wBasicRate); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BASIC RATE: %X\n", pDevice->wBasicRate);
if (!CARDbIsOFDMinBasicRate((PVOID)pDevice)) { if (!CARDbIsOFDMinBasicRate((void *)pDevice)) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate:(NO OFDM) %d\n", wRateIdx); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate:(NO OFDM) %d\n", wRateIdx);
if (wRateIdx > RATE_24M) if (wRateIdx > RATE_24M)
wRateIdx = RATE_24M; wRateIdx = RATE_24M;
@ -2601,7 +2601,7 @@ WORD CARDwGetOFDMControlRate (PVOID pDeviceHandler, WORD wRateIdx)
* Return Value: None. * Return Value: None.
* *
*/ */
void CARDvSetRSPINF (PVOID pDeviceHandler, CARD_PHY_TYPE ePHYType) void CARDvSetRSPINF (void *pDeviceHandler, CARD_PHY_TYPE ePHYType)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
BYTE byServ = 0x00, bySignal = 0x00; //For CCK BYTE byServ = 0x00, bySignal = 0x00; //For CCK
@ -2614,7 +2614,7 @@ void CARDvSetRSPINF (PVOID pDeviceHandler, CARD_PHY_TYPE ePHYType)
//RSPINF_b_1 //RSPINF_b_1
BBvCaculateParameter(pDevice, BBvCaculateParameter(pDevice,
14, 14,
CARDwGetCCKControlRate((PVOID)pDevice, RATE_1M), CARDwGetCCKControlRate((void *)pDevice, RATE_1M),
PK_TYPE_11B, PK_TYPE_11B,
&wLen, &wLen,
&byServ, &byServ,
@ -2625,7 +2625,7 @@ void CARDvSetRSPINF (PVOID pDeviceHandler, CARD_PHY_TYPE ePHYType)
///RSPINF_b_2 ///RSPINF_b_2
BBvCaculateParameter(pDevice, BBvCaculateParameter(pDevice,
14, 14,
CARDwGetCCKControlRate((PVOID)pDevice, RATE_2M), CARDwGetCCKControlRate((void *)pDevice, RATE_2M),
PK_TYPE_11B, PK_TYPE_11B,
&wLen, &wLen,
&byServ, &byServ,
@ -2636,7 +2636,7 @@ void CARDvSetRSPINF (PVOID pDeviceHandler, CARD_PHY_TYPE ePHYType)
//RSPINF_b_5 //RSPINF_b_5
BBvCaculateParameter(pDevice, BBvCaculateParameter(pDevice,
14, 14,
CARDwGetCCKControlRate((PVOID)pDevice, RATE_5M), CARDwGetCCKControlRate((void *)pDevice, RATE_5M),
PK_TYPE_11B, PK_TYPE_11B,
&wLen, &wLen,
&byServ, &byServ,
@ -2647,7 +2647,7 @@ void CARDvSetRSPINF (PVOID pDeviceHandler, CARD_PHY_TYPE ePHYType)
//RSPINF_b_11 //RSPINF_b_11
BBvCaculateParameter(pDevice, BBvCaculateParameter(pDevice,
14, 14,
CARDwGetCCKControlRate((PVOID)pDevice, RATE_11M), CARDwGetCCKControlRate((void *)pDevice, RATE_11M),
PK_TYPE_11B, PK_TYPE_11B,
&wLen, &wLen,
&byServ, &byServ,
@ -2686,26 +2686,26 @@ void CARDvSetRSPINF (PVOID pDeviceHandler, CARD_PHY_TYPE ePHYType)
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_24, MAKEWORD(byTxRate,byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_24, MAKEWORD(byTxRate,byRsvTime));
//RSPINF_a_36 //RSPINF_a_36
s_vCaculateOFDMRParameter(CARDwGetOFDMControlRate((PVOID)pDevice, RATE_36M), s_vCaculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_36M),
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_36, MAKEWORD(byTxRate,byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_36, MAKEWORD(byTxRate,byRsvTime));
//RSPINF_a_48 //RSPINF_a_48
s_vCaculateOFDMRParameter(CARDwGetOFDMControlRate((PVOID)pDevice, RATE_48M), s_vCaculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_48M),
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_48, MAKEWORD(byTxRate,byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_48, MAKEWORD(byTxRate,byRsvTime));
//RSPINF_a_54 //RSPINF_a_54
s_vCaculateOFDMRParameter(CARDwGetOFDMControlRate((PVOID)pDevice, RATE_54M), s_vCaculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_54M),
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_54, MAKEWORD(byTxRate,byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_54, MAKEWORD(byTxRate,byRsvTime));
//RSPINF_a_72 //RSPINF_a_72
s_vCaculateOFDMRParameter(CARDwGetOFDMControlRate((PVOID)pDevice, RATE_54M), s_vCaculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_54M),
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
@ -2726,7 +2726,7 @@ void CARDvSetRSPINF (PVOID pDeviceHandler, CARD_PHY_TYPE ePHYType)
* Return Value: None. * Return Value: None.
* *
*/ */
void vUpdateIFS (PVOID pDeviceHandler) void vUpdateIFS (void *pDeviceHandler)
{ {
//Set SIFS, DIFS, EIFS, SlotTime, CwMin //Set SIFS, DIFS, EIFS, SlotTime, CwMin
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
@ -2780,7 +2780,7 @@ void vUpdateIFS (PVOID pDeviceHandler)
VNSvOutPortB(pDevice->PortOffset + MAC_REG_CWMAXMIN0, (BYTE)byMaxMin); VNSvOutPortB(pDevice->PortOffset + MAC_REG_CWMAXMIN0, (BYTE)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;
@ -2820,7 +2820,7 @@ void CARDvUpdateBasicTopRate (PVOID pDeviceHandler)
* 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);
@ -2828,12 +2828,12 @@ BOOL CARDbAddBasicRate (PVOID pDeviceHandler, WORD wRateIdx)
pDevice->wBasicRate |= wRate; pDevice->wBasicRate |= wRate;
//Determines the highest basic rate. //Determines the highest basic rate.
CARDvUpdateBasicTopRate((PVOID)pDevice); CARDvUpdateBasicTopRate((void *)pDevice);
return(TRUE); return(TRUE);
} }
BOOL CARDbIsOFDMinBasicRate (PVOID pDeviceHandler) BOOL CARDbIsOFDMinBasicRate (void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
int ii; int ii;
@ -2845,14 +2845,14 @@ BOOL CARDbIsOFDMinBasicRate (PVOID pDeviceHandler)
return FALSE; return FALSE;
} }
BYTE CARDbyGetPktType (PVOID pDeviceHandler) BYTE CARDbyGetPktType (void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;
if (pDevice->byBBType == BB_TYPE_11A || pDevice->byBBType == BB_TYPE_11B) { if (pDevice->byBBType == BB_TYPE_11A || pDevice->byBBType == BB_TYPE_11B) {
return (BYTE)pDevice->byBBType; return (BYTE)pDevice->byBBType;
} }
else if (CARDbIsOFDMinBasicRate((PVOID)pDevice)) { else if (CARDbIsOFDMinBasicRate((void *)pDevice)) {
return PK_TYPE_11GA; return PK_TYPE_11GA;
} }
else { else {
@ -2902,7 +2902,7 @@ void CARDvSetLoopbackMode (DWORD_PTR dwIoBase, WORD wLoopbackMode)
* Return Value: none * Return Value: none
* *
*/ */
BOOL CARDbSoftwareReset (PVOID pDeviceHandler) BOOL CARDbSoftwareReset (void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; PSDevice pDevice = (PSDevice) pDeviceHandler;

96
drivers/staging/vt6655/card.h
View file

@ -87,77 +87,77 @@ typedef enum _CARD_OP_MODE {
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
BOOL ChannelValid(UINT CountryCode, UINT ChannelIndex); BOOL ChannelValid(UINT CountryCode, UINT ChannelIndex);
void CARDvSetRSPINF(PVOID pDeviceHandler, CARD_PHY_TYPE ePHYType); void CARDvSetRSPINF(void *pDeviceHandler, CARD_PHY_TYPE ePHYType);
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 CARDvSetLoopbackMode(DWORD_PTR dwIoBase, WORD wLoopbackMode); void CARDvSetLoopbackMode(DWORD_PTR dwIoBase, WORD wLoopbackMode);
BOOL CARDbSoftwareReset(PVOID pDeviceHandler); BOOL CARDbSoftwareReset(void *pDeviceHandler);
void CARDvSetFirstNextTBTT(DWORD_PTR dwIoBase, WORD wBeaconInterval); void CARDvSetFirstNextTBTT(DWORD_PTR dwIoBase, WORD wBeaconInterval);
void CARDvUpdateNextTBTT(DWORD_PTR dwIoBase, QWORD qwTSF, WORD wBeaconInterval); void CARDvUpdateNextTBTT(DWORD_PTR dwIoBase, QWORD qwTSF, WORD wBeaconInterval);
BOOL CARDbGetCurrentTSF(DWORD_PTR dwIoBase, PQWORD pqwCurrTSF); BOOL CARDbGetCurrentTSF(DWORD_PTR dwIoBase, PQWORD pqwCurrTSF);
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 CARDbSetTxPower(PVOID pDeviceHandler, ULONG ulTxPower); BOOL CARDbSetTxPower(void *pDeviceHandler, ULONG ulTxPower);
BYTE CARDbyGetPktType(PVOID pDeviceHandler); BYTE CARDbyGetPktType(void *pDeviceHandler);
void CARDvSafeResetTx(PVOID pDeviceHandler); void CARDvSafeResetTx(void *pDeviceHandler);
void CARDvSafeResetRx(PVOID pDeviceHandler); void CARDvSafeResetRx(void *pDeviceHandler);
//xxx //xxx
BOOL CARDbRadioPowerOff(PVOID pDeviceHandler); BOOL CARDbRadioPowerOff(void *pDeviceHandler);
BOOL CARDbRadioPowerOn(PVOID pDeviceHandler); BOOL CARDbRadioPowerOn(void *pDeviceHandler);
BOOL CARDbSetChannel(PVOID pDeviceHandler, UINT uConnectionChannel); BOOL CARDbSetChannel(void *pDeviceHandler, UINT uConnectionChannel);
//BOOL CARDbSendPacket(PVOID pDeviceHandler, PVOID pPacket, CARD_PKT_TYPE ePktType, UINT uLength); //BOOL CARDbSendPacket(void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, UINT uLength);
BOOL CARDbIsShortPreamble(PVOID pDeviceHandler); BOOL CARDbIsShortPreamble(void *pDeviceHandler);
BOOL CARDbIsShorSlotTime(PVOID pDeviceHandler); BOOL CARDbIsShorSlotTime(void *pDeviceHandler);
BOOL CARDbSetPhyParameter(PVOID pDeviceHandler, CARD_PHY_TYPE ePHYType, WORD wCapInfo, BYTE byERPField, PVOID pvSupportRateIEs, PVOID pvExtSupportRateIEs); BOOL CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, WORD wCapInfo, BYTE byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs);
BOOL CARDbUpdateTSF(PVOID pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF); BOOL CARDbUpdateTSF(void *pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF);
BOOL CARDbStopTxPacket(PVOID pDeviceHandler, CARD_PKT_TYPE ePktType); BOOL CARDbStopTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType);
BOOL CARDbStartTxPacket(PVOID pDeviceHandler, CARD_PKT_TYPE ePktType); BOOL CARDbStartTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType);
BOOL CARDbSetBeaconPeriod(PVOID pDeviceHandler, WORD wBeaconInterval); BOOL CARDbSetBeaconPeriod(void *pDeviceHandler, WORD wBeaconInterval);
BOOL CARDbSetBSSID(PVOID pDeviceHandler, PBYTE pbyBSSID, CARD_OP_MODE eOPMode); BOOL CARDbSetBSSID(void *pDeviceHandler, PBYTE pbyBSSID, CARD_OP_MODE eOPMode);
BOOL BOOL
CARDbPowerDown( CARDbPowerDown(
PVOID pDeviceHandler void *pDeviceHandler
); );
BOOL CARDbSetTxDataRate( BOOL CARDbSetTxDataRate(
PVOID pDeviceHandler, void *pDeviceHandler,
WORD wDataRate WORD wDataRate
); );
BOOL CARDbRemoveKey (PVOID pDeviceHandler, PBYTE pbyBSSID); BOOL CARDbRemoveKey (void *pDeviceHandler, PBYTE pbyBSSID);
BOOL BOOL
CARDbAdd_PMKID_Candidate ( CARDbAdd_PMKID_Candidate (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN PBYTE pbyBSSID, IN PBYTE pbyBSSID,
IN BOOL bRSNCapExist, IN BOOL bRSNCapExist,
IN WORD wRSNCap IN WORD wRSNCap
); );
PVOID void *
CARDpGetCurrentAddress ( CARDpGetCurrentAddress (
IN PVOID pDeviceHandler IN void *pDeviceHandler
); );
void CARDvInitChannelTable(PVOID pDeviceHandler); void CARDvInitChannelTable(void *pDeviceHandler);
BYTE CARDbyGetChannelMapping(PVOID pDeviceHandler, BYTE byChannelNumber, CARD_PHY_TYPE ePhyType); BYTE CARDbyGetChannelMapping(void *pDeviceHandler, BYTE byChannelNumber, CARD_PHY_TYPE ePhyType);
BOOL BOOL
CARDbStartMeasure ( CARDbStartMeasure (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN PVOID pvMeasureEIDs, IN void *pvMeasureEIDs,
IN UINT uNumOfMeasureEIDs IN UINT uNumOfMeasureEIDs
); );
BOOL BOOL
CARDbChannelSwitch ( CARDbChannelSwitch (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN BYTE byMode, IN BYTE byMode,
IN BYTE byNewChannel, IN BYTE byNewChannel,
IN BYTE byCount IN BYTE byCount
@ -165,7 +165,7 @@ CARDbChannelSwitch (
BOOL BOOL
CARDbSetQuiet ( CARDbSetQuiet (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN BOOL bResetQuiet, IN BOOL bResetQuiet,
IN BYTE byQuietCount, IN BYTE byQuietCount,
IN BYTE byQuietPeriod, IN BYTE byQuietPeriod,
@ -175,39 +175,39 @@ CARDbSetQuiet (
BOOL BOOL
CARDbStartQuiet ( CARDbStartQuiet (
IN PVOID pDeviceHandler IN void *pDeviceHandler
); );
void void
CARDvSetCountryInfo ( CARDvSetCountryInfo (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN CARD_PHY_TYPE ePHYType, IN CARD_PHY_TYPE ePHYType,
IN PVOID pIE IN void *pIE
); );
void void
CARDvSetPowerConstraint ( CARDvSetPowerConstraint (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN BYTE byChannel, IN BYTE byChannel,
IN I8 byPower IN I8 byPower
); );
void void
CARDvGetPowerCapability ( CARDvGetPowerCapability (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
OUT PBYTE pbyMinPower, OUT PBYTE pbyMinPower,
OUT PBYTE pbyMaxPower OUT PBYTE pbyMaxPower
); );
BYTE BYTE
CARDbySetSupportChannels ( CARDbySetSupportChannels (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN OUT PBYTE pbyIEs IN OUT PBYTE pbyIEs
); );
I8 I8
CARDbyGetTransmitPower ( CARDbyGetTransmitPower (
IN PVOID pDeviceHandler IN void *pDeviceHandler
); );
BOOL BOOL
@ -218,13 +218,13 @@ CARDbChannelGetList (
void void
CARDvSetCountryIE( CARDvSetCountryIE(
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN PVOID pIE IN void *pIE
); );
BOOL BOOL
CARDbGetChannelMapInfo( CARDbGetChannelMapInfo(
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN UINT uChannelIndex, IN UINT uChannelIndex,
OUT PBYTE pbyChannelNumber, OUT PBYTE pbyChannelNumber,
OUT PBYTE pbyMap OUT PBYTE pbyMap
@ -232,23 +232,23 @@ CARDbGetChannelMapInfo(
void void
CARDvSetChannelMapInfo( CARDvSetChannelMapInfo(
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN UINT uChannelIndex, IN UINT uChannelIndex,
IN BYTE byMap IN BYTE byMap
); );
void void
CARDvClearChannelMapInfo( CARDvClearChannelMapInfo(
IN PVOID pDeviceHandler IN void *pDeviceHandler
); );
BYTE BYTE
CARDbyAutoChannelSelect( CARDbyAutoChannelSelect(
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
CARD_PHY_TYPE ePHYType CARD_PHY_TYPE ePHYType
); );
BYTE CARDbyGetChannelNumber(PVOID pDeviceHandler, BYTE byChannelIndex); BYTE CARDbyGetChannelNumber(void *pDeviceHandler, BYTE byChannelIndex);
#endif // __CARD_H__ #endif // __CARD_H__

12
drivers/staging/vt6655/datarate.c
View file

@ -196,7 +196,7 @@ wGetRateIdx(
-*/ -*/
void void
RATEvParseMaxRate ( RATEvParseMaxRate (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN PWLAN_IE_SUPP_RATES pItemRates, IN PWLAN_IE_SUPP_RATES pItemRates,
IN PWLAN_IE_SUPP_RATES pItemExtRates, IN PWLAN_IE_SUPP_RATES pItemExtRates,
IN BOOL bUpdateBasicRate, IN BOOL bUpdateBasicRate,
@ -235,7 +235,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, wGetRateIdx(byRate)); CARDbAddBasicRate((void *)pDevice, wGetRateIdx(byRate));
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", wGetRateIdx(byRate)); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", wGetRateIdx(byRate));
} }
byRate = (BYTE)(pItemRates->abyRates[ii]&0x7F); byRate = (BYTE)(pItemRates->abyRates[ii]&0x7F);
@ -258,7 +258,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, wGetRateIdx(byRate)); CARDbAddBasicRate((void *)pDevice, wGetRateIdx(byRate));
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", wGetRateIdx(byRate)); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", wGetRateIdx(byRate));
} }
byRate = (BYTE)(pItemExtRates->abyRates[ii]&0x7F); byRate = (BYTE)(pItemExtRates->abyRates[ii]&0x7F);
@ -271,7 +271,7 @@ 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;
} }
@ -283,7 +283,7 @@ UINT uRateLen;
else else
*pwMaxBasicRate = pDevice->byTopOFDMBasicRate; *pwMaxBasicRate = pDevice->byTopOFDMBasicRate;
if (wOldBasicRate != pDevice->wBasicRate) if (wOldBasicRate != pDevice->wBasicRate)
CARDvSetRSPINF((PVOID)pDevice, pDevice->eCurrentPHYType); CARDvSetRSPINF((void *)pDevice, pDevice->eCurrentPHYType);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Exit ParseMaxRate\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Exit ParseMaxRate\n");
} }
@ -309,7 +309,7 @@ UINT uRateLen;
void void
RATEvTxRateFallBack ( RATEvTxRateFallBack (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN PKnownNodeDB psNodeDBTable IN PKnownNodeDB psNodeDBTable
) )
{ {

4
drivers/staging/vt6655/datarate.h
View file

@ -56,7 +56,7 @@
void void
RATEvParseMaxRate( RATEvParseMaxRate(
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN PWLAN_IE_SUPP_RATES pItemRates, IN PWLAN_IE_SUPP_RATES pItemRates,
IN PWLAN_IE_SUPP_RATES pItemExtRates, IN PWLAN_IE_SUPP_RATES pItemExtRates,
IN BOOL bUpdateBasicRate, IN BOOL bUpdateBasicRate,
@ -69,7 +69,7 @@ RATEvParseMaxRate(
void void
RATEvTxRateFallBack( RATEvTxRateFallBack(
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN PKnownNodeDB psNodeDBTable IN PKnownNodeDB psNodeDBTable
); );

14
drivers/staging/vt6655/device_main.c
View file

@ -729,7 +729,7 @@ else
pDevice->abyOFDMPwrTbl[ii+CB_MAX_CHANNEL_24G+1] = SROMbyReadEmbedded(pDevice->PortOffset, (BYTE)(ii + EEP_OFS_OFDMA_PWR_TBL)); pDevice->abyOFDMPwrTbl[ii+CB_MAX_CHANNEL_24G+1] = SROMbyReadEmbedded(pDevice->PortOffset, (BYTE)(ii + EEP_OFS_OFDMA_PWR_TBL));
pDevice->abyOFDMDefaultPwr[ii+CB_MAX_CHANNEL_24G+1] = SROMbyReadEmbedded(pDevice->PortOffset, (BYTE)(ii + EEP_OFS_OFDMA_PWR_dBm)); pDevice->abyOFDMDefaultPwr[ii+CB_MAX_CHANNEL_24G+1] = SROMbyReadEmbedded(pDevice->PortOffset, (BYTE)(ii + EEP_OFS_OFDMA_PWR_dBm));
} }
CARDvInitChannelTable((PVOID)pDevice); CARDvInitChannelTable((void *)pDevice);
if (pDevice->byLocalID > REV_ID_VT3253_B1) { if (pDevice->byLocalID > REV_ID_VT3253_B1) {
@ -1074,7 +1074,7 @@ device_found1(struct pci_dev *pcid, const struct pci_device_id *ent)
//Enable the chip specified capbilities //Enable the chip specified capbilities
pDevice->flags = pDevice->sOpts.flags | (pChip_info->flags & 0xFF000000UL); pDevice->flags = pDevice->sOpts.flags | (pChip_info->flags & 0xFF000000UL);
pDevice->tx_80211 = device_dma0_tx_80211; pDevice->tx_80211 = device_dma0_tx_80211;
pDevice->sMgmtObj.pAdapter = (PVOID)pDevice; pDevice->sMgmtObj.pAdapter = (void *)pDevice;
pDevice->pMgmt = &(pDevice->sMgmtObj); pDevice->pMgmt = &(pDevice->sMgmtObj);
dev->irq = pcid->irq; dev->irq = pcid->irq;
@ -1249,7 +1249,7 @@ device_release_WPADEV(pDevice);
unregister_netdev(dev); unregister_netdev(dev);
if (pDevice->PortOffset) if (pDevice->PortOffset)
iounmap((PVOID)pDevice->PortOffset); iounmap((void *)pDevice->PortOffset);
if (pDevice->pcid) if (pDevice->pcid)
pci_release_regions(pDevice->pcid); pci_release_regions(pDevice->pcid);
@ -1461,7 +1461,7 @@ static void device_free_rd0_ring(PSDevice pDevice) {
dev_kfree_skb(pRDInfo->skb); dev_kfree_skb(pRDInfo->skb);
kfree((PVOID)pDesc->pRDInfo); kfree((void *)pDesc->pRDInfo);
} }
} }
@ -1479,7 +1479,7 @@ static void device_free_rd1_ring(PSDevice pDevice) {
dev_kfree_skb(pRDInfo->skb); dev_kfree_skb(pRDInfo->skb);
kfree((PVOID)pDesc->pRDInfo); kfree((void *)pDesc->pRDInfo);
} }
} }
@ -1564,7 +1564,7 @@ static void device_free_td0_ring(PSDevice pDevice) {
if (pTDInfo->skb) if (pTDInfo->skb)
dev_kfree_skb(pTDInfo->skb); dev_kfree_skb(pTDInfo->skb);
kfree((PVOID)pDesc->pTDInfo); kfree((void *)pDesc->pTDInfo);
} }
} }
@ -1582,7 +1582,7 @@ static void device_free_td1_ring(PSDevice pDevice) {
if (pTDInfo->skb) if (pTDInfo->skb)
dev_kfree_skb(pTDInfo->skb); dev_kfree_skb(pTDInfo->skb);
kfree((PVOID)pDesc->pTDInfo); kfree((void *)pDesc->pTDInfo);
} }
} }

2
drivers/staging/vt6655/dpc.c
View file

@ -314,7 +314,7 @@ s_vGetDASA (
//PLICE_DEBUG -> //PLICE_DEBUG ->
void MngWorkItem(PVOID Context) void MngWorkItem(void *Context)
{ {
PSRxMgmtPacket pRxMgmtPacket; PSRxMgmtPacket pRxMgmtPacket;
PSDevice pDevice = (PSDevice) Context; PSDevice pDevice = (PSDevice) Context;

2
drivers/staging/vt6655/dpc.h
View file

@ -47,7 +47,7 @@ device_receive_frame (
IN PSRxDesc pCurrRD IN PSRxDesc pCurrRD
); );
void MngWorkItem(PVOID Context); void MngWorkItem(void *Context);
#endif // __RXTX_H__ #endif // __RXTX_H__

4
drivers/staging/vt6655/key.c
View file

@ -104,10 +104,10 @@ void KeyvInitTable (PSKeyManagement pTable, DWORD_PTR dwIoBase)
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;

2
drivers/staging/vt6655/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

88
drivers/staging/vt6655/rxtx.c
View file

@ -133,7 +133,7 @@ void
s_vFillRTSHead( s_vFillRTSHead(
IN PSDevice pDevice, IN PSDevice pDevice,
IN BYTE byPktType, IN BYTE byPktType,
IN PVOID pvRTS, IN void * pvRTS,
IN UINT cbFrameLength, IN UINT cbFrameLength,
IN BOOL bNeedAck, IN BOOL bNeedAck,
IN BOOL bDisCRC, IN BOOL bDisCRC,
@ -147,10 +147,10 @@ void
s_vGenerateTxParameter( s_vGenerateTxParameter(
IN PSDevice pDevice, IN PSDevice pDevice,
IN BYTE byPktType, IN BYTE byPktType,
IN PVOID pTxBufHead, IN void * pTxBufHead,
IN PVOID pvRrvTime, IN void * pvRrvTime,
IN PVOID pvRTS, IN void * pvRTS,
IN PVOID pvCTS, IN void * pvCTS,
IN UINT cbFrameSize, IN UINT cbFrameSize,
IN BOOL bNeedACK, IN BOOL bNeedACK,
IN UINT uDMAIdx, IN UINT uDMAIdx,
@ -164,7 +164,7 @@ static void s_vFillFragParameter(
IN PSDevice pDevice, IN PSDevice pDevice,
IN PBYTE pbyBuffer, IN PBYTE pbyBuffer,
IN UINT uTxType, IN UINT uTxType,
IN PVOID pvtdCurr, IN void * pvtdCurr,
IN WORD wFragType, IN WORD wFragType,
IN UINT cbReqCount IN UINT cbReqCount
); );
@ -193,7 +193,7 @@ UINT
s_uFillDataHead ( s_uFillDataHead (
IN PSDevice pDevice, IN PSDevice pDevice,
IN BYTE byPktType, IN BYTE byPktType,
IN PVOID pTxDataHead, IN void * pTxDataHead,
IN UINT cbFrameLength, IN UINT cbFrameLength,
IN UINT uDMAIdx, IN UINT uDMAIdx,
IN BOOL bNeedAck, IN BOOL bNeedAck,
@ -723,7 +723,7 @@ UINT
s_uFillDataHead ( s_uFillDataHead (
IN PSDevice pDevice, IN PSDevice pDevice,
IN BYTE byPktType, IN BYTE byPktType,
IN PVOID pTxDataHead, IN void * pTxDataHead,
IN UINT cbFrameLength, IN UINT cbFrameLength,
IN UINT uDMAIdx, IN UINT uDMAIdx,
IN BOOL bNeedAck, IN BOOL bNeedAck,
@ -855,7 +855,7 @@ void
s_vFillRTSHead ( s_vFillRTSHead (
IN PSDevice pDevice, IN PSDevice pDevice,
IN BYTE byPktType, IN BYTE byPktType,
IN PVOID pvRTS, IN void * pvRTS,
IN UINT cbFrameLength, IN UINT cbFrameLength,
IN BOOL bNeedAck, IN BOOL bNeedAck,
IN BOOL bDisCRC, IN BOOL bDisCRC,
@ -1050,7 +1050,7 @@ s_vFillCTSHead (
IN PSDevice pDevice, IN PSDevice pDevice,
IN UINT uDMAIdx, IN UINT uDMAIdx,
IN BYTE byPktType, IN BYTE byPktType,
IN PVOID pvCTS, IN void * pvCTS,
IN UINT cbFrameLength, IN UINT cbFrameLength,
IN BOOL bNeedAck, IN BOOL bNeedAck,
IN BOOL bDisCRC, IN BOOL bDisCRC,
@ -1154,10 +1154,10 @@ void
s_vGenerateTxParameter ( s_vGenerateTxParameter (
IN PSDevice pDevice, IN PSDevice pDevice,
IN BYTE byPktType, IN BYTE byPktType,
IN PVOID pTxBufHead, IN void * pTxBufHead,
IN PVOID pvRrvTime, IN void * pvRrvTime,
IN PVOID pvRTS, IN void * pvRTS,
IN PVOID pvCTS, IN void * pvCTS,
IN UINT cbFrameSize, IN UINT cbFrameSize,
IN BOOL bNeedACK, IN BOOL bNeedACK,
IN UINT uDMAIdx, IN UINT uDMAIdx,
@ -1273,7 +1273,7 @@ s_vFillFragParameter(
IN PSDevice pDevice, IN PSDevice pDevice,
IN PBYTE pbyBuffer, IN PBYTE pbyBuffer,
IN UINT uTxType, IN UINT uTxType,
IN PVOID pvtdCurr, IN void * pvtdCurr,
IN WORD wFragType, IN WORD wFragType,
IN UINT cbReqCount IN UINT cbReqCount
) )
@ -1376,11 +1376,11 @@ s_cbFillTxBufHead (
PSTxBufHead psTxBufHd = (PSTxBufHead) pbyTxBufferAddr; PSTxBufHead psTxBufHd = (PSTxBufHead) pbyTxBufferAddr;
// UINT tmpDescIdx; // UINT tmpDescIdx;
UINT cbHeaderLength = 0; UINT cbHeaderLength = 0;
PVOID pvRrvTime; void * pvRrvTime;
PSMICHDRHead pMICHDR; PSMICHDRHead pMICHDR;
PVOID pvRTS; void * pvRTS;
PVOID pvCTS; void * pvCTS;
PVOID pvTxDataHd; void * pvTxDataHd;
WORD wTxBufSize; // FFinfo size WORD wTxBufSize; // FFinfo size
UINT uTotalCopyLength = 0; UINT uTotalCopyLength = 0;
BYTE byFBOption = AUTO_FB_NONE; BYTE byFBOption = AUTO_FB_NONE;
@ -1544,7 +1544,7 @@ s_cbFillTxBufHead (
} }
} // Auto Fall Back } // Auto Fall Back
} }
memset((PVOID)(pbyTxBufferAddr + wTxBufSize), 0, (cbHeaderLength - wTxBufSize)); memset((void *)(pbyTxBufferAddr + wTxBufSize), 0, (cbHeaderLength - wTxBufSize));
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
if ((bNeedEncrypt == TRUE) && (pTransmitKey != NULL) && (pTransmitKey->byCipherSuite == KEY_CTL_TKIP)) { if ((bNeedEncrypt == TRUE) && (pTransmitKey != NULL) && (pTransmitKey->byCipherSuite == KEY_CTL_TKIP)) {
@ -1600,7 +1600,7 @@ s_cbFillTxBufHead (
//Fill FIFO,RrvTime,RTS,and CTS //Fill FIFO,RrvTime,RTS,and CTS
s_vGenerateTxParameter(pDevice, byPktType, (PVOID)psTxBufHd, pvRrvTime, pvRTS, pvCTS, s_vGenerateTxParameter(pDevice, byPktType, (void *)psTxBufHd, pvRrvTime, pvRTS, pvCTS,
cbFragmentSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate); cbFragmentSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate);
//Fill DataHead //Fill DataHead
uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFragmentSize, uDMAIdx, bNeedACK, uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFragmentSize, uDMAIdx, bNeedACK,
@ -1643,7 +1643,7 @@ s_cbFillTxBufHead (
//if (pDevice->bAES) { //if (pDevice->bAES) {
// s_vFillMICHDR(pDevice, (PBYTE)pMICHDR, pbyMacHdr, (WORD)cbFragPayloadSize); // s_vFillMICHDR(pDevice, (PBYTE)pMICHDR, pbyMacHdr, (WORD)cbFragPayloadSize);
//} //}
//cbReqCount += s_uDoEncryption(pDevice, psEthHeader, (PVOID)psTxBufHd, byKeySel, //cbReqCount += s_uDoEncryption(pDevice, psEthHeader, (void *)psTxBufHd, byKeySel,
// pbyPayloadHead, (WORD)cbFragPayloadSize, uDMAIdx); // pbyPayloadHead, (WORD)cbFragPayloadSize, uDMAIdx);
@ -1653,7 +1653,7 @@ s_cbFillTxBufHead (
uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen + cb802_1_H_len; uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen + cb802_1_H_len;
//copy TxBufferHeader + MacHeader to desc //copy TxBufferHeader + MacHeader to desc
memcpy(pbyBuffer, (PVOID)psTxBufHd, uLength); memcpy(pbyBuffer, (void *)psTxBufHd, uLength);
// Copy the Packet into a tx Buffer // Copy the Packet into a tx Buffer
memcpy((pbyBuffer + uLength), (pPacket + 14), (cbFragPayloadSize - cb802_1_H_len)); memcpy((pbyBuffer + uLength), (pPacket + 14), (cbFragPayloadSize - cb802_1_H_len));
@ -1685,7 +1685,7 @@ s_cbFillTxBufHead (
//4.Set Sequence Control //4.Set Sequence Control
//5.Get S/W generate FCS //5.Get S/W generate FCS
//-------------------- //--------------------
s_vFillFragParameter(pDevice, pbyBuffer, uDMAIdx, (PVOID)ptdCurr, wFragType, cbReqCount); s_vFillFragParameter(pDevice, pbyBuffer, uDMAIdx, (void *)ptdCurr, wFragType, cbReqCount);
ptdCurr->pTDInfo->dwReqCount = cbReqCount - uPadding; ptdCurr->pTDInfo->dwReqCount = cbReqCount - uPadding;
ptdCurr->pTDInfo->dwHeaderLength = cbHeaderLength; ptdCurr->pTDInfo->dwHeaderLength = cbHeaderLength;
@ -1704,7 +1704,7 @@ s_cbFillTxBufHead (
wFragType = FRAGCTL_ENDFRAG; wFragType = FRAGCTL_ENDFRAG;
//Fill FIFO,RrvTime,RTS,and CTS //Fill FIFO,RrvTime,RTS,and CTS
s_vGenerateTxParameter(pDevice, byPktType, (PVOID)psTxBufHd, pvRrvTime, pvRTS, pvCTS, s_vGenerateTxParameter(pDevice, byPktType, (void *)psTxBufHd, pvRrvTime, pvRTS, pvCTS,
cbLastFragmentSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate); cbLastFragmentSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate);
//Fill DataHead //Fill DataHead
uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbLastFragmentSize, uDMAIdx, bNeedACK, uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbLastFragmentSize, uDMAIdx, bNeedACK,
@ -1740,7 +1740,7 @@ s_cbFillTxBufHead (
uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen; uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen;
//copy TxBufferHeader + MacHeader to desc //copy TxBufferHeader + MacHeader to desc
memcpy(pbyBuffer, (PVOID)psTxBufHd, uLength); memcpy(pbyBuffer, (void *)psTxBufHd, uLength);
// Copy the Packet into a tx Buffer // Copy the Packet into a tx Buffer
if (bMIC2Frag == FALSE) { if (bMIC2Frag == FALSE) {
@ -1814,7 +1814,7 @@ s_cbFillTxBufHead (
//-------------------- //--------------------
s_vFillFragParameter(pDevice, pbyBuffer, uDMAIdx, (PVOID)ptdCurr, wFragType, cbReqCount); s_vFillFragParameter(pDevice, pbyBuffer, uDMAIdx, (void *)ptdCurr, wFragType, cbReqCount);
ptdCurr->pTDInfo->dwReqCount = cbReqCount - uPadding; ptdCurr->pTDInfo->dwReqCount = cbReqCount - uPadding;
ptdCurr->pTDInfo->dwHeaderLength = cbHeaderLength; ptdCurr->pTDInfo->dwHeaderLength = cbHeaderLength;
@ -1834,7 +1834,7 @@ s_cbFillTxBufHead (
wFragType = FRAGCTL_MIDFRAG; wFragType = FRAGCTL_MIDFRAG;
//Fill FIFO,RrvTime,RTS,and CTS //Fill FIFO,RrvTime,RTS,and CTS
s_vGenerateTxParameter(pDevice, byPktType, (PVOID)psTxBufHd, pvRrvTime, pvRTS, pvCTS, s_vGenerateTxParameter(pDevice, byPktType, (void *)psTxBufHd, pvRrvTime, pvRTS, pvCTS,
cbFragmentSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate); cbFragmentSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate);
//Fill DataHead //Fill DataHead
uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFragmentSize, uDMAIdx, bNeedACK, uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFragmentSize, uDMAIdx, bNeedACK,
@ -1864,7 +1864,7 @@ s_cbFillTxBufHead (
//if (pDevice->bAES) { //if (pDevice->bAES) {
// s_vFillMICHDR(pDevice, (PBYTE)pMICHDR, pbyMacHdr, (WORD)cbFragPayloadSize); // s_vFillMICHDR(pDevice, (PBYTE)pMICHDR, pbyMacHdr, (WORD)cbFragPayloadSize);
//} //}
//cbReqCount += s_uDoEncryption(pDevice, psEthHeader, (PVOID)psTxBufHd, byKeySel, //cbReqCount += s_uDoEncryption(pDevice, psEthHeader, (void *)psTxBufHd, byKeySel,
// pbyPayloadHead, (WORD)cbFragPayloadSize, uDMAIdx); // pbyPayloadHead, (WORD)cbFragPayloadSize, uDMAIdx);
@ -1875,7 +1875,7 @@ s_cbFillTxBufHead (
uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen; uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen;
//copy TxBufferHeader + MacHeader to desc //copy TxBufferHeader + MacHeader to desc
memcpy(pbyBuffer, (PVOID)psTxBufHd, uLength); memcpy(pbyBuffer, (void *)psTxBufHd, uLength);
// Copy the Packet into a tx Buffer // Copy the Packet into a tx Buffer
memcpy((pbyBuffer + uLength), memcpy((pbyBuffer + uLength),
@ -1941,7 +1941,7 @@ s_cbFillTxBufHead (
//5.Get S/W generate FCS //5.Get S/W generate FCS
//-------------------- //--------------------
s_vFillFragParameter(pDevice, pbyBuffer, uDMAIdx, (PVOID)ptdCurr, wFragType, cbReqCount); s_vFillFragParameter(pDevice, pbyBuffer, uDMAIdx, (void *)ptdCurr, wFragType, cbReqCount);
ptdCurr->pTDInfo->dwReqCount = cbReqCount - uPadding; ptdCurr->pTDInfo->dwReqCount = cbReqCount - uPadding;
ptdCurr->pTDInfo->dwHeaderLength = cbHeaderLength; ptdCurr->pTDInfo->dwHeaderLength = cbHeaderLength;
@ -1964,7 +1964,7 @@ s_cbFillTxBufHead (
psTxBufHd->wFragCtl |= (WORD)wFragType; psTxBufHd->wFragCtl |= (WORD)wFragType;
//Fill FIFO,RrvTime,RTS,and CTS //Fill FIFO,RrvTime,RTS,and CTS
s_vGenerateTxParameter(pDevice, byPktType, (PVOID)psTxBufHd, pvRrvTime, pvRTS, pvCTS, s_vGenerateTxParameter(pDevice, byPktType, (void *)psTxBufHd, pvRrvTime, pvRTS, pvCTS,
cbFrameSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate); cbFrameSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate);
//Fill DataHead //Fill DataHead
uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFrameSize, uDMAIdx, bNeedACK, uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFrameSize, uDMAIdx, bNeedACK,
@ -2015,7 +2015,7 @@ s_cbFillTxBufHead (
uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen + cb802_1_H_len; uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen + cb802_1_H_len;
//copy TxBufferHeader + MacHeader to desc //copy TxBufferHeader + MacHeader to desc
memcpy(pbyBuffer, (PVOID)psTxBufHd, uLength); memcpy(pbyBuffer, (void *)psTxBufHd, uLength);
// Copy the Packet into a tx Buffer // Copy the Packet into a tx Buffer
memcpy((pbyBuffer + uLength), memcpy((pbyBuffer + uLength),
@ -2342,9 +2342,9 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
PSTxDesc pFrstTD; PSTxDesc pFrstTD;
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;
@ -2362,8 +2362,8 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
WORD wTxBufSize; WORD wTxBufSize;
UINT cbMacHdLen; UINT cbMacHdLen;
SEthernetHeader sEthHeader; SEthernetHeader sEthHeader;
PVOID pvRrvTime; void * pvRrvTime;
PVOID pMICHDR; void * pMICHDR;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
WORD wCurrentRate = RATE_1M; WORD wCurrentRate = RATE_1M;
@ -2516,7 +2516,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
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]), &(pPacket->p80211Header->sA3.abyAddr1[0]), U_ETHER_ADDR_LEN); memcpy(&(sEthHeader.abyDstAddr[0]), &(pPacket->p80211Header->sA3.abyAddr1[0]), U_ETHER_ADDR_LEN);
memcpy(&(sEthHeader.abySrcAddr[0]), &(pPacket->p80211Header->sA3.abyAddr2[0]), U_ETHER_ADDR_LEN); memcpy(&(sEthHeader.abySrcAddr[0]), &(pPacket->p80211Header->sA3.abyAddr2[0]), U_ETHER_ADDR_LEN);
@ -2831,9 +2831,9 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU
PSTxDesc pFrstTD; PSTxDesc pFrstTD;
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;
@ -2857,8 +2857,8 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU
WORD wTxBufSize; WORD wTxBufSize;
UINT cbMacHdLen; UINT cbMacHdLen;
SEthernetHeader sEthHeader; SEthernetHeader sEthHeader;
PVOID pvRrvTime; void * pvRrvTime;
PVOID pMICHDR; void * pMICHDR;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
WORD wCurrentRate = RATE_1M; WORD wCurrentRate = RATE_1M;
PUWLAN_80211HDR p80211Header; PUWLAN_80211HDR p80211Header;
@ -3061,7 +3061,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU
} }
memset((PVOID)(pbyTxBufferAddr + wTxBufSize), 0, (cbHeaderSize - wTxBufSize)); memset((void *)(pbyTxBufferAddr + wTxBufSize), 0, (cbHeaderSize - wTxBufSize));
memcpy(&(sEthHeader.abyDstAddr[0]), &(p80211Header->sA3.abyAddr1[0]), U_ETHER_ADDR_LEN); memcpy(&(sEthHeader.abyDstAddr[0]), &(p80211Header->sA3.abyAddr1[0]), U_ETHER_ADDR_LEN);
memcpy(&(sEthHeader.abySrcAddr[0]), &(p80211Header->sA3.abyAddr2[0]), U_ETHER_ADDR_LEN); memcpy(&(sEthHeader.abySrcAddr[0]), &(p80211Header->sA3.abyAddr2[0]), U_ETHER_ADDR_LEN);
//========================= //=========================

7
drivers/staging/vt6655/ttype.h
View file

@ -132,13 +132,6 @@ typedef DWORD * PDWORD;
typedef QWORD * PQWORD; typedef QWORD * PQWORD;
typedef void * PVOID;
// handle declaration
#ifdef STRICT
typedef void *HANDLE; typedef void *HANDLE;
#else
typedef PVOID HANDLE;
#endif
#endif // __TTYPE_H__ #endif // __TTYPE_H__

58
drivers/staging/vt6655/vntwifi.c
View file

@ -71,7 +71,7 @@
-*/ -*/
void void
VNTWIFIvSetOPMode ( VNTWIFIvSetOPMode (
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN WMAC_CONFIG_MODE eOPMode IN WMAC_CONFIG_MODE eOPMode
) )
{ {
@ -100,7 +100,7 @@ VNTWIFIvSetOPMode (
-*/ -*/
void void
VNTWIFIvSetIBSSParameter ( VNTWIFIvSetIBSSParameter (
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN WORD wBeaconPeriod, IN WORD wBeaconPeriod,
IN WORD wATIMWindow, IN WORD wATIMWindow,
IN UINT uChannel IN UINT uChannel
@ -129,7 +129,7 @@ VNTWIFIvSetIBSSParameter (
-*/ -*/
PWLAN_IE_SSID PWLAN_IE_SSID
VNTWIFIpGetCurrentSSID ( VNTWIFIpGetCurrentSSID (
IN PVOID pMgmtHandle IN void *pMgmtHandle
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
@ -152,7 +152,7 @@ VNTWIFIpGetCurrentSSID (
-*/ -*/
UINT UINT
VNTWIFIpGetCurrentChannel ( VNTWIFIpGetCurrentChannel (
IN PVOID pMgmtHandle IN void *pMgmtHandle
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
@ -178,7 +178,7 @@ VNTWIFIpGetCurrentChannel (
-*/ -*/
WORD WORD
VNTWIFIwGetAssocID ( VNTWIFIwGetAssocID (
IN PVOID pMgmtHandle IN void *pMgmtHandle
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
@ -308,7 +308,7 @@ VNTWIFIbyGetACKTxRate (
-*/ -*/
void void
VNTWIFIvSetAuthenticationMode ( VNTWIFIvSetAuthenticationMode (
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN WMAC_AUTHENTICATION_MODE eAuthMode IN WMAC_AUTHENTICATION_MODE eAuthMode
) )
{ {
@ -340,7 +340,7 @@ VNTWIFIvSetAuthenticationMode (
-*/ -*/
void void
VNTWIFIvSetEncryptionMode ( VNTWIFIvSetEncryptionMode (
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN WMAC_ENCRYPTION_MODE eEncryptionMode IN WMAC_ENCRYPTION_MODE eEncryptionMode
) )
{ {
@ -360,7 +360,7 @@ VNTWIFIvSetEncryptionMode (
BOOL BOOL
VNTWIFIbConfigPhyMode ( VNTWIFIbConfigPhyMode (
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN CARD_PHY_TYPE ePhyType IN CARD_PHY_TYPE ePhyType
) )
{ {
@ -381,8 +381,8 @@ VNTWIFIbConfigPhyMode (
void void
VNTWIFIbGetConfigPhyMode ( VNTWIFIbGetConfigPhyMode (
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
OUT PVOID pePhyType OUT void *pePhyType
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
@ -426,9 +426,9 @@ VNTWIFIbGetConfigPhyMode (
void void
VNTWIFIvQueryBSSList ( VNTWIFIvQueryBSSList (
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
OUT PUINT puBSSCount, OUT PUINT puBSSCount,
OUT PVOID *pvFirstBSS OUT void **pvFirstBSS
) )
{ {
UINT ii = 0; UINT ii = 0;
@ -456,9 +456,9 @@ VNTWIFIvQueryBSSList (
void void
VNTWIFIvGetNextBSS ( VNTWIFIvGetNextBSS (
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN PVOID pvCurrentBSS, IN void *pvCurrentBSS,
OUT PVOID *pvNextBSS OUT void **pvNextBSS
) )
{ {
PKnownBSS pBSS = (PKnownBSS) pvCurrentBSS; PKnownBSS pBSS = (PKnownBSS) pvCurrentBSS;
@ -496,7 +496,7 @@ VNTWIFIvGetNextBSS (
-*/ -*/
void void
VNTWIFIvUpdateNodeTxCounter( VNTWIFIvUpdateNodeTxCounter(
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN PBYTE pbyDestAddress, IN PBYTE pbyDestAddress,
IN BOOL bTxOk, IN BOOL bTxOk,
IN WORD wRate, IN WORD wRate,
@ -531,7 +531,7 @@ VNTWIFIvUpdateNodeTxCounter(
void void
VNTWIFIvGetTxRate( VNTWIFIvGetTxRate(
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN PBYTE pbyDestAddress, IN PBYTE pbyDestAddress,
OUT PWORD pwTxDataRate, OUT PWORD pwTxDataRate,
OUT PBYTE pbyACKRate, OUT PBYTE pbyACKRate,
@ -603,7 +603,7 @@ VNTWIFIvGetTxRate(
BYTE BYTE
VNTWIFIbyGetKeyCypher( VNTWIFIbyGetKeyCypher(
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN BOOL bGroupKey IN BOOL bGroupKey
) )
{ {
@ -620,8 +620,8 @@ VNTWIFIbyGetKeyCypher(
/* /*
BOOL BOOL
VNTWIFIbInit( VNTWIFIbInit(
IN PVOID pAdapterHandler, IN void *pAdapterHandler,
OUT PVOID *pMgmtHandler OUT void **pMgmtHandler
) )
{ {
@ -636,7 +636,7 @@ VNTWIFIbInit(
} }
memset(pMgmt, 0, sizeof(SMgmtObject)); memset(pMgmt, 0, sizeof(SMgmtObject));
pMgmt->pAdapter = (PVOID) pAdapterHandler; pMgmt->pAdapter = (void *) pAdapterHandler;
// should initial MAC address abyMACAddr // should initial MAC address abyMACAddr
for(ii=0;ii<WLAN_BSSID_LEN;ii++) { for(ii=0;ii<WLAN_BSSID_LEN;ii++) {
@ -664,9 +664,9 @@ VNTWIFIbInit(
BOOL BOOL
VNTWIFIbSetPMKIDCache ( VNTWIFIbSetPMKIDCache (
IN PVOID pMgmtObject, IN void *pMgmtObject,
IN ULONG ulCount, IN ULONG ulCount,
IN PVOID pPMKIDInfo IN void *pPMKIDInfo
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
@ -683,7 +683,7 @@ VNTWIFIbSetPMKIDCache (
WORD WORD
VNTWIFIwGetMaxSupportRate( VNTWIFIwGetMaxSupportRate(
IN PVOID pMgmtObject IN void *pMgmtObject
) )
{ {
WORD wRate = RATE_54M; WORD wRate = RATE_54M;
@ -704,7 +704,7 @@ VNTWIFIwGetMaxSupportRate(
void void
VNTWIFIvSet11h ( VNTWIFIvSet11h (
IN PVOID pMgmtObject, IN void *pMgmtObject,
IN BOOL b11hEnable IN BOOL b11hEnable
) )
{ {
@ -715,9 +715,9 @@ VNTWIFIvSet11h (
BOOL BOOL
VNTWIFIbMeasureReport( VNTWIFIbMeasureReport(
IN PVOID pMgmtObject, IN void *pMgmtObject,
IN BOOL bEndOfReport, IN BOOL bEndOfReport,
IN PVOID pvMeasureEID, IN void *pvMeasureEID,
IN BYTE byReportMode, IN BYTE byReportMode,
IN BYTE byBasicMap, IN BYTE byBasicMap,
IN BYTE byCCAFraction, IN BYTE byCCAFraction,
@ -775,7 +775,7 @@ VNTWIFIbMeasureReport(
BOOL BOOL
VNTWIFIbChannelSwitch( VNTWIFIbChannelSwitch(
IN PVOID pMgmtObject, IN void *pMgmtObject,
IN BYTE byNewChannel IN BYTE byNewChannel
) )
{ {
@ -791,7 +791,7 @@ VNTWIFIbChannelSwitch(
/* /*
BOOL BOOL
VNTWIFIbRadarPresent( VNTWIFIbRadarPresent(
IN PVOID pMgmtObject, IN void *pMgmtObject,
IN BYTE byChannel IN BYTE byChannel
) )
{ {

58
drivers/staging/vt6655/vntwifi.h
View file

@ -142,7 +142,7 @@ typedef enum tagWMAC_POWER_MODE {
void void
VNTWIFIvSetIBSSParameter ( VNTWIFIvSetIBSSParameter (
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN WORD wBeaconPeriod, IN WORD wBeaconPeriod,
IN WORD wATIMWindow, IN WORD wATIMWindow,
IN UINT uChannel IN UINT uChannel
@ -150,23 +150,23 @@ VNTWIFIvSetIBSSParameter (
void void
VNTWIFIvSetOPMode ( VNTWIFIvSetOPMode (
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN WMAC_CONFIG_MODE eOPMode IN WMAC_CONFIG_MODE eOPMode
); );
PWLAN_IE_SSID PWLAN_IE_SSID
VNTWIFIpGetCurrentSSID( VNTWIFIpGetCurrentSSID(
IN PVOID pMgmtHandle IN void *pMgmtHandle
); );
UINT UINT
VNTWIFIpGetCurrentChannel( VNTWIFIpGetCurrentChannel(
IN PVOID pMgmtHandle IN void *pMgmtHandle
); );
WORD WORD
VNTWIFIwGetAssocID ( VNTWIFIwGetAssocID (
IN PVOID pMgmtHandle IN void *pMgmtHandle
); );
BYTE BYTE
@ -184,34 +184,34 @@ VNTWIFIbyGetACKTxRate (
void void
VNTWIFIvSetAuthenticationMode ( VNTWIFIvSetAuthenticationMode (
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN WMAC_AUTHENTICATION_MODE eAuthMode IN WMAC_AUTHENTICATION_MODE eAuthMode
); );
void void
VNTWIFIvSetEncryptionMode ( VNTWIFIvSetEncryptionMode (
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN WMAC_ENCRYPTION_MODE eEncryptionMode IN WMAC_ENCRYPTION_MODE eEncryptionMode
); );
BOOL BOOL
VNTWIFIbConfigPhyMode( VNTWIFIbConfigPhyMode(
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN CARD_PHY_TYPE ePhyType IN CARD_PHY_TYPE ePhyType
); );
void void
VNTWIFIbGetConfigPhyMode( VNTWIFIbGetConfigPhyMode(
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
OUT PVOID pePhyType OUT void *pePhyType
); );
void void
VNTWIFIvQueryBSSList( VNTWIFIvQueryBSSList(
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
OUT PUINT puBSSCount, OUT PUINT puBSSCount,
OUT PVOID *pvFirstBSS OUT void **pvFirstBSS
); );
@ -219,16 +219,16 @@ VNTWIFIvQueryBSSList(
void void
VNTWIFIvGetNextBSS ( VNTWIFIvGetNextBSS (
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN PVOID pvCurrentBSS, IN void *pvCurrentBSS,
OUT PVOID *pvNextBSS OUT void **pvNextBSS
); );
void void
VNTWIFIvUpdateNodeTxCounter( VNTWIFIvUpdateNodeTxCounter(
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN PBYTE pbyDestAddress, IN PBYTE pbyDestAddress,
IN BOOL bTxOk, IN BOOL bTxOk,
IN WORD wRate, IN WORD wRate,
@ -238,7 +238,7 @@ VNTWIFIvUpdateNodeTxCounter(
void void
VNTWIFIvGetTxRate( VNTWIFIvGetTxRate(
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN PBYTE pbyDestAddress, IN PBYTE pbyDestAddress,
OUT PWORD pwTxDataRate, OUT PWORD pwTxDataRate,
OUT PBYTE pbyACKRate, OUT PBYTE pbyACKRate,
@ -248,14 +248,14 @@ VNTWIFIvGetTxRate(
/* /*
BOOL BOOL
VNTWIFIbInit( VNTWIFIbInit(
IN PVOID pAdapterHandler, IN void *pAdapterHandler,
OUT PVOID *pMgmtHandler OUT void **pMgmtHandler
); );
*/ */
BYTE BYTE
VNTWIFIbyGetKeyCypher( VNTWIFIbyGetKeyCypher(
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
IN BOOL bGroupKey IN BOOL bGroupKey
); );
@ -264,33 +264,33 @@ VNTWIFIbyGetKeyCypher(
BOOL BOOL
VNTWIFIbSetPMKIDCache ( VNTWIFIbSetPMKIDCache (
IN PVOID pMgmtObject, IN void *pMgmtObject,
IN ULONG ulCount, IN ULONG ulCount,
IN PVOID pPMKIDInfo IN void *pPMKIDInfo
); );
BOOL BOOL
VNTWIFIbCommandRunning ( VNTWIFIbCommandRunning (
IN PVOID pMgmtObject IN void *pMgmtObject
); );
WORD WORD
VNTWIFIwGetMaxSupportRate( VNTWIFIwGetMaxSupportRate(
IN PVOID pMgmtObject IN void *pMgmtObject
); );
// for 802.11h // for 802.11h
void void
VNTWIFIvSet11h ( VNTWIFIvSet11h (
IN PVOID pMgmtObject, IN void *pMgmtObject,
IN BOOL b11hEnable IN BOOL b11hEnable
); );
BOOL BOOL
VNTWIFIbMeasureReport( VNTWIFIbMeasureReport(
IN PVOID pMgmtObject, IN void *pMgmtObject,
IN BOOL bEndOfReport, IN BOOL bEndOfReport,
IN PVOID pvMeasureEID, IN void *pvMeasureEID,
IN BYTE byReportMode, IN BYTE byReportMode,
IN BYTE byBasicMap, IN BYTE byBasicMap,
IN BYTE byCCAFraction, IN BYTE byCCAFraction,
@ -299,13 +299,13 @@ VNTWIFIbMeasureReport(
BOOL BOOL
VNTWIFIbChannelSwitch( VNTWIFIbChannelSwitch(
IN PVOID pMgmtObject, IN void *pMgmtObject,
IN BYTE byNewChannel IN BYTE byNewChannel
); );
/* /*
BOOL BOOL
VNTWIFIbRadarPresent( VNTWIFIbRadarPresent(
IN PVOID pMgmtObject, IN void *pMgmtObject,
IN BYTE byChannel IN BYTE byChannel
); );
*/ */

18
drivers/staging/vt6655/wmgr.c
View file

@ -736,7 +736,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
@ -895,7 +895,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
@ -2091,7 +2091,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,
@ -2256,7 +2256,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,
@ -2277,7 +2277,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,
@ -2485,7 +2485,7 @@ 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);
@ -2781,7 +2781,7 @@ vMgrJoinBSSBegin(
} }
} }
RATEvParseMaxRate((PVOID)pDevice, pItemRates, pItemExtRates, TRUE, RATEvParseMaxRate((void *)pDevice, pItemRates, pItemExtRates, TRUE,
&wMaxBasicRate, &wMaxSuppRate, &wSuppRate, &wMaxBasicRate, &wMaxSuppRate, &wSuppRate,
&byTopCCKBasicRate, &byTopOFDMBasicRate); &byTopCCKBasicRate, &byTopOFDMBasicRate);
@ -2867,7 +2867,7 @@ 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);
@ -2967,7 +2967,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
CARDbUpdateTSF(pDevice, pCurr->byRxRate, pCurr->qwBSSTimestamp, pCurr->qwLocalTSF); CARDbUpdateTSF(pDevice, pCurr->byRxRate, pCurr->qwBSSTimestamp, pCurr->qwLocalTSF);

2
drivers/staging/vt6655/wmgr.h
View file

@ -249,7 +249,7 @@ typedef struct tagSRxMgmtPacket {
typedef struct tagSMgmtObject typedef struct tagSMgmtObject
{ {
PVOID pAdapter; void * pAdapter;
// MAC address // MAC address
BYTE abyMACAddr[WLAN_ADDR_LEN]; BYTE abyMACAddr[WLAN_ADDR_LEN];

2
drivers/staging/vt6655/wpa2.c
View file

@ -263,7 +263,7 @@ WPA2vParseRSN (
-*/ -*/
UINT UINT
WPA2uSetIEs( WPA2uSetIEs(
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
OUT PWLAN_IE_RSN pRSNIEs OUT PWLAN_IE_RSN pRSNIEs
) )
{ {

2
drivers/staging/vt6655/wpa2.h
View file

@ -71,7 +71,7 @@ WPA2vParseRSN (
UINT UINT
WPA2uSetIEs( WPA2uSetIEs(
IN PVOID pMgmtHandle, IN void *pMgmtHandle,
OUT PWLAN_IE_RSN pRSNIEs OUT PWLAN_IE_RSN pRSNIEs
); );