diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-10-20 18:27:26 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-10-20 18:27:26 +0000 |
| commit | 04c51fd42d84ad343e77a4cc4e3b81e41ecffb69 (patch) | |
| tree | 3af643e55fa0ae76ccb59da993b059fda9492897 /sys/dev/ic | |
| parent | 111d6ebe613c941a6144b3af2733e9b3c5e63fb3 (diff) | |
use the ASIX AX88190 defines from ax88190reg.h and remove some
AX88190 specific defines from ne2000reg.h
From NetBSD
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/ne2000.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/ne2000reg.h | 13 |
2 files changed, 5 insertions, 14 deletions
diff --git a/sys/dev/ic/ne2000.c b/sys/dev/ic/ne2000.c index 62fb33b8156..d0b0a554496 100644 --- a/sys/dev/ic/ne2000.c +++ b/sys/dev/ic/ne2000.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ne2000.c,v 1.21 2006/10/20 17:11:39 brad Exp $ */ +/* $OpenBSD: ne2000.c,v 1.22 2006/10/20 18:27:25 brad Exp $ */ /* $NetBSD: ne2000.c,v 1.12 1998/06/10 01:15:50 thorpej Exp $ */ /*- @@ -78,6 +78,8 @@ #include <dev/ic/ne2000reg.h> #include <dev/ic/ne2000var.h> +#include <dev/ic/ax88190reg.h> + int ne2000_write_mbuf(struct dp8390_softc *, struct mbuf *, int); int ne2000_ring_copy(struct dp8390_softc *, int, caddr_t, u_short); void ne2000_read_hdr(struct dp8390_softc *, int, struct dp8390_ring *); @@ -250,7 +252,7 @@ ne2000_attach(struct ne2000_softc *nsc, u_int8_t *myea) bus_space_write_1(nict, nich, ED_P0_DCR, ED_DCR_WTS); NIC_BARRIER(nict, nich); ne2000_readmem(nict, nich, asict, asich, - NE2000_AX88190_NODEID_OFFSET, + AX88190_NODEID_OFFSET, dsc->sc_arpcom.ac_enaddr, ETHER_ADDR_LEN, useword); } else { ne2000_readmem(nict, nich, asict, asich, 0, romdata, diff --git a/sys/dev/ic/ne2000reg.h b/sys/dev/ic/ne2000reg.h index 84565d7ec10..4fc2d982559 100644 --- a/sys/dev/ic/ne2000reg.h +++ b/sys/dev/ic/ne2000reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ne2000reg.h,v 1.2 2000/05/30 14:31:39 fgsch Exp $ */ +/* $OpenBSD: ne2000reg.h,v 1.3 2006/10/20 18:27:25 brad Exp $ */ /* $NetBSD: ne2000reg.h,v 1.2 1997/10/14 22:54:11 thorpej Exp $ */ /* @@ -30,15 +30,4 @@ #define NE2000_ASIC_DATA 0x00 /* remote DMA/data register */ #define NE2000_ASIC_RESET 0x0f /* reset on read */ -/* - * Offset of NODE ID in SRAM memory of ASIX AX88190. - */ -#define NE2000_AX88190_NODEID_OFFSET 0x400 - -/* - * Offset of LAN IOBASE0 and IOBASE1, and its size. - */ -#define NE2000_AX88190_LAN_IOBASE 0x3ca -#define NE2000_AX88190_LAN_IOSIZE 4 - #endif /* _DEV_IC_NE2000REG_H_ */ |