Skip to content

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

staging: vt6656: cleanup struct vnt_private 

Where appropriate replacing types defined in "type.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 14c5ef57
Hide whitespace changes
Inline Side-by-side
Showing with 349 additions and 372 deletions
drivers/staging/vt6656/device.h
View file @ 61462ab3
...@@ -393,426 +393,403 @@ typedef struct __device_opt { ...@@ -393,426 +393,403 @@ typedef struct __device_opt {
struct vnt_private { struct vnt_private {
/* netdev */
struct usb_device *usb;
struct net_device *dev;
struct net_device_stats stats;
// netdev OPTIONS sOpts;
struct usb_device* usb;
struct net_device* dev;
struct net_device_stats stats;
struct tasklet_struct CmdWorkItem;
struct tasklet_struct EventWorkItem;
struct tasklet_struct ReadWorkItem;
struct tasklet_struct RxMngWorkItem;
OPTIONS sOpts; u32 rx_buf_sz;
int multicast_limit;
u8 byRxMode;
struct tasklet_struct CmdWorkItem; spinlock_t lock;
struct tasklet_struct EventWorkItem;
struct tasklet_struct ReadWorkItem;
struct tasklet_struct RxMngWorkItem;
u32 rx_buf_sz; u32 rx_bytes;
int multicast_limit;
BYTE byRxMode;
spinlock_t lock; u8 byRevId;
u32 rx_bytes; u32 flags;
unsigned long Flags;
BYTE byRevId; SCache sDupRxCache;
u32 flags; SDeFragControlBlock sRxDFCB[CB_MAX_RX_FRAG];
unsigned long Flags; u32 cbDFCB;
u32 cbFreeDFCB;
u32 uCurrentDFCBIdx;
SCache sDupRxCache;
SDeFragControlBlock sRxDFCB[CB_MAX_RX_FRAG]; /* USB */
unsigned int cbDFCB; struct urb *pControlURB;
unsigned int cbFreeDFCB; struct urb *pInterruptURB;
unsigned int uCurrentDFCBIdx; struct usb_ctrlrequest sUsbCtlRequest;
u32 int_interval;
// +++USB /* Variables to track resources for the BULK In Pipe */
PRCB pRCBMem;
struct urb *pControlURB; PRCB apRCB[CB_MAX_RX_DESC];
struct urb *pInterruptURB; u32 cbRD;
struct usb_ctrlrequest sUsbCtlRequest; PRCB FirstRecvFreeList;
PRCB LastRecvFreeList;
unsigned int int_interval; u32 NumRecvFreeList;
// PRCB FirstRecvMngList;
// Variables to track resources for the BULK In Pipe PRCB LastRecvMngList;
// u32 NumRecvMngList;
PRCB pRCBMem; int bIsRxWorkItemQueued;
PRCB apRCB[CB_MAX_RX_DESC]; int bIsRxMngWorkItemQueued;
unsigned int cbRD;
PRCB FirstRecvFreeList;
PRCB LastRecvFreeList;
unsigned int NumRecvFreeList;
PRCB FirstRecvMngList;
PRCB LastRecvMngList;
unsigned int NumRecvMngList;
BOOL bIsRxWorkItemQueued;
BOOL bIsRxMngWorkItemQueued;
unsigned long ulRcvRefCount; /* packets that have not returned back */ unsigned long ulRcvRefCount; /* packets that have not returned back */
// /* Variables to track resources for the BULK Out Pipe */
// Variables to track resources for the BULK Out Pipe PUSB_SEND_CONTEXT apTD[CB_MAX_TX_DESC];
// u32 cbTD;
PUSB_SEND_CONTEXT apTD[CB_MAX_TX_DESC];
unsigned int cbTD;
//
// Variables to track resources for the Interrupt In Pipe
//
INT_BUFFER intBuf;
BOOL fKillEventPollingThread;
BOOL bEventAvailable;
/* Variables to track resources for the Interrupt In Pipe */
INT_BUFFER intBuf;
int fKillEventPollingThread;
int bEventAvailable;
//default config from file by user setting /* default config from file by user setting */
DEFAULT_CONFIG config_file; DEFAULT_CONFIG config_file;
// /* Statistic for USB */
// Statistic for USB unsigned long ulBulkInPosted;
// protect with spinlock unsigned long ulBulkInError;
unsigned long ulBulkInPosted; unsigned long ulBulkInContCRCError;
unsigned long ulBulkInError; unsigned long ulBulkInBytesRead;
unsigned long ulBulkInContCRCError;
unsigned long ulBulkInBytesRead;
unsigned long ulBulkOutPosted; unsigned long ulBulkOutPosted;
unsigned long ulBulkOutError; unsigned long ulBulkOutError;
unsigned long ulBulkOutContCRCError; unsigned long ulBulkOutContCRCError;
unsigned long ulBulkOutBytesWrite; unsigned long ulBulkOutBytesWrite;
unsigned long ulIntInPosted; unsigned long ulIntInPosted;
unsigned long ulIntInError; unsigned long ulIntInError;
unsigned long ulIntInContCRCError; unsigned long ulIntInContCRCError;
unsigned long ulIntInBytesRead; unsigned long ulIntInBytesRead;
// Version control /* Version control */
WORD wFirmwareVersion; u16 wFirmwareVersion;
BYTE byLocalID; u8 byLocalID;
BYTE byRFType; u8 byRFType;
BYTE byBBRxConf; u8 byBBRxConf;
BYTE byZoneType; u8 byZoneType;
BOOL bZoneRegExist; int bZoneRegExist;
BYTE byOriginalZonetype; u8 byOriginalZonetype;
BOOL bLinkPass; // link status: OK or fail int bLinkPass; /* link status: OK or fail */
BYTE abyCurrentNetAddr[ETH_ALEN]; u8 abyCurrentNetAddr[ETH_ALEN];
BYTE abyPermanentNetAddr[ETH_ALEN]; u8 abyPermanentNetAddr[ETH_ALEN];
// SW network address
/* u8 abySoftwareNetAddr[ETH_ALEN]; */
BOOL bExistSWNetAddr;
// Adapter statistics int bExistSWNetAddr;
SStatCounter scStatistic;
// 802.11 counter
SDot11Counters s802_11Counter;
// /* Adapter statistics */
// Maintain statistical debug info. SStatCounter scStatistic;
// /* 802.11 counter */
unsigned long packetsReceived; SDot11Counters s802_11Counter;
unsigned long packetsReceivedDropped;
unsigned long packetsReceivedOverflow;
unsigned long packetsSent;
unsigned long packetsSentDropped;
unsigned long SendContextsInUse;
unsigned long RcvBuffersInUse;
/* Maintain statistical debug info. */
unsigned long packetsReceived;
unsigned long packetsReceivedDropped;
unsigned long packetsReceivedOverflow;
unsigned long packetsSent;
unsigned long packetsSentDropped;
unsigned long SendContextsInUse;
unsigned long RcvBuffersInUse;
/* 802.11 management */ /* 802.11 management */
struct vnt_manager vnt_mgmt; struct vnt_manager vnt_mgmt;
u64 qwCurrTSF; u64 qwCurrTSF;
unsigned int cbBulkInMax; u32 cbBulkInMax;
BOOL bPSRxBeacon; int bPSRxBeacon;
// 802.11 MAC specific /* 802.11 MAC specific */
unsigned int uCurrRSSI; u32 uCurrRSSI;
BYTE byCurrSQ; u8 byCurrSQ;
/* Antenna Diversity */
//Antenna Diversity int bTxRxAntInv;
BOOL bTxRxAntInv; u32 dwRxAntennaSel;
DWORD dwRxAntennaSel; u32 dwTxAntennaSel;
DWORD dwTxAntennaSel; u8 byAntennaCount;
BYTE byAntennaCount; u8 byRxAntennaMode;
BYTE byRxAntennaMode; u8 byTxAntennaMode;
BYTE byTxAntennaMode; u8 byRadioCtl;
BYTE byRadioCtl; u8 bHWRadioOff;
BYTE bHWRadioOff;
/* SQ3 functions for antenna diversity */
//SQ3 functions for antenna diversity struct timer_list TimerSQ3Tmax1;
struct timer_list TimerSQ3Tmax1; struct timer_list TimerSQ3Tmax2;
struct timer_list TimerSQ3Tmax2; struct timer_list TimerSQ3Tmax3;
struct timer_list TimerSQ3Tmax3;
int bDiversityRegCtlON;
BOOL bDiversityRegCtlON; int bDiversityEnable;
BOOL bDiversityEnable; unsigned long ulDiversityNValue;
unsigned long ulDiversityNValue; unsigned long ulDiversityMValue;
unsigned long ulDiversityMValue; u8 byTMax;
BYTE byTMax; u8 byTMax2;
BYTE byTMax2; u8 byTMax3;
BYTE byTMax3; unsigned long ulSQ3TH;
unsigned long ulSQ3TH;
unsigned long uDiversityCnt;
unsigned long uDiversityCnt; u8 byAntennaState;
BYTE byAntennaState; unsigned long ulRatio_State0;
unsigned long ulRatio_State0; unsigned long ulRatio_State1;
unsigned long ulRatio_State1; unsigned long ulSQ3_State0;
unsigned long ulSQ3_State0; unsigned long ulSQ3_State1;
unsigned long ulSQ3_State1;
unsigned long aulSQ3Val[MAX_RATE];
unsigned long aulSQ3Val[MAX_RATE]; unsigned long aulPktNum[MAX_RATE];
unsigned long aulPktNum[MAX_RATE];
/* IFS & Cw */ /* IFS & Cw */
unsigned int uSIFS; /* Current SIFS */ u32 uSIFS; /* Current SIFS */
unsigned int uDIFS; /* Current DIFS */ u32 uDIFS; /* Current DIFS */
unsigned int uEIFS; /* Current EIFS */ u32 uEIFS; /* Current EIFS */
unsigned int uSlot; /* Current SlotTime */ u32 uSlot; /* Current SlotTime */
unsigned int uCwMin; /* Current CwMin */ u32 uCwMin; /* Current CwMin */
unsigned int uCwMax; /* CwMax is fixed on 1023 */ u32 uCwMax; /* CwMax is fixed on 1023 */
// PHY parameter /* PHY parameter */
BYTE bySIFS; u8 bySIFS;
BYTE byDIFS; u8 byDIFS;
BYTE byEIFS; u8 byEIFS;
BYTE bySlot; u8 bySlot;
BYTE byCWMaxMin; u8 byCWMaxMin;
// Rate /* Rate */
VIA_BB_TYPE byBBType; //0: 11A, 1:11B, 2:11G VIA_BB_TYPE byBBType; /* 0: 11A, 1:11B, 2:11G */
VIA_PKT_TYPE byPacketType; //0:11a,1:11b,2:11gb(only CCK in BasicRate),3:11ga(OFDM in Basic Rate) VIA_PKT_TYPE byPacketType; /* 0:11a 1:11b 2:11gb 3:11ga */
WORD wBasicRate; u16 wBasicRate;
BYTE byACKRate; u8 byACKRate;
BYTE byTopOFDMBasicRate; u8 byTopOFDMBasicRate;
BYTE byTopCCKBasicRate; u8 byTopCCKBasicRate;
DWORD dwAotoRateTxOkCnt; u32 dwAotoRateTxOkCnt;
DWORD dwAotoRateTxFailCnt; u32 dwAotoRateTxFailCnt;
DWORD dwErrorRateThreshold[13]; u32 dwErrorRateThreshold[13];
DWORD dwTPTable[MAX_RATE]; u32 dwTPTable[MAX_RATE];
BYTE abyEEPROM[EEP_MAX_CONTEXT_SIZE]; //DWORD alignment u8 abyEEPROM[EEP_MAX_CONTEXT_SIZE]; /*u32 alignment */
BYTE byMinChannel; u8 byMinChannel;
BYTE byMaxChannel; u8 byMaxChannel;
unsigned int uConnectionRate; u32 uConnectionRate;
BYTE byPreambleType; u8 byPreambleType;
BYTE byShortPreamble; u8 byShortPreamble;
// CARD_PHY_TYPE /* CARD_PHY_TYPE */
BYTE eConfigPHYMode; u8 eConfigPHYMode;
// For RF Power table /* For RF Power table */
BYTE byCCKPwr; u8 byCCKPwr;
BYTE byOFDMPwrG; u8 byOFDMPwrG;
BYTE byOFDMPwrA; u8 byOFDMPwrA;
BYTE byCurPwr; u8 byCurPwr;
BYTE abyCCKPwrTbl[14]; u8 abyCCKPwrTbl[14];
BYTE abyOFDMPwrTbl[14]; u8 abyOFDMPwrTbl[14];
BYTE abyOFDMAPwrTbl[42]; u8 abyOFDMAPwrTbl[42];
WORD wCurrentRate; u16 wCurrentRate;
WORD wRTSThreshold; u16 wRTSThreshold;
WORD wFragmentationThreshold; u16 wFragmentationThreshold;
BYTE byShortRetryLimit; u8 byShortRetryLimit;
BYTE byLongRetryLimit; u8 byLongRetryLimit;
CARD_OP_MODE eOPMode; CARD_OP_MODE eOPMode;
BOOL bBSSIDFilter; int bBSSIDFilter;
WORD wMaxTransmitMSDULifetime; u16 wMaxTransmitMSDULifetime;
BYTE abyBSSID[ETH_ALEN]; u8 abyBSSID[ETH_ALEN];
BYTE abyDesireBSSID[ETH_ALEN]; u8 abyDesireBSSID[ETH_ALEN];
WORD wCTSDuration; // update while speed change
WORD wACKDuration; // update while speed change u16 wCTSDuration; /* update while speed change */
WORD wRTSTransmitLen; // update while speed change u16 wACKDuration;
BYTE byRTSServiceField; // update while speed change u16 wRTSTransmitLen;
BYTE byRTSSignalField; // update while speed change u8 byRTSServiceField;
u8 byRTSSignalField;
DWORD dwMaxReceiveLifetime; // dot11MaxReceiveLifetime
u32 dwMaxReceiveLifetime; /* dot11MaxReceiveLifetime */
BOOL bCCK;
BOOL bEncryptionEnable; int bCCK;
BOOL bLongHeader; int bEncryptionEnable;
BOOL bSoftwareGenCrcErr; int bLongHeader;
BOOL bShortSlotTime; int bSoftwareGenCrcErr;
BOOL bProtectMode; int bShortSlotTime;
BOOL bNonERPPresent; int bProtectMode;
BOOL bBarkerPreambleMd; int bNonERPPresent;
int bBarkerPreambleMd;
BYTE byERPFlag;
WORD wUseProtectCntDown; u8 byERPFlag;
u16 wUseProtectCntDown;
BOOL bRadioControlOff;
BOOL bRadioOff; int bRadioControlOff;
int bRadioOff;
// Power save
BOOL bEnablePSMode; /* Power save */
WORD wListenInterval; int bEnablePSMode;
BOOL bPWBitOn; u16 wListenInterval;
WMAC_POWER_MODE ePSMode; int bPWBitOn;
unsigned long ulPSModeWaitTx; WMAC_POWER_MODE ePSMode;
BOOL bPSModeTxBurst; unsigned long ulPSModeWaitTx;
int bPSModeTxBurst;
// Beacon releated
WORD wSeqCounter; /* Beacon releated */
BOOL bBeaconBufReady; u16 wSeqCounter;
BOOL bBeaconSent; int bBeaconBufReady;
BOOL bFixRate; int bBeaconSent;
BYTE byCurrentCh; int bFixRate;
unsigned int uScanTime; u8 byCurrentCh;
u32 uScanTime;
CMD_STATE eCommandState;
CMD_STATE eCommandState;
CMD_CODE eCommand;
BOOL bBeaconTx; CMD_CODE eCommand;
BYTE byScanBBType; int bBeaconTx;
u8 byScanBBType;
BOOL bStopBeacon;
BOOL bStopDataPkt; int bStopBeacon;
BOOL bStopTx0Pkt; int bStopDataPkt;
unsigned int uAutoReConnectTime; int bStopTx0Pkt;
unsigned int uIsroamingTime; u32 uAutoReConnectTime;
u32 uIsroamingTime;
// 802.11 counter
/* 802.11 counter */
CMD_ITEM eCmdQueue[CMD_Q_SIZE];
unsigned int uCmdDequeueIdx; CMD_ITEM eCmdQueue[CMD_Q_SIZE];
unsigned int uCmdEnqueueIdx; u32 uCmdDequeueIdx;
unsigned int cbFreeCmdQueue; u32 uCmdEnqueueIdx;
BOOL bCmdRunning; u32 cbFreeCmdQueue;
BOOL bCmdClear; int bCmdRunning;
BOOL bNeedRadioOFF; int bCmdClear;
int bNeedRadioOFF;
BOOL bEnableRoaming;
BOOL bIsRoaming; int bEnableRoaming;
BOOL bFastRoaming; int bIsRoaming;
BYTE bSameBSSMaxNum; int bFastRoaming;
BYTE bSameBSSCurNum; u8 bSameBSSMaxNum;
BOOL bRoaming; u8 bSameBSSCurNum;
BOOL b11hEable; int bRoaming;
unsigned long ulTxPower; int b11hEable;
unsigned long ulTxPower;
// Encryption
NDIS_802_11_WEP_STATUS eEncryptionStatus; /* Encryption */
BOOL bTransmitKey; NDIS_802_11_WEP_STATUS eEncryptionStatus;
int bTransmitKey;
//mike add :save old Encryption NDIS_802_11_WEP_STATUS eOldEncryptionStatus;
NDIS_802_11_WEP_STATUS eOldEncryptionStatus; SKeyManagement sKey;
u32 dwIVCounter;
SKeyManagement sKey;
DWORD dwIVCounter;
RC4Ext SBox;
u8 abyPRNG[WLAN_WEPMAX_KEYLEN+3];
RC4Ext SBox; u8 byKeyIndex;
BYTE abyPRNG[WLAN_WEPMAX_KEYLEN+3];
BYTE byKeyIndex; int bAES;
BOOL bAES; u32 uKeyLength;
u8 abyKey[WLAN_WEP232_KEYLEN];
unsigned int uKeyLength;
BYTE abyKey[WLAN_WEP232_KEYLEN]; /* for AP mode */
u32 uAssocCount;
// for AP mode int bMoreData;
unsigned int uAssocCount;
BOOL bMoreData; /* QoS */
int bGrpAckPolicy;
// QoS
BOOL bGrpAckPolicy;
u8 byAutoFBCtrl;
BYTE byAutoFBCtrl; int bTxMICFail;
int bRxMICFail;
BOOL bTxMICFail;
BOOL bRxMICFail;
/* For Update BaseBand VGA Gain Offset */
int bUpdateBBVGA;
// For Update BaseBand VGA Gain Offset u32 uBBVGADiffCount;
BOOL bUpdateBBVGA; u8 byBBVGANew;
unsigned int uBBVGADiffCount; u8 byBBVGACurrent;
BYTE byBBVGANew; u8 abyBBVGA[BB_VGA_LEVEL];
BYTE byBBVGACurrent; signed long ldBmThreshold[BB_VGA_LEVEL];
BYTE abyBBVGA[BB_VGA_LEVEL];
signed long ldBmThreshold[BB_VGA_LEVEL]; u8 byBBPreEDRSSI;
u8 byBBPreEDIndex;
BYTE byBBPreEDRSSI;
BYTE byBBPreEDIndex;
int bRadioCmd;
u32 dwDiagRefCount;
/* For FOE Tuning */
u8 byFOETuning;
/* For Auto Power Tunning */
u8 byAutoPwrTunning;
/* BaseBand Loopback Use */
u8 byBBCR4d;
u8 byBBCRc9;
u8 byBBCR88;
u8 byBBCR09;
/* command timer */
struct timer_list sTimerCommand;
BOOL bRadioCmd; struct timer_list sTimerTxData;
DWORD dwDiagRefCount; unsigned long nTxDataTimeCout;
int fTxDataInSleep;
int IsTxDataTrigger;
// For FOE Tuning int fWPA_Authened; /*is WPA/WPA-PSK or WPA2/WPA2-PSK authen?? */
BYTE byFOETuning; u8 byReAssocCount;
u8 byLinkWaitCount;
// For Auto Power Tunning SEthernetHeader sTxEthHeader;
SEthernetHeader sRxEthHeader;
u8 abyBroadcastAddr[ETH_ALEN];
u8 abySNAP_RFC1042[ETH_ALEN];
u8 abySNAP_Bridgetunnel[ETH_ALEN];
BYTE byAutoPwrTunning; /* Pre-Authentication & PMK cache */
SPMKID gsPMKID;
SPMKIDCandidateEvent gsPMKIDCandidate;
// BaseBand Loopback Use
BYTE byBBCR4d;
BYTE byBBCRc9;
BYTE byBBCR88;
BYTE byBBCR09;
// command timer /* for 802.11h */
struct timer_list sTimerCommand; int b11hEnable;
struct timer_list sTimerTxData; int bChannelSwitch;
unsigned long nTxDataTimeCout; u8 byNewChannel;
BOOL fTxDataInSleep; u8 byChannelSwitchCount;
BOOL IsTxDataTrigger;
BOOL fWPA_Authened; //is WPA/WPA-PSK or WPA2/WPA2-PSK authen?? /* WPA supplicant daemon */
BYTE byReAssocCount; //mike add:re-association retry times! int bWPADEVUp;
BYTE byLinkWaitCount; int bwextstep0;
int bwextstep1;
int bwextstep2;
int bwextstep3;
int bWPASuppWextEnabled;
SEthernetHeader sTxEthHeader; /* user space daemon: hostapd, is used for HOSTAP */
SEthernetHeader sRxEthHeader; int bEnableHostapd;
BYTE abyBroadcastAddr[ETH_ALEN]; int bEnable8021x;
BYTE abySNAP_RFC1042[ETH_ALEN]; int bEnableHostWEP;
BYTE abySNAP_Bridgetunnel[ETH_ALEN]; struct net_device *apdev;
int (*tx_80211)(struct sk_buff *skb, struct net_device *dev);
// Pre-Authentication & PMK cache
SPMKID gsPMKID;
SPMKIDCandidateEvent gsPMKIDCandidate;
// for 802.11h
BOOL b11hEnable;
BOOL bChannelSwitch;
BYTE byNewChannel;
BYTE byChannelSwitchCount;
//WPA supplicant daemon
struct net_device *wpadev;
BOOL bWPADEVUp;
//--
BOOL bwextstep0; u32 uChannel;
BOOL bwextstep1;
BOOL bwextstep2;
BOOL bwextstep3;
BOOL bWPASuppWextEnabled;
#ifdef HOSTAP struct iw_statistics wstats; /* wireless stats */
// user space daemon: hostapd, is used for HOSTAP
BOOL bEnableHostapd;
BOOL bEnable8021x;
BOOL bEnableHostWEP;
struct net_device *apdev;
int (*tx_80211)(struct sk_buff *skb, struct net_device *dev);
#endif
unsigned int uChannel;
struct iw_statistics wstats; // wireless stats int bCommit;
BOOL bCommit;
}; };
......
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