git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
cs89x0.h
diff --git
a/drivers/net/cs89x0.h
b/drivers/net/cs89x0.h
index
b0ef7ad
..
bd954aa
100644
(file)
--- a/
drivers/net/cs89x0.h
+++ b/
drivers/net/cs89x0.h
@@
-16,13
+16,6
@@
#include <linux/config.h>
#include <linux/config.h>
-#ifdef CONFIG_ARCH_IXDP2X01
-/* IXDP2401/IXDP2801 uses dword-aligned register addressing */
-#define CS89x0_PORT(reg) ((reg) * 2)
-#else
-#define CS89x0_PORT(reg) (reg)
-#endif
-
#define PP_ChipID 0x0000 /* offset 0h -> Corp -ID */
/* offset 2h -> Model/Product Number */
/* offset 3h -> Chip Revision Number */
#define PP_ChipID 0x0000 /* offset 0h -> Corp -ID */
/* offset 2h -> Model/Product Number */
/* offset 3h -> Chip Revision Number */
@@
-93,6
+86,7
@@
#endif
#define CHIP_EISA_ID_SIG 0x630E /* Product ID Code for Crystal Chip (CS8900 spec 4.3) */
#endif
#define CHIP_EISA_ID_SIG 0x630E /* Product ID Code for Crystal Chip (CS8900 spec 4.3) */
+#define CHIP_EISA_ID_SIG_STR "0x630E"
#ifdef IBMEIPKT
#define EISA_ID_SIG 0x4D24 /* IBM */
#ifdef IBMEIPKT
#define EISA_ID_SIG 0x4D24 /* IBM */
@@
-331,16
+325,16
@@
#define RAM_SIZE 0x1000 /* The card has 4k bytes or RAM */
#define PKT_START PP_TxFrame /* Start of packet RAM */
#define RAM_SIZE 0x1000 /* The card has 4k bytes or RAM */
#define PKT_START PP_TxFrame /* Start of packet RAM */
-#define RX_FRAME_PORT
CS89x0_PORT(0x0000)
+#define RX_FRAME_PORT
0x0000
#define TX_FRAME_PORT RX_FRAME_PORT
#define TX_FRAME_PORT RX_FRAME_PORT
-#define TX_CMD_PORT
CS89x0_PORT(0x0004)
+#define TX_CMD_PORT
0x0004
#define TX_NOW 0x0000 /* Tx packet after 5 bytes copied */
#define TX_AFTER_381 0x0040 /* Tx packet after 381 bytes copied */
#define TX_AFTER_ALL 0x00c0 /* Tx packet after all bytes copied */
#define TX_NOW 0x0000 /* Tx packet after 5 bytes copied */
#define TX_AFTER_381 0x0040 /* Tx packet after 381 bytes copied */
#define TX_AFTER_ALL 0x00c0 /* Tx packet after all bytes copied */
-#define TX_LEN_PORT
CS89x0_PORT(0x0006)
-#define ISQ_PORT
CS89x0_PORT(0x0008)
-#define ADD_PORT
CS89x0_PORT(0x000A)
-#define DATA_PORT
CS89x0_PORT(0x000C)
+#define TX_LEN_PORT
0x0006
+#define ISQ_PORT
0x0008
+#define ADD_PORT
0x000A
+#define DATA_PORT
0x000C
#define EEPROM_WRITE_EN 0x00F0
#define EEPROM_WRITE_DIS 0x0000
#define EEPROM_WRITE_EN 0x00F0
#define EEPROM_WRITE_DIS 0x0000