diff options
Diffstat (limited to 'sys/dev')
67 files changed, 135 insertions, 202 deletions
diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c index 86b5e04cc74..93b4ec1106c 100644 --- a/sys/dev/isa/if_ed.c +++ b/sys/dev/isa/if_ed.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ed.c,v 1.46 2001/07/08 23:38:07 fgsch Exp $ */ +/* $OpenBSD: if_ed.c,v 1.47 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: if_ed.c,v 1.105 1996/10/21 22:40:45 thorpej Exp $ */ /* @@ -514,8 +514,7 @@ ed_pci_attach(parent, self, aux) printf("%s", sc->isa16bit ? "(16-bit)" : "(8-bit)"); /* XXX */ /* 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("\n%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/aac_pci.c b/sys/dev/pci/aac_pci.c index 30cad8e1f99..4e56d2e0fd9 100644 --- a/sys/dev/pci/aac_pci.c +++ b/sys/dev/pci/aac_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aac_pci.c,v 1.4 2001/07/07 12:04:22 niklas Exp $ */ +/* $OpenBSD: aac_pci.c,v 1.5 2001/08/25 10:13:29 art Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -183,8 +183,7 @@ aac_pci_attach(parent, self, aux) } state++; - 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 bail_out; } diff --git a/sys/dev/pci/adv_pci.c b/sys/dev/pci/adv_pci.c index ee3d8e12696..0d2f5c7462a 100644 --- a/sys/dev/pci/adv_pci.c +++ b/sys/dev/pci/adv_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adv_pci.c,v 1.4 1998/11/17 07:55:46 downsj Exp $ */ +/* $OpenBSD: adv_pci.c,v 1.5 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: adv_pci.c,v 1.5 1998/09/26 15:52:55 dante Exp $ */ /* @@ -188,8 +188,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("\n%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 d354d7adbdc..b861404d5ef 100644 --- a/sys/dev/pci/adw_pci.c +++ b/sys/dev/pci/adw_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adw_pci.c,v 1.9 2001/07/11 17:31:24 krw Exp $ */ +/* $OpenBSD: adw_pci.c,v 1.10 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: adw_pci.c,v 1.7 2000/05/26 15:13:46 dante Exp $ */ /* @@ -182,8 +182,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("\n%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 5b1bb4493f9..a862b131e7b 100644 --- a/sys/dev/pci/ahc_pci.c +++ b/sys/dev/pci/ahc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahc_pci.c,v 1.24 2001/08/23 05:41:14 deraadt Exp $ */ +/* $OpenBSD: ahc_pci.c,v 1.25 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: ahc_pci.c,v 1.9 1996/10/21 22:56:24 thorpej Exp $ */ /* @@ -469,8 +469,7 @@ void *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(": couldn't map interrupt\n", ahc->sc_dev.dv_xname); ahc_free(ahc); return; diff --git a/sys/dev/pci/ami_pci.c b/sys/dev/pci/ami_pci.c index 0810034d537..9efcda526de 100644 --- a/sys/dev/pci/ami_pci.c +++ b/sys/dev/pci/ami_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami_pci.c,v 1.7 2001/06/23 21:43:07 mickey Exp $ */ +/* $OpenBSD: ami_pci.c,v 1.8 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -178,8 +178,7 @@ ami_pci_attach(parent, self, aux) pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, csr | PCI_COMMAND_MASTER_ENABLE); - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf(": can't map interrupt\n"); bus_space_unmap(sc->iot, sc->ioh, size); return; diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c index 31463996c51..cd75ef15b3a 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auich.c,v 1.12 2001/06/12 15:40:30 niklas Exp $ */ +/* $OpenBSD: auich.c,v 1.13 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 2000,2001 Michael Shalayeff @@ -310,8 +310,7 @@ auich_attach(parent, self, aux) pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, csr | PCI_COMMAND_MASTER_ENABLE); - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf(": can't map interrupt\n"); bus_space_unmap(sc->iot, sc->aud_ioh, aud_size); bus_space_unmap(sc->iot, sc->mix_ioh, mix_size); diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c index 8197f78b78c..297638c1260 100644 --- a/sys/dev/pci/auvia.c +++ b/sys/dev/pci/auvia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auvia.c,v 1.9 2001/06/12 15:40:30 niklas Exp $ */ +/* $OpenBSD: auvia.c,v 1.10 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: auvia.c,v 1.7 2000/11/15 21:06:33 jdolecek Exp $ */ /*- @@ -224,8 +224,7 @@ auvia_attach(struct device *parent, struct device *self, void *aux) u_int16_t v; int r, i; - 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 89a808f31d6..856c59be0dc 100644 --- a/sys/dev/pci/bktr/bktr_os.c +++ b/sys/dev/pci/bktr/bktr_os.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_os.c,v 1.4 2001/07/04 04:59:29 csapuntz Exp $ */ +/* $OpenBSD: bktr_os.c,v 1.5 2001/08/25 10:13:30 art Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */ /* @@ -1398,8 +1398,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/cac_pci.c b/sys/dev/pci/cac_pci.c index 39deca30387..ec848766c94 100644 --- a/sys/dev/pci/cac_pci.c +++ b/sys/dev/pci/cac_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cac_pci.c,v 1.4 2001/06/12 15:40:30 niklas Exp $ */ +/* $OpenBSD: cac_pci.c,v 1.5 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: cac_pci.c,v 1.10 2001/01/10 16:48:04 ad Exp $ */ /*- @@ -220,8 +220,7 @@ cac_pci_attach(parent, self, aux) reg | 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 8b4013af070..c9db943446d 100644 --- a/sys/dev/pci/cmpci.c +++ b/sys/dev/pci/cmpci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmpci.c,v 1.2 2001/06/12 15:40:30 niklas Exp $ */ +/* $OpenBSD: cmpci.c,v 1.3 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 2000 Takuya SHIOZAKI @@ -329,8 +329,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("\n%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 80e942d5e57..113d6162196 100644 --- a/sys/dev/pci/cs4280.c +++ b/sys/dev/pci/cs4280.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4280.c,v 1.10 2001/06/18 19:27:17 deraadt Exp $ */ +/* $OpenBSD: cs4280.c,v 1.11 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $ */ /* @@ -602,8 +602,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(": couldn't map interrupt\n"); return; } diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c index 022d5e46390..ea69837d34a 100644 --- a/sys/dev/pci/cs4281.c +++ b/sys/dev/pci/cs4281.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4281.c,v 1.5 2001/07/27 17:02:49 art Exp $ */ +/* $OpenBSD: cs4281.c,v 1.6 2001/08/25 10:13:29 art Exp $ */ /* $Tera: cs4281.c,v 1.18 2000/12/27 14:24:45 tacha Exp $ */ /* @@ -344,8 +344,7 @@ cs4281_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/cy_pci.c b/sys/dev/pci/cy_pci.c index b516b26cdfc..527214465bd 100644 --- a/sys/dev/pci/cy_pci.c +++ b/sys/dev/pci/cy_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cy_pci.c,v 1.7 2001/08/20 04:41:39 smart Exp $ */ +/* $OpenBSD: cy_pci.c,v 1.8 2001/08/25 10:13:29 art Exp $ */ /* * cy_pci.c @@ -144,8 +144,7 @@ cy_pci_attach(parent, self, aux) } /* Enable PCI card interrupts */ - 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) panic("%s: couldn't map PCI interrupt", sc->sc_dev.dv_xname); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_TTY, cy_intr, diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c index 4037ba6d249..c2e2d84a912 100644 --- a/sys/dev/pci/cz.c +++ b/sys/dev/pci/cz.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cz.c,v 1.2 2001/06/25 20:25:55 nate Exp $ */ +/* $OpenBSD: cz.c,v 1.3 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: cz.c,v 1.15 2001/01/20 19:10:36 thorpej Exp $ */ /*- @@ -348,8 +348,7 @@ cz_attach(parent, self, aux) * Now that we're ready to roll, map and establish the interrupt * handler. */ - if (pci_intr_map(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 bc35287800f..9c58c7b3636 100644 --- a/sys/dev/pci/dpt_pci.c +++ b/sys/dev/pci/dpt_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dpt_pci.c,v 1.2 2001/06/12 15:40:30 niklas Exp $ */ +/* $OpenBSD: dpt_pci.c,v 1.3 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: dpt_pci.c,v 1.2 1999/09/29 17:33:02 ad Exp $ */ /* @@ -130,8 +130,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 12c70c7707c..6d91a585323 100644 --- a/sys/dev/pci/eap.c +++ b/sys/dev/pci/eap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eap.c,v 1.11 2001/06/12 15:40:30 niklas Exp $ */ +/* $OpenBSD: eap.c,v 1.12 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: eap.c,v 1.25 1999/02/18 07:59:30 mycroft Exp $ */ /* @@ -792,8 +792,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("\n%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c index ba98aa72fd2..3d0bc060c2b 100644 --- a/sys/dev/pci/eso.c +++ b/sys/dev/pci/eso.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eso.c,v 1.11 2001/06/12 15:40:30 niklas Exp $ */ +/* $OpenBSD: eso.c,v 1.12 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: eso.c,v 1.3 1999/08/02 17:37:43 augustss Exp $ */ /* @@ -334,8 +334,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(", couldn't map interrupt\n"); return; } diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c index a07a88eb326..7cb0679f7a8 100644 --- a/sys/dev/pci/fms.c +++ b/sys/dev/pci/fms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fms.c,v 1.3 2001/06/12 15:40:30 niklas Exp $ */ +/* $OpenBSD: fms.c,v 1.4 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $ */ /*- @@ -255,8 +255,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/gdt_pci.c b/sys/dev/pci/gdt_pci.c index e68f6a73a0d..41f816cc580 100644 --- a/sys/dev/pci/gdt_pci.c +++ b/sys/dev/pci/gdt_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt_pci.c,v 1.12 2001/07/30 01:28:56 deraadt Exp $ */ +/* $OpenBSD: gdt_pci.c,v 1.13 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -535,8 +535,7 @@ gdt_pci_attach(parent, self, aux) gdt->sc_test_busy = gdt_mpr_test_busy; } - 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"); goto bail_out; } diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c index 0fffdaebd90..575b35a25ee 100644 --- a/sys/dev/pci/hifn7751.c +++ b/sys/dev/pci/hifn7751.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hifn7751.c,v 1.97 2001/08/22 16:34:47 jason Exp $ */ +/* $OpenBSD: hifn7751.c,v 1.98 2001/08/25 10:13:29 art Exp $ */ /* * Invertex AEON / Hifn 7751 driver @@ -249,8 +249,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 1b9c9ad2917..712ee051236 100644 --- a/sys/dev/pci/if_an_pci.c +++ b/sys/dev/pci/if_an_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_an_pci.c,v 1.4 2001/06/23 01:44:30 mickey Exp $ */ +/* $OpenBSD: if_an_pci.c,v 1.5 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -133,8 +133,7 @@ an_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("\n%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/if_dc_pci.c b/sys/dev/pci/if_dc_pci.c index c4e167fa3df..d1b7333fdb9 100644 --- a/sys/dev/pci/if_dc_pci.c +++ b/sys/dev/pci/if_dc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dc_pci.c,v 1.16 2001/08/22 16:38:38 aaron Exp $ */ +/* $OpenBSD: if_dc_pci.c,v 1.17 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -239,8 +239,7 @@ void dc_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(": couldn't map interrupt\n"); goto fail; } diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index 80fe80e4f73..540b169a028 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_de.c,v 1.48 2001/08/12 20:33:50 mickey Exp $ */ +/* $OpenBSD: if_de.c,v 1.49 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: if_de.c,v 1.45 1997/06/09 00:34:18 thorpej Exp $ */ /*- @@ -5538,8 +5538,7 @@ tulip_pci_attach( pci_intr_handle_t intrhandle; const char *intrstr; - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &intrhandle)) { + if (pci_intr_map(pa, &intrhandle)) { printf(", couldn't map interrupt\n"); return; } diff --git a/sys/dev/pci/if_en_pci.c b/sys/dev/pci/if_en_pci.c index 5a4ad306a17..a95ad7d0093 100644 --- a/sys/dev/pci/if_en_pci.c +++ b/sys/dev/pci/if_en_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_en_pci.c,v 1.7 2001/04/06 16:27:45 jason Exp $ */ +/* $OpenBSD: if_en_pci.c,v 1.8 2001/08/25 10:13:29 art Exp $ */ /* * @@ -212,8 +212,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(": couldn't map interrupt\n"); return; } diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c index e93ca84c901..bbbbe43227d 100644 --- a/sys/dev/pci/if_ep_pci.c +++ b/sys/dev/pci/if_ep_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_pci.c,v 1.19 2000/05/29 18:04:08 aaron Exp $ */ +/* $OpenBSD: if_ep_pci.c,v 1.20 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: if_ep_pci.c,v 1.13 1996/10/21 22:56:38 thorpej Exp $ */ /* @@ -154,8 +154,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(", couldn't map interrupt\n"); return; } diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c index b7054cb7652..7acc3ef4ae6 100644 --- a/sys/dev/pci/if_fpa.c +++ b/sys/dev/pci/if_fpa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fpa.c,v 1.14 2001/08/12 20:33:50 mickey Exp $ */ +/* $OpenBSD: if_fpa.c,v 1.15 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: if_fpa.c,v 1.15 1996/10/21 22:56:40 thorpej Exp $ */ /*- @@ -154,8 +154,7 @@ pdq_pci_attach(parent, self, aux) return; } - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &intrhandle)) { + if (pci_intr_map(pa, &intrhandle)) { printf(": couldn't map interrupt\n"); return; } diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c index da7d2a66bed..55318bd41ba 100644 --- a/sys/dev/pci/if_fxp_pci.c +++ b/sys/dev/pci/if_fxp_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fxp_pci.c,v 1.8 2001/08/09 21:12:51 jason Exp $ */ +/* $OpenBSD: if_fxp_pci.c,v 1.9 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 1995, David Greenman @@ -142,8 +142,7 @@ fxp_pci_attach(parent, self, aux) /* * Allocate our interrupt. */ - 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"); return; } diff --git a/sys/dev/pci/if_hme_pci.c b/sys/dev/pci/if_hme_pci.c index 0bd0f18b782..270ad994128 100644 --- a/sys/dev/pci/if_hme_pci.c +++ b/sys/dev/pci/if_hme_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_hme_pci.c,v 1.2 2001/08/23 03:44:46 jason Exp $ */ +/* $OpenBSD: if_hme_pci.c,v 1.3 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: if_hme_pci.c,v 1.3 2000/12/28 22:59:13 sommerfeld Exp $ */ /* @@ -167,8 +167,7 @@ hmeattach_pci(parent, self, aux) */ hme_config(sc); - 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 95486be1414..79b0bf96a95 100644 --- a/sys/dev/pci/if_le_pci.c +++ b/sys/dev/pci/if_le_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_pci.c,v 1.15 2001/08/12 20:33:50 mickey Exp $ */ +/* $OpenBSD: if_le_pci.c,v 1.16 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: if_le_pci.c,v 1.13 1996/10/25 21:33:32 cgd Exp $ */ /*- @@ -246,8 +246,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_obsd.c b/sys/dev/pci/if_lmc_obsd.c index 1076203b7d5..0bcedc4caeb 100644 --- a/sys/dev/pci/if_lmc_obsd.c +++ b/sys/dev/pci/if_lmc_obsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lmc_obsd.c,v 1.9 2001/08/12 20:33:50 mickey Exp $ */ +/* $OpenBSD: if_lmc_obsd.c,v 1.10 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: if_lmc_nbsd.c,v 1.1 1999/03/25 03:32:43 explorer Exp $ */ /*- @@ -358,8 +358,7 @@ lmc_pci_attach(struct device * const parent, lmc_read_macaddr(sc); - 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 9ec7a27b4ed..0dce398ddbb 100644 --- a/sys/dev/pci/if_ne_pci.c +++ b/sys/dev/pci/if_ne_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_pci.c,v 1.9 2001/06/12 15:40:31 niklas Exp $ */ +/* $OpenBSD: if_ne_pci.c,v 1.10 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: if_ne_pci.c,v 1.8 1998/07/05 00:51:24 jonathan Exp $ */ /*- @@ -259,8 +259,7 @@ ne_pci_attach(parent, self, aux) dsc->init_card = npp->npp_init_card; /* 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(": couldn't map interrupt\n"); return; } diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c index 95a44b8bdc5..a20c83fabf1 100644 --- a/sys/dev/pci/if_nge.c +++ b/sys/dev/pci/if_nge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nge.c,v 1.7 2001/08/12 20:03:49 mickey Exp $ */ +/* $OpenBSD: if_nge.c,v 1.8 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -803,8 +803,7 @@ void nge_attach(parent, self, aux) #endif DPRINTFN(5, ("pci_intr_map\n")); - 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; } diff --git a/sys/dev/pci/if_rl_pci.c b/sys/dev/pci/if_rl_pci.c index 047ad8ee906..fda4701dea1 100644 --- a/sys/dev/pci/if_rl_pci.c +++ b/sys/dev/pci/if_rl_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rl_pci.c,v 1.3 2001/08/12 20:03:49 mickey Exp $ */ +/* $OpenBSD: if_rl_pci.c,v 1.4 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 1997, 1998 @@ -172,8 +172,7 @@ rl_pci_attach(parent, self, aux) /* * Allocate our interrupt. */ - 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"); return; } diff --git a/sys/dev/pci/if_sf.c b/sys/dev/pci/if_sf.c index f1096c54898..d8edf500253 100644 --- a/sys/dev/pci/if_sf.c +++ b/sys/dev/pci/if_sf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sf.c,v 1.13 2001/08/12 20:03:49 mickey Exp $ */ +/* $OpenBSD: if_sf.c,v 1.14 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -689,8 +689,7 @@ void sf_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(": couldn't map interrupt\n"); goto fail; } diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c index edc61509a37..9b97dd70938 100644 --- a/sys/dev/pci/if_sis.c +++ b/sys/dev/pci/if_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sis.c,v 1.16 2001/08/12 20:03:49 mickey Exp $ */ +/* $OpenBSD: if_sis.c,v 1.17 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -713,8 +713,7 @@ void sis_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(": couldn't map interrupt\n"); goto fail; } diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index 7a5a437eec4..70911dd8988 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.15 2001/08/15 16:50:26 jason Exp $ */ +/* $OpenBSD: if_sk.c,v 1.16 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -1107,8 +1107,7 @@ skc_attach(parent, self, aux) sc->sc_dmatag = pa->pa_dmat; /* Allocate interrupt */ - 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; } diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c index b3041206c93..6a75bb6d0ad 100644 --- a/sys/dev/pci/if_ste.c +++ b/sys/dev/pci/if_ste.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ste.c,v 1.13 2001/08/12 20:03:49 mickey Exp $ */ +/* $OpenBSD: if_ste.c,v 1.14 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -939,8 +939,7 @@ void ste_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(": couldn't map interrupt\n"); goto fail; } diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c index fc33591e112..d674e57ac51 100644 --- a/sys/dev/pci/if_ti.c +++ b/sys/dev/pci/if_ti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ti.c,v 1.28 2001/08/12 20:03:49 mickey Exp $ */ +/* $OpenBSD: if_ti.c,v 1.29 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -1503,8 +1503,7 @@ ti_attach(parent, self, aux) } sc->ti_btag = pa->pa_memt; - 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; } diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index 2535b6992b5..3488e63a09b 100644 --- a/sys/dev/pci/if_tl.c +++ b/sys/dev/pci/if_tl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tl.c,v 1.22 2001/08/12 20:03:49 mickey Exp $ */ +/* $OpenBSD: if_tl.c,v 1.23 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 1997, 1998 @@ -2050,8 +2050,7 @@ tl_attach(parent, self, aux) /* * Allocate our interrupt. */ - 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"); return; } diff --git a/sys/dev/pci/if_tx.c b/sys/dev/pci/if_tx.c index 5d048d72491..34e7a31cf1b 100644 --- a/sys/dev/pci/if_tx.c +++ b/sys/dev/pci/if_tx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tx.c,v 1.18 2001/08/12 20:03:49 mickey Exp $ */ +/* $OpenBSD: if_tx.c,v 1.19 2001/08/25 10:13:29 art Exp $ */ /* $FreeBSD: src/sys/pci/if_tx.c,v 1.45 2001/02/07 20:11:02 semenu Exp $ */ /*- @@ -270,8 +270,7 @@ epic_openbsd_attach( if( epic_common_attach(sc) ) return; /* Map 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/if_txp.c b/sys/dev/pci/if_txp.c index dda8cf213eb..bc979ab0f2d 100644 --- a/sys/dev/pci/if_txp.c +++ b/sys/dev/pci/if_txp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_txp.c,v 1.52 2001/08/24 21:11:14 jason Exp $ */ +/* $OpenBSD: if_txp.c,v 1.53 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 2001 @@ -201,8 +201,7 @@ txp_attach(parent, self, aux) /* * Allocate our interrupt. */ - 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"); return; } diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index ca7256b7689..d2c8c26c813 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.19 2001/08/12 20:03:49 mickey Exp $ */ +/* $OpenBSD: if_vr.c,v 1.20 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 1997, 1998 @@ -681,8 +681,7 @@ vr_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(": couldn't map interrupt\n"); goto fail; } diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c index ec3a5c31813..312eb8e6a99 100644 --- a/sys/dev/pci/if_wb.c +++ b/sys/dev/pci/if_wb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wb.c,v 1.12 2001/08/12 20:03:49 mickey Exp $ */ +/* $OpenBSD: if_wb.c,v 1.13 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 1997, 1998 @@ -833,8 +833,7 @@ wb_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(": couldn't map interrupt\n"); goto fail; } diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c index 66fabfdda17..468912f78a8 100644 --- a/sys/dev/pci/if_wi_pci.c +++ b/sys/dev/pci/if_wi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_pci.c,v 1.6 2001/07/06 17:22:07 jason Exp $ */ +/* $OpenBSD: if_wi_pci.c,v 1.7 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 2001 Todd C. Miller <Todd.Miller@courtesan.com> @@ -190,8 +190,7 @@ wi_pci_attach(parent, self, aux) CSR_WRITE_2(sc, WI_EVENT_ACK, 0xFFFF); /* 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(": couldn't map interrupt\n"); return; } diff --git a/sys/dev/pci/if_wx.c b/sys/dev/pci/if_wx.c index 2557548b476..46c762fc025 100644 --- a/sys/dev/pci/if_wx.c +++ b/sys/dev/pci/if_wx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wx.c,v 1.14 2001/06/27 06:34:51 kjc Exp $ */ +/* $OpenBSD: if_wx.c,v 1.15 2001/08/25 10:13:29 art Exp $ */ /* * Principal Author: Matthew Jacob * Copyright (c) 1999, 2001 by Traakan Software @@ -261,8 +261,7 @@ wx_attach(struct device *parent, struct device *self, void *aux) /* * Allocate our interrupt. */ - if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { #ifndef __OpenBSD__ printf("%s: couldn't map interrupt\n", sc->wx_name); #else diff --git a/sys/dev/pci/if_xl_pci.c b/sys/dev/pci/if_xl_pci.c index e9905a0bb07..7e6de7d158c 100644 --- a/sys/dev/pci/if_xl_pci.c +++ b/sys/dev/pci/if_xl_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xl_pci.c,v 1.8 2001/08/12 20:03:49 mickey Exp $ */ +/* $OpenBSD: if_xl_pci.c,v 1.9 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -281,8 +281,7 @@ xl_pci_attach(parent, self, aux) /* * Allocate our interrupt. */ - 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"); return; } diff --git a/sys/dev/pci/iha_pci.c b/sys/dev/pci/iha_pci.c index f45995be5ec..facf81785fe 100644 --- a/sys/dev/pci/iha_pci.c +++ b/sys/dev/pci/iha_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iha_pci.c,v 1.4 2001/07/13 03:24:19 krw Exp $ */ +/* $OpenBSD: iha_pci.c,v 1.5 2001/08/25 10:13:29 art Exp $ */ /* * Initio INI-9xxxU/UW SCSI Device Driver * @@ -114,8 +114,7 @@ iha_pci_attach(parent, self, aux) sc->sc_ioh = ioh; sc->sc_dmat = pa->pa_dmat; - 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/iop_pci.c b/sys/dev/pci/iop_pci.c index 7b3b9f8f4cc..3d834945d97 100644 --- a/sys/dev/pci/iop_pci.c +++ b/sys/dev/pci/iop_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iop_pci.c,v 1.2 2001/06/26 06:05:55 niklas Exp $ */ +/* $OpenBSD: iop_pci.c,v 1.3 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: iop_pci.c,v 1.4 2001/03/20 13:21:00 ad Exp $ */ /*- @@ -139,8 +139,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(pa->pa_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/ises.c b/sys/dev/pci/ises.c index 35ac6f69690..04d80eb3657 100644 --- a/sys/dev/pci/ises.c +++ b/sys/dev/pci/ises.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ises.c,v 1.14 2001/08/09 19:42:05 ho Exp $ */ +/* $OpenBSD: ises.c,v 1.15 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 2000, 2001 Håkan Olsson (ho@crt.se) @@ -192,8 +192,7 @@ ises_attach(struct device *parent, struct device *self, void *aux) state++; /* Map interrupt. */ - 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; } diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c index 6612d54a7df..e4aaa8277f5 100644 --- a/sys/dev/pci/isp_pci.c +++ b/sys/dev/pci/isp_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isp_pci.c,v 1.19 2001/05/16 12:51:49 ho Exp $ */ +/* $OpenBSD: isp_pci.c,v 1.20 2001/08/25 10:13:29 art Exp $ */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. * @@ -553,8 +553,7 @@ isp_pci_attach(struct device *parent, struct device *self, void *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(": couldn't map interrupt\n"); free(isp->isp_param, M_DEVBUF); return; diff --git a/sys/dev/pci/lofn.c b/sys/dev/pci/lofn.c index 83c675752ca..d7f1e9a115d 100644 --- a/sys/dev/pci/lofn.c +++ b/sys/dev/pci/lofn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lofn.c,v 1.9 2001/08/12 20:03:49 mickey Exp $ */ +/* $OpenBSD: lofn.c,v 1.10 2001/08/25 10:13:29 art Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -122,8 +122,7 @@ lofn_attach(parent, self, aux) sc->sc_dmat = pa->pa_dmat; - 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; } diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c index 4d3438a024c..7eff62c1b22 100644 --- a/sys/dev/pci/maestro.c +++ b/sys/dev/pci/maestro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: maestro.c,v 1.8 2001/08/02 11:16:29 espie Exp $ */ +/* $OpenBSD: maestro.c,v 1.9 2001/08/25 10:13:29 art Exp $ */ /* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */ /* * FreeBSD's ESS Agogo/Maestro driver @@ -339,8 +339,7 @@ maestro_attach(parent, self, aux) sc->dmat = pa->pa_dmat; /* Map interrupt */ - 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"); return; } diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c index 05b1574b2a2..ea1d92453eb 100644 --- a/sys/dev/pci/ncr.c +++ b/sys/dev/pci/ncr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr.c,v 1.59 2001/08/19 15:07:34 miod Exp $ */ +/* $OpenBSD: ncr.c,v 1.60 2001/08/25 10:13:30 art Exp $ */ /* $NetBSD: ncr.c,v 1.63 1997/09/23 02:39:15 perry Exp $ */ /************************************************************************** @@ -1467,7 +1467,7 @@ static void ncr_attach (pcici_t tag, int unit); #if 0 static char ident[] = - "\n$OpenBSD: ncr.c,v 1.59 2001/08/19 15:07:34 miod Exp $\n"; + "\n$OpenBSD: ncr.c,v 1.60 2001/08/25 10:13:30 art Exp $\n"; #endif static const u_long ncr_version = NCR_VERSION * 11 @@ -3717,8 +3717,7 @@ ncr_attach(parent, self, aux) /* ** 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(": couldn't map interrupt\n"); return; diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c index 2f6366b9240..0b1de40b593 100644 --- a/sys/dev/pci/neo.c +++ b/sys/dev/pci/neo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neo.c,v 1.7 2001/06/18 19:27:18 deraadt Exp $ */ +/* $OpenBSD: neo.c,v 1.8 2001/08/25 10:13:30 art Exp $ */ /* * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk> @@ -576,8 +576,7 @@ neo_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("\n%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 4292d75d0a0..07ddacc581f 100644 --- a/sys/dev/pci/ohci_pci.c +++ b/sys/dev/pci/ohci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci_pci.c,v 1.12 2001/06/13 07:43:35 deraadt Exp $ */ +/* $OpenBSD: ohci_pci.c,v 1.13 2001/08/25 10:13:30 art Exp $ */ /* $NetBSD: ohci_pci.c,v 1.9 1999/05/20 09:52:35 augustss Exp $ */ /* @@ -133,8 +133,7 @@ ohci_pci_attach(parent, self, aux) OHCI_INTERRUPT_DISABLE, OHCI_ALL_INTRS); /* 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(": couldn't map interrupt\n"); return; } diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index 12ad13b69fb..d2202dfdbdc 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccbb.c,v 1.25 2001/08/22 16:33:11 aaron Exp $ */ +/* $OpenBSD: pccbb.c,v 1.26 2001/08/25 10:13:30 art Exp $ */ /* $NetBSD: pccbb.c,v 1.42 2000/06/16 23:41:35 cgd Exp $ */ /* @@ -479,8 +479,7 @@ pccbbattach(parent, self, aux) sc->sc_pcmcia_flags = flags; /* set PCMCIA facility */ /* 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(": couldn't map interrupt\n"); return; } diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index eaad4e3644f..e156d090389 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.63 2001/08/23 11:25:54 art Exp $ */ +/* $OpenBSD: pciide.c,v 1.64 2001/08/25 10:13:30 art Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -683,8 +683,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 4f79e4ea736..c5d1adf2a50 100644 --- a/sys/dev/pci/pcscp.c +++ b/sys/dev/pci/pcscp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcscp.c,v 1.3 2001/06/12 15:40:33 niklas Exp $ */ +/* $OpenBSD: pcscp.c,v 1.4 2001/08/25 10:13:30 art Exp $ */ /* $NetBSD: pcscp.c,v 1.11 2000/11/14 18:42:58 thorpej Exp $ */ /*- @@ -267,8 +267,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(": couldn't map interrupt\n"); return; } diff --git a/sys/dev/pci/puc.c b/sys/dev/pci/puc.c index 44cc94dbcc9..d2949b183bc 100644 --- a/sys/dev/pci/puc.c +++ b/sys/dev/pci/puc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: puc.c,v 1.4 2001/06/12 15:40:33 niklas Exp $ */ +/* $OpenBSD: puc.c,v 1.5 2001/08/25 10:13:30 art Exp $ */ /* $NetBSD: puc.c,v 1.3 1999/02/06 06:29:54 cgd Exp $ */ /* @@ -215,8 +215,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 b3695fde9b8..16f2d16878e 100644 --- a/sys/dev/pci/siop_pci_common.c +++ b/sys/dev/pci/siop_pci_common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop_pci_common.c,v 1.6 2001/06/12 15:40:33 niklas Exp $ */ +/* $OpenBSD: siop_pci_common.c,v 1.7 2001/08/25 10:13:30 art Exp $ */ /* $NetBSD: siop_pci_common.c,v 1.6 2001/01/10 15:50:20 thorpej Exp $ */ /* @@ -267,8 +267,7 @@ siop_pci_attach_common(sc, pa) sc->siop.features &= ~SF_CHIP_RAM; } - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &intrhandle)) { + if (pci_intr_map(pa, &intrhandle)) { printf("\n%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 4899b951c1a..74d06b9a55b 100644 --- a/sys/dev/pci/sv.c +++ b/sys/dev/pci/sv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sv.c,v 1.8 2000/04/03 21:13:48 deraadt Exp $ */ +/* $OpenBSD: sv.c,v 1.9 2001/08/25 10:13:30 art Exp $ */ /* * Copyright (c) 1998 Constantine Paul Sapuntzakis @@ -389,8 +389,7 @@ sv_attach(parent, self, aux) sc->sc_enable = 0; /* 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(": couldn't map interrupt\n"); return; } diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c index 1cfdf4e77d6..23b8c7a4b7b 100644 --- a/sys/dev/pci/tga.c +++ b/sys/dev/pci/tga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tga.c,v 1.7 2001/05/16 19:33:33 mickey Exp $ */ +/* $OpenBSD: tga.c,v 1.8 2001/08/25 10:13:30 art Exp $ */ /* $NetBSD: tga.c,v 1.31 2001/02/11 19:34:58 nathanw Exp $ */ /* @@ -440,8 +440,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_pci.c b/sys/dev/pci/twe_pci.c index dc1c4774553..306317d9d23 100644 --- a/sys/dev/pci/twe_pci.c +++ b/sys/dev/pci/twe_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: twe_pci.c,v 1.4 2001/06/12 15:40:33 niklas Exp $ */ +/* $OpenBSD: twe_pci.c,v 1.5 2001/08/25 10:13:30 art Exp $ */ /* * Copyright (c) 2000 Michael Shalayeff @@ -98,8 +98,7 @@ twe_pci_attach(parent, self, aux) pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, csr | PCI_COMMAND_MASTER_ENABLE); - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, - pa->pa_intrline, &ih)) { + if (pci_intr_map(pa, &ih)) { printf(": can't map interrupt\n"); bus_space_unmap(sc->iot, sc->ioh, size); return; diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c index 3a1c95358f0..6f5cae41cc2 100644 --- a/sys/dev/pci/ubsec.c +++ b/sys/dev/pci/ubsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsec.c,v 1.67 2001/08/12 20:03:49 mickey Exp $ */ +/* $OpenBSD: ubsec.c,v 1.68 2001/08/25 10:13:30 art Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -166,8 +166,7 @@ ubsec_attach(parent, self, aux) } sc->sc_dmat = pa->pa_dmat; - 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"); bus_space_unmap(sc->sc_st, sc->sc_sh, iosize); return; diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c index 71444830743..8e49e420dd9 100644 --- a/sys/dev/pci/uhci_pci.c +++ b/sys/dev/pci/uhci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci_pci.c,v 1.11 2001/06/12 19:11:59 mickey Exp $ */ +/* $OpenBSD: uhci_pci.c,v 1.12 2001/08/25 10:13:30 art Exp $ */ /* $NetBSD: uhci_pci.c,v 1.14 2000/01/25 11:26:06 augustss Exp $ */ /* @@ -149,8 +149,7 @@ uhci_pci_attach(parent, self, aux) bus_space_write_2(sc->sc.iot, sc->sc.ioh, UHCI_INTR, 0); /* 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(": couldn't map interrupt\n"); return; } diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c index 7aae339ec67..d0e86811335 100644 --- a/sys/dev/pci/yds.c +++ b/sys/dev/pci/yds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yds.c,v 1.3 2001/06/12 15:40:33 niklas Exp $ */ +/* $OpenBSD: yds.c,v 1.4 2001/08/25 10:13:30 art Exp $ */ /* $NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $ */ /* @@ -663,8 +663,7 @@ yds_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; } |