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
Show whitespace changes
Inline Side-by-side
Showing with 349 additions and 372 deletions
drivers/staging/vt6656/device.h
View file @ 61462ab3
...@@ -393,13 +393,11 @@ typedef struct __device_opt { ...@@ -393,13 +393,11 @@ typedef struct __device_opt {
struct vnt_private { struct vnt_private {
/* netdev */
// netdev struct usb_device *usb;
struct usb_device* usb; struct net_device *dev;
struct net_device* dev;
struct net_device_stats stats; struct net_device_stats stats;
OPTIONS sOpts; OPTIONS sOpts;
struct tasklet_struct CmdWorkItem; struct tasklet_struct CmdWorkItem;
...@@ -409,13 +407,13 @@ struct vnt_private { ...@@ -409,13 +407,13 @@ struct vnt_private {
u32 rx_buf_sz; u32 rx_buf_sz;
int multicast_limit; int multicast_limit;
BYTE byRxMode; u8 byRxMode;
spinlock_t lock; spinlock_t lock;
u32 rx_bytes; u32 rx_bytes;
BYTE byRevId; u8 byRevId;
u32 flags; u32 flags;
unsigned long Flags; unsigned long Flags;
...@@ -423,55 +421,45 @@ struct vnt_private { ...@@ -423,55 +421,45 @@ struct vnt_private {
SCache sDupRxCache; SCache sDupRxCache;
SDeFragControlBlock sRxDFCB[CB_MAX_RX_FRAG]; SDeFragControlBlock sRxDFCB[CB_MAX_RX_FRAG];
unsigned int cbDFCB; u32 cbDFCB;
unsigned int cbFreeDFCB; u32 cbFreeDFCB;
unsigned int uCurrentDFCBIdx; u32 uCurrentDFCBIdx;
// +++USB
/* USB */
struct urb *pControlURB; struct urb *pControlURB;
struct urb *pInterruptURB; struct urb *pInterruptURB;
struct usb_ctrlrequest sUsbCtlRequest; struct usb_ctrlrequest sUsbCtlRequest;
u32 int_interval;
unsigned int int_interval; /* Variables to track resources for the BULK In Pipe */
//
// Variables to track resources for the BULK In Pipe
//
PRCB pRCBMem; PRCB pRCBMem;
PRCB apRCB[CB_MAX_RX_DESC]; PRCB apRCB[CB_MAX_RX_DESC];
unsigned int cbRD; u32 cbRD;
PRCB FirstRecvFreeList; PRCB FirstRecvFreeList;
PRCB LastRecvFreeList; PRCB LastRecvFreeList;
unsigned int NumRecvFreeList; u32 NumRecvFreeList;
PRCB FirstRecvMngList; PRCB FirstRecvMngList;
PRCB LastRecvMngList; PRCB LastRecvMngList;
unsigned int NumRecvMngList; u32 NumRecvMngList;
BOOL bIsRxWorkItemQueued; int bIsRxWorkItemQueued;
BOOL bIsRxMngWorkItemQueued; int 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]; PUSB_SEND_CONTEXT apTD[CB_MAX_TX_DESC];
unsigned int cbTD; u32 cbTD;
// /* Variables to track resources for the Interrupt In Pipe */
// Variables to track resources for the Interrupt In Pipe
//
INT_BUFFER intBuf; INT_BUFFER intBuf;
BOOL fKillEventPollingThread; int fKillEventPollingThread;
BOOL bEventAvailable; 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
// protect with spinlock
unsigned long ulBulkInPosted; unsigned long ulBulkInPosted;
unsigned long ulBulkInError; unsigned long ulBulkInError;
unsigned long ulBulkInContCRCError; unsigned long ulBulkInContCRCError;
...@@ -488,33 +476,30 @@ struct vnt_private { ...@@ -488,33 +476,30 @@ struct vnt_private {
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;
u8 byZoneType;
int bZoneRegExist;
BYTE byZoneType; u8 byOriginalZonetype;
BOOL bZoneRegExist;
BYTE byOriginalZonetype; int bLinkPass; /* link status: OK or fail */
u8 abyCurrentNetAddr[ETH_ALEN];
u8 abyPermanentNetAddr[ETH_ALEN];
BOOL bLinkPass; // link status: OK or fail int bExistSWNetAddr;
BYTE abyCurrentNetAddr[ETH_ALEN];
BYTE abyPermanentNetAddr[ETH_ALEN];
// SW network address
/* u8 abySoftwareNetAddr[ETH_ALEN]; */
BOOL bExistSWNetAddr;
// Adapter statistics /* Adapter statistics */
SStatCounter scStatistic; SStatCounter scStatistic;
// 802.11 counter /* 802.11 counter */
SDot11Counters s802_11Counter; SDot11Counters s802_11Counter;
// /* Maintain statistical debug info. */
// Maintain statistical debug info.
//
unsigned long packetsReceived; unsigned long packetsReceived;
unsigned long packetsReceivedDropped; unsigned long packetsReceivedDropped;
unsigned long packetsReceivedOverflow; unsigned long packetsReceivedOverflow;
...@@ -523,45 +508,43 @@ struct vnt_private { ...@@ -523,45 +508,43 @@ struct vnt_private {
unsigned long SendContextsInUse; unsigned long SendContextsInUse;
unsigned long RcvBuffersInUse; 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;
BOOL bDiversityRegCtlON; int bDiversityRegCtlON;
BOOL bDiversityEnable; int bDiversityEnable;
unsigned long ulDiversityNValue; unsigned long ulDiversityNValue;
unsigned long ulDiversityMValue; unsigned long ulDiversityMValue;
BYTE byTMax; u8 byTMax;
BYTE byTMax2; u8 byTMax2;
BYTE byTMax3; u8 byTMax3;
unsigned long ulSQ3TH; unsigned long ulSQ3TH;
unsigned long uDiversityCnt; unsigned long uDiversityCnt;
BYTE byAntennaState; u8 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;
...@@ -571,248 +554,242 @@ struct vnt_private { ...@@ -571,248 +554,242 @@ struct vnt_private {
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;
int bPWBitOn;
WMAC_POWER_MODE ePSMode; WMAC_POWER_MODE ePSMode;
unsigned long ulPSModeWaitTx; unsigned long ulPSModeWaitTx;
BOOL bPSModeTxBurst; int bPSModeTxBurst;
// Beacon releated /* Beacon releated */
WORD wSeqCounter; u16 wSeqCounter;
BOOL bBeaconBufReady; int bBeaconBufReady;
BOOL bBeaconSent; int bBeaconSent;
BOOL bFixRate; int bFixRate;
BYTE byCurrentCh; u8 byCurrentCh;
unsigned int uScanTime; u32 uScanTime;
CMD_STATE eCommandState; CMD_STATE eCommandState;
CMD_CODE eCommand; CMD_CODE eCommand;
BOOL bBeaconTx; int bBeaconTx;
BYTE byScanBBType; u8 byScanBBType;
BOOL bStopBeacon; int bStopBeacon;
BOOL bStopDataPkt; int bStopDataPkt;
BOOL bStopTx0Pkt; int bStopTx0Pkt;
unsigned int uAutoReConnectTime; u32 uAutoReConnectTime;
unsigned int uIsroamingTime; u32 uIsroamingTime;
// 802.11 counter /* 802.11 counter */
CMD_ITEM eCmdQueue[CMD_Q_SIZE]; CMD_ITEM eCmdQueue[CMD_Q_SIZE];
unsigned int uCmdDequeueIdx; u32 uCmdDequeueIdx;
unsigned int uCmdEnqueueIdx; u32 uCmdEnqueueIdx;
unsigned int cbFreeCmdQueue; u32 cbFreeCmdQueue;
BOOL bCmdRunning; int bCmdRunning;
BOOL bCmdClear; int bCmdClear;
BOOL bNeedRadioOFF; int bNeedRadioOFF;
BOOL bEnableRoaming; int bEnableRoaming;
BOOL bIsRoaming; int bIsRoaming;
BOOL bFastRoaming; int bFastRoaming;
BYTE bSameBSSMaxNum; u8 bSameBSSMaxNum;
BYTE bSameBSSCurNum; u8 bSameBSSCurNum;
BOOL bRoaming; int bRoaming;
BOOL b11hEable; int b11hEable;
unsigned long ulTxPower; unsigned long ulTxPower;
// Encryption /* Encryption */
NDIS_802_11_WEP_STATUS eEncryptionStatus; NDIS_802_11_WEP_STATUS eEncryptionStatus;
BOOL bTransmitKey; int bTransmitKey;
//mike add :save old Encryption
NDIS_802_11_WEP_STATUS eOldEncryptionStatus; NDIS_802_11_WEP_STATUS eOldEncryptionStatus;
SKeyManagement sKey; SKeyManagement sKey;
DWORD dwIVCounter; u32 dwIVCounter;
RC4Ext SBox; RC4Ext SBox;
BYTE abyPRNG[WLAN_WEPMAX_KEYLEN+3]; u8 abyPRNG[WLAN_WEPMAX_KEYLEN+3];
BYTE byKeyIndex; u8 byKeyIndex;
BOOL bAES; int bAES;
unsigned int uKeyLength; u32 uKeyLength;
BYTE abyKey[WLAN_WEP232_KEYLEN]; u8 abyKey[WLAN_WEP232_KEYLEN];
// for AP mode /* for AP mode */
unsigned int uAssocCount; u32 uAssocCount;
BOOL bMoreData; int bMoreData;
// QoS /* QoS */
BOOL bGrpAckPolicy; int bGrpAckPolicy;
BYTE byAutoFBCtrl; u8 byAutoFBCtrl;
BOOL bTxMICFail; int bTxMICFail;
BOOL bRxMICFail; int bRxMICFail;
// For Update BaseBand VGA Gain Offset /* For Update BaseBand VGA Gain Offset */
BOOL bUpdateBBVGA; int bUpdateBBVGA;
unsigned int uBBVGADiffCount; u32 uBBVGADiffCount;
BYTE byBBVGANew; u8 byBBVGANew;
BYTE byBBVGACurrent; u8 byBBVGACurrent;
BYTE abyBBVGA[BB_VGA_LEVEL]; u8 abyBBVGA[BB_VGA_LEVEL];
signed long ldBmThreshold[BB_VGA_LEVEL]; signed long ldBmThreshold[BB_VGA_LEVEL];
BYTE byBBPreEDRSSI; u8 byBBPreEDRSSI;
BYTE byBBPreEDIndex; u8 byBBPreEDIndex;
BOOL bRadioCmd;
DWORD dwDiagRefCount;
// For FOE Tuning int bRadioCmd;
BYTE byFOETuning; u32 dwDiagRefCount;
// For Auto Power Tunning /* For FOE Tuning */
u8 byFOETuning;
BYTE byAutoPwrTunning; /* For Auto Power Tunning */
u8 byAutoPwrTunning;
// BaseBand Loopback Use /* BaseBand Loopback Use */
BYTE byBBCR4d; u8 byBBCR4d;
BYTE byBBCRc9; u8 byBBCRc9;
BYTE byBBCR88; u8 byBBCR88;
BYTE byBBCR09; u8 byBBCR09;
// command timer /* command timer */
struct timer_list sTimerCommand; struct timer_list sTimerCommand;
struct timer_list sTimerTxData; struct timer_list sTimerTxData;
unsigned long nTxDataTimeCout; unsigned long nTxDataTimeCout;
BOOL fTxDataInSleep; int fTxDataInSleep;
BOOL IsTxDataTrigger; int IsTxDataTrigger;
BOOL fWPA_Authened; //is WPA/WPA-PSK or WPA2/WPA2-PSK authen?? int fWPA_Authened; /*is WPA/WPA-PSK or WPA2/WPA2-PSK authen?? */
BYTE byReAssocCount; //mike add:re-association retry times! u8 byReAssocCount;
BYTE byLinkWaitCount; u8 byLinkWaitCount;
SEthernetHeader sTxEthHeader; SEthernetHeader sTxEthHeader;
SEthernetHeader sRxEthHeader; SEthernetHeader sRxEthHeader;
BYTE abyBroadcastAddr[ETH_ALEN]; u8 abyBroadcastAddr[ETH_ALEN];
BYTE abySNAP_RFC1042[ETH_ALEN]; u8 abySNAP_RFC1042[ETH_ALEN];
BYTE abySNAP_Bridgetunnel[ETH_ALEN]; u8 abySNAP_Bridgetunnel[ETH_ALEN];
// Pre-Authentication & PMK cache /* Pre-Authentication & PMK cache */
SPMKID gsPMKID; SPMKID gsPMKID;
SPMKIDCandidateEvent gsPMKIDCandidate; SPMKIDCandidateEvent gsPMKIDCandidate;
// for 802.11h /* for 802.11h */
BOOL b11hEnable; int b11hEnable;
BOOL bChannelSwitch; int bChannelSwitch;
BYTE byNewChannel; u8 byNewChannel;
BYTE byChannelSwitchCount; u8 byChannelSwitchCount;
//WPA supplicant daemon /* WPA supplicant daemon */
struct net_device *wpadev; int bWPADEVUp;
BOOL bWPADEVUp; int bwextstep0;
//-- int bwextstep1;
int bwextstep2;
int bwextstep3;
int bWPASuppWextEnabled;
BOOL bwextstep0; /* user space daemon: hostapd, is used for HOSTAP */
BOOL bwextstep1; int bEnableHostapd;
BOOL bwextstep2; int bEnable8021x;
BOOL bwextstep3; int bEnableHostWEP;
BOOL bWPASuppWextEnabled;
#ifdef HOSTAP
// user space daemon: hostapd, is used for HOSTAP
BOOL bEnableHostapd;
BOOL bEnable8021x;
BOOL bEnableHostWEP;
struct net_device *apdev; struct net_device *apdev;
int (*tx_80211)(struct sk_buff *skb, struct net_device *dev); int (*tx_80211)(struct sk_buff *skb, struct net_device *dev);
#endif
unsigned int uChannel;
struct iw_statistics wstats; // wireless stats u32 uChannel;
BOOL bCommit;
struct iw_statistics wstats; /* wireless stats */
int 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