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 Show 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
-*/
BOOL
IEEE11hbMgrRxAction (
IN PVOID pMgmtHandle,
IN PVOID pRxPacket
IN void *pMgmtHandle,
IN void *pRxPacket
)
{
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
......@@ -265,7 +265,7 @@ IEEE11hbMgrRxAction (
BOOL IEEE11hbMSRRepTx (
IN PVOID pMgmtHandle
IN void *pMgmtHandle
)
{
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
......
drivers/staging/vt6655/IEEE11h.h
View file @ 830a619c
......@@ -46,7 +46,7 @@
/*--------------------- Export Functions --------------------------*/
BOOL IEEE11hbMSRRepTx (
IN PVOID pMgmtHandle
IN void *pMgmtHandle
);
#endif // __IEEE11h_H__
drivers/staging/vt6655/bssdb.c
View file @ 830a619c
......@@ -764,7 +764,7 @@ BSSbUpdateToBSSList (
BOOL
BSSDBbIsSTAInNodeDB(
IN PVOID pMgmtObject,
IN void *pMgmtObject,
IN PBYTE abyDstAddr,
OUT PUINT puNodeIndex
)
......@@ -919,7 +919,7 @@ BSSvUpdateAPNode(
pMgmt->abyCurrExtSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)pExtSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates,
uRateLen);
RATEvParseMaxRate((PVOID) pDevice,
RATEvParseMaxRate((void *)pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates,
TRUE,
......@@ -972,7 +972,7 @@ BSSvAddMulticastNode(
pMgmt->sNodeDBTable[0].bActive = TRUE;
pMgmt->sNodeDBTable[0].bPSEnable = FALSE;
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->abyCurrExtSuppRates,
TRUE,
......@@ -1162,7 +1162,7 @@ CARDbRadioPowerOn(pDevice);
*/
if (ii > 0) {
// ii = 0 for multicast node (AP & Adhoc)
RATEvTxRateFallBack((PVOID)pDevice, &(pMgmt->sNodeDBTable[ii]));
RATEvTxRateFallBack((void *)pDevice, &(pMgmt->sNodeDBTable[ii]));
}
else {
// ii = 0 reserved for unicast AP node (Infra STA)
......@@ -1170,7 +1170,7 @@ CARDbRadioPowerOn(pDevice);
#ifdef PLICE_DEBUG
printk("SecondCallback:Before:TxDataRate is %d\n",pMgmt->sNodeDBTable[0].wTxDataRate);
#endif
RATEvTxRateFallBack((PVOID)pDevice, &(pMgmt->sNodeDBTable[ii]));
RATEvTxRateFallBack((void *)pDevice, &(pMgmt->sNodeDBTable[ii]));
#ifdef PLICE_DEBUG
printk("SecondCallback:After:TxDataRate is %d\n",pMgmt->sNodeDBTable[0].wTxDataRate);
#endif
......@@ -1215,14 +1215,14 @@ CARDbRadioPowerOn(pDevice);
if (pDevice->bShortSlotTime) {
pDevice->bShortSlotTime = FALSE;
BBvSetShortSlotTime(pDevice);
vUpdateIFS((PVOID)pDevice);
vUpdateIFS((void *)pDevice);
}
}
else {
if (!pDevice->bShortSlotTime) {
pDevice->bShortSlotTime = TRUE;
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 {
/*--------------------- Export Functions --------------------------*/
BOOL ChannelValid(UINT CountryCode, UINT ChannelIndex);
void CARDvSetRSPINF(PVOID pDeviceHandler, CARD_PHY_TYPE ePHYType);
void vUpdateIFS(PVOID pDeviceHandler);
void CARDvUpdateBasicTopRate(PVOID pDeviceHandler);
BOOL CARDbAddBasicRate(PVOID pDeviceHandler, WORD wRateIdx);
BOOL CARDbIsOFDMinBasicRate(PVOID pDeviceHandler);
void CARDvSetRSPINF(void *pDeviceHandler, CARD_PHY_TYPE ePHYType);
void vUpdateIFS(void *pDeviceHandler);
void CARDvUpdateBasicTopRate(void *pDeviceHandler);
BOOL CARDbAddBasicRate(void *pDeviceHandler, WORD wRateIdx);
BOOL CARDbIsOFDMinBasicRate(void *pDeviceHandler);
void CARDvSetLoopbackMode(DWORD_PTR dwIoBase, WORD wLoopbackMode);
BOOL CARDbSoftwareReset(PVOID pDeviceHandler);
BOOL CARDbSoftwareReset(void *pDeviceHandler);
void CARDvSetFirstNextTBTT(DWORD_PTR dwIoBase, WORD wBeaconInterval);
void CARDvUpdateNextTBTT(DWORD_PTR dwIoBase, QWORD qwTSF, WORD wBeaconInterval);
BOOL CARDbGetCurrentTSF(DWORD_PTR dwIoBase, PQWORD pqwCurrTSF);
QWORD CARDqGetNextTBTT(QWORD qwTSF, WORD wBeaconInterval);
QWORD CARDqGetTSFOffset(BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2);
BOOL CARDbSetTxPower(PVOID pDeviceHandler, ULONG ulTxPower);
BYTE CARDbyGetPktType(PVOID pDeviceHandler);
void CARDvSafeResetTx(PVOID pDeviceHandler);
void CARDvSafeResetRx(PVOID pDeviceHandler);
BOOL CARDbSetTxPower(void *pDeviceHandler, ULONG ulTxPower);
BYTE CARDbyGetPktType(void *pDeviceHandler);
void CARDvSafeResetTx(void *pDeviceHandler);
void CARDvSafeResetRx(void *pDeviceHandler);
//xxx
BOOL CARDbRadioPowerOff(PVOID pDeviceHandler);
BOOL CARDbRadioPowerOn(PVOID pDeviceHandler);
BOOL CARDbSetChannel(PVOID pDeviceHandler, UINT uConnectionChannel);
//BOOL CARDbSendPacket(PVOID pDeviceHandler, PVOID pPacket, CARD_PKT_TYPE ePktType, UINT uLength);
BOOL CARDbIsShortPreamble(PVOID pDeviceHandler);
BOOL CARDbIsShorSlotTime(PVOID pDeviceHandler);
BOOL CARDbSetPhyParameter(PVOID pDeviceHandler, CARD_PHY_TYPE ePHYType, WORD wCapInfo, BYTE byERPField, PVOID pvSupportRateIEs, PVOID pvExtSupportRateIEs);
BOOL CARDbUpdateTSF(PVOID pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF);
BOOL CARDbStopTxPacket(PVOID pDeviceHandler, CARD_PKT_TYPE ePktType);
BOOL CARDbStartTxPacket(PVOID pDeviceHandler, CARD_PKT_TYPE ePktType);
BOOL CARDbSetBeaconPeriod(PVOID pDeviceHandler, WORD wBeaconInterval);
BOOL CARDbSetBSSID(PVOID pDeviceHandler, PBYTE pbyBSSID, CARD_OP_MODE eOPMode);
BOOL CARDbRadioPowerOff(void *pDeviceHandler);
BOOL CARDbRadioPowerOn(void *pDeviceHandler);
BOOL CARDbSetChannel(void *pDeviceHandler, UINT uConnectionChannel);
//BOOL CARDbSendPacket(void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktType, UINT uLength);
BOOL CARDbIsShortPreamble(void *pDeviceHandler);
BOOL CARDbIsShorSlotTime(void *pDeviceHandler);
BOOL CARDbSetPhyParameter(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, WORD wCapInfo, BYTE byERPField, void *pvSupportRateIEs, void *pvExtSupportRateIEs);
BOOL CARDbUpdateTSF(void *pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp, QWORD qwLocalTSF);
BOOL CARDbStopTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType);
BOOL CARDbStartTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType);
BOOL CARDbSetBeaconPeriod(void *pDeviceHandler, WORD wBeaconInterval);
BOOL CARDbSetBSSID(void *pDeviceHandler, PBYTE pbyBSSID, CARD_OP_MODE eOPMode);
BOOL
CARDbPowerDown(
PVOID pDeviceHandler
void *pDeviceHandler
);
BOOL CARDbSetTxDataRate(
PVOID pDeviceHandler,
void *pDeviceHandler,
WORD wDataRate
);
BOOL CARDbRemoveKey (PVOID pDeviceHandler, PBYTE pbyBSSID);
BOOL CARDbRemoveKey (void *pDeviceHandler, PBYTE pbyBSSID);
BOOL
CARDbAdd_PMKID_Candidate (
IN PVOID pDeviceHandler,
IN void *pDeviceHandler,
IN PBYTE pbyBSSID,
IN BOOL bRSNCapExist,
IN WORD wRSNCap
);
PVOID
void *
CARDpGetCurrentAddress (
IN PVOID pDeviceHandler
IN void *pDeviceHandler
);
void CARDvInitChannelTable(PVOID pDeviceHandler);
BYTE CARDbyGetChannelMapping(PVOID pDeviceHandler, BYTE byChannelNumber, CARD_PHY_TYPE ePhyType);
void CARDvInitChannelTable(void *pDeviceHandler);
BYTE CARDbyGetChannelMapping(void *pDeviceHandler, BYTE byChannelNumber, CARD_PHY_TYPE ePhyType);
BOOL
CARDbStartMeasure (
IN PVOID pDeviceHandler,
IN PVOID pvMeasureEIDs,
IN void *pDeviceHandler,
IN void *pvMeasureEIDs,
IN UINT uNumOfMeasureEIDs
);
BOOL
CARDbChannelSwitch (
IN PVOID pDeviceHandler,
IN void *pDeviceHandler,
IN BYTE byMode,
IN BYTE byNewChannel,
IN BYTE byCount
......@@ -165,7 +165,7 @@ CARDbChannelSwitch (
BOOL
CARDbSetQuiet (
IN PVOID pDeviceHandler,
IN void *pDeviceHandler,
IN BOOL bResetQuiet,
IN BYTE byQuietCount,
IN BYTE byQuietPeriod,
......@@ -175,39 +175,39 @@ CARDbSetQuiet (
BOOL
CARDbStartQuiet (
IN PVOID pDeviceHandler
IN void *pDeviceHandler
);
void
CARDvSetCountryInfo (
IN PVOID pDeviceHandler,
IN void *pDeviceHandler,
IN CARD_PHY_TYPE ePHYType,
IN PVOID pIE
IN void *pIE
);
void
CARDvSetPowerConstraint (
IN PVOID pDeviceHandler,
IN void *pDeviceHandler,
IN BYTE byChannel,
IN I8 byPower
);
void
CARDvGetPowerCapability (
IN PVOID pDeviceHandler,
IN void *pDeviceHandler,
OUT PBYTE pbyMinPower,
OUT PBYTE pbyMaxPower
);
BYTE
CARDbySetSupportChannels (
IN PVOID pDeviceHandler,
IN void *pDeviceHandler,
IN OUT PBYTE pbyIEs
);
I8
CARDbyGetTransmitPower (
IN PVOID pDeviceHandler
IN void *pDeviceHandler
);
BOOL
......@@ -218,13 +218,13 @@ CARDbChannelGetList (
void
CARDvSetCountryIE(
IN PVOID pDeviceHandler,
IN PVOID pIE
IN void *pDeviceHandler,
IN void *pIE
);
BOOL
CARDbGetChannelMapInfo(
IN PVOID pDeviceHandler,
IN void *pDeviceHandler,
IN UINT uChannelIndex,
OUT PBYTE pbyChannelNumber,
OUT PBYTE pbyMap
......@@ -232,23 +232,23 @@ CARDbGetChannelMapInfo(
void
CARDvSetChannelMapInfo(
IN PVOID pDeviceHandler,
IN void *pDeviceHandler,
IN UINT uChannelIndex,
IN BYTE byMap
);
void
CARDvClearChannelMapInfo(
IN PVOID pDeviceHandler
IN void *pDeviceHandler
);
BYTE
CARDbyAutoChannelSelect(
IN PVOID pDeviceHandler,
IN void *pDeviceHandler,
CARD_PHY_TYPE ePHYType
);
BYTE CARDbyGetChannelNumber(PVOID pDeviceHandler, BYTE byChannelIndex);
BYTE CARDbyGetChannelNumber(void *pDeviceHandler, BYTE byChannelIndex);
#endif // __CARD_H__
......
drivers/staging/vt6655/datarate.c
View file @ 830a619c
......@@ -196,7 +196,7 @@ wGetRateIdx(
-*/
void
RATEvParseMaxRate (
IN PVOID pDeviceHandler,
IN void *pDeviceHandler,
IN PWLAN_IE_SUPP_RATES pItemRates,
IN PWLAN_IE_SUPP_RATES pItemExtRates,
IN BOOL bUpdateBasicRate,
......@@ -235,7 +235,7 @@ UINT uRateLen;
if (WLAN_MGMT_IS_BASICRATE(byRate) &&
(bUpdateBasicRate == TRUE)) {
// 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));
}
byRate = (BYTE)(pItemRates->abyRates[ii]&0x7F);
......@@ -258,7 +258,7 @@ UINT uRateLen;
// select highest basic rate
if (WLAN_MGMT_IS_BASICRATE(pItemExtRates->abyRates[ii])) {
// 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));
}
byRate = (BYTE)(pItemExtRates->abyRates[ii]&0x7F);
......@@ -271,7 +271,7 @@ UINT uRateLen;
}
} //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;
}
......@@ -283,7 +283,7 @@ UINT uRateLen;
else
*pwMaxBasicRate = pDevice->byTopOFDMBasicRate;
if (wOldBasicRate != pDevice->wBasicRate)
CARDvSetRSPINF((PVOID)pDevice, pDevice->eCurrentPHYType);
CARDvSetRSPINF((void *)pDevice, pDevice->eCurrentPHYType);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Exit ParseMaxRate\n");
}
......@@ -309,7 +309,7 @@ UINT uRateLen;
void
RATEvTxRateFallBack (
IN PVOID pDeviceHandler,
IN void *pDeviceHandler,
IN PKnownNodeDB psNodeDBTable
)
{
......
drivers/staging/vt6655/datarate.h
View file @ 830a619c
......@@ -56,7 +56,7 @@
void
RATEvParseMaxRate(
IN PVOID pDeviceHandler,
IN void *pDeviceHandler,
IN PWLAN_IE_SUPP_RATES pItemRates,
IN PWLAN_IE_SUPP_RATES pItemExtRates,
IN BOOL bUpdateBasicRate,
......@@ -69,7 +69,7 @@ RATEvParseMaxRate(
void
RATEvTxRateFallBack(
IN PVOID pDeviceHandler,
IN void *pDeviceHandler,
IN PKnownNodeDB psNodeDBTable
);
......
drivers/staging/vt6655/device_main.c
View file @ 830a619c
......@@ -729,7 +729,7 @@ else
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));
}
CARDvInitChannelTable((PVOID)pDevice);
CARDvInitChannelTable((void *)pDevice);
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
pDevice->flags = pDevice->sOpts.flags | (pChip_info->flags & 0xFF000000UL);
pDevice->tx_80211 = device_dma0_tx_80211;
pDevice->sMgmtObj.pAdapter = (PVOID)pDevice;
pDevice->sMgmtObj.pAdapter = (void *)pDevice;
pDevice->pMgmt = &(pDevice->sMgmtObj);
dev->irq = pcid->irq;
......@@ -1249,7 +1249,7 @@ device_release_WPADEV(pDevice);
unregister_netdev(dev);
if (pDevice->PortOffset)
iounmap((PVOID)pDevice->PortOffset);
iounmap((void *)pDevice->PortOffset);
if (pDevice->pcid)
pci_release_regions(pDevice->pcid);
......@@ -1461,7 +1461,7 @@ static void device_free_rd0_ring(PSDevice pDevice) {
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);
kfree((PVOID)pDesc->pRDInfo);
kfree((void *)pDesc->pRDInfo);
}
}
......@@ -1564,7 +1564,7 @@ static void device_free_td0_ring(PSDevice pDevice) {
if (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)
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 (
//PLICE_DEBUG ->
void MngWorkItem(PVOID Context)
void MngWorkItem(void *Context)
{
PSRxMgmtPacket pRxMgmtPacket;
PSDevice pDevice = (PSDevice) Context;
......
drivers/staging/vt6655/dpc.h
View file @ 830a619c
......@@ -47,7 +47,7 @@ device_receive_frame (
IN PSRxDesc pCurrRD
);
void MngWorkItem(PVOID Context);
void MngWorkItem(void *Context);
#endif // __RXTX_H__
......
drivers/staging/vt6655/key.c
View file @ 830a619c
......@@ -104,10 +104,10 @@ void KeyvInitTable (PSKeyManagement pTable, DWORD_PTR dwIoBase)
for (i=0;i<MAX_KEY_TABLE;i++) {
pTable->KeyTable[i].bInUse = 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++) {
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].dwGTKeyIndex = 0;
......
drivers/staging/vt6655/key.h
View file @ 830a619c
......@@ -66,7 +66,7 @@ typedef struct tagSKeyItem
BYTE byCipherSuite;
BYTE byReserved0;
DWORD dwKeyIndex;
PVOID pvKeyTable;
void *pvKeyTable;
} SKeyItem, *PSKeyItem; //64
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;
typedef QWORD * PQWORD;
typedef void * PVOID;
// handle declaration
#ifdef STRICT
typedef void *HANDLE;
#else
typedef PVOID HANDLE;
#endif
#endif // __TTYPE_H__
drivers/staging/vt6655/vntwifi.c
View file @ 830a619c
......@@ -71,7 +71,7 @@
-*/
void
VNTWIFIvSetOPMode (
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN WMAC_CONFIG_MODE eOPMode
)
{
......@@ -100,7 +100,7 @@ VNTWIFIvSetOPMode (
-*/
void
VNTWIFIvSetIBSSParameter (
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN WORD wBeaconPeriod,
IN WORD wATIMWindow,
IN UINT uChannel
......@@ -129,7 +129,7 @@ VNTWIFIvSetIBSSParameter (
-*/
PWLAN_IE_SSID
VNTWIFIpGetCurrentSSID (
IN PVOID pMgmtHandle
IN void *pMgmtHandle
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
......@@ -152,7 +152,7 @@ VNTWIFIpGetCurrentSSID (
-*/
UINT
VNTWIFIpGetCurrentChannel (
IN PVOID pMgmtHandle
IN void *pMgmtHandle
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
......@@ -178,7 +178,7 @@ VNTWIFIpGetCurrentChannel (
-*/
WORD
VNTWIFIwGetAssocID (
IN PVOID pMgmtHandle
IN void *pMgmtHandle
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
......@@ -308,7 +308,7 @@ VNTWIFIbyGetACKTxRate (
-*/
void
VNTWIFIvSetAuthenticationMode (
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN WMAC_AUTHENTICATION_MODE eAuthMode
)
{
......@@ -340,7 +340,7 @@ VNTWIFIvSetAuthenticationMode (
-*/
void
VNTWIFIvSetEncryptionMode (
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN WMAC_ENCRYPTION_MODE eEncryptionMode
)
{
......@@ -360,7 +360,7 @@ VNTWIFIvSetEncryptionMode (
BOOL
VNTWIFIbConfigPhyMode (
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN CARD_PHY_TYPE ePhyType
)
{
......@@ -381,8 +381,8 @@ VNTWIFIbConfigPhyMode (
void
VNTWIFIbGetConfigPhyMode (
IN PVOID pMgmtHandle,
OUT PVOID pePhyType
IN void *pMgmtHandle,
OUT void *pePhyType
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
......@@ -426,9 +426,9 @@ VNTWIFIbGetConfigPhyMode (
void
VNTWIFIvQueryBSSList (
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
OUT PUINT puBSSCount,
OUT PVOID *pvFirstBSS
OUT void **pvFirstBSS
)
{
UINT ii = 0;
......@@ -456,9 +456,9 @@ VNTWIFIvQueryBSSList (
void
VNTWIFIvGetNextBSS (
IN PVOID pMgmtHandle,
IN PVOID pvCurrentBSS,
OUT PVOID *pvNextBSS
IN void *pMgmtHandle,
IN void *pvCurrentBSS,
OUT void **pvNextBSS
)
{
PKnownBSS pBSS = (PKnownBSS) pvCurrentBSS;
......@@ -496,7 +496,7 @@ VNTWIFIvGetNextBSS (
-*/
void
VNTWIFIvUpdateNodeTxCounter(
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN PBYTE pbyDestAddress,
IN BOOL bTxOk,
IN WORD wRate,
......@@ -531,7 +531,7 @@ VNTWIFIvUpdateNodeTxCounter(
void
VNTWIFIvGetTxRate(
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN PBYTE pbyDestAddress,
OUT PWORD pwTxDataRate,
OUT PBYTE pbyACKRate,
......@@ -603,7 +603,7 @@ VNTWIFIvGetTxRate(
BYTE
VNTWIFIbyGetKeyCypher(
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN BOOL bGroupKey
)
{
......@@ -620,8 +620,8 @@ VNTWIFIbyGetKeyCypher(
/*
BOOL
VNTWIFIbInit(
IN PVOID pAdapterHandler,
OUT PVOID *pMgmtHandler
IN void *pAdapterHandler,
OUT void **pMgmtHandler
)
{
......@@ -636,7 +636,7 @@ VNTWIFIbInit(
}
memset(pMgmt, 0, sizeof(SMgmtObject));
pMgmt->pAdapter = (PVOID) pAdapterHandler;
pMgmt->pAdapter = (void *) pAdapterHandler;
// should initial MAC address abyMACAddr
for(ii=0;ii<WLAN_BSSID_LEN;ii++) {
......@@ -664,9 +664,9 @@ VNTWIFIbInit(
BOOL
VNTWIFIbSetPMKIDCache (
IN PVOID pMgmtObject,
IN void *pMgmtObject,
IN ULONG ulCount,
IN PVOID pPMKIDInfo
IN void *pPMKIDInfo
)
{
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
......@@ -683,7 +683,7 @@ VNTWIFIbSetPMKIDCache (
WORD
VNTWIFIwGetMaxSupportRate(
IN PVOID pMgmtObject
IN void *pMgmtObject
)
{
WORD wRate = RATE_54M;
......@@ -704,7 +704,7 @@ VNTWIFIwGetMaxSupportRate(
void
VNTWIFIvSet11h (
IN PVOID pMgmtObject,
IN void *pMgmtObject,
IN BOOL b11hEnable
)
{
......@@ -715,9 +715,9 @@ VNTWIFIvSet11h (
BOOL
VNTWIFIbMeasureReport(
IN PVOID pMgmtObject,
IN void *pMgmtObject,
IN BOOL bEndOfReport,
IN PVOID pvMeasureEID,
IN void *pvMeasureEID,
IN BYTE byReportMode,
IN BYTE byBasicMap,
IN BYTE byCCAFraction,
......@@ -775,7 +775,7 @@ VNTWIFIbMeasureReport(
BOOL
VNTWIFIbChannelSwitch(
IN PVOID pMgmtObject,
IN void *pMgmtObject,
IN BYTE byNewChannel
)
{
......@@ -791,7 +791,7 @@ VNTWIFIbChannelSwitch(
/*
BOOL
VNTWIFIbRadarPresent(
IN PVOID pMgmtObject,
IN void *pMgmtObject,
IN BYTE byChannel
)
{
......
drivers/staging/vt6655/vntwifi.h
View file @ 830a619c
......@@ -142,7 +142,7 @@ typedef enum tagWMAC_POWER_MODE {
void
VNTWIFIvSetIBSSParameter (
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN WORD wBeaconPeriod,
IN WORD wATIMWindow,
IN UINT uChannel
......@@ -150,23 +150,23 @@ VNTWIFIvSetIBSSParameter (
void
VNTWIFIvSetOPMode (
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN WMAC_CONFIG_MODE eOPMode
);
PWLAN_IE_SSID
VNTWIFIpGetCurrentSSID(
IN PVOID pMgmtHandle
IN void *pMgmtHandle
);
UINT
VNTWIFIpGetCurrentChannel(
IN PVOID pMgmtHandle
IN void *pMgmtHandle
);
WORD
VNTWIFIwGetAssocID (
IN PVOID pMgmtHandle
IN void *pMgmtHandle
);
BYTE
......@@ -184,34 +184,34 @@ VNTWIFIbyGetACKTxRate (
void
VNTWIFIvSetAuthenticationMode (
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN WMAC_AUTHENTICATION_MODE eAuthMode
);
void
VNTWIFIvSetEncryptionMode (
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN WMAC_ENCRYPTION_MODE eEncryptionMode
);
BOOL
VNTWIFIbConfigPhyMode(
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN CARD_PHY_TYPE ePhyType
);
void
VNTWIFIbGetConfigPhyMode(
IN PVOID pMgmtHandle,
OUT PVOID pePhyType
IN void *pMgmtHandle,
OUT void *pePhyType
);
void
VNTWIFIvQueryBSSList(
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
OUT PUINT puBSSCount,
OUT PVOID *pvFirstBSS
OUT void **pvFirstBSS
);
......@@ -219,16 +219,16 @@ VNTWIFIvQueryBSSList(
void
VNTWIFIvGetNextBSS (
IN PVOID pMgmtHandle,
IN PVOID pvCurrentBSS,
OUT PVOID *pvNextBSS
IN void *pMgmtHandle,
IN void *pvCurrentBSS,
OUT void **pvNextBSS
);
void
VNTWIFIvUpdateNodeTxCounter(
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN PBYTE pbyDestAddress,
IN BOOL bTxOk,
IN WORD wRate,
......@@ -238,7 +238,7 @@ VNTWIFIvUpdateNodeTxCounter(
void
VNTWIFIvGetTxRate(
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN PBYTE pbyDestAddress,
OUT PWORD pwTxDataRate,
OUT PBYTE pbyACKRate,
......@@ -248,14 +248,14 @@ VNTWIFIvGetTxRate(
/*
BOOL
VNTWIFIbInit(
IN PVOID pAdapterHandler,
OUT PVOID *pMgmtHandler
IN void *pAdapterHandler,
OUT void **pMgmtHandler
);
*/
BYTE
VNTWIFIbyGetKeyCypher(
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
IN BOOL bGroupKey
);
......@@ -264,33 +264,33 @@ VNTWIFIbyGetKeyCypher(
BOOL
VNTWIFIbSetPMKIDCache (
IN PVOID pMgmtObject,
IN void *pMgmtObject,
IN ULONG ulCount,
IN PVOID pPMKIDInfo
IN void *pPMKIDInfo
);
BOOL
VNTWIFIbCommandRunning (
IN PVOID pMgmtObject
IN void *pMgmtObject
);
WORD
VNTWIFIwGetMaxSupportRate(
IN PVOID pMgmtObject
IN void *pMgmtObject
);
// for 802.11h
void
VNTWIFIvSet11h (
IN PVOID pMgmtObject,
IN void *pMgmtObject,
IN BOOL b11hEnable
);
BOOL
VNTWIFIbMeasureReport(
IN PVOID pMgmtObject,
IN void *pMgmtObject,
IN BOOL bEndOfReport,
IN PVOID pvMeasureEID,
IN void *pvMeasureEID,
IN BYTE byReportMode,
IN BYTE byBasicMap,
IN BYTE byCCAFraction,
......@@ -299,13 +299,13 @@ VNTWIFIbMeasureReport(
BOOL
VNTWIFIbChannelSwitch(
IN PVOID pMgmtObject,
IN void *pMgmtObject,
IN BYTE byNewChannel
);
/*
BOOL
VNTWIFIbRadarPresent(
IN PVOID pMgmtObject,
IN void *pMgmtObject,
IN BYTE byChannel
);
*/
......
drivers/staging/vt6655/wmgr.c
View file @ 830a619c
......@@ -736,7 +736,7 @@ s_vMgrRxAssocRequest(
}
RATEvParseMaxRate((PVOID)pDevice,
RATEvParseMaxRate((void *)pDevice,
(PWLAN_IE_SUPP_RATES)abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)abyCurrExtSuppRates,
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)abyCurrExtSuppRates,
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,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates,
uRateLen);
RATEvParseMaxRate( (PVOID)pDevice,
RATEvParseMaxRate( (void *)pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates,
TRUE,
......@@ -2256,7 +2256,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)sFrame.pSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
WLAN_RATES_MAXLEN_11B);
RATEvParseMaxRate( (PVOID)pDevice,
RATEvParseMaxRate( (void *)pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
NULL,
TRUE,
......@@ -2277,7 +2277,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)sFrame.pSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
WLAN_RATES_MAXLEN_11B);
RATEvParseMaxRate( (PVOID)pDevice,
RATEvParseMaxRate( (void *)pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
NULL,
TRUE,
......@@ -2485,7 +2485,7 @@ vMgrCreateOwnIBSS(
// 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,
&wMaxBasicRate, &wMaxSuppRate, &wSuppRate,
&byTopCCKBasicRate, &byTopOFDMBasicRate);
......@@ -2781,7 +2781,7 @@ vMgrJoinBSSBegin(
}
}
RATEvParseMaxRate((PVOID)pDevice, pItemRates, pItemExtRates, TRUE,
RATEvParseMaxRate((void *)pDevice, pItemRates, pItemExtRates, TRUE,
&wMaxBasicRate, &wMaxSuppRate, &wSuppRate,
&byTopCCKBasicRate, &byTopOFDMBasicRate);
......@@ -2867,7 +2867,7 @@ vMgrJoinBSSBegin(
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
WLAN_RATES_MAXLEN_11B);
// 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,
&byTopCCKBasicRate, &byTopOFDMBasicRate);
......@@ -2967,7 +2967,7 @@ s_vMgrSynchBSS (
pDevice->byPreambleType = 0;
pDevice->wBasicRate = 0;
// Set Basic Rate
CARDbAddBasicRate((PVOID)pDevice, RATE_1M);
CARDbAddBasicRate((void *)pDevice, RATE_1M);
// calculate TSF offset
// TSF Offset = Received Timestamp TSF - Marked Local's TSF
CARDbUpdateTSF(pDevice, pCurr->byRxRate, pCurr->qwBSSTimestamp, pCurr->qwLocalTSF);
......
drivers/staging/vt6655/wmgr.h
View file @ 830a619c
......@@ -249,7 +249,7 @@ typedef struct tagSRxMgmtPacket {
typedef struct tagSMgmtObject
{
PVOID pAdapter;
void * pAdapter;
// MAC address
BYTE abyMACAddr[WLAN_ADDR_LEN];
......
drivers/staging/vt6655/wpa2.c
View file @ 830a619c
......@@ -263,7 +263,7 @@ WPA2vParseRSN (
-*/
UINT
WPA2uSetIEs(
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
OUT PWLAN_IE_RSN pRSNIEs
)
{
......
drivers/staging/vt6655/wpa2.h
View file @ 830a619c
......@@ -71,7 +71,7 @@ WPA2vParseRSN (
UINT
WPA2uSetIEs(
IN PVOID pMgmtHandle,
IN void *pMgmtHandle,
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