diff options
Diffstat (limited to 'drivers/net/8390.h')
| -rw-r--r-- | drivers/net/8390.h | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/drivers/net/8390.h b/drivers/net/8390.h index f44f1220b3a5..fae4aa92c4b7 100644 --- a/drivers/net/8390.h +++ b/drivers/net/8390.h | |||
| @@ -116,26 +116,23 @@ struct ei_device { | |||
| 116 | #undef outb | 116 | #undef outb |
| 117 | #undef outb_p | 117 | #undef outb_p |
| 118 | 118 | ||
| 119 | #define inb(port) in_8(port) | 119 | #define ei_inb(port) in_8(port) |
| 120 | #define outb(val,port) out_8(port,val) | 120 | #define ei_outb(val,port) out_8(port,val) |
| 121 | #define inb_p(port) in_8(port) | 121 | #define ei_inb_p(port) in_8(port) |
| 122 | #define outb_p(val,port) out_8(port,val) | 122 | #define ei_outb_p(val,port) out_8(port,val) |
| 123 | 123 | ||
| 124 | #elif defined(CONFIG_ARM_ETHERH) || defined(CONFIG_ARM_ETHERH_MODULE) | 124 | #elif defined(CONFIG_NE_H8300) || defined(CONFIG_NE_H8300_MODULE) |
| 125 | #define EI_SHIFT(x) (ei_local->reg_offset[x]) | 125 | #define EI_SHIFT(x) (ei_local->reg_offset[x]) |
| 126 | #undef inb | 126 | #endif |
| 127 | #undef inb_p | ||
| 128 | #undef outb | ||
| 129 | #undef outb_p | ||
| 130 | 127 | ||
| 131 | #define inb(_p) readb(_p) | 128 | #ifndef ei_inb |
| 132 | #define outb(_v,_p) writeb(_v,_p) | 129 | #define ei_inb(_p) inb(_p) |
| 133 | #define inb_p(_p) inb(_p) | 130 | #define ei_outb(_v,_p) outb(_v,_p) |
| 134 | #define outb_p(_v,_p) outb(_v,_p) | 131 | #define ei_inb_p(_p) inb_p(_p) |
| 132 | #define ei_outb_p(_v,_p) outb_p(_v,_p) | ||
| 133 | #endif | ||
| 135 | 134 | ||
| 136 | #elif defined(CONFIG_NE_H8300) || defined(CONFIG_NE_H8300_MODULE) | 135 | #ifndef EI_SHIFT |
| 137 | #define EI_SHIFT(x) (ei_local->reg_offset[x]) | ||
| 138 | #else | ||
| 139 | #define EI_SHIFT(x) (x) | 136 | #define EI_SHIFT(x) (x) |
| 140 | #endif | 137 | #endif |
| 141 | 138 | ||