Skip to content

L
linux
Commit 830a619c authored by Charles Clément's avatar Charles Clément Committed by Greg Kroah-Hartman
Browse files
Options

Staging: vt6655: remove PVOID definition and use 

Signed-off-by: default avatarCharles Clément <caratorn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6b35b7b3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 254 additions and 261 deletions
drivers/staging/vt6655/IEEE11h.c
View file @ 830a619c
...@@ -203,8 +203,8 @@ static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, BYTE byR ...@@ -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 ( ...@@ -265,7 +265,7 @@ IEEE11hbMgrRxAction (
BOOL IEEE11hbMSRRepTx ( BOOL IEEE11hbMSRRepTx (
IN PVOID pMgmtHandle IN void *pMgmtHandle
) )
{ {
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
......
drivers/staging/vt6655/IEEE11h.h
View file @ 830a619c
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
BOOL IEEE11hbMSRRepTx ( BOOL IEEE11hbMSRRepTx (
IN PVOID pMgmtHandle IN void *pMgmtHandle
); );
#endif // __IEEE11h_H__ #endif // __IEEE11h_H__
drivers/staging/vt6655/bssdb.c
View file @ 830a619c
...@@ -764,7 +764,7 @@ BSSbUpdateToBSSList ( ...@@ -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( ...@@ -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( ...@@ -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 @@ CARDbRadioPowerOn(pDevice); ...@@ -1162,7 +1162,7 @@ CARDbRadioPowerOn(pDevice);
*/ */
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 @@ CARDbRadioPowerOn(pDevice); ...@@ -1170,7 +1170,7 @@ CARDbRadioPowerOn(pDevice);
#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 @@ CARDbRadioPowerOn(pDevice); ...@@ -1215,14 +1215,14 @@ CARDbRadioPowerOn(pDevice);
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);
} }
} }
......
drivers/staging/vt6655/card.c
View file @ 830a619c
This diff is collapsed.
drivers/staging/vt6655/card.h
View file @ 830a619c
...@@ -87,77 +87,77 @@ typedef enum _CARD_OP_MODE { ...@@ -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 ( ...@@ -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 ( ...@@ -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 ( ...@@ -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( ...@@ -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__
......
drivers/staging/vt6655/datarate.c
View file @ 830a619c
...@@ -196,7 +196,7 @@ wGetRateIdx( ...@@ -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; ...@@ -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; ...@@ -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; ...@@ -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; ...@@ -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; ...@@ -309,7 +309,7 @@ UINT uRateLen;
void void
RATEvTxRateFallBack ( RATEvTxRateFallBack (
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN PKnownNodeDB psNodeDBTable IN PKnownNodeDB psNodeDBTable
) )
{ {
......
drivers/staging/vt6655/datarate.h
View file @ 830a619c
...@@ -56,7 +56,7 @@ ...@@ -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( ...@@ -69,7 +69,7 @@ RATEvParseMaxRate(
void void
RATEvTxRateFallBack( RATEvTxRateFallBack(
IN PVOID pDeviceHandler, IN void *pDeviceHandler,
IN PKnownNodeDB psNodeDBTable IN PKnownNodeDB psNodeDBTable
); );
......
drivers/staging/vt6655/device_main.c
View file @ 830a619c
...@@ -729,7 +729,7 @@ else ...@@ -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) ...@@ -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); ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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);
} }
} }
......
drivers/staging/vt6655/dpc.c
View file @ 830a619c
...@@ -314,7 +314,7 @@ s_vGetDASA ( ...@@ -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;
......
drivers/staging/vt6655/dpc.h
View file @ 830a619c
...@@ -47,7 +47,7 @@ device_receive_frame ( ...@@ -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__
......
drivers/staging/vt6655/key.c
View file @ 830a619c
...@@ -104,10 +104,10 @@ void KeyvInitTable (PSKeyManagement pTable, DWORD_PTR dwIoBase) ...@@ -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;
......
drivers/staging/vt6655/key.h
View file @ 830a619c
...@@ -66,7 +66,7 @@ typedef struct tagSKeyItem ...@@ -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
......
drivers/staging/vt6655/rxtx.c
View file @ 830a619c
This diff is collapsed.
drivers/staging/vt6655/ttype.h
View file @ 830a619c
...@@ -132,13 +132,6 @@ typedef DWORD * PDWORD; ...@@ -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__
drivers/staging/vt6655/vntwifi.c
View file @ 830a619c
...@@ -71,7 +71,7 @@ ...@@ -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 ( ...@@ -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 ( ...@@ -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 ( ...@@ -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 ( ...@@ -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 ( ...@@ -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 ( ...@@ -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 ( ...@@ -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 ( ...@@ -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 ( ...@@ -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 ( ...@@ -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 ( ...@@ -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( ...@@ -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( ...@@ -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( ...@@ -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( ...@@ -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( ...@@ -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 ( ...@@ -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( ...@@ -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 ( ...@@ -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( ...@@ -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( ...@@ -791,7 +791,7 @@ VNTWIFIbChannelSwitch(
/* /*
BOOL BOOL
VNTWIFIbRadarPresent( VNTWIFIbRadarPresent(
IN PVOID pMgmtObject, IN void *pMgmtObject,
IN BYTE byChannel IN BYTE byChannel
) )
{ {
......
drivers/staging/vt6655/vntwifi.h
View file @ 830a619c
...@@ -142,7 +142,7 @@ typedef enum tagWMAC_POWER_MODE { ...@@ -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 ( ...@@ -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 ( ...@@ -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( ...@@ -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( ...@@ -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( ...@@ -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( ...@@ -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( ...@@ -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
); );
*/ */
......
drivers/staging/vt6655/wmgr.c
View file @ 830a619c
...@@ -736,7 +736,7 @@ s_vMgrRxAssocRequest( ...@@ -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( ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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( ...@@ -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( ...@@ -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( ...@@ -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 ( ...@@ -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);
......
drivers/staging/vt6655/wmgr.h
View file @ 830a619c
...@@ -249,7 +249,7 @@ typedef struct tagSRxMgmtPacket { ...@@ -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];
......
drivers/staging/vt6655/wpa2.c
View file @ 830a619c
...@@ -263,7 +263,7 @@ WPA2vParseRSN ( ...@@ -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
) )
{ {
......
drivers/staging/vt6655/wpa2.h
View file @ 830a619c
...@@ -71,7 +71,7 @@ WPA2vParseRSN ( ...@@ -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
); );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7