From df88297cad3e438e774e13137af8eaff53c0fc7f Mon Sep 17 00:00:00 2001 From: bde Date: Thu, 22 Oct 1998 05:58:45 +0000 Subject: 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 --- sys/dev/sr/if_sr.c | 5 +++-- sys/dev/sr/if_sr_isa.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'sys/dev/sr') diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c index 236bb42..85cbb70 100644 --- a/sys/dev/sr/if_sr.c +++ b/sys/dev/sr/if_sr.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_sr.c,v 1.14 1998/06/17 13:54:56 bde Exp $ + * $Id: if_sr.c,v 1.15 1998/06/21 14:53:12 bde Exp $ */ /* @@ -270,6 +270,7 @@ struct sr_hardc *srattach_pci(int unit, vm_offset_t plx_vaddr, void srintr_hc(struct sr_hardc *hc); static int srattach(struct sr_hardc *hc); +static ointhand2_t srintr; static void sr_xmit(struct sr_softc *sc); static void srstart(struct ifnet *ifp); static int srioctl(struct ifnet *ifp, u_long cmd, caddr_t data); @@ -864,7 +865,7 @@ srattach(struct sr_hardc *hc) * See if there is other interrupts pending. * Repeat until there no interrupts remain. */ -void +static void srintr(int unit) { struct sr_hardc *hc; diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c index 236bb42..85cbb70 100644 --- a/sys/dev/sr/if_sr_isa.c +++ b/sys/dev/sr/if_sr_isa.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_sr.c,v 1.14 1998/06/17 13:54:56 bde Exp $ + * $Id: if_sr.c,v 1.15 1998/06/21 14:53:12 bde Exp $ */ /* @@ -270,6 +270,7 @@ struct sr_hardc *srattach_pci(int unit, vm_offset_t plx_vaddr, void srintr_hc(struct sr_hardc *hc); static int srattach(struct sr_hardc *hc); +static ointhand2_t srintr; static void sr_xmit(struct sr_softc *sc); static void srstart(struct ifnet *ifp); static int srioctl(struct ifnet *ifp, u_long cmd, caddr_t data); @@ -864,7 +865,7 @@ srattach(struct sr_hardc *hc) * See if there is other interrupts pending. * Repeat until there no interrupts remain. */ -void +static void srintr(int unit) { struct sr_hardc *hc; -- cgit v1.1