Skip to content

L
linux
Commit 98583c09 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files
Options

staging: vt6656: change baseband/mac/wcmd/wctl to new structures. 

This patch also cleans up function declarations, definitions and local variables
were appropriate replacing types defined in "ttype.h" with linux/types.h.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dd0a774f
Show whitespace changes
Inline Side-by-side
Showing with 179 additions and 248 deletions
drivers/staging/vt6656/baseband.c
View file @ 98583c09
...@@ -690,7 +690,7 @@ s_vClearSQ3Value(PSDevice pDevice); ...@@ -690,7 +690,7 @@ s_vClearSQ3Value(PSDevice pDevice);
* *
*/ */
unsigned int unsigned int
BBuGetFrameTime ( BBuGetFrameTime(
BYTE byPreambleType, BYTE byPreambleType,
BYTE byPktType, BYTE byPktType,
unsigned int cbFrameLength, unsigned int cbFrameLength,
...@@ -756,23 +756,16 @@ BBuGetFrameTime ( ...@@ -756,23 +756,16 @@ BBuGetFrameTime (
* Return Value: none * Return Value: none
* *
*/ */
void void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength,
BBvCalculateParameter ( u16 wRate, u8 byPacketType, u16 *pwPhyLen, u8 *pbyPhySrv,
PSDevice pDevice, u8 *pbyPhySgn)
unsigned int cbFrameLength,
WORD wRate,
BYTE byPacketType,
PWORD pwPhyLen,
PBYTE pbyPhySrv,
PBYTE pbyPhySgn
)
{ {
unsigned int cbBitCount; u32 cbBitCount;
unsigned int cbUsCount = 0; u32 cbUsCount = 0;
unsigned int cbTmp; u32 cbTmp;
BOOL bExtBit; int bExtBit;
BYTE byPreambleType = pDevice->byPreambleType; u8 byPreambleType = pDevice->byPreambleType;
BOOL bCCK = pDevice->bCCK; int bCCK = pDevice->bCCK;
cbBitCount = cbFrameLength * 8; cbBitCount = cbFrameLength * 8;
bExtBit = FALSE; bExtBit = FALSE;
...@@ -929,8 +922,7 @@ BBvCalculateParameter ( ...@@ -929,8 +922,7 @@ BBvCalculateParameter (
* Return Value: none * Return Value: none
* *
*/ */
void void BBvSetAntennaMode(struct vnt_private *pDevice, u8 byAntennaMode)
BBvSetAntennaMode (PSDevice pDevice, BYTE byAntennaMode)
{ {
switch (byAntennaMode) { switch (byAntennaMode) {
case ANT_TXA: case ANT_TXA:
...@@ -968,7 +960,7 @@ BBvSetAntennaMode (PSDevice pDevice, BYTE byAntennaMode) ...@@ -968,7 +960,7 @@ BBvSetAntennaMode (PSDevice pDevice, BYTE byAntennaMode)
* *
*/ */
BOOL BBbVT3184Init(PSDevice pDevice) int BBbVT3184Init(struct vnt_private *pDevice)
{ {
int ntStatus; int ntStatus;
WORD wLength; WORD wLength;
...@@ -1161,7 +1153,7 @@ else { ...@@ -1161,7 +1153,7 @@ else {
* Return Value: none * Return Value: none
* *
*/ */
void BBvLoopbackOn (PSDevice pDevice) void BBvLoopbackOn(struct vnt_private *pDevice)
{ {
BYTE byData; BYTE byData;
...@@ -1214,9 +1206,9 @@ void BBvLoopbackOn (PSDevice pDevice) ...@@ -1214,9 +1206,9 @@ void BBvLoopbackOn (PSDevice pDevice)
* Return Value: none * Return Value: none
* *
*/ */
void BBvLoopbackOff (PSDevice pDevice) void BBvLoopbackOff(struct vnt_private *pDevice)
{ {
BYTE byData; u8 byData;
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0xC9, pDevice->byBBCRc9);//CR201 ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0xC9, pDevice->byBBCRc9);//CR201
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x88, pDevice->byBBCR88);//CR136 ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x88, pDevice->byBBCR88);//CR136
...@@ -1249,8 +1241,7 @@ void BBvLoopbackOff (PSDevice pDevice) ...@@ -1249,8 +1241,7 @@ void BBvLoopbackOff (PSDevice pDevice)
* Return Value: none * Return Value: none
* *
*/ */
void void BBvSetShortSlotTime(struct vnt_private *pDevice)
BBvSetShortSlotTime (PSDevice pDevice)
{ {
BYTE byBBVGA=0; BYTE byBBVGA=0;
...@@ -1267,7 +1258,7 @@ BBvSetShortSlotTime (PSDevice pDevice) ...@@ -1267,7 +1258,7 @@ BBvSetShortSlotTime (PSDevice pDevice)
} }
void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData) void BBvSetVGAGainOffset(struct vnt_private *pDevice, BYTE byData)
{ {
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0xE7, byData); ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0xE7, byData);
...@@ -1294,8 +1285,7 @@ void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData) ...@@ -1294,8 +1285,7 @@ void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData)
* Return Value: none * Return Value: none
* *
*/ */
void void BBvSoftwareReset(struct vnt_private *pDevice)
BBvSoftwareReset (PSDevice pDevice)
{ {
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x50, 0x40); ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x50, 0x40);
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x50, 0); ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x50, 0);
...@@ -1315,22 +1305,20 @@ BBvSoftwareReset (PSDevice pDevice) ...@@ -1315,22 +1305,20 @@ BBvSoftwareReset (PSDevice pDevice)
* Return Value: none * Return Value: none
* *
*/ */
void void BBvSetDeepSleep(struct vnt_private *pDevice)
BBvSetDeepSleep (PSDevice pDevice)
{ {
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0c, 0x17);//CR12 ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0c, 0x17);//CR12
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0D, 0xB9);//CR13 ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0D, 0xB9);//CR13
} }
void void BBvExitDeepSleep(struct vnt_private *pDevice)
BBvExitDeepSleep (PSDevice pDevice)
{ {
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0C, 0x00);//CR12 ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0C, 0x00);//CR12
ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0D, 0x01);//CR13 ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0D, 0x01);//CR13
} }
static unsigned long s_ulGetLowSQ3(PSDevice pDevice) static unsigned long s_ulGetLowSQ3(struct vnt_private *pDevice)
{ {
int ii; int ii;
unsigned long ulSQ3 = 0; unsigned long ulSQ3 = 0;
...@@ -1349,7 +1337,7 @@ static unsigned long s_ulGetLowSQ3(PSDevice pDevice) ...@@ -1349,7 +1337,7 @@ static unsigned long s_ulGetLowSQ3(PSDevice pDevice)
return ulSQ3; return ulSQ3;
} }
static unsigned long s_ulGetRatio(PSDevice pDevice) static unsigned long s_ulGetRatio(struct vnt_private *pDevice)
{ {
int ii, jj; int ii, jj;
unsigned long ulRatio = 0; unsigned long ulRatio = 0;
...@@ -1377,9 +1365,7 @@ static unsigned long s_ulGetRatio(PSDevice pDevice) ...@@ -1377,9 +1365,7 @@ static unsigned long s_ulGetRatio(PSDevice pDevice)
} }
static static void s_vClearSQ3Value(struct vnt_private *pDevice)
void
s_vClearSQ3Value (PSDevice pDevice)
{ {
int ii; int ii;
pDevice->uDiversityCnt = 0; pDevice->uDiversityCnt = 0;
...@@ -1406,8 +1392,8 @@ s_vClearSQ3Value (PSDevice pDevice) ...@@ -1406,8 +1392,8 @@ s_vClearSQ3Value (PSDevice pDevice)
* *
*/ */
void void BBvAntennaDiversity(struct vnt_private *pDevice,
BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3) u8 byRxRate, u8 bySQ3)
{ {
pDevice->uDiversityCnt++; pDevice->uDiversityCnt++;
...@@ -1541,9 +1527,8 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3) ...@@ -1541,9 +1527,8 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3)
* *
-*/ -*/
void TimerSQ3CallBack(void *hDeviceContext) void TimerSQ3CallBack(struct vnt_private *pDevice)
{ {
PSDevice pDevice = (PSDevice)hDeviceContext;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TimerSQ3CallBack..."); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TimerSQ3CallBack...");
spin_lock_irq(&pDevice->lock); spin_lock_irq(&pDevice->lock);
...@@ -1579,9 +1564,8 @@ void TimerSQ3CallBack(void *hDeviceContext) ...@@ -1579,9 +1564,8 @@ void TimerSQ3CallBack(void *hDeviceContext)
* *
-*/ -*/
void TimerSQ3Tmax3CallBack(void *hDeviceContext) void TimerSQ3Tmax3CallBack(struct vnt_private *pDevice)
{ {
PSDevice pDevice = (PSDevice)hDeviceContext;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TimerSQ3Tmax3CallBack..."); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TimerSQ3Tmax3CallBack...");
spin_lock_irq(&pDevice->lock); spin_lock_irq(&pDevice->lock);
...@@ -1607,10 +1591,7 @@ void TimerSQ3Tmax3CallBack(void *hDeviceContext) ...@@ -1607,10 +1591,7 @@ void TimerSQ3Tmax3CallBack(void *hDeviceContext)
spin_unlock_irq(&pDevice->lock); spin_unlock_irq(&pDevice->lock);
} }
void void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning)
BBvUpdatePreEDThreshold(
PSDevice pDevice,
BOOL bScanning)
{ {
......
drivers/staging/vt6656/baseband.h
View file @ 98583c09
...@@ -104,33 +104,26 @@ BBuGetFrameTime( ...@@ -104,33 +104,26 @@ BBuGetFrameTime(
WORD wRate WORD wRate
); );
void BBvCalculateParameter(PSDevice pDevice, void BBvCalculateParameter(struct vnt_private *, u32 cbFrameLength,
unsigned int cbFrameLength, u16 wRate, u8 byPacketType, u16 *pwPhyLen, u8 *pbyPhySrv,
WORD wRate, u8 *pbyPhySgn);
BYTE byPacketType,
PWORD pwPhyLen,
PBYTE pbyPhySrv,
PBYTE pbyPhySgn);
// timer for antenna diversity // timer for antenna diversity
void TimerSQ3CallBack(void *hDeviceContext); void TimerSQ3CallBack(struct vnt_private *);
void TimerSQ3Tmax3CallBack(void *hDeviceContext); void TimerSQ3Tmax3CallBack(struct vnt_private *);
void BBvAntennaDiversity(PSDevice pDevice, BYTE byRxRate, BYTE bySQ3); void BBvAntennaDiversity(struct vnt_private *, u8 byRxRate, u8 bySQ3);
void BBvLoopbackOn(PSDevice pDevice); void BBvLoopbackOn(struct vnt_private *);
void BBvLoopbackOff(PSDevice pDevice); void BBvLoopbackOff(struct vnt_private *);
void BBvSoftwareReset(PSDevice pDevice); void BBvSoftwareReset(struct vnt_private *);
void BBvSetShortSlotTime(PSDevice pDevice); void BBvSetShortSlotTime(struct vnt_private *);
void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData); void BBvSetVGAGainOffset(struct vnt_private *, u8 byData);
void BBvSetAntennaMode(PSDevice pDevice, BYTE byAntennaMode); void BBvSetAntennaMode(struct vnt_private *, u8 byAntennaMode);
BOOL BBbVT3184Init(PSDevice pDevice); int BBbVT3184Init(struct vnt_private *);
void BBvSetDeepSleep(PSDevice pDevice); void BBvSetDeepSleep(struct vnt_private *);
void BBvExitDeepSleep(PSDevice pDevice); void BBvExitDeepSleep(struct vnt_private *);
void BBvUpdatePreEDThreshold( void BBvUpdatePreEDThreshold(struct vnt_private *, int bScanning);
PSDevice pDevice,
BOOL bScanning
);
#endif /* __BASEBAND_H__ */ #endif /* __BASEBAND_H__ */
drivers/staging/vt6656/mac.c
View file @ 98583c09
...@@ -68,11 +68,11 @@ static int msglevel =MSG_LEVEL_INFO; ...@@ -68,11 +68,11 @@ static int msglevel =MSG_LEVEL_INFO;
* Return Value: none * Return Value: none
* *
*/ */
void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx) void MACvSetMultiAddrByHash(struct vnt_private *pDevice, u8 byHashIdx)
{ {
unsigned int uByteIdx; u8 uByteIdx;
BYTE byBitMask; u8 byBitMask;
BYTE pbyData[2]; u8 pbyData[2];
// calculate byte position // calculate byte position
...@@ -110,9 +110,9 @@ void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx) ...@@ -110,9 +110,9 @@ void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx)
* Return Value: none * Return Value: none
* *
*/ */
void MACvWriteMultiAddr(PSDevice pDevice, unsigned int uByteIdx, BYTE byData) void MACvWriteMultiAddr(struct vnt_private *pDevice, u32 uByteIdx, u8 byData)
{ {
BYTE byData1; u8 byData1;
byData1 = byData; byData1 = byData;
CONTROLnsRequestOut(pDevice, CONTROLnsRequestOut(pDevice,
...@@ -135,7 +135,7 @@ void MACvWriteMultiAddr(PSDevice pDevice, unsigned int uByteIdx, BYTE byData) ...@@ -135,7 +135,7 @@ void MACvWriteMultiAddr(PSDevice pDevice, unsigned int uByteIdx, BYTE byData)
* *
* *
*/ */
void MACbShutdown(PSDevice pDevice) void MACbShutdown(struct vnt_private *pDevice)
{ {
CONTROLnsRequestOutAsyn(pDevice, CONTROLnsRequestOutAsyn(pDevice,
MESSAGE_TYPE_MACSHUTDOWN, MESSAGE_TYPE_MACSHUTDOWN,
...@@ -146,9 +146,9 @@ void MACbShutdown(PSDevice pDevice) ...@@ -146,9 +146,9 @@ void MACbShutdown(PSDevice pDevice)
); );
} }
void MACvSetBBType(PSDevice pDevice,BYTE byType) void MACvSetBBType(struct vnt_private *pDevice, u8 byType)
{ {
BYTE pbyData[2]; u8 pbyData[2];
pbyData[0] = byType; pbyData[0] = byType;
...@@ -163,9 +163,9 @@ BYTE pbyData[2]; ...@@ -163,9 +163,9 @@ BYTE pbyData[2];
); );
} }
void MACvSetMISCFifo (PSDevice pDevice, WORD wOffset, DWORD dwData) void MACvSetMISCFifo(struct vnt_private *pDevice, u16 wOffset, u32 dwData)
{ {
BYTE pbyData[4]; u8 pbyData[4];
if (wOffset > 273) if (wOffset > 273)
return; return;
...@@ -197,10 +197,10 @@ BYTE pbyData[4]; ...@@ -197,10 +197,10 @@ BYTE pbyData[4];
* Return Value: none * Return Value: none
* *
*/ */
void MACvDisableKeyEntry(PSDevice pDevice, unsigned int uEntryIdx) void MACvDisableKeyEntry(struct vnt_private *pDevice, u32 uEntryIdx)
{ {
WORD wOffset; u16 wOffset;
BYTE byData; u8 byData;
byData = (BYTE) uEntryIdx; byData = (BYTE) uEntryIdx;
...@@ -237,15 +237,14 @@ BYTE byData; ...@@ -237,15 +237,14 @@ BYTE byData;
* Return Value: none * Return Value: none
* *
*/ */
void MACvSetKeyEntry(PSDevice pDevice, WORD wKeyCtl, void MACvSetKeyEntry(struct vnt_private *pDevice, u16 wKeyCtl, u32 uEntryIdx,
unsigned int uEntryIdx, unsigned int uKeyIdx, u32 uKeyIdx, u8 *pbyAddr, u32 *pdwKey)
PBYTE pbyAddr, PDWORD pdwKey)
{ {
PBYTE pbyKey; u8 *pbyKey;
WORD wOffset; u16 wOffset;
DWORD dwData1,dwData2; u32 dwData1, dwData2;
int ii; int ii;
BYTE pbyData[24]; u8 pbyData[24];
if ( pDevice->byLocalID <= MAC_REVISION_A1 ) { if ( pDevice->byLocalID <= MAC_REVISION_A1 ) {
if ( pDevice->sMgmtObj.byCSSPK == KEY_CTL_CCMP ) if ( pDevice->sMgmtObj.byCSSPK == KEY_CTL_CCMP )
...@@ -321,9 +320,9 @@ BYTE pbyData[24]; ...@@ -321,9 +320,9 @@ BYTE pbyData[24];
} }
void MACvRegBitsOff(PSDevice pDevice, BYTE byRegOfs, BYTE byBits) void MACvRegBitsOff(struct vnt_private *pDevice, u8 byRegOfs, u8 byBits)
{ {
BYTE pbyData[2]; u8 pbyData[2];
pbyData[0] = 0; pbyData[0] = 0;
pbyData[1] = byBits; pbyData[1] = byBits;
...@@ -338,9 +337,9 @@ BYTE pbyData[2]; ...@@ -338,9 +337,9 @@ BYTE pbyData[2];
} }
void MACvRegBitsOn(PSDevice pDevice, BYTE byRegOfs, BYTE byBits) void MACvRegBitsOn(struct vnt_private *pDevice, u8 byRegOfs, u8 byBits)
{ {
BYTE pbyData[2]; u8 pbyData[2];
pbyData[0] = byBits; pbyData[0] = byBits;
...@@ -355,9 +354,9 @@ BYTE pbyData[2]; ...@@ -355,9 +354,9 @@ BYTE pbyData[2];
); );
} }
void MACvWriteWord(PSDevice pDevice, BYTE byRegOfs, WORD wData) void MACvWriteWord(struct vnt_private *pDevice, u8 byRegOfs, u16 wData)
{ {
BYTE pbyData[2]; u8 pbyData[2];
pbyData[0] = (BYTE)(wData & 0xff); pbyData[0] = (BYTE)(wData & 0xff);
...@@ -373,9 +372,9 @@ BYTE pbyData[2]; ...@@ -373,9 +372,9 @@ BYTE pbyData[2];
} }
void MACvWriteBSSIDAddress(PSDevice pDevice, PBYTE pbyEtherAddr) void MACvWriteBSSIDAddress(struct vnt_private *pDevice, u8 *pbyEtherAddr)
{ {
BYTE pbyData[6]; u8 pbyData[6];
pbyData[0] = *((PBYTE)pbyEtherAddr); pbyData[0] = *((PBYTE)pbyEtherAddr);
...@@ -394,9 +393,9 @@ BYTE pbyData[6]; ...@@ -394,9 +393,9 @@ BYTE pbyData[6];
); );
} }
void MACvEnableProtectMD(PSDevice pDevice) void MACvEnableProtectMD(struct vnt_private *pDevice)
{ {
BYTE pbyData[2]; u8 pbyData[2];
pbyData[0] = EnCFG_ProtectMd; pbyData[0] = EnCFG_ProtectMd;
...@@ -411,9 +410,9 @@ BYTE pbyData[2]; ...@@ -411,9 +410,9 @@ BYTE pbyData[2];
); );
} }
void MACvDisableProtectMD(PSDevice pDevice) void MACvDisableProtectMD(struct vnt_private *pDevice)
{ {
BYTE pbyData[2]; u8 pbyData[2];
pbyData[0] = 0; pbyData[0] = 0;
...@@ -428,9 +427,9 @@ BYTE pbyData[2]; ...@@ -428,9 +427,9 @@ BYTE pbyData[2];
); );
} }
void MACvEnableBarkerPreambleMd(PSDevice pDevice) void MACvEnableBarkerPreambleMd(struct vnt_private *pDevice)
{ {
BYTE pbyData[2]; u8 pbyData[2];
pbyData[0] = EnCFG_BarkerPream; pbyData[0] = EnCFG_BarkerPream;
...@@ -445,9 +444,9 @@ BYTE pbyData[2]; ...@@ -445,9 +444,9 @@ BYTE pbyData[2];
); );
} }
void MACvDisableBarkerPreambleMd(PSDevice pDevice) void MACvDisableBarkerPreambleMd(struct vnt_private *pDevice)
{ {
BYTE pbyData[2]; u8 pbyData[2];
pbyData[0] = 0; pbyData[0] = 0;
...@@ -463,12 +462,12 @@ BYTE pbyData[2]; ...@@ -463,12 +462,12 @@ BYTE pbyData[2];
} }
void MACvWriteBeaconInterval(PSDevice pDevice, WORD wInterval) void MACvWriteBeaconInterval(struct vnt_private *pDevice, u16 wInterval)
{ {
BYTE pbyData[2]; u8 pbyData[2];
pbyData[0] = (BYTE) (wInterval & 0xff); pbyData[0] = (u8)(wInterval & 0xff);
pbyData[1] = (BYTE) (wInterval >> 8); pbyData[1] = (u8)(wInterval >> 8);
CONTROLnsRequestOut(pDevice, CONTROLnsRequestOut(pDevice,
MESSAGE_TYPE_WRITE, MESSAGE_TYPE_WRITE,
......
drivers/staging/vt6656/mac.h
View file @ 98583c09
...@@ -420,24 +420,21 @@ ...@@ -420,24 +420,21 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
void MACvSetMultiAddrByHash(PSDevice pDevice, BYTE byHashIdx); void MACvSetMultiAddrByHash(struct vnt_private *, u8);
void MACvWriteMultiAddr(PSDevice pDevice, unsigned int uByteIdx, BYTE byData); void MACvWriteMultiAddr(struct vnt_private *, u32, u8);
void MACbShutdown(PSDevice pDevice); void MACbShutdown(struct vnt_private *);
void MACvSetBBType(PSDevice pDevice, BYTE byType); void MACvSetBBType(struct vnt_private *, u8);
void MACvSetMISCFifo(PSDevice pDevice, WORD wOffset, DWORD dwData); void MACvSetMISCFifo(struct vnt_private *pDevice, u16, u32);
void MACvDisableKeyEntry(PSDevice pDevice, unsigned int uEntryIdx); void MACvDisableKeyEntry(struct vnt_private *, u32);
void MACvSetKeyEntry(PSDevice pDevice, WORD wKeyCtl, unsigned int uEntryIdx, void MACvSetKeyEntry(struct vnt_private *, u16, u32, u32, u8 *, u32 *);
unsigned int uKeyIdx, PBYTE pbyAddr, PDWORD pdwKey); void MACvRegBitsOff(struct vnt_private *, u8, u8);
void MACvRegBitsOn(struct vnt_private *, u8, u8);
void MACvRegBitsOff(PSDevice pDevice, BYTE byRegOfs, BYTE byBits); void MACvWriteWord(struct vnt_private *, u8, u16);
void MACvRegBitsOn(PSDevice pDevice, BYTE byRegOfs, BYTE byBits); void MACvWriteBSSIDAddress(struct vnt_private *, u8 *);
void MACvWriteWord(PSDevice pDevice, BYTE byRegOfs, WORD wData); void MACvEnableProtectMD(struct vnt_private *);
void MACvDisableProtectMD(struct vnt_private *);
void MACvWriteBSSIDAddress(PSDevice pDevice, PBYTE pbyEtherAddr); void MACvEnableBarkerPreambleMd(struct vnt_private *);
void MACvEnableProtectMD(PSDevice pDevice); void MACvDisableBarkerPreambleMd(struct vnt_private *);
void MACvDisableProtectMD(PSDevice pDevice); void MACvWriteBeaconInterval(struct vnt_private *, u16);
void MACvEnableBarkerPreambleMd(PSDevice pDevice);
void MACvDisableBarkerPreambleMd(PSDevice pDevice);
void MACvWriteBeaconInterval(PSDevice pDevice, WORD wInterval);
#endif /* __MAC_H__ */ #endif /* __MAC_H__ */
drivers/staging/vt6656/wcmd.c
View file @ 98583c09
...@@ -68,33 +68,17 @@ static int msglevel =MSG_LEVEL_INFO; ...@@ -68,33 +68,17 @@ static int msglevel =MSG_LEVEL_INFO;
//static int msglevel =MSG_LEVEL_DEBUG; //static int msglevel =MSG_LEVEL_DEBUG;
/*--------------------- Static Functions --------------------------*/ /*--------------------- Static Functions --------------------------*/
static static void s_vProbeChannel(struct vnt_private *);
void
s_vProbeChannel(
PSDevice pDevice
);
static struct vnt_tx_mgmt *s_MgrMakeProbeRequest(struct vnt_private *,
struct vnt_manager *pMgmt, u8 *pScanBSSID, PWLAN_IE_SSID pSSID,
PWLAN_IE_SUPP_RATES pCurrRates, PWLAN_IE_SUPP_RATES pCurrExtSuppRates);
static
PSTxMgmtPacket
s_MgrMakeProbeRequest(
PSDevice pDevice,
PSMgmtObject pMgmt,
PBYTE pScanBSSID,
PWLAN_IE_SSID pSSID,
PWLAN_IE_SUPP_RATES pCurrRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates
);
static int s_bCommandComplete(struct vnt_private *);
static
BOOL
s_bCommandComplete (
PSDevice pDevice
);
static int s_bClearBSSID_SCAN(struct vnt_private *);
static BOOL s_bClearBSSID_SCAN(void *hDeviceContext);
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
...@@ -114,13 +98,10 @@ static BOOL s_bClearBSSID_SCAN(void *hDeviceContext); ...@@ -114,13 +98,10 @@ static BOOL s_bClearBSSID_SCAN(void *hDeviceContext);
* *
*/ */
static static void vAdHocBeaconStop(struct vnt_private *pDevice)
void
vAdHocBeaconStop(PSDevice pDevice)
{ {
struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); int bStop;
BOOL bStop;
/* /*
* temporarily stop Beacon packet for AdHoc Server * temporarily stop Beacon packet for AdHoc Server
...@@ -171,11 +152,9 @@ vAdHocBeaconStop(PSDevice pDevice) ...@@ -171,11 +152,9 @@ vAdHocBeaconStop(PSDevice pDevice)
* Return Value: none * Return Value: none
* *
*/ */
static static void vAdHocBeaconRestart(struct vnt_private *pDevice)
void
vAdHocBeaconRestart(PSDevice pDevice)
{ {
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
/* /*
* Restart Beacon packet for AdHoc Server * Restart Beacon packet for AdHoc Server
...@@ -204,22 +183,22 @@ vAdHocBeaconRestart(PSDevice pDevice) ...@@ -204,22 +183,22 @@ vAdHocBeaconRestart(PSDevice pDevice)
* *
-*/ -*/
static static void s_vProbeChannel(struct vnt_private *pDevice)
void
s_vProbeChannel(
PSDevice pDevice
)
{ {
//1M, 2M, 5M, 11M, 18M, 24M, 36M, 54M struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
BYTE abyCurrSuppRatesG[] = {WLAN_EID_SUPP_RATES, 8, 0x02, 0x04, 0x0B, 0x16, 0x24, 0x30, 0x48, 0x6C}; struct vnt_tx_mgmt *pTxPacket;
BYTE abyCurrExtSuppRatesG[] = {WLAN_EID_EXTSUPP_RATES, 4, 0x0C, 0x12, 0x18, 0x60}; u8 abyCurrSuppRatesG[] = {WLAN_EID_SUPP_RATES,
//6M, 9M, 12M, 48M 8, 0x02, 0x04, 0x0B, 0x16, 0x24, 0x30, 0x48, 0x6C};
BYTE abyCurrSuppRatesA[] = {WLAN_EID_SUPP_RATES, 8, 0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C}; /* 1M, 2M, 5M, 11M, 18M, 24M, 36M, 54M*/
BYTE abyCurrSuppRatesB[] = {WLAN_EID_SUPP_RATES, 4, 0x02, 0x04, 0x0B, 0x16}; u8 abyCurrExtSuppRatesG[] = {WLAN_EID_EXTSUPP_RATES,
PBYTE pbyRate; 4, 0x0C, 0x12, 0x18, 0x60};
PSTxMgmtPacket pTxPacket; /* 6M, 9M, 12M, 48M*/
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); u8 abyCurrSuppRatesA[] = {WLAN_EID_SUPP_RATES,
unsigned int ii; 8, 0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C};
u8 abyCurrSuppRatesB[] = {WLAN_EID_SUPP_RATES,
4, 0x02, 0x04, 0x0B, 0x16};
u8 *pbyRate;
int ii;
if (pDevice->byBBType == BB_TYPE_11A) { if (pDevice->byBBType == BB_TYPE_11A) {
...@@ -268,24 +247,19 @@ s_vProbeChannel( ...@@ -268,24 +247,19 @@ s_vProbeChannel(
-*/ -*/
PSTxMgmtPacket struct vnt_tx_mgmt *s_MgrMakeProbeRequest(struct vnt_private *pDevice,
s_MgrMakeProbeRequest( struct vnt_manager *pMgmt, u8 *pScanBSSID, PWLAN_IE_SSID pSSID,
PSDevice pDevice, PWLAN_IE_SUPP_RATES pCurrRates, PWLAN_IE_SUPP_RATES pCurrExtSuppRates)
PSMgmtObject pMgmt,
PBYTE pScanBSSID,
PWLAN_IE_SSID pSSID,
PWLAN_IE_SUPP_RATES pCurrRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates
)
{ {
PSTxMgmtPacket pTxPacket = NULL; struct vnt_tx_mgmt *pTxPacket = NULL;
WLAN_FR_PROBEREQ sFrame; WLAN_FR_PROBEREQ sFrame;
pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool; pTxPacket = (struct vnt_tx_mgmt *)pMgmt->pbyMgmtPacketPool;
memset(pTxPacket, 0, sizeof(STxMgmtPacket) + WLAN_PROBEREQ_FR_MAXLEN); memset(pTxPacket, 0, sizeof(struct vnt_tx_mgmt)
pTxPacket->p80211Header = (PUWLAN_80211HDR)((PBYTE)pTxPacket + sizeof(STxMgmtPacket)); + WLAN_PROBEREQ_FR_MAXLEN);
pTxPacket->p80211Header = (PUWLAN_80211HDR)((u8 *)pTxPacket
+ sizeof(struct vnt_tx_mgmt));
sFrame.pBuf = (PBYTE)pTxPacket->p80211Header; sFrame.pBuf = (PBYTE)pTxPacket->p80211Header;
sFrame.len = WLAN_PROBEREQ_FR_MAXLEN; sFrame.len = WLAN_PROBEREQ_FR_MAXLEN;
vMgrEncodeProbeRequest(&sFrame); vMgrEncodeProbeRequest(&sFrame);
...@@ -316,9 +290,8 @@ s_MgrMakeProbeRequest( ...@@ -316,9 +290,8 @@ s_MgrMakeProbeRequest(
return pTxPacket; return pTxPacket;
} }
void vCommandTimerWait(void *hDeviceContext, unsigned long MSecond) void vCommandTimerWait(struct vnt_private *pDevice, unsigned long MSecond)
{ {
PSDevice pDevice = (PSDevice)hDeviceContext;
init_timer(&pDevice->sTimerCommand); init_timer(&pDevice->sTimerCommand);
...@@ -331,18 +304,17 @@ void vCommandTimerWait(void *hDeviceContext, unsigned long MSecond) ...@@ -331,18 +304,17 @@ void vCommandTimerWait(void *hDeviceContext, unsigned long MSecond)
return; return;
} }
void vRunCommand(void *hDeviceContext) void vRunCommand(struct vnt_private *pDevice)
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
PWLAN_IE_SSID pItemSSID; PWLAN_IE_SSID pItemSSID;
PWLAN_IE_SSID pItemSSIDCurr; PWLAN_IE_SSID pItemSSIDCurr;
CMD_STATUS Status; CMD_STATUS Status;
unsigned int ii;
BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
struct sk_buff *skb; struct sk_buff *skb;
BYTE byData;
union iwreq_data wrqu; union iwreq_data wrqu;
int ii;
u8 byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
u8 byData;
if (pDevice->dwDiagRefCount != 0) if (pDevice->dwDiagRefCount != 0)
...@@ -1043,17 +1015,12 @@ void vRunCommand(void *hDeviceContext) ...@@ -1043,17 +1015,12 @@ void vRunCommand(void *hDeviceContext)
} }
static static int s_bCommandComplete(struct vnt_private *pDevice)
BOOL
s_bCommandComplete (
PSDevice pDevice
)
{ {
struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
PWLAN_IE_SSID pSSID; PWLAN_IE_SSID pSSID;
BOOL bRadioCmd = FALSE; int bRadioCmd = FALSE;
//WORD wDeAuthenReason = 0; int bForceSCAN = TRUE;
BOOL bForceSCAN = TRUE;
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
pDevice->eCommandState = WLAN_CMD_IDLE; pDevice->eCommandState = WLAN_CMD_IDLE;
...@@ -1146,18 +1113,15 @@ s_bCommandComplete ( ...@@ -1146,18 +1113,15 @@ s_bCommandComplete (
break; break;
} }
vCommandTimerWait((void *) pDevice, 0); vCommandTimerWait(pDevice, 0);
} }
return TRUE; return TRUE;
} }
BOOL bScheduleCommand(void *hDeviceContext, int bScheduleCommand(struct vnt_private *pDevice,
CMD_CODE eCommand, CMD_CODE eCommand, u8 *pbyItem0)
PBYTE pbyItem0)
{ {
PSDevice pDevice = (PSDevice)hDeviceContext;
if (pDevice->cbFreeCmdQueue == 0) { if (pDevice->cbFreeCmdQueue == 0) {
return (FALSE); return (FALSE);
...@@ -1222,9 +1186,8 @@ BOOL bScheduleCommand(void *hDeviceContext, ...@@ -1222,9 +1186,8 @@ BOOL bScheduleCommand(void *hDeviceContext,
* Return Value: TRUE if success; otherwise FALSE * Return Value: TRUE if success; otherwise FALSE
* *
*/ */
static BOOL s_bClearBSSID_SCAN(void *hDeviceContext) static int s_bClearBSSID_SCAN(struct vnt_private *pDevice)
{ {
PSDevice pDevice = (PSDevice)hDeviceContext;
unsigned int uCmdDequeueIdx = pDevice->uCmdDequeueIdx; unsigned int uCmdDequeueIdx = pDevice->uCmdDequeueIdx;
unsigned int ii; unsigned int ii;
...@@ -1242,9 +1205,8 @@ static BOOL s_bClearBSSID_SCAN(void *hDeviceContext) ...@@ -1242,9 +1205,8 @@ static BOOL s_bClearBSSID_SCAN(void *hDeviceContext)
//mike add:reset command timer //mike add:reset command timer
void vResetCommandTimer(void *hDeviceContext) void vResetCommandTimer(struct vnt_private *pDevice)
{ {
PSDevice pDevice = (PSDevice)hDeviceContext;
//delete timer //delete timer
del_timer(&pDevice->sTimerCommand); del_timer(&pDevice->sTimerCommand);
...@@ -1261,10 +1223,9 @@ void vResetCommandTimer(void *hDeviceContext) ...@@ -1261,10 +1223,9 @@ void vResetCommandTimer(void *hDeviceContext)
pDevice->bCmdClear = FALSE; pDevice->bCmdClear = FALSE;
} }
void BSSvSecondTxData(void *hDeviceContext) void BSSvSecondTxData(struct vnt_private *pDevice)
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
pDevice->nTxDataTimeCout++; pDevice->nTxDataTimeCout++;
......
drivers/staging/vt6656/wcmd.h
View file @ 98583c09
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#ifndef __WCMD_H__ #ifndef __WCMD_H__
#define __WCMD_H__ #define __WCMD_H__
#include "ttype.h" #include "ttype.h"
#include "80211hdr.h" #include "80211hdr.h"
#include "80211mgr.h" #include "80211mgr.h"
...@@ -112,14 +111,13 @@ typedef enum tagCMD_STATE { ...@@ -112,14 +111,13 @@ typedef enum tagCMD_STATE {
/*--------------------- Export Types ------------------------------*/ /*--------------------- Export Types ------------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
struct vnt_private;
void vResetCommandTimer(void *hDeviceContext); void vResetCommandTimer(struct vnt_private *);
BOOL bScheduleCommand(void *hDeviceContext, int bScheduleCommand(struct vnt_private *, CMD_CODE eCommand, u8 *pbyItem0);
CMD_CODE eCommand,
PBYTE pbyItem0);
void vRunCommand(void *hDeviceContext); void vRunCommand(struct vnt_private *);
/* /*
void void
...@@ -128,6 +126,6 @@ WCMDvCommandThread( ...@@ -128,6 +126,6 @@ WCMDvCommandThread(
); );
*/ */
void BSSvSecondTxData(void *hDeviceContext); void BSSvSecondTxData(struct vnt_private *);
#endif /* __WCMD_H__ */ #endif /* __WCMD_H__ */
drivers/staging/vt6656/wctl.c
View file @ 98583c09
...@@ -113,7 +113,8 @@ BOOL WCTLbIsDuplicate (PSCache pCache, PS802_11Header pMACHeader) ...@@ -113,7 +113,8 @@ BOOL WCTLbIsDuplicate (PSCache pCache, PS802_11Header pMACHeader)
* *
*/ */
unsigned int WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader) unsigned int WCTLuSearchDFCB(struct vnt_private *pDevice,
PS802_11Header pMACHeader)
{ {
unsigned int ii; unsigned int ii;
...@@ -141,7 +142,8 @@ unsigned int WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader) ...@@ -141,7 +142,8 @@ unsigned int WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader)
* Return Value: index number in Defragment Database * Return Value: index number in Defragment Database
* *
*/ */
unsigned int WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader) unsigned int WCTLuInsertDFCB(struct vnt_private *pDevice,
PS802_11Header pMACHeader)
{ {
unsigned int ii; unsigned int ii;
...@@ -180,10 +182,10 @@ unsigned int WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader) ...@@ -180,10 +182,10 @@ unsigned int WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader)
* Return Value: TRUE if it is valid fragment packet and we have resource to defragment; otherwise FALSE * Return Value: TRUE if it is valid fragment packet and we have resource to defragment; otherwise FALSE
* *
*/ */
BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, int WCTLbHandleFragment(struct vnt_private *pDevice, PS802_11Header pMACHeader,
unsigned int cbFrameLength, BOOL bWEP, BOOL bExtIV) unsigned int cbFrameLength, int bWEP, int bExtIV)
{ {
unsigned int uHeaderSize; unsigned int uHeaderSize;
if (bWEP == TRUE) { if (bWEP == TRUE) {
......
drivers/staging/vt6656/wctl.h
View file @ 98583c09
...@@ -97,9 +97,9 @@ ...@@ -97,9 +97,9 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
BOOL WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader); BOOL WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader);
BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, int WCTLbHandleFragment(struct vnt_private *, PS802_11Header pMACHeader,
unsigned int cbFrameLength, BOOL bWEP, BOOL bExtIV); unsigned int cbFrameLength, BOOL bWEP, BOOL bExtIV);
unsigned int WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader); unsigned int WCTLuSearchDFCB(struct vnt_private *, PS802_11Header pMACHeader);
unsigned int WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader); unsigned int WCTLuInsertDFCB(struct vnt_private *, PS802_11Header pMACHeader);
#endif /* __WCTL_H__ */ #endif /* __WCTL_H__ */
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