summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraaron <aaron@openbsd.org>2001-08-18 16:50:03 +0000
committeraaron <aaron@openbsd.org>2001-08-18 16:50:03 +0000
commitfdccb99473b97cfd91880eb048afcf77348a0e5e (patch)
tree4776f4609ff84cf9d648f14f239fc1fd433db350
parentofwboot.net compiles/links, too (diff)
downloadwireguard-openbsd-fdccb99473b97cfd91880eb048afcf77348a0e5e.tar.xz
wireguard-openbsd-fdccb99473b97cfd91880eb048afcf77348a0e5e.zip
Make use of ax88190_stop_card and dl10019_stop_card.
-rw-r--r--sys/dev/ic/dp8390.c5
-rw-r--r--sys/dev/ic/dp8390var.h3
-rw-r--r--sys/dev/pcmcia/if_ne_pcmcia.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index b2db45c8b4b..819c04c2420 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dp8390.c,v 1.17 2001/07/09 17:22:12 fgsch Exp $ */
+/* $OpenBSD: dp8390.c,v 1.18 2001/08/18 16:50:03 aaron Exp $ */
/* $NetBSD: dp8390.c,v 1.13 1998/07/05 06:49:11 jonathan Exp $ */
/*
@@ -221,6 +221,9 @@ dp8390_stop(sc)
while (((NIC_GET(regt, regh,
ED_P0_ISR) & ED_ISR_RST) == 0) && --n)
;
+
+ if (sc->stop_card != NULL)
+ (*sc->stop_card)(sc);
}
/*
diff --git a/sys/dev/ic/dp8390var.h b/sys/dev/ic/dp8390var.h
index d04b3f88a5d..0c959364151 100644
--- a/sys/dev/ic/dp8390var.h
+++ b/sys/dev/ic/dp8390var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dp8390var.h,v 1.5 2001/03/29 01:39:32 aaron Exp $ */
+/* $OpenBSD: dp8390var.h,v 1.6 2001/08/18 16:50:03 aaron Exp $ */
/* $NetBSD: dp8390var.h,v 1.8 1998/08/12 07:19:09 scottr Exp $ */
/*
@@ -67,6 +67,7 @@ struct dp8390_softc {
int (*test_mem) __P((struct dp8390_softc *));
void (*init_card) __P((struct dp8390_softc *));
+ void (*stop_card) __P((struct dp8390_softc *));
void (*read_hdr) __P((struct dp8390_softc *,
int, struct dp8390_ring *));
void (*recv_int) __P((struct dp8390_softc *));
diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index 40fad01a5bb..e83cd62d8cc 100644
--- a/sys/dev/pcmcia/if_ne_pcmcia.c
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ne_pcmcia.c,v 1.53 2001/08/18 16:19:01 aaron Exp $ */
+/* $OpenBSD: if_ne_pcmcia.c,v 1.54 2001/08/18 16:50:03 aaron Exp $ */
/* $NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $ */
/*
@@ -648,6 +648,7 @@ again:
dsc->sc_mediachange = ax88190_mediachange;
dsc->sc_mediastatus = ax88190_mediastatus;
dsc->init_card = ax88190_init_card;
+ dsc->stop_card = ax88190_stop_card;
dsc->sc_media_init = ax88190_media_init;
dsc->sc_media_fini = ax88190_media_fini;
@@ -674,6 +675,7 @@ again:
dsc->sc_mediachange = dl10019_mediachange;
dsc->sc_mediastatus = dl10019_mediastatus;
dsc->init_card = dl10019_init_card;
+ dsc->stop_card = dl10019_stop_card;
dsc->sc_media_init = dl10019_media_init;
dsc->sc_media_fini = dl10019_media_fini;
}