aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tlan.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/tlan.h')
-rw-r--r--drivers/net/tlan.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/tlan.h b/drivers/net/tlan.h
index 5d32bc62bef8..a44e2f2ef62a 100644
--- a/drivers/net/tlan.h
+++ b/drivers/net/tlan.h
@@ -9,13 +9,13 @@
9 * 9 *
10 * (C) 1997-1998 Caldera, Inc. 10 * (C) 1997-1998 Caldera, Inc.
11 * (C) 1999-2001 Torben Mathiasen 11 * (C) 1999-2001 Torben Mathiasen
12 * 12 *
13 * This software may be used and distributed according to the terms 13 * This software may be used and distributed according to the terms
14 * of the GNU General Public License, incorporated herein by reference. 14 * of the GNU General Public License, incorporated herein by reference.
15 * 15 *
16 ** This file is best viewed/edited with tabstop=4, colums>=132 16 ** This file is best viewed/edited with tabstop=4, colums>=132
17 * 17 *
18 * 18 *
19 * Dec 10, 1999 Torben Mathiasen <torben.mathiasen@compaq.com> 19 * Dec 10, 1999 Torben Mathiasen <torben.mathiasen@compaq.com>
20 * New Maintainer 20 * New Maintainer
21 * 21 *
@@ -48,7 +48,7 @@
48#define TLAN_DBG(lvl, format, args...) if (debug&lvl) printk(KERN_DEBUG "TLAN: " format, ##args ); 48#define TLAN_DBG(lvl, format, args...) if (debug&lvl) printk(KERN_DEBUG "TLAN: " format, ##args );
49#define TLAN_DEBUG_GNRL 0x0001 49#define TLAN_DEBUG_GNRL 0x0001
50#define TLAN_DEBUG_TX 0x0002 50#define TLAN_DEBUG_TX 0x0002
51#define TLAN_DEBUG_RX 0x0004 51#define TLAN_DEBUG_RX 0x0004
52#define TLAN_DEBUG_LIST 0x0008 52#define TLAN_DEBUG_LIST 0x0008
53#define TLAN_DEBUG_PROBE 0x0010 53#define TLAN_DEBUG_PROBE 0x0010
54 54
@@ -60,7 +60,7 @@
60 * Device Identification Definitions 60 * Device Identification Definitions
61 * 61 *
62 ****************************************************************/ 62 ****************************************************************/
63 63
64#define PCI_DEVICE_ID_NETELLIGENT_10_T2 0xB012 64#define PCI_DEVICE_ID_NETELLIGENT_10_T2 0xB012
65#define PCI_DEVICE_ID_NETELLIGENT_10_100_WS_5100 0xB030 65#define PCI_DEVICE_ID_NETELLIGENT_10_100_WS_5100 0xB030
66#ifndef PCI_DEVICE_ID_OLICOM_OC2183 66#ifndef PCI_DEVICE_ID_OLICOM_OC2183
@@ -102,11 +102,11 @@ typedef struct tlan_adapter_entry {
102 * 102 *
103 ****************************************************************/ 103 ****************************************************************/
104 104
105#define EISA_ID 0xc80 /* EISA ID Registers */ 105#define EISA_ID 0xc80 /* EISA ID Registers */
106#define EISA_ID0 0xc80 /* EISA ID Register 0 */ 106#define EISA_ID0 0xc80 /* EISA ID Register 0 */
107#define EISA_ID1 0xc81 /* EISA ID Register 1 */ 107#define EISA_ID1 0xc81 /* EISA ID Register 1 */
108#define EISA_ID2 0xc82 /* EISA ID Register 2 */ 108#define EISA_ID2 0xc82 /* EISA ID Register 2 */
109#define EISA_ID3 0xc83 /* EISA ID Register 3 */ 109#define EISA_ID3 0xc83 /* EISA ID Register 3 */
110#define EISA_CR 0xc84 /* EISA Control Register */ 110#define EISA_CR 0xc84 /* EISA Control Register */
111#define EISA_REG0 0xc88 /* EISA Configuration Register 0 */ 111#define EISA_REG0 0xc88 /* EISA Configuration Register 0 */
112#define EISA_REG1 0xc89 /* EISA Configuration Register 1 */ 112#define EISA_REG1 0xc89 /* EISA Configuration Register 1 */
@@ -447,7 +447,7 @@ static inline u8 TLan_DioRead8(u16 base_addr, u16 internal_addr)
447{ 447{
448 outw(internal_addr, base_addr + TLAN_DIO_ADR); 448 outw(internal_addr, base_addr + TLAN_DIO_ADR);
449 return (inb((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x3))); 449 return (inb((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x3)));
450 450
451} /* TLan_DioRead8 */ 451} /* TLan_DioRead8 */
452 452
453 453
@@ -505,8 +505,8 @@ static inline void TLan_DioWrite32(u16 base_addr, u16 internal_addr, u32 data)
505#define TLan_SetBit( bit, port ) outb_p(inb_p(port) | bit, port) 505#define TLan_SetBit( bit, port ) outb_p(inb_p(port) | bit, port)
506 506
507/* 507/*
508 * given 6 bytes, view them as 8 6-bit numbers and return the XOR of those 508 * given 6 bytes, view them as 8 6-bit numbers and return the XOR of those
509 * the code below is about seven times as fast as the original code 509 * the code below is about seven times as fast as the original code
510 * 510 *
511 * The original code was: 511 * The original code was:
512 * 512 *