diff options
Diffstat (limited to 'sys/dev/isa/if_ne_isa.c')
| -rw-r--r-- | sys/dev/isa/if_ne_isa.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/sys/dev/isa/if_ne_isa.c b/sys/dev/isa/if_ne_isa.c index 76484db6f86..025ae84abdb 100644 --- a/sys/dev/isa/if_ne_isa.c +++ b/sys/dev/isa/if_ne_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_isa.c,v 1.4 1999/04/30 07:20:29 fgsch Exp $ */ +/* $OpenBSD: if_ne_isa.c,v 1.5 2001/03/12 05:36:59 aaron Exp $ */ /* $NetBSD: if_ne_isa.c,v 1.6 1998/07/05 06:49:13 jonathan Exp $ */ /*- @@ -170,17 +170,10 @@ ne_isa_attach(parent, self, aux) bus_space_handle_t nich; bus_space_tag_t asict = nict; bus_space_handle_t asich; - void (*npp_init_media) __P((struct dp8390_softc *, int **, - int *, int *)); - int *media, nmedia, defmedia; const char *typestr; printf("\n"); - npp_init_media = NULL; - media = NULL; - nmedia = defmedia = 0; - /* Map i/o space. */ if (bus_space_map(nict, ia->ia_iobase, NE2000_NPORTS, 0, &nich)) { printf("%s: can't map i/o space\n", dsc->sc_dev.dv_xname); @@ -216,10 +209,10 @@ ne_isa_attach(parent, self, aux) bus_space_read_1(nict, nich, NERTL_RTL0_8019ID1) == RTL0_8019ID1) { typestr = "NE2000 (RTL8019)"; - npp_init_media = rtl80x9_init_media; dsc->sc_mediachange = rtl80x9_mediachange; dsc->sc_mediastatus = rtl80x9_mediastatus; dsc->init_card = rtl80x9_init_card; + dsc->sc_media_init = rtl80x9_media_init; } break; @@ -230,10 +223,6 @@ ne_isa_attach(parent, self, aux) printf("%s: %s Ethernet\n", dsc->sc_dev.dv_xname, typestr); - /* Initialize media, if we have it. */ - if (npp_init_media != NULL) - (*npp_init_media)(dsc, &media, &nmedia, &defmedia); - /* This interface is always enabled. */ dsc->sc_enabled = 1; @@ -241,7 +230,7 @@ ne_isa_attach(parent, self, aux) * Do generic NE2000 attach. This will read the station address * from the EEPROM. */ - ne2000_attach(nsc, NULL, media, nmedia, defmedia); + ne2000_attach(nsc, NULL); /* Establish the interrupt handler. */ isc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE, |