diff options
| author | sommerfeld <sommerfeld@NetBSD.org> | 2000-12-28 22:59:06 +0000 |
|---|---|---|
| committer | sommerfeld <sommerfeld@NetBSD.org> | 2000-12-28 22:59:06 +0000 |
| commit | 851de295ebb3bb79664436236423c73ef6f04a28 (patch) | |
| tree | 8bba5aa7ca8521de3dbea0faafb6d727dda0ec30 /sys/dev | |
| parent | 7490542205ba83d44ce216b7f540884721e4773e (diff) | |
Change pci_intr_map to get interrupt source information from a "struct
pci_attach_args *" instead of from four separate parameters which in
all cases were extracted from the same "struct pci_attach_args".
This both simplifies the driver api, and allows for alternate PCI
interrupt mapping schemes, such as one using the tables described in
the Intel Multiprocessor Spec which describe interrupt wirings for
devices behind pci-pci bridges based on the device's location rather
the bridge's location.
Tested on alpha and i386; welcome to 1.5Q
Diffstat (limited to 'sys/dev')
56 files changed, 118 insertions, 178 deletions
diff --git a/sys/dev/pci/adv_pci.c b/sys/dev/pci/adv_pci.c index 750813acd7f..0e38ca163a0 100644 --- a/sys/dev/pci/adv_pci.c +++ b/sys/dev/pci/adv_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: adv_pci.c,v 1.7 1999/06/12 12:09:58 dante Exp $ */ +/* $NetBSD: adv_pci.c,v 1.8 2000/12/28 22:59:11 sommerfeld Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. @@ -232,8 +232,7 @@ adv_pci_attach(parent, self, aux) /* * Map Interrupt line */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/adw_pci.c b/sys/dev/pci/adw_pci.c index 5e3afc9c353..eb12efe61b8 100644 --- a/sys/dev/pci/adw_pci.c +++ b/sys/dev/pci/adw_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: adw_pci.c,v 1.7 2000/05/26 15:13:46 dante Exp $ */ +/* $NetBSD: adw_pci.c,v 1.8 2000/12/28 22:59:11 sommerfeld Exp $ */ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -183,8 +183,7 @@ adw_pci_attach(parent, self, aux) /* * Map Interrupt line */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c index e3d418d2e26..b325625fe32 100644 --- a/sys/dev/pci/ahc_pci.c +++ b/sys/dev/pci/ahc_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ahc_pci.c,v 1.27 2000/09/24 12:37:03 jdolecek Exp $ */ +/* $NetBSD: ahc_pci.c,v 1.28 2000/12/28 22:59:11 sommerfeld Exp $ */ /* * Product specific probe and attach routines for: @@ -731,8 +731,7 @@ ahc_pci_attach(parent, self, aux) |TARGCRCENDEN|TARGCRCCNTEN); } - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", ahc->sc_dev.dv_xname); ahc_free(ahc); return; diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c index f92fc1d847f..e8d90986f05 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $NetBSD: auich.c,v 1.2 2000/11/28 16:57:16 thorpej Exp $ */ +/* $NetBSD: auich.c,v 1.3 2000/12/28 22:59:11 sommerfeld Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -335,8 +335,7 @@ auich_attach(struct device *parent, struct device *self, void *aux) csr | PCI_COMMAND_MASTER_ENABLE); /* Map and establish the interrupt. */ - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: can't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c index f4a879da2e9..5c87820bfe8 100644 --- a/sys/dev/pci/auvia.c +++ b/sys/dev/pci/auvia.c @@ -1,4 +1,4 @@ -/* $NetBSD: auvia.c,v 1.8 2000/12/10 15:43:02 jdolecek Exp $ */ +/* $NetBSD: auvia.c,v 1.9 2000/12/28 22:59:11 sommerfeld Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -238,8 +238,7 @@ auvia_attach(struct device *parent, struct device *self, void *aux) printf(": VIA VT82C686A AC'97 Audio (rev %s)\n", sc->sc_revision); - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, pa->pa_intrline, - &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/bha_pci.c b/sys/dev/pci/bha_pci.c index a469f3ea26e..020b7259fd0 100644 --- a/sys/dev/pci/bha_pci.c +++ b/sys/dev/pci/bha_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: bha_pci.c,v 1.16 1998/08/15 10:10:53 mycroft Exp $ */ +/* $NetBSD: bha_pci.c,v 1.17 2000/12/28 22:59:11 sommerfeld Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -143,8 +143,7 @@ bha_pci_attach(parent, self, aux) pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, csr | PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_IO_ENABLE); - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c index a7e309e2218..b222cd9b62f 100644 --- a/sys/dev/pci/bktr/bktr_os.c +++ b/sys/dev/pci/bktr/bktr_os.c @@ -1,4 +1,4 @@ -/* $NetBSD: bktr_os.c,v 1.14 2000/10/28 14:50:27 wiz Exp $ */ +/* $NetBSD: bktr_os.c,v 1.15 2000/12/28 22:59:16 sommerfeld Exp $ */ /* FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.18 2000/10/15 14:18:06 phk Exp */ @@ -1387,8 +1387,7 @@ bktr_attach(struct device *parent, struct device *self, void *aux) /* * map interrupt */ - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf(": couldn't map interrupt\n"); return; } @@ -1445,8 +1444,7 @@ bktr_attach(struct device *parent, struct device *self, void *aux) /* * map interrupt */ - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", bktr_name(bktr)); return; diff --git a/sys/dev/pci/btvmei.c b/sys/dev/pci/btvmei.c index 0932537a445..8b44df6f926 100644 --- a/sys/dev/pci/btvmei.c +++ b/sys/dev/pci/btvmei.c @@ -1,4 +1,4 @@ -/* $NetBSD: btvmei.c,v 1.3 2000/08/08 20:06:48 tv Exp $ */ +/* $NetBSD: btvmei.c,v 1.4 2000/12/28 22:59:11 sommerfeld Exp $ */ /* * Copyright (c) 1999 @@ -138,8 +138,7 @@ b3_617_attach(parent, self, aux) sc->sc_vmet = pa->pa_memt; /* XXX needed for VME mappings */ /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/cac_pci.c b/sys/dev/pci/cac_pci.c index f87569eddf8..4eae3ebe10b 100644 --- a/sys/dev/pci/cac_pci.c +++ b/sys/dev/pci/cac_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: cac_pci.c,v 1.8 2000/11/09 18:19:40 ad Exp $ */ +/* $NetBSD: cac_pci.c,v 1.9 2000/12/28 22:59:11 sommerfeld Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -183,8 +183,7 @@ cac_pci_attach(struct device *parent, struct device *self, void *aux) csr | PCI_COMMAND_MASTER_ENABLE); /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("can't map interrupt\n"); return; } diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c index c5300af26b9..54501753adc 100644 --- a/sys/dev/pci/cmpci.c +++ b/sys/dev/pci/cmpci.c @@ -1,4 +1,4 @@ -/* $NetBSD: cmpci.c,v 1.4 2000/06/26 04:56:23 simonb Exp $ */ +/* $NetBSD: cmpci.c,v 1.5 2000/12/28 22:59:11 sommerfeld Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -345,8 +345,7 @@ cmpci_attach(parent, self, aux) } /* interrupt */ - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: failed to map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c index 4ebaed600ad..685675f5e96 100644 --- a/sys/dev/pci/cs4280.c +++ b/sys/dev/pci/cs4280.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4280.c,v 1.8 2000/11/26 11:08:59 takemura Exp $ */ +/* $NetBSD: cs4280.c,v 1.9 2000/12/28 22:59:11 sommerfeld Exp $ */ /* * Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved. @@ -599,8 +599,7 @@ cs4280_attach(parent, self, aux) } /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/cy_pci.c b/sys/dev/pci/cy_pci.c index 2e69374bd96..0e258163bad 100644 --- a/sys/dev/pci/cy_pci.c +++ b/sys/dev/pci/cy_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: cy_pci.c,v 1.9 2000/05/29 12:05:41 tsubai Exp $ */ +/* $NetBSD: cy_pci.c,v 1.10 2000/12/28 22:59:11 sommerfeld Exp $ */ /* * cy_pci.c @@ -168,8 +168,7 @@ cy_attach_pci(parent, self, aux) } /* Set up interrupt handler. */ - if (pci_intr_map(pap->pa_pc, pap->pa_intrtag, pap->pa_intrpin, - pap->pa_intrline, &intrhandle) != 0) { + if (pci_intr_map(pap, &intrhandle) != 0) { printf(": couldn't map PCI interrupt\n"); return; } diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c index 2ac6c48b538..f966ddcf19b 100644 --- a/sys/dev/pci/cz.c +++ b/sys/dev/pci/cz.c @@ -1,4 +1,4 @@ -/* $NetBSD: cz.c,v 1.11 2000/11/02 00:01:45 eeh Exp $ */ +/* $NetBSD: cz.c,v 1.12 2000/12/28 22:59:11 sommerfeld Exp $ */ /*- * Copyright (c) 2000 Zembu Labs, Inc. @@ -346,8 +346,7 @@ cz_attach(struct device *parent, * Now that we're ready to roll, map and establish the interrupt * handler. */ - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih) != 0) { + if (pci_intr_map(pa, &ih) != 0) { /* * The common case is for Cyclades-Z boards to run * in polling mode, and thus not have an interrupt diff --git a/sys/dev/pci/dpt_pci.c b/sys/dev/pci/dpt_pci.c index 6625d12ee9d..22d51e4d295 100644 --- a/sys/dev/pci/dpt_pci.c +++ b/sys/dev/pci/dpt_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: dpt_pci.c,v 1.6 2000/06/13 13:36:50 ad Exp $ */ +/* $NetBSD: dpt_pci.c,v 1.7 2000/12/28 22:59:11 sommerfeld Exp $ */ /* * Copyright (c) 1999 Andrew Doran <ad@NetBSD.org> @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dpt_pci.c,v 1.6 2000/06/13 13:36:50 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dpt_pci.c,v 1.7 2000/12/28 22:59:11 sommerfeld Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -120,8 +120,7 @@ dpt_pci_attach(parent, self, aux) csr | PCI_COMMAND_MASTER_ENABLE); /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("can't map interrupt\n"); return; } diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c index 07321de737a..4a8cea62e89 100644 --- a/sys/dev/pci/eap.c +++ b/sys/dev/pci/eap.c @@ -1,4 +1,4 @@ -/* $NetBSD: eap.c,v 1.41 2000/06/26 04:56:24 simonb Exp $ */ +/* $NetBSD: eap.c,v 1.42 2000/12/28 22:59:12 sommerfeld Exp $ */ /* $OpenBSD: eap.c,v 1.6 1999/10/05 19:24:42 csapuntz Exp $ */ /* @@ -617,8 +617,7 @@ eap_attach(parent, self, aux) csr | PCI_COMMAND_MASTER_ENABLE); /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/ehci_pci.c b/sys/dev/pci/ehci_pci.c index dc33dfd0568..e3489204113 100644 --- a/sys/dev/pci/ehci_pci.c +++ b/sys/dev/pci/ehci_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ehci_pci.c,v 1.2 2000/12/24 06:42:34 augustss Exp $ */ +/* $NetBSD: ehci_pci.c,v 1.3 2000/12/28 22:59:12 sommerfeld Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -122,8 +122,7 @@ ehci_pci_attach(struct device *parent, struct device *self, void *aux) csr | PCI_COMMAND_MASTER_ENABLE); /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", devname); return; } diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c index e0f661e09f2..46850525cda 100644 --- a/sys/dev/pci/eso.c +++ b/sys/dev/pci/eso.c @@ -1,4 +1,4 @@ -/* $NetBSD: eso.c,v 1.19 2000/06/26 04:56:24 simonb Exp $ */ +/* $NetBSD: eso.c,v 1.20 2000/12/28 22:59:12 sommerfeld Exp $ */ /* * Copyright (c) 1999, 2000 Klaus J. Klein @@ -308,8 +308,7 @@ eso_attach(parent, self, aux) eso_set_recsrc(sc, ESO_MIXREG_ERS_MIC); /* Map and establish the interrupt. */ - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c index 7e14214e718..c69697e0cf9 100644 --- a/sys/dev/pci/fms.c +++ b/sys/dev/pci/fms.c @@ -1,4 +1,4 @@ -/* $NetBSD: fms.c,v 1.8 2000/12/07 14:12:30 abs Exp $ */ +/* $NetBSD: fms.c,v 1.9 2000/12/28 22:59:12 sommerfeld Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -250,8 +250,7 @@ fms_attach(parent, self, aux) printf(": Forte Media FM-801\n"); - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, pa->pa_intrline, - &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/fwohci_pci.c b/sys/dev/pci/fwohci_pci.c index 6290fdd51f7..4fdc34b0eec 100644 --- a/sys/dev/pci/fwohci_pci.c +++ b/sys/dev/pci/fwohci_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwohci_pci.c,v 1.5 2000/12/13 11:30:14 enami Exp $ */ +/* $NetBSD: fwohci_pci.c,v 1.6 2000/12/28 22:59:12 sommerfeld Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -114,8 +114,7 @@ fwohci_pci_attach(struct device *parent, struct device *self, void *aux) csr | PCI_COMMAND_MASTER_ENABLE); /* Map and establish the interrupt. */ - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", self->dv_xname); return; } diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c index 9e207b88aed..bf66abfd7ab 100644 --- a/sys/dev/pci/hifn7751.c +++ b/sys/dev/pci/hifn7751.c @@ -1,4 +1,4 @@ -/* $NetBSD: hifn7751.c,v 1.1 2000/10/12 02:59:59 itojun Exp $ */ +/* $NetBSD: hifn7751.c,v 1.2 2000/12/28 22:59:12 sommerfeld Exp $ */ /* $OpenBSD: hifn7751.c,v 1.47 2000/10/11 13:15:41 itojun Exp $ */ /* @@ -250,8 +250,7 @@ hifn_attach(parent, self, aux) hifn_init_dma(sc); hifn_init_pci_registers(sc); - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf(": couldn't map interrupt\n"); goto fail_mem; } diff --git a/sys/dev/pci/if_an_pci.c b/sys/dev/pci/if_an_pci.c index 409f0d8c815..8b86ebbf2d4 100644 --- a/sys/dev/pci/if_an_pci.c +++ b/sys/dev/pci/if_an_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_an_pci.c,v 1.1 2000/12/14 04:11:25 onoe Exp $ */ +/* $NetBSD: if_an_pci.c,v 1.2 2000/12/28 22:59:12 sommerfeld Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -160,8 +160,7 @@ an_pci_attach(struct device *parent, struct device *self, void *aux) csr | PCI_COMMAND_MASTER_ENABLE); /* Map and establish the interrupt. */ - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: unable to map interrupt\n", self->dv_xname); return; } diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index 35b2755172b..d348ad3e26d 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_de.c,v 1.95 2000/11/15 01:02:14 thorpej Exp $ */ +/* $NetBSD: if_de.c,v 1.96 2000/12/28 22:59:12 sommerfeld Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -5879,8 +5879,7 @@ tulip_pci_attach( printf("\n"); - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &intrhandle)) { + if (pci_intr_map(pa, &intrhandle)) { printf("%s: couldn't map interrupt\n", sc->tulip_dev.dv_xname); return; } diff --git a/sys/dev/pci/if_en_pci.c b/sys/dev/pci/if_en_pci.c index 2a883085173..9fbd792432e 100644 --- a/sys/dev/pci/if_en_pci.c +++ b/sys/dev/pci/if_en_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_en_pci.c,v 1.13 1999/07/01 08:12:46 itojun Exp $ */ +/* $NetBSD: if_en_pci.c,v 1.14 2000/12/28 22:59:12 sommerfeld Exp $ */ /* * @@ -220,8 +220,7 @@ void *aux; * interrupt map */ - if (pci_intr_map(scp->en_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c index 8087760ebd1..80f1ac0afd7 100644 --- a/sys/dev/pci/if_ep_pci.c +++ b/sys/dev/pci/if_ep_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ep_pci.c,v 1.32 1999/02/19 06:57:56 thorpej Exp $ */ +/* $NetBSD: if_ep_pci.c,v 1.33 2000/12/28 22:59:13 sommerfeld Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -245,8 +245,7 @@ ep_pci_attach(parent, self, aux) PCI_COMMAND_MASTER_ENABLE); /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/if_epic_pci.c b/sys/dev/pci/if_epic_pci.c index b6c427f8607..cadbf5ede62 100644 --- a/sys/dev/pci/if_epic_pci.c +++ b/sys/dev/pci/if_epic_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_epic_pci.c,v 1.14 2000/07/17 18:12:00 tron Exp $ */ +/* $NetBSD: if_epic_pci.c,v 1.15 2000/12/28 22:59:13 sommerfeld Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -229,8 +229,7 @@ epic_pci_attach(parent, self, aux) /* * Map and establish our interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: unable to map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/if_esh_pci.c b/sys/dev/pci/if_esh_pci.c index befd4f4b867..9bfcc746858 100644 --- a/sys/dev/pci/if_esh_pci.c +++ b/sys/dev/pci/if_esh_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_esh_pci.c,v 1.6 2000/01/21 23:39:59 thorpej Exp $ */ +/* $NetBSD: if_esh_pci.c,v 1.7 2000/12/28 22:59:13 sommerfeld Exp $ */ /* * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -176,8 +176,7 @@ esh_pci_attach(parent, self, aux) PCI_COMMAND_MASTER_ENABLE); /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/if_ex_pci.c b/sys/dev/pci/if_ex_pci.c index fcd2cb3c988..3af1fd3433e 100644 --- a/sys/dev/pci/if_ex_pci.c +++ b/sys/dev/pci/if_ex_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ex_pci.c,v 1.14 2000/09/19 01:15:06 fvdl Exp $ */ +/* $NetBSD: if_ex_pci.c,v 1.15 2000/12/28 22:59:13 sommerfeld Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -278,8 +278,7 @@ ex_pci_attach(parent, self, aux) } /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c index ab76a733a3d..c0ef05fd45b 100644 --- a/sys/dev/pci/if_fpa.c +++ b/sys/dev/pci/if_fpa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fpa.c,v 1.32 2000/06/28 16:08:43 mrg Exp $ */ +/* $NetBSD: if_fpa.c,v 1.33 2000/12/28 22:59:13 sommerfeld Exp $ */ /*- * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com> @@ -481,8 +481,7 @@ pdq_pci_attach( pdq_ifattach(sc, pdq_pci_ifwatchdog); - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &intrhandle)) { + if (pci_intr_map(pa, &intrhandle)) { printf("%s: couldn't map interrupt\n", self->dv_xname); return; } diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c index 3586b0e98ff..eccfe92c299 100644 --- a/sys/dev/pci/if_fxp_pci.c +++ b/sys/dev/pci/if_fxp_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fxp_pci.c,v 1.11 2000/09/27 10:54:55 ad Exp $ */ +/* $NetBSD: if_fxp_pci.c,v 1.12 2000/12/28 22:59:13 sommerfeld Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -369,8 +369,7 @@ fxp_pci_attach(parent, self, aux) /* * Map and establish our interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/if_hme_pci.c b/sys/dev/pci/if_hme_pci.c index 7e1a475e6e0..429baf049fd 100644 --- a/sys/dev/pci/if_hme_pci.c +++ b/sys/dev/pci/if_hme_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_hme_pci.c,v 1.2 2000/06/25 01:05:18 eeh Exp $ */ +/* $NetBSD: if_hme_pci.c,v 1.3 2000/12/28 22:59:13 sommerfeld Exp $ */ /* * Copyright (c) 2000 Matthew R. Green @@ -184,8 +184,7 @@ printf("%s: ", sc->sc_dev.dv_xname); pci_conf_print(pa->pa_pc, pa->pa_tag, 0); #endif - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &intrhandle) != 0) { + if (pci_intr_map(pa, &intrhandle) != 0) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; /* bus_unmap ? */ diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c index d7f82745a76..707d7d9abb6 100644 --- a/sys/dev/pci/if_le_pci.c +++ b/sys/dev/pci/if_le_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_pci.c,v 1.29 2000/11/14 18:42:56 thorpej Exp $ */ +/* $NetBSD: if_le_pci.c,v 1.30 2000/12/28 22:59:13 sommerfeld Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -377,8 +377,7 @@ le_pci_attach(parent, self, aux) csr | PCI_COMMAND_MASTER_ENABLE); /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/if_lmc_nbsd.c b/sys/dev/pci/if_lmc_nbsd.c index 5fde60d7dc8..f1441c4bd06 100644 --- a/sys/dev/pci/if_lmc_nbsd.c +++ b/sys/dev/pci/if_lmc_nbsd.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_lmc_nbsd.c,v 1.5 2000/06/28 16:08:45 mrg Exp $ */ +/* $NetBSD: if_lmc_nbsd.c,v 1.6 2000/12/28 22:59:13 sommerfeld Exp $ */ /*- * Copyright (c) 1997-1999 LAN Media Corporation (LMC) @@ -328,8 +328,7 @@ lmc_pci_attach(struct device * const parent, (sc->lmc_revinfo & 0xF0) >> 4, sc->lmc_revinfo & 0x0F, LMC_EADDR_ARGS(sc->lmc_enaddr)); - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &intrhandle)) { + if (pci_intr_map(pa, &intrhandle)) { printf("%s: couldn't map interrupt\n", sc->lmc_dev.dv_xname); return; diff --git a/sys/dev/pci/if_ne_pci.c b/sys/dev/pci/if_ne_pci.c index 1cdb42d8c71..d3502d6008e 100644 --- a/sys/dev/pci/if_ne_pci.c +++ b/sys/dev/pci/if_ne_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ne_pci.c,v 1.16 2000/03/22 20:58:29 ws Exp $ */ +/* $NetBSD: if_ne_pci.c,v 1.17 2000/12/28 22:59:13 sommerfeld Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -286,8 +286,7 @@ ne_pci_attach(parent, self, aux) ne2000_attach(nsc, NULL, media, nmedia, defmedia); /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", dsc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/if_ntwoc_pci.c b/sys/dev/pci/if_ntwoc_pci.c index 3e2ae3a4f1c..840d4bf3d18 100644 --- a/sys/dev/pci/if_ntwoc_pci.c +++ b/sys/dev/pci/if_ntwoc_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ntwoc_pci.c,v 1.3 2000/01/04 06:31:39 chopps Exp $ */ +/* $NetBSD: if_ntwoc_pci.c,v 1.4 2000/12/28 22:59:13 sommerfeld Exp $ */ /* * Copyright (c) 1998 Vixie Enterprises @@ -230,8 +230,7 @@ ntwoc_pci_attach(struct device *parent, struct device *self, void *aux) /* * Map and establish the interrupt */ - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/if_rtk_pci.c b/sys/dev/pci/if_rtk_pci.c index 71dcdae5c6f..732dd20ed90 100644 --- a/sys/dev/pci/if_rtk_pci.c +++ b/sys/dev/pci/if_rtk_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_rtk_pci.c,v 1.3 2000/05/19 13:42:30 tsutsui Exp $ */ +/* $NetBSD: if_rtk_pci.c,v 1.4 2000/12/28 22:59:13 sommerfeld Exp $ */ /* * Copyright (c) 1997, 1998 @@ -286,8 +286,7 @@ rtk_pci_attach(parent, self, aux) #endif /* Allocate interrupt */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c index 863b43db4b5..8466ad9eb03 100644 --- a/sys/dev/pci/if_sip.c +++ b/sys/dev/pci/if_sip.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sip.c,v 1.22 2000/12/19 00:12:47 thorpej Exp $ */ +/* $NetBSD: if_sip.c,v 1.23 2000/12/28 22:59:13 sommerfeld Exp $ */ /*- * Copyright (c) 1999 Network Computer, Inc. @@ -453,8 +453,7 @@ sip_attach(parent, self, aux) /* * Map and establish our interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: unable to map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c index 9fc88f96085..c2eeaa2ca9b 100644 --- a/sys/dev/pci/if_ti.c +++ b/sys/dev/pci/if_ti.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ti.c,v 1.16 2000/12/14 06:42:57 thorpej Exp $ */ +/* $NetBSD: if_ti.c,v 1.17 2000/12/28 22:59:13 sommerfeld Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -1656,8 +1656,7 @@ static void ti_attach(parent, self, aux) pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, command); /* Allocate interrupt */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return;; } diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index f8e120e8bfa..d3a9a6c00aa 100644 --- a/sys/dev/pci/if_tl.c +++ b/sys/dev/pci/if_tl.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tl.c,v 1.38 2000/12/14 06:42:57 thorpej Exp $ */ +/* $NetBSD: if_tl.c,v 1.39 2000/12/28 22:59:13 sommerfeld Exp $ */ /* XXX ALTQ XXX */ @@ -390,8 +390,7 @@ tl_pci_attach(parent, self, aux) ether_sprintf(sc->tl_enaddr)); /* Map and establish interrupts */ - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &intrhandle)) { + if (pci_intr_map(pa, &intrhandle)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/if_tlp_pci.c b/sys/dev/pci/if_tlp_pci.c index b905435a54d..9df1926eb4a 100644 --- a/sys/dev/pci/if_tlp_pci.c +++ b/sys/dev/pci/if_tlp_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tlp_pci.c,v 1.47 2000/10/03 04:32:02 thorpej Exp $ */ +/* $NetBSD: if_tlp_pci.c,v 1.48 2000/12/28 22:59:13 sommerfeld Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -930,8 +930,7 @@ tlp_pci_attach(parent, self, aux) /* * Map and establish our interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: unable to map interrupt\n", sc->sc_dev.dv_xname); return; diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index b524ed6a875..b9f6e46f54d 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_vr.c,v 1.43 2000/12/19 00:12:47 thorpej Exp $ */ +/* $NetBSD: if_vr.c,v 1.44 2000/12/28 22:59:14 sommerfeld Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -1509,8 +1509,7 @@ vr_attach(parent, self, aux) } /* Allocate interrupt */ - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &intrhandle)) { + if (pci_intr_map(pa, &intrhandle)) { printf("%s: couldn't map interrupt\n", sc->vr_dev.dv_xname); return; diff --git a/sys/dev/pci/iop_pci.c b/sys/dev/pci/iop_pci.c index 94a6c552f64..82e2750e3b5 100644 --- a/sys/dev/pci/iop_pci.c +++ b/sys/dev/pci/iop_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: iop_pci.c,v 1.2 2000/12/03 13:05:14 ad Exp $ */ +/* $NetBSD: iop_pci.c,v 1.3 2000/12/28 22:59:14 sommerfeld Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -144,8 +144,7 @@ iop_pci_attach(struct device *parent, struct device *self, void *aux) reg | PCI_COMMAND_MASTER_ENABLE); /* Map and establish the interrupt. XXX IPL_BIO. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("can't map interrupt\n"); return; } diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c index 62ad88bc07d..fddb76d9ad4 100644 --- a/sys/dev/pci/isp_pci.c +++ b/sys/dev/pci/isp_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: isp_pci.c,v 1.63 2000/12/28 22:23:41 mjacob Exp $ */ +/* $NetBSD: isp_pci.c,v 1.64 2000/12/28 22:59:14 sommerfeld Exp $ */ /* * This driver, which is contained in NetBSD in the files: * @@ -519,8 +519,7 @@ isp_pci_attach(parent, self, aux) data &= ~1; pci_conf_write(pa->pa_pc, pa->pa_tag, PCIR_ROMADDR, data); - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", isp->isp_name); free(isp->isp_param, M_DEVBUF); return; diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c index 48e6be99298..6e37b88d61e 100644 --- a/sys/dev/pci/ncr.c +++ b/sys/dev/pci/ncr.c @@ -1,4 +1,4 @@ -/* $NetBSD: ncr.c,v 1.104 2000/09/24 12:37:03 jdolecek Exp $ */ +/* $NetBSD: ncr.c,v 1.105 2000/12/28 22:59:14 sommerfeld Exp $ */ /************************************************************************** ** @@ -1538,7 +1538,7 @@ static int read_tekram_eeprom #if 0 static char ident[] = - "\n$NetBSD: ncr.c,v 1.104 2000/09/24 12:37:03 jdolecek Exp $\n"; + "\n$NetBSD: ncr.c,v 1.105 2000/12/28 22:59:14 sommerfeld Exp $\n"; #endif static const u_long ncr_version = NCR_VERSION * 11 @@ -3832,8 +3832,7 @@ static void ncr_attach (pcici_t config_id, int unit) /* ** Set up the controller chip's interrupt. */ - retval = pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &intrhandle); + retval = pci_intr_map(pa, &intrhandle); if (retval) { printf("%s: couldn't map interrupt\n", self->dv_xname); return; diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c index 12f2bb3b313..fbfccf29a27 100644 --- a/sys/dev/pci/neo.c +++ b/sys/dev/pci/neo.c @@ -1,4 +1,4 @@ -/* $NetBSD: neo.c,v 1.6 2000/11/27 02:37:14 thorpej Exp $ */ +/* $NetBSD: neo.c,v 1.7 2000/12/28 22:59:14 sommerfeld Exp $ */ /* * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk> @@ -565,8 +565,7 @@ neo_attach(struct device *parent, struct device *self, void *aux) } /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->dev.dv_xname); return; } diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c index e33c17421d1..78321b63fef 100644 --- a/sys/dev/pci/ohci_pci.c +++ b/sys/dev/pci/ohci_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ohci_pci.c,v 1.17 2000/09/06 00:17:23 augustss Exp $ */ +/* $NetBSD: ohci_pci.c,v 1.18 2000/12/28 22:59:14 sommerfeld Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -122,8 +122,7 @@ ohci_pci_attach(struct device *parent, struct device *self, void *aux) csr | PCI_COMMAND_MASTER_ENABLE); /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", devname); return; } diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index 8e743ea1e13..a6758250a60 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $NetBSD: pccbb.c,v 1.50 2000/12/08 21:51:02 mycroft Exp $ */ +/* $NetBSD: pccbb.c,v 1.51 2000/12/28 22:59:14 sommerfeld Exp $ */ /* * Copyright (c) 1998, 1999 and 2000 @@ -498,9 +498,7 @@ pccbbattach(parent, self, aux) sc->sc_tag = pa->pa_tag; sc->sc_function = pa->pa_function; - sc->sc_intrline = pa->pa_intrline; - sc->sc_intrtag = pa->pa_intrtag; - sc->sc_intrpin = pa->pa_intrpin; + memcpy(&sc->sc_pa, pa, sizeof(*pa)); sc->sc_pcmcia_flags = flags; /* set PCMCIA facility */ @@ -613,8 +611,7 @@ pccbb_pci_callback(self) sc->sc_pil_intr_enable = 1; /* Map and establish the interrupt. */ - if (pci_intr_map(pc, sc->sc_intrtag, sc->sc_intrpin, - sc->sc_intrline, &ih)) { + if (pci_intr_map(&sc->sc_pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } @@ -661,7 +658,7 @@ pccbb_pci_callback(self) cba.cba_bus = (busreg >> 8) & 0x0ff; cba.cba_cc = (void *)sc; cba.cba_cf = &pccbb_funcs; - cba.cba_intrline = sc->sc_intrline; + cba.cba_intrline = sc->sc_pa.pa_intrline; #if rbus cba.cba_rbus_iot = sc->sc_rbus_iot; @@ -839,7 +836,7 @@ pccbb_pcmcia_attach_setup(sc, paa) ph->sock = sc->sc_function; ph->flags = 0; ph->shutdown = 0; - ph->ih_irq = sc->sc_intrline; + ph->ih_irq = sc->sc_pa.pa_intrline; ph->ph_bus_t = sc->sc_base_memt; ph->ph_bus_h = sc->sc_base_memh; ph->ph_read = pccbb_pcmcia_read; diff --git a/sys/dev/pci/pccbbvar.h b/sys/dev/pci/pccbbvar.h index 52221ab907d..9301d23baa5 100644 --- a/sys/dev/pci/pccbbvar.h +++ b/sys/dev/pci/pccbbvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pccbbvar.h,v 1.13 2000/06/08 10:28:29 haya Exp $ */ +/* $NetBSD: pccbbvar.h,v 1.14 2000/12/28 22:59:15 sommerfeld Exp $ */ /* * Copyright (c) 1999 HAYAKAWA Koichi. All rights reserved. * @@ -120,9 +120,7 @@ struct pccbb_softc { struct callout sc_insert_ch; void *sc_ih; /* interrupt handler */ - int sc_intrline; /* interrupt line */ - pcitag_t sc_intrtag; /* copy of pa->pa_intrtag */ - pci_intr_pin_t sc_intrpin; /* copy of pa->pa_intrpin */ + struct pci_attach_args sc_pa; /* copy of our attach args */ int sc_function; u_int32_t sc_flags; #define CBB_CARDEXIST 0x01 diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 751c5305969..45c6ce28693 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $NetBSD: pciide.c,v 1.98 2000/12/21 01:19:24 mycroft Exp $ */ +/* $NetBSD: pciide.c,v 1.99 2000/12/28 22:59:15 sommerfeld Exp $ */ /* @@ -639,8 +639,7 @@ pciide_mapregs_native(pa, cp, cmdsizep, ctlsizep, pci_intr) cp->compat = 0; if (sc->sc_pci_ih == NULL) { - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &intrhandle) != 0) { + if (pci_intr_map(pa, &intrhandle) != 0) { printf("%s: couldn't map native-PCI interrupt\n", sc->sc_wdcdev.sc_dev.dv_xname); return 0; diff --git a/sys/dev/pci/pcscp.c b/sys/dev/pci/pcscp.c index 5f51628e87a..88885e6dbd6 100644 --- a/sys/dev/pci/pcscp.c +++ b/sys/dev/pci/pcscp.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcscp.c,v 1.11 2000/11/14 18:42:58 thorpej Exp $ */ +/* $NetBSD: pcscp.c,v 1.12 2000/12/28 22:59:15 sommerfeld Exp $ */ /*- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. @@ -261,8 +261,7 @@ pcscp_attach(parent, self, aux) sc->sc_maxxfer = 16 * 1024 * 1024; /* map and establish interrupt */ - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/puc.c b/sys/dev/pci/puc.c index 6b48062568f..dd38765f7ab 100644 --- a/sys/dev/pci/puc.c +++ b/sys/dev/pci/puc.c @@ -1,4 +1,4 @@ -/* $NetBSD: puc.c,v 1.8 2000/07/29 17:49:08 jhawk Exp $ */ +/* $NetBSD: puc.c,v 1.9 2000/12/28 22:59:15 sommerfeld Exp $ */ /* * Copyright (c) 1996, 1998, 1999 @@ -233,8 +233,7 @@ puc_attach(parent, self, aux) } /* Map interrupt. */ - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &intrhandle)) { + if (pci_intr_map(pa, &intrhandle)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/siop_pci_common.c b/sys/dev/pci/siop_pci_common.c index 99c02c79801..f70aaa57bfe 100644 --- a/sys/dev/pci/siop_pci_common.c +++ b/sys/dev/pci/siop_pci_common.c @@ -1,4 +1,4 @@ -/* $NetBSD: siop_pci_common.c,v 1.4 2000/11/29 02:00:38 matt Exp $ */ +/* $NetBSD: siop_pci_common.c,v 1.5 2000/12/28 22:59:15 sommerfeld Exp $ */ /* * Copyright (c) 2000 Manuel Bouyer. @@ -263,8 +263,7 @@ siop_pci_attach_common(sc, pa) } } - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &intrhandle) != 0) { + if (pci_intr_map(pa, &intrhandle) != 0) { printf("%s: couldn't map interrupt\n", sc->siop.sc_dev.dv_xname); return 0; diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c index 445af941ccb..9801dbf81f0 100644 --- a/sys/dev/pci/sv.c +++ b/sys/dev/pci/sv.c @@ -1,4 +1,4 @@ -/* $NetBSD: sv.c,v 1.11 2000/06/26 04:56:25 simonb Exp $ */ +/* $NetBSD: sv.c,v 1.12 2000/12/28 22:59:15 sommerfeld Exp $ */ /* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */ /* @@ -420,8 +420,7 @@ sv_attach(parent, self, aux) sv_read(sc, SV_CODEC_STATUS); /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c index b41b1bd901b..71f2e2f9ede 100644 --- a/sys/dev/pci/tga.c +++ b/sys/dev/pci/tga.c @@ -1,4 +1,4 @@ -/* $NetBSD: tga.c,v 1.29 2000/12/17 22:23:12 thorpej Exp $ */ +/* $NetBSD: tga.c,v 1.30 2000/12/28 22:59:15 sommerfeld Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -387,8 +387,7 @@ tgaattach(parent, self, aux) /* XXX say what's going on. */ intrstr = NULL; - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &intrh)) { + if (pci_intr_map(pa, &intrh)) { printf(": couldn't map interrupt"); return; } diff --git a/sys/dev/pci/twe.c b/sys/dev/pci/twe.c index 81e4f106652..ce70339fd0d 100644 --- a/sys/dev/pci/twe.c +++ b/sys/dev/pci/twe.c @@ -1,4 +1,4 @@ -/* $NetBSD: twe.c,v 1.4 2000/11/14 18:42:58 thorpej Exp $ */ +/* $NetBSD: twe.c,v 1.5 2000/12/28 22:59:15 sommerfeld Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -200,8 +200,7 @@ twe_attach(struct device *parent, struct device *self, void *aux) csr | PCI_COMMAND_MASTER_ENABLE); /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: can't map interrupt\n", sc->sc_dv.dv_xname); return; } diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c index 58647d53fac..7688935f71d 100644 --- a/sys/dev/pci/uhci_pci.c +++ b/sys/dev/pci/uhci_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhci_pci.c,v 1.17 2000/09/06 00:17:23 augustss Exp $ */ +/* $NetBSD: uhci_pci.c,v 1.18 2000/12/28 22:59:15 sommerfeld Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -123,8 +123,7 @@ uhci_pci_attach(struct device *parent, struct device *self, void *aux) csr | PCI_COMMAND_MASTER_ENABLE); /* Map and establish the interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", devname); return; } diff --git a/sys/dev/pci/universe_pci.c b/sys/dev/pci/universe_pci.c index c2d0c4e3bfa..0c5cd07b966 100644 --- a/sys/dev/pci/universe_pci.c +++ b/sys/dev/pci/universe_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: universe_pci.c,v 1.2 2000/03/12 11:21:02 drochner Exp $ */ +/* $NetBSD: universe_pci.c,v 1.3 2000/12/28 22:59:15 sommerfeld Exp $ */ /* * Copyright (c) 1999 @@ -138,8 +138,7 @@ univ_pci_attach(d, pa, name, inthdl, intcookie) printf("requesting at VME bus level %d\n", (reg >> 22) & 3); /* Map and establish the PCI interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf("%s: couldn't map interrupt\n", name); return (-1); } |
