aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/et131x/et131x_adapter.h
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-06-10 12:30:41 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 15:01:26 -0400
commit64f930361bede4e049509858bcef8b333399547f (patch)
tree6d32e7f5ca0fd9c6178afc06c793a54c3ba20656 /drivers/staging/et131x/et131x_adapter.h
parent297f06cea635ea4552541a11e7fb7014425110c6 (diff)
Staging: et1310: Fix the coding style
UTF-8 for copyright symbols etc included. Typedefs and anything else which would cause actual code changes skipped. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et131x_adapter.h')
-rw-r--r--drivers/staging/et131x/et131x_adapter.h72
1 files changed, 36 insertions, 36 deletions
diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h
index 36e61a47ae2..2b553199680 100644
--- a/drivers/staging/et131x/et131x_adapter.h
+++ b/drivers/staging/et131x/et131x_adapter.h
@@ -2,7 +2,7 @@
2 * Agere Systems Inc. 2 * Agere Systems Inc.
3 * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs 3 * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs
4 * 4 *
5 * Copyright © 2005 Agere Systems Inc. 5 * Copyright © 2005 Agere Systems Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * http://www.agere.com 7 * http://www.agere.com
8 * 8 *
@@ -20,7 +20,7 @@
20 * software indicates your acceptance of these terms and conditions. If you do 20 * software indicates your acceptance of these terms and conditions. If you do
21 * not agree with these terms and conditions, do not use the software. 21 * not agree with these terms and conditions, do not use the software.
22 * 22 *
23 * Copyright © 2005 Agere Systems Inc. 23 * Copyright © 2005 Agere Systems Inc.
24 * All rights reserved. 24 * All rights reserved.
25 * 25 *
26 * Redistribution and use in source or binary forms, with or without 26 * Redistribution and use in source or binary forms, with or without
@@ -41,7 +41,7 @@
41 * 41 *
42 * Disclaimer 42 * Disclaimer
43 * 43 *
44 * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, 44 * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
45 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF 45 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
46 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY 46 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY
47 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN 47 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
@@ -67,7 +67,7 @@
67 * Do not change these values: if changed, then change also in respective 67 * Do not change these values: if changed, then change also in respective
68 * TXdma and Rxdma engines 68 * TXdma and Rxdma engines
69 */ 69 */
70#define NUM_DESC_PER_RING_TX 512 // TX Do not change these values 70#define NUM_DESC_PER_RING_TX 512 /* TX Do not change these values */
71#define NUM_TCB 64 71#define NUM_TCB 64
72 72
73/* 73/*
@@ -118,10 +118,10 @@
118 118
119#define MP_SHOULD_FAIL_SEND(_M) ((_M)->Flags & fMP_ADAPTER_FAIL_SEND_MASK) 119#define MP_SHOULD_FAIL_SEND(_M) ((_M)->Flags & fMP_ADAPTER_FAIL_SEND_MASK)
120#define MP_IS_NOT_READY(_M) ((_M)->Flags & fMP_ADAPTER_NOT_READY_MASK) 120#define MP_IS_NOT_READY(_M) ((_M)->Flags & fMP_ADAPTER_NOT_READY_MASK)
121#define MP_IS_READY(_M) !((_M)->Flags & fMP_ADAPTER_NOT_READY_MASK) 121#define MP_IS_READY(_M) (!((_M)->Flags & fMP_ADAPTER_NOT_READY_MASK))
122 122
123#define MP_HAS_CABLE(_M) !((_M)->Flags & fMP_ADAPTER_NO_CABLE) 123#define MP_HAS_CABLE(_M) (!((_M)->Flags & fMP_ADAPTER_NO_CABLE))
124#define MP_LINK_DETECTED(_M) !((_M)->Flags & fMP_ADAPTER_LINK_DETECTION) 124#define MP_LINK_DETECTED(_M) (!((_M)->Flags & fMP_ADAPTER_LINK_DETECTION))
125 125
126/* Counters for error rate monitoring */ 126/* Counters for error rate monitoring */
127typedef struct _MP_ERR_COUNTERS { 127typedef struct _MP_ERR_COUNTERS {
@@ -136,7 +136,7 @@ typedef struct _MP_ERR_COUNTERS {
136typedef struct _MP_RFD { 136typedef struct _MP_RFD {
137 struct list_head list_node; 137 struct list_head list_node;
138 struct sk_buff *Packet; 138 struct sk_buff *Packet;
139 u32 PacketSize; // total size of receive frame 139 u32 PacketSize; /* total size of receive frame */
140 u16 iBufferIndex; 140 u16 iBufferIndex;
141 u8 iRingIndex; 141 u8 iRingIndex;
142} MP_RFD, *PMP_RFD; 142} MP_RFD, *PMP_RFD;
@@ -152,8 +152,8 @@ typedef enum _eflow_control_t {
152/* Struct to define some device statistics */ 152/* Struct to define some device statistics */
153typedef struct _ce_stats_t { 153typedef struct _ce_stats_t {
154 /* Link Input/Output stats */ 154 /* Link Input/Output stats */
155 uint64_t ipackets; // # of in packets 155 uint64_t ipackets; /* # of in packets */
156 uint64_t opackets; // # of out packets 156 uint64_t opackets; /* # of out packets */
157 157
158 /* MIB II variables 158 /* MIB II variables
159 * 159 *
@@ -161,21 +161,21 @@ typedef struct _ce_stats_t {
161 * MUST have 32, then we'll need another way to perform atomic 161 * MUST have 32, then we'll need another way to perform atomic
162 * operations 162 * operations
163 */ 163 */
164 u32 unircv; // # multicast packets received 164 u32 unircv; /* # multicast packets received */
165 atomic_t unixmt; // # multicast packets for Tx 165 atomic_t unixmt; /* # multicast packets for Tx */
166 u32 multircv; // # multicast packets received 166 u32 multircv; /* # multicast packets received */
167 atomic_t multixmt; // # multicast packets for Tx 167 atomic_t multixmt; /* # multicast packets for Tx */
168 u32 brdcstrcv; // # broadcast packets received 168 u32 brdcstrcv; /* # broadcast packets received */
169 atomic_t brdcstxmt; // # broadcast packets for Tx 169 atomic_t brdcstxmt; /* # broadcast packets for Tx */
170 u32 norcvbuf; // # Rx packets discarded 170 u32 norcvbuf; /* # Rx packets discarded */
171 u32 noxmtbuf; // # Tx packets discarded 171 u32 noxmtbuf; /* # Tx packets discarded */
172 172
173 /* Transciever state informations. */ 173 /* Transciever state informations. */
174 u8 xcvr_addr; 174 u8 xcvr_addr;
175 u32 xcvr_id; 175 u32 xcvr_id;
176 176
177 /* Tx Statistics. */ 177 /* Tx Statistics. */
178 u32 tx_uflo; // Tx Underruns 178 u32 tx_uflo; /* Tx Underruns */
179 179
180 u32 collisions; 180 u32 collisions;
181 u32 excessive_collisions; 181 u32 excessive_collisions;
@@ -185,7 +185,7 @@ typedef struct _ce_stats_t {
185 u32 tx_deferred; 185 u32 tx_deferred;
186 186
187 /* Rx Statistics. */ 187 /* Rx Statistics. */
188 u32 rx_ov_flow; // Rx Over Flow 188 u32 rx_ov_flow; /* Rx Over Flow */
189 189
190 u32 length_err; 190 u32 length_err;
191 u32 alignment_err; 191 u32 alignment_err;
@@ -268,16 +268,16 @@ struct et131x_adapter {
268 u32 pci_cfg_state[64 / sizeof(u32)]; 268 u32 pci_cfg_state[64 / sizeof(u32)];
269 269
270 /* Registry parameters */ 270 /* Registry parameters */
271 u8 SpeedDuplex; // speed/duplex 271 u8 SpeedDuplex; /* speed/duplex */
272 eFLOW_CONTROL_t RegistryFlowControl; // for 802.3x flow control 272 eFLOW_CONTROL_t RegistryFlowControl; /* for 802.3x flow control */
273 u8 RegistryWOLMatch; // Enable WOL pattern-matching 273 u8 RegistryWOLMatch; /* Enable WOL pattern-matching */
274 u8 RegistryWOLLink; // Link state change is independant 274 u8 RegistryWOLLink; /* Link state change is independant */
275 u8 RegistryPhyComa; // Phy Coma mode enable/disable 275 u8 RegistryPhyComa; /* Phy Coma mode enable/disable */
276 276
277 u32 RegistryRxMemEnd; // Size of internal rx memory 277 u32 RegistryRxMemEnd; /* Size of internal rx memory */
278 u8 RegistryMACStat; // If set, read MACSTAT, else don't 278 u8 RegistryMACStat; /* If set, read MACSTAT, else don't */
279 u32 RegistryVlanTag; // 802.1q Vlan TAG 279 u32 RegistryVlanTag; /* 802.1q Vlan TAG */
280 u32 RegistryJumboPacket; // Max supported ethernet packet size 280 u32 RegistryJumboPacket; /* Max supported ethernet packet size */
281 281
282 u32 RegistryTxNumBuffers; 282 u32 RegistryTxNumBuffers;
283 u32 RegistryTxTimeInterval; 283 u32 RegistryTxTimeInterval;
@@ -290,12 +290,12 @@ struct et131x_adapter {
290 u8 RegistryNMIDisable; 290 u8 RegistryNMIDisable;
291 u32 RegistryDMACache; 291 u32 RegistryDMACache;
292 u32 RegistrySCGain; 292 u32 RegistrySCGain;
293 u8 RegistryPhyLoopbk; // Enable Phy loopback 293 u8 RegistryPhyLoopbk; /* Enable Phy loopback */
294 294
295 /* Derived from the registry: */ 295 /* Derived from the registry: */
296 u8 AiForceDpx; // duplex setting 296 u8 AiForceDpx; /* duplex setting */
297 u16 AiForceSpeed; // 'Speed', user over-ride of line speed 297 u16 AiForceSpeed; /* 'Speed', user over-ride of line speed */
298 eFLOW_CONTROL_t FlowControl; // flow control validated by the far-end 298 eFLOW_CONTROL_t FlowControl; /* flow control validated by the far-end */
299 enum { 299 enum {
300 NETIF_STATUS_INVALID = 0, 300 NETIF_STATUS_INVALID = 0,
301 NETIF_STATUS_MEDIA_CONNECT, 301 NETIF_STATUS_MEDIA_CONNECT,
@@ -313,7 +313,7 @@ struct et131x_adapter {
313 MP_POWER_MGMT PoMgmt; 313 MP_POWER_MGMT PoMgmt;
314 INTERRUPT_t CachedMaskValue; 314 INTERRUPT_t CachedMaskValue;
315 315
316 atomic_t RcvRefCount; // Num packets not yet returned 316 atomic_t RcvRefCount; /* Num packets not yet returned */
317 317
318 /* Xcvr status at last poll */ 318 /* Xcvr status at last poll */
319 MI_BMSR_t Bmsr; 319 MI_BMSR_t Bmsr;
@@ -329,8 +329,8 @@ struct et131x_adapter {
329 PCI_CFG_SPACE_REGS PciCfgRegs; 329 PCI_CFG_SPACE_REGS PciCfgRegs;
330 330
331 /* Loopback specifics */ 331 /* Loopback specifics */
332 u8 ReplicaPhyLoopbk; // Replica Enable 332 u8 ReplicaPhyLoopbk; /* Replica Enable */
333 u8 ReplicaPhyLoopbkPF; // Replica Enable Pass/Fail 333 u8 ReplicaPhyLoopbkPF; /* Replica Enable Pass/Fail */
334 334
335 /* Stats */ 335 /* Stats */
336 CE_STATS_t Stats; 336 CE_STATS_t Stats;