From 3ba88ec4647ddd8ae50851cd7fed45a680aef936 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 7 Sep 2005 03:20:33 +0000 Subject: o Expose ed_probe_Novel_generic, it is useful for pccard case. o Fix a now stale comment. There are likely many others like them, but this one definitely hasn't been true since DELAY was introduced into the tree. --- sys/dev/ed/if_ed_novell.c | 7 ++----- sys/dev/ed/if_edvar.h | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'sys/dev/ed') diff --git a/sys/dev/ed/if_ed_novell.c b/sys/dev/ed/if_ed_novell.c index 2d763a2b4281..032dc572d748 100644 --- a/sys/dev/ed/if_ed_novell.c +++ b/sys/dev/ed/if_ed_novell.c @@ -64,7 +64,7 @@ static int ed_probe_gwether(device_t); /* * Probe and vendor-specific initialization routine for NE1000/2000 boards */ -static int +int ed_probe_Novell_generic(device_t dev, int flags) { struct ed_softc *sc = device_get_softc(dev); @@ -84,10 +84,7 @@ ed_probe_Novell_generic(device_t dev, int flags) /* * I don't know if this is necessary; probably cruft leftover from * Clarkson packet driver code. Doesn't do a thing on the boards I've - * tested. -DG [note that an outb(0x84, 0) seems to work here, and is - * non-invasive...but some boards don't seem to reset and I don't have - * complete documentation on what the 'right' thing to do is...so we - * do the invasive thing for now. Yuck.] + * tested. -DG */ ed_asic_outb(sc, ED_NOVELL_RESET, tmp); DELAY(5000); diff --git a/sys/dev/ed/if_edvar.h b/sys/dev/ed/if_edvar.h index f125d38376ae..571e7c21d1d9 100644 --- a/sys/dev/ed/if_edvar.h +++ b/sys/dev/ed/if_edvar.h @@ -196,6 +196,7 @@ int ed_probe_3Com(device_t, int, int); #ifdef ED_SIC int ed_probe_SIC(device_t, int, int); #endif +int ed_probe_Novell_generic(device_t, int); int ed_probe_Novell(device_t, int, int); void ed_Novell_read_mac(struct ed_softc *); #ifdef ED_HPP -- cgit v1.3