diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1996-09-06 23:09:20 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1996-09-06 23:09:20 +0000 |
| commit | bfbb029d8745290a139bf3b15d942717e986fd9f (patch) | |
| tree | 35dad08bf59366e84921fd4aad9718c2f9426a1b /sys/dev/de | |
| parent | cb3c44d7878864912ded33f7f1c468863ae4b43d (diff) | |
Notes
Diffstat (limited to 'sys/dev/de')
| -rw-r--r-- | sys/dev/de/if_de.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index 3078142fd84c..32c3e6a8b8de 100644 --- a/sys/dev/de/if_de.c +++ b/sys/dev/de/if_de.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_de.c,v 1.48 1996/06/14 05:25:32 davidg Exp $ + * $Id: if_de.c,v 1.49 1996/08/06 21:09:25 phk Exp $ * */ @@ -46,7 +46,6 @@ #include <sys/kernel.h> #include <sys/proc.h> /* only for declaration of wakeup() used by vm.h */ #if defined(__FreeBSD__) -#include <sys/devconf.h> #include <machine/clock.h> #elif defined(__bsdi__) || defined(__NetBSD__) #include <sys/device.h> @@ -3712,17 +3711,14 @@ static const int tulip_eisa_irqs[4] = { IRQ5, IRQ9, IRQ10, IRQ11 }; static int tulip_pci_shutdown( - struct kern_devconf * const kdc, + int unit, int force) { - if (kdc->kdc_unit < tulip_count) { - tulip_softc_t * const sc = TULIP_UNIT_TO_SOFTC(kdc->kdc_unit); - TULIP_CSR_WRITE(sc, csr_busmode, TULIP_BUSMODE_SWRESET); - DELAY(10); /* Wait 10 microseconds (actually 50 PCI cycles but at - 33MHz that comes to two microseconds but wait a - bit longer anyways) */ - } - (void) dev_detach(kdc); + tulip_softc_t * const sc = TULIP_UNIT_TO_SOFTC(unit); + TULIP_CSR_WRITE(sc, csr_busmode, TULIP_BUSMODE_SWRESET); + DELAY(10); /* Wait 10 microseconds (actually 50 PCI cycles but at + 33MHz that comes to two microseconds but wait a + bit longer anyways) */ return 0; } |
