diff options
| author | bde <bde@FreeBSD.org> | 1998-10-22 05:58:45 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-10-22 05:58:45 +0000 |
| commit | df88297cad3e438e774e13137af8eaff53c0fc7f (patch) | |
| tree | d694ec5d94b6e29be85865e36be61cbb2bea66dc /sys/dev/ar | |
| parent | 7a07480a8f242db0c438040f3beb4ce7b2c7cde2 (diff) | |
| download | FreeBSD-src-df88297cad3e438e774e13137af8eaff53c0fc7f.zip FreeBSD-src-df88297cad3e438e774e13137af8eaff53c0fc7f.tar.gz | |
Initialize isa_devtab entries for interrupt handlers in individual
device drivers, not in ioconf.c. Use a different hack in isa_device.h
so that a new config(8) is not required yet.
pc98 parts approved by: kato
Diffstat (limited to 'sys/dev/ar')
| -rw-r--r-- | sys/dev/ar/if_ar.c | 6 | ||||
| -rw-r--r-- | sys/dev/ar/if_ar_isa.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c index adebd22..374aed9 100644 --- a/sys/dev/ar/if_ar.c +++ b/sys/dev/ar/if_ar.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ar.c,v 1.21 1998/06/21 14:53:10 bde Exp $ + * $Id: if_ar.c,v 1.22 1998/08/24 02:28:15 bde Exp $ */ /* @@ -178,6 +178,7 @@ static int irqtable[16] = { struct isa_driver ardriver = {arprobe, arattach, "arc"}; +static ointhand2_t arintr; static void ar_xmit(struct ar_softc *sc); static void arstart(struct ifnet *ifp); static int arioctl(struct ifnet *ifp, u_long cmd, caddr_t data); @@ -296,6 +297,7 @@ arattach(struct isa_device *id) int unit; char *iface; + id->id_ointr = arintr; switch(hc->interface) { default: iface = "UNKNOWN"; break; case AR_IFACE_EIA_232: iface = "EIA-232"; break; @@ -378,7 +380,7 @@ arattach(struct isa_device *id) * See if there is other interrupts pending. * Repeat until there is no more interrupts. */ -void +static void arintr(int unit) { struct ar_hardc *hc = &ar_hardc[unit]; diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c index adebd22..374aed9 100644 --- a/sys/dev/ar/if_ar_isa.c +++ b/sys/dev/ar/if_ar_isa.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ar.c,v 1.21 1998/06/21 14:53:10 bde Exp $ + * $Id: if_ar.c,v 1.22 1998/08/24 02:28:15 bde Exp $ */ /* @@ -178,6 +178,7 @@ static int irqtable[16] = { struct isa_driver ardriver = {arprobe, arattach, "arc"}; +static ointhand2_t arintr; static void ar_xmit(struct ar_softc *sc); static void arstart(struct ifnet *ifp); static int arioctl(struct ifnet *ifp, u_long cmd, caddr_t data); @@ -296,6 +297,7 @@ arattach(struct isa_device *id) int unit; char *iface; + id->id_ointr = arintr; switch(hc->interface) { default: iface = "UNKNOWN"; break; case AR_IFACE_EIA_232: iface = "EIA-232"; break; @@ -378,7 +380,7 @@ arattach(struct isa_device *id) * See if there is other interrupts pending. * Repeat until there is no more interrupts. */ -void +static void arintr(int unit) { struct ar_hardc *hc = &ar_hardc[unit]; |
