summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655/device.h
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-03-18 20:55:41 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-25 11:16:17 -0700
commit96d69e201bbdb05c363e899138f9f42bc8ad8f88 (patch)
treef3ba7f8c5436cfbce1617f415febbd681fe78fd4 /drivers/staging/vt6655/device.h
parentbda2a44e2a015535f08aecd5c98e263098db9e75 (diff)
downloadop-kernel-dev-96d69e201bbdb05c363e899138f9f42bc8ad8f88.zip
op-kernel-dev-96d69e201bbdb05c363e899138f9f42bc8ad8f88.tar.gz
staging: vt6655: Remove unnecessary blank lines
Remove a bunch of useless vertical whitespace. Convert 3 or more consecutive newlines to 2. Remove blank lines after open brace and before close brace. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/device.h')
-rw-r--r--drivers/staging/vt6655/device.h57
1 files changed, 0 insertions, 57 deletions
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 07f5af9..ca1b857 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -87,7 +87,6 @@
#include "key.h"
#include "mac.h"
-
/*--------------------- Export Definitions -------------------------*/
#define MAC_MAX_CONTEXT_REG (256+128)
@@ -111,8 +110,6 @@
#define KEYSEL_TKIP 2
#define KEYSEL_CCMP 3
-
-
#define AUTO_FB_NONE 0
#define AUTO_FB_0 1
#define AUTO_FB_1 2
@@ -133,8 +130,6 @@
#define BB_VGA_LEVEL 4
#define BB_VGA_CHANGE_THRESHOLD 16
-
-
#ifndef RUN_AT
#define RUN_AT(x) (jiffies+(x))
#endif
@@ -142,23 +137,18 @@
// DMA related
#define RESERV_AC0DMA 4
-
// BUILD OBJ mode
-
#define AVAIL_TD(p, q) ((p)->sOpts.nTxDescs[(q)] - ((p)->iTDUsed[(q)]))
//PLICE_DEBUG ->
#define NUM 64
//PLICE_DEUBG <-
-
-
#define PRIVATE_Message 0
/*--------------------- Export Types ------------------------------*/
-
#define DBG_PRT(l, p, args...) { if (l <= msglevel) printk(p, ##args); }
#define PRINT_K(p, args...) { if (PRIVATE_Message) printk(p, ##args); }
@@ -179,7 +169,6 @@ typedef enum _VIA_PKT_TYPE
PK_TYPE_11GA
} VIA_PKT_TYPE, *PVIA_PKT_TYPE;
-
typedef enum __device_msg_level {
MSG_LEVEL_ERR = 0, //Errors that will cause abnormal operation.
MSG_LEVEL_NOTICE = 1, //Some errors need users to be notified.
@@ -194,7 +183,6 @@ typedef enum __device_init_type {
DEVICE_INIT_DXPL // Dx to D0 power lost init
} DEVICE_INIT_TYPE, *PDEVICE_INIT_TYPE;
-
//++ NDIS related
#define MAX_BSSIDINFO_4_PMKID 16
@@ -205,7 +193,6 @@ typedef enum __device_init_type {
// PMKID Structures
typedef unsigned char NDIS_802_11_PMKID_VALUE[16];
-
typedef enum _NDIS_802_11_WEP_STATUS
{
Ndis802_11WEPEnabled,
@@ -223,7 +210,6 @@ typedef enum _NDIS_802_11_WEP_STATUS
} NDIS_802_11_WEP_STATUS, *PNDIS_802_11_WEP_STATUS,
NDIS_802_11_ENCRYPTION_STATUS, *PNDIS_802_11_ENCRYPTION_STATUS;
-
typedef enum _NDIS_802_11_STATUS_TYPE
{
Ndis802_11StatusType_Authentication,
@@ -238,7 +224,6 @@ typedef struct _PMKID_CANDIDATE {
unsigned long Flags;
} PMKID_CANDIDATE, *PPMKID_CANDIDATE;
-
typedef struct _BSSID_INFO
{
NDIS_802_11_MAC_ADDRESS BSSID;
@@ -279,13 +264,11 @@ typedef struct __chip_info_tbl {
u32 flags;
} CHIP_INFO, *PCHIP_INFO;
-
typedef enum {
OWNED_BY_HOST = 0,
OWNED_BY_NIC = 1
} DEVICE_OWNER_TYPE, *PDEVICE_OWNER_TYPE;
-
// The receive duplicate detection cache entry
typedef struct tagSCacheEntry {
unsigned short wFmSequence;
@@ -314,8 +297,6 @@ typedef struct tagSDeFragControlBlock
bool bInUse;
} SDeFragControlBlock, *PSDeFragControlBlock;
-
-
//flags for options
#define DEVICE_FLAGS_IP_ALIGN 0x00000001UL
#define DEVICE_FLAGS_PREAMBLE_TYPE 0x00000002UL
@@ -343,10 +324,8 @@ typedef struct tagSDeFragControlBlock
//for device_set_media_duplex
#define DEVICE_LINK_CHANGE 0x00000001UL
-
//PLICE_DEBUG->
-
typedef struct _RxManagementQueue
{
int packet_num;
@@ -354,11 +333,8 @@ typedef struct _RxManagementQueue
PSRxMgmtPacket Q[NUM];
} RxManagementQueue, *PSRxManagementQueue;
-
-
//PLICE_DEBUG<-
-
typedef struct __device_opt {
int nRxDescs0; //Number of RX descriptors0
int nRxDescs1; //Number of RX descriptors1
@@ -374,7 +350,6 @@ typedef struct __device_opt {
u32 flags;
} OPTIONS, *POPTIONS;
-
typedef struct __device_info {
struct __device_info *next;
struct __device_info *prev;
@@ -456,7 +431,6 @@ typedef struct __device_info {
struct semaphore mlme_semaphore;
//PLICE_DEBUG <-
-
u32 rx_bytes;
// Version control
@@ -476,7 +450,6 @@ typedef struct __device_info {
// 802.11 counter
SDot11Counters s802_11Counter;
-
// 802.11 management
PSMgmtObject pMgmt;
SMgmtObject sMgmtObj;
@@ -507,7 +480,6 @@ typedef struct __device_info {
unsigned char byCWMaxMin;
CARD_PHY_TYPE eCurrentPHYType;
-
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)
unsigned short wBasicRate;
@@ -559,7 +531,6 @@ typedef struct __device_info {
bool bPWBitOn;
WMAC_POWER_MODE ePSMode;
-
// GPIO Radio Control
unsigned char byRadioCtl;
unsigned char byGPIO;
@@ -597,8 +568,6 @@ typedef struct __device_info {
bool bCmdRunning;
bool bCmdClear;
-
-
bool bRoaming;
//WOW
unsigned char abyIPAddr[4];
@@ -635,16 +604,13 @@ typedef struct __device_info {
// for OID_802_11_ASSOCIATION_INFORMATION
bool bAssocInfoSet;
-
unsigned char byAutoFBCtrl;
bool bTxMICFail;
bool bRxMICFail;
-
unsigned int uRATEIdx;
-
// For Update BaseBand VGA Gain Offset
bool bUpdateBBVGA;
unsigned int uBBVGADiffCount;
@@ -656,7 +622,6 @@ typedef struct __device_info {
unsigned char byBBPreEDRSSI;
unsigned char byBBPreEDIndex;
-
bool bRadioCmd;
unsigned long dwDiagRefCount;
@@ -686,7 +651,6 @@ typedef struct __device_info {
char abyRegPwr[CB_MAX_CHANNEL+1];
char abyLocalPwr[CB_MAX_CHANNEL+1];
-
// BaseBand Loopback Use
unsigned char byBBCR4d;
unsigned char byBBCRc9;
@@ -708,7 +672,6 @@ typedef struct __device_info {
unsigned char byReAssocCount; //mike add:re-association retry times!
unsigned char byLinkWaitCount;
-
unsigned char abyNodeName[17];
bool bDiversityRegCtlON;
@@ -731,11 +694,9 @@ typedef struct __device_info {
struct timer_list TimerSQ3Tmax2;
struct timer_list TimerSQ3Tmax3;
-
unsigned long uNumSQ3[MAX_RATE];
unsigned short wAntDiversityMaxRate;
-
SEthernetHeader sTxEthHeader;
SEthernetHeader sRxEthHeader;
unsigned char abyBroadcastAddr[ETH_ALEN];
@@ -746,7 +707,6 @@ typedef struct __device_info {
SPMKID gsPMKID;
SPMKIDCandidateEvent gsPMKIDCandidate;
-
// for 802.11h
bool b11hEnable;
unsigned char abyCountryCode[3];
@@ -806,13 +766,10 @@ typedef struct __device_info {
struct iw_statistics wstats; // wireless stats
bool bCommit;
-
} DEVICE_INFO, *PSDevice;
-
//PLICE_DEBUG->
-
inline static void EnQueue(PSDevice pDevice, PSRxMgmtPacket pRxMgmtPacket)
{
if ((pDevice->rxManeQueue.tail+1) % NUM == pDevice->rxManeQueue.head) {
@@ -824,9 +781,6 @@ inline static void EnQueue(PSDevice pDevice, PSRxMgmtPacket pRxMgmtPacket)
}
}
-
-
-
inline static PSRxMgmtPacket DeQueue(PSDevice pDevice)
{
PSRxMgmtPacket pRxMgmtPacket;
@@ -846,15 +800,8 @@ inline static PSRxMgmtPacket DeQueue(PSDevice pDevice)
void InitRxManagementQueue(PSDevice pDevice);
-
-
//PLICE_DEBUG<-
-
-
-
-
-
inline static bool device_get_ip(PSDevice pInfo) {
struct in_device *in_dev = (struct in_device *)pInfo->dev->ip_ptr;
struct in_ifaddr *ifa;
@@ -869,8 +816,6 @@ inline static bool device_get_ip(PSDevice pInfo) {
return false;
}
-
-
static inline PDEVICE_RD_INFO alloc_rd_info(void)
{
return kzalloc(sizeof(DEVICE_RD_INFO), GFP_ATOMIC);
@@ -887,5 +832,3 @@ bool device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeI
bool device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF);
int Config_FileOperation(PSDevice pDevice, bool fwrite, unsigned char *Parameter);
#endif
-
-
OpenPOWER on IntegriCloud