Commit 4ec4aa4a authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman

staging:vt6655:device: Whitespace cleanups

Neatening only.
git diff -w shows no differences.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78a717d8
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
// BUILD OBJ mode // BUILD OBJ mode
#define AVAIL_TD(p,q) ((p)->sOpts.nTxDescs[(q)]-((p)->iTDUsed[(q)])) #define AVAIL_TD(p, q) ((p)->sOpts.nTxDescs[(q)] - ((p)->iTDUsed[(q)]))
//PLICE_DEBUG -> //PLICE_DEBUG ->
#define NUM 64 #define NUM 64
...@@ -159,13 +159,13 @@ ...@@ -159,13 +159,13 @@
/*--------------------- Export Types ------------------------------*/ /*--------------------- Export Types ------------------------------*/
#define DBG_PRT(l, p, args...) {if (l<=msglevel) printk( p ,##args);} #define DBG_PRT(l, p, args...) { if (l <= msglevel) printk(p, ##args); }
#define PRINT_K(p, args...) {if (PRIVATE_Message) printk( p ,##args);} #define PRINT_K(p, args...) { if (PRIVATE_Message) printk(p, ##args); }
//0:11A 1:11B 2:11G //0:11A 1:11B 2:11G
typedef enum _VIA_BB_TYPE typedef enum _VIA_BB_TYPE
{ {
BB_TYPE_11A=0, BB_TYPE_11A = 0,
BB_TYPE_11B, BB_TYPE_11B,
BB_TYPE_11G BB_TYPE_11G
} VIA_BB_TYPE, *PVIA_BB_TYPE; } VIA_BB_TYPE, *PVIA_BB_TYPE;
...@@ -173,7 +173,7 @@ typedef enum _VIA_BB_TYPE ...@@ -173,7 +173,7 @@ typedef enum _VIA_BB_TYPE
//0:11a,1:11b,2:11gb(only CCK in BasicRate),3:11ga(OFDM in Basic Rate) //0:11a,1:11b,2:11gb(only CCK in BasicRate),3:11ga(OFDM in Basic Rate)
typedef enum _VIA_PKT_TYPE typedef enum _VIA_PKT_TYPE
{ {
PK_TYPE_11A=0, PK_TYPE_11A = 0,
PK_TYPE_11B, PK_TYPE_11B,
PK_TYPE_11GB, PK_TYPE_11GB,
PK_TYPE_11GA PK_TYPE_11GA
...@@ -181,15 +181,15 @@ typedef enum _VIA_PKT_TYPE ...@@ -181,15 +181,15 @@ typedef enum _VIA_PKT_TYPE
typedef enum __device_msg_level { typedef enum __device_msg_level {
MSG_LEVEL_ERR=0, //Errors that will cause abnormal operation. MSG_LEVEL_ERR = 0, //Errors that will cause abnormal operation.
MSG_LEVEL_NOTICE=1, //Some errors need users to be notified. MSG_LEVEL_NOTICE = 1, //Some errors need users to be notified.
MSG_LEVEL_INFO=2, //Normal message. MSG_LEVEL_INFO = 2, //Normal message.
MSG_LEVEL_VERBOSE=3, //Will report all trival errors. MSG_LEVEL_VERBOSE = 3, //Will report all trival errors.
MSG_LEVEL_DEBUG=4 //Only for debug purpose. MSG_LEVEL_DEBUG = 4 //Only for debug purpose.
} DEVICE_MSG_LEVEL, *PDEVICE_MSG_LEVEL; } DEVICE_MSG_LEVEL, *PDEVICE_MSG_LEVEL;
typedef enum __device_init_type { typedef enum __device_init_type {
DEVICE_INIT_COLD=0, // cold init DEVICE_INIT_COLD = 0, // cold init
DEVICE_INIT_RESET, // reset init or Dx to D0 power remain init DEVICE_INIT_RESET, // reset init or Dx to D0 power remain init
DEVICE_INIT_DXPL // Dx to D0 power lost init DEVICE_INIT_DXPL // Dx to D0 power lost init
} DEVICE_INIT_TYPE, *PDEVICE_INIT_TYPE; } DEVICE_INIT_TYPE, *PDEVICE_INIT_TYPE;
...@@ -271,9 +271,9 @@ typedef struct tagSQuietControl { ...@@ -271,9 +271,9 @@ typedef struct tagSQuietControl {
} SQuietControl, *PSQuietControl; } SQuietControl, *PSQuietControl;
//-- //--
typedef struct __chip_info_tbl{ typedef struct __chip_info_tbl {
CHIP_TYPE chip_id; CHIP_TYPE chip_id;
char* name; char *name;
int io_size; int io_size;
int nTxQueue; int nTxQueue;
u32 flags; u32 flags;
...@@ -281,21 +281,21 @@ typedef struct __chip_info_tbl{ ...@@ -281,21 +281,21 @@ typedef struct __chip_info_tbl{
typedef enum { typedef enum {
OWNED_BY_HOST=0, OWNED_BY_HOST = 0,
OWNED_BY_NIC=1 OWNED_BY_NIC = 1
} DEVICE_OWNER_TYPE, *PDEVICE_OWNER_TYPE; } DEVICE_OWNER_TYPE, *PDEVICE_OWNER_TYPE;
// The receive duplicate detection cache entry // The receive duplicate detection cache entry
typedef struct tagSCacheEntry{ typedef struct tagSCacheEntry {
unsigned short wFmSequence; unsigned short wFmSequence;
unsigned char abyAddr2[ETH_ALEN]; unsigned char abyAddr2[ETH_ALEN];
} SCacheEntry, *PSCacheEntry; } SCacheEntry, *PSCacheEntry;
typedef struct tagSCache{ typedef struct tagSCache {
/* The receive cache is updated circularly. The next entry to be written is /* The receive cache is updated circularly. The next entry to be written is
* indexed by the "InPtr". * indexed by the "InPtr".
*/ */
unsigned int uInPtr; // Place to use next unsigned int uInPtr; // Place to use next
SCacheEntry asCacheEntry[DUPLICATE_RX_CACHE_LENGTH]; SCacheEntry asCacheEntry[DUPLICATE_RX_CACHE_LENGTH];
} SCache, *PSCache; } SCache, *PSCache;
...@@ -308,7 +308,7 @@ typedef struct tagSDeFragControlBlock ...@@ -308,7 +308,7 @@ typedef struct tagSDeFragControlBlock
unsigned short wFragNum; unsigned short wFragNum;
unsigned char abyAddr2[ETH_ALEN]; unsigned char abyAddr2[ETH_ALEN];
unsigned int uLifetime; unsigned int uLifetime;
struct sk_buff* skb; struct sk_buff *skb;
unsigned char *pbyRxBuffer; unsigned char *pbyRxBuffer;
unsigned int cbFrameLength; unsigned int cbFrameLength;
bool bInUse; bool bInUse;
...@@ -350,9 +350,9 @@ typedef struct tagSDeFragControlBlock ...@@ -350,9 +350,9 @@ typedef struct tagSDeFragControlBlock
typedef struct _RxManagementQueue typedef struct _RxManagementQueue
{ {
int packet_num; int packet_num;
int head,tail; int head, tail;
PSRxMgmtPacket Q[NUM]; PSRxMgmtPacket Q[NUM];
} RxManagementQueue,*PSRxManagementQueue; } RxManagementQueue, *PSRxManagementQueue;
...@@ -376,18 +376,18 @@ typedef struct __device_opt { ...@@ -376,18 +376,18 @@ typedef struct __device_opt {
typedef struct __device_info { typedef struct __device_info {
struct __device_info* next; struct __device_info *next;
struct __device_info* prev; struct __device_info *prev;
struct pci_dev* pcid; struct pci_dev *pcid;
#ifdef CONFIG_PM #ifdef CONFIG_PM
u32 pci_state[16]; u32 pci_state[16];
#endif #endif
// netdev // netdev
struct net_device* dev; struct net_device *dev;
struct net_device* next_module; struct net_device *next_module;
struct net_device_stats stats; struct net_device_stats stats;
//dma addr, rx/tx pool //dma addr, rx/tx pool
...@@ -787,7 +787,7 @@ typedef struct __device_info { ...@@ -787,7 +787,7 @@ typedef struct __device_info {
bool bwextstep1; bool bwextstep1;
bool bwextstep2; bool bwextstep2;
bool bwextstep3; bool bwextstep3;
*/ */
unsigned int bwextcount; unsigned int bwextcount;
bool bWPASuppWextEnabled; bool bWPASuppWextEnabled;
#endif #endif
...@@ -813,17 +813,17 @@ typedef struct __device_info { ...@@ -813,17 +813,17 @@ typedef struct __device_info {
//PLICE_DEBUG-> //PLICE_DEBUG->
inline static void EnQueue (PSDevice pDevice,PSRxMgmtPacket pRxMgmtPacket) inline static void EnQueue(PSDevice pDevice, PSRxMgmtPacket pRxMgmtPacket)
{ {
//printk("Enter EnQueue:tail is %d\n",pDevice->rxManeQueue.tail); //printk("Enter EnQueue:tail is %d\n",pDevice->rxManeQueue.tail);
if ((pDevice->rxManeQueue.tail+1) % NUM == pDevice->rxManeQueue.head) if ((pDevice->rxManeQueue.tail+1) % NUM == pDevice->rxManeQueue.head)
{ {
//printk("Queue is Full,tail is %d\n",pDevice->rxManeQueue.tail); //printk("Queue is Full,tail is %d\n",pDevice->rxManeQueue.tail);
return ; return;
} }
else else
{ {
pDevice->rxManeQueue.tail = (pDevice->rxManeQueue.tail+1)% NUM; pDevice->rxManeQueue.tail = (pDevice->rxManeQueue.tail + 1) % NUM;
pDevice->rxManeQueue.Q[pDevice->rxManeQueue.tail] = pRxMgmtPacket; pDevice->rxManeQueue.Q[pDevice->rxManeQueue.tail] = pRxMgmtPacket;
pDevice->rxManeQueue.packet_num++; pDevice->rxManeQueue.packet_num++;
//printk("packet num is %d\n",pDevice->rxManeQueue.packet_num); //printk("packet num is %d\n",pDevice->rxManeQueue.packet_num);
...@@ -833,7 +833,7 @@ typedef struct __device_info { ...@@ -833,7 +833,7 @@ typedef struct __device_info {
inline static PSRxMgmtPacket DeQueue (PSDevice pDevice) inline static PSRxMgmtPacket DeQueue(PSDevice pDevice)
{ {
PSRxMgmtPacket pRxMgmtPacket; PSRxMgmtPacket pRxMgmtPacket;
if (pDevice->rxManeQueue.tail == pDevice->rxManeQueue.head) if (pDevice->rxManeQueue.tail == pDevice->rxManeQueue.head)
...@@ -866,13 +866,13 @@ void InitRxManagementQueue(PSDevice pDevice); ...@@ -866,13 +866,13 @@ void InitRxManagementQueue(PSDevice pDevice);
inline static bool device_get_ip(PSDevice pInfo) { inline static bool device_get_ip(PSDevice pInfo) {
struct in_device* in_dev=(struct in_device*) pInfo->dev->ip_ptr; struct in_device *in_dev = (struct in_device *)pInfo->dev->ip_ptr;
struct in_ifaddr* ifa; struct in_ifaddr *ifa;
if (in_dev!=NULL) { if (in_dev != NULL) {
ifa=(struct in_ifaddr*) in_dev->ifa_list; ifa = (struct in_ifaddr *)in_dev->ifa_list;
if (ifa!=NULL) { if (ifa != NULL) {
memcpy(pInfo->abyIPAddr,&ifa->ifa_address,4); memcpy(pInfo->abyIPAddr, &ifa->ifa_address, 4);
return true; return true;
} }
} }
......
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