diff options
| author | christos <christos@NetBSD.org> | 2014-03-29 19:28:24 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2014-03-29 19:28:24 +0000 |
| commit | b8930f846ddd5473ed1faecb105807ff207af0b0 (patch) | |
| tree | 35b01151919862d21f30779687bf1ec028ecc4fd /sys/dev | |
| parent | be574ccf4eae1a6f527d09d63eb59ee645f8baa8 (diff) | |
make pci_intr_string and eisa_intr_string take a buffer and a length
instead of relying in local static storage.
Diffstat (limited to 'sys/dev')
163 files changed, 659 insertions, 486 deletions
diff --git a/sys/dev/eisa/ahb.c b/sys/dev/eisa/ahb.c index f79f6d3bda6..e49aed8c121 100644 --- a/sys/dev/eisa/ahb.c +++ b/sys/dev/eisa/ahb.c @@ -1,4 +1,4 @@ -/* $NetBSD: ahb.c,v 1.60 2012/10/27 17:18:16 chs Exp $ */ +/* $NetBSD: ahb.c,v 1.61 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.60 2012/10/27 17:18:16 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.61 2014/03/29 19:28:24 christos Exp $"); #include "opt_ddb.h" @@ -191,6 +191,7 @@ ahbattach(device_t parent, device_t self, void *aux) struct ahb_probe_data apd; struct scsipi_adapter *adapt = &sc->sc_adapter; struct scsipi_channel *chan = &sc->sc_channel; + char intrbuf[EISA_INTRSTR_LEN]; sc->sc_dev = self; @@ -251,7 +252,7 @@ ahbattach(device_t parent, device_t self, void *aux) apd.sc_irq); return; } - intrstr = eisa_intr_string(ec, ih); + intrstr = eisa_intr_string(ec, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = eisa_intr_establish(ec, ih, IST_LEVEL, IPL_BIO, ahbintr, sc); if (sc->sc_ih == NULL) { diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c index cfdb7e5ffec..1fdd9ab1c55 100644 --- a/sys/dev/eisa/ahc_eisa.c +++ b/sys/dev/eisa/ahc_eisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: ahc_eisa.c,v 1.38 2009/12/04 11:13:04 njoly Exp $ */ +/* $NetBSD: ahc_eisa.c,v 1.39 2014/03/29 19:28:24 christos Exp $ */ /* * Product specific probe and attach routines for: @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ahc_eisa.c,v 1.38 2009/12/04 11:13:04 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahc_eisa.c,v 1.39 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -110,6 +110,7 @@ ahc_eisa_attach(device_t parent, device_t self, void *aux) #ifdef AHC_DEBUG int i; #endif + char intrbuf[EISA_INTRSTR_LEN]; ahc->sc_dev = self; @@ -165,7 +166,7 @@ ahc_eisa_attach(device_t parent, device_t self, void *aux) intrtype = IST_LEVEL; intrtypestr = "level sensitive"; } - intrstr = eisa_intr_string(ec, ih); + intrstr = eisa_intr_string(ec, ih, intrbuf, sizeof(intrbuf)); ahc->ih = eisa_intr_establish(ec, ih, intrtype, IPL_BIO, ahc_intr, ahc); if (ahc->ih == NULL) { diff --git a/sys/dev/eisa/bha_eisa.c b/sys/dev/eisa/bha_eisa.c index 6eb8472e0b9..00af65915b5 100644 --- a/sys/dev/eisa/bha_eisa.c +++ b/sys/dev/eisa/bha_eisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: bha_eisa.c,v 1.35 2012/10/27 17:18:16 chs Exp $ */ +/* $NetBSD: bha_eisa.c,v 1.36 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.35 2012/10/27 17:18:16 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.36 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -146,6 +146,7 @@ bha_eisa_attach(device_t parent, device_t self, void *aux) eisa_chipset_tag_t ec = ea->ea_ec; eisa_intr_handle_t ih; const char *model, *intrstr; + char intrbuf[EISA_INTRSTR_LEN]; sc->sc_dev = self; @@ -179,7 +180,7 @@ bha_eisa_attach(device_t parent, device_t self, void *aux) bpd.sc_irq); return; } - intrstr = eisa_intr_string(ec, ih); + intrstr = eisa_intr_string(ec, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = eisa_intr_establish(ec, ih, IST_LEVEL, IPL_BIO, bha_intr, sc); if (sc->sc_ih == NULL) { diff --git a/sys/dev/eisa/cac_eisa.c b/sys/dev/eisa/cac_eisa.c index d5de5f87951..cf86ddd9a5b 100644 --- a/sys/dev/eisa/cac_eisa.c +++ b/sys/dev/eisa/cac_eisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: cac_eisa.c,v 1.22 2012/10/27 17:18:16 chs Exp $ */ +/* $NetBSD: cac_eisa.c,v 1.23 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.22 2012/10/27 17:18:16 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.23 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -139,6 +139,7 @@ cac_eisa_attach(device_t parent, device_t self, void *aux) bus_space_tag_t iot; const char *intrstr; int irq, i; + char intrbuf[EISA_INTRSTR_LEN]; ea = aux; sc = device_private(self); @@ -182,7 +183,7 @@ cac_eisa_attach(device_t parent, device_t self, void *aux) return; } - intrstr = eisa_intr_string(ec, ih); + intrstr = eisa_intr_string(ec, ih, intrbuf, sizeof(intrbuf)); if ((sc->sc_ih = eisa_intr_establish(ec, ih, IST_LEVEL, IPL_BIO, cac_intr, sc)) == NULL) { printf("can't establish interrupt"); diff --git a/sys/dev/eisa/depca_eisa.c b/sys/dev/eisa/depca_eisa.c index cbb46e483f0..d68ffc0bc38 100644 --- a/sys/dev/eisa/depca_eisa.c +++ b/sys/dev/eisa/depca_eisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: depca_eisa.c,v 1.14 2012/10/27 17:18:16 chs Exp $ */ +/* $NetBSD: depca_eisa.c,v 1.15 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: depca_eisa.c,v 1.14 2012/10/27 17:18:16 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: depca_eisa.c,v 1.15 2014/03/29 19:28:24 christos Exp $"); #include "opt_inet.h" @@ -156,13 +156,14 @@ depca_eisa_intr_establish(struct depca_softc *sc, struct lance_softc *child) eisa_intr_handle_t ih; const char *intrstr; void *rv; + char intrbuf[EISA_INTRSTR_LEN]; if (eisa_intr_map(esc->sc_ec, esc->sc_irq, &ih)) { aprint_error_dev(sc->sc_dev, "unable to map interrupt (%d)\n", esc->sc_irq); return (NULL); } - intrstr = eisa_intr_string(esc->sc_ec, ih); + intrstr = eisa_intr_string(esc->sc_ec, ih, intrbuf, sizeof(intrbuf)); rv = eisa_intr_establish(esc->sc_ec, ih, esc->sc_ist, IPL_NET, (esc->sc_ist == IST_LEVEL) ? am7990_intr : depca_intredge, child); if (rv == NULL) { diff --git a/sys/dev/eisa/dpt_eisa.c b/sys/dev/eisa/dpt_eisa.c index f429ffdec81..693970f888d 100644 --- a/sys/dev/eisa/dpt_eisa.c +++ b/sys/dev/eisa/dpt_eisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: dpt_eisa.c,v 1.21 2012/10/27 17:18:16 chs Exp $ */ +/* $NetBSD: dpt_eisa.c,v 1.22 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org> @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.21 2012/10/27 17:18:16 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.22 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -128,6 +128,7 @@ dpt_eisa_attach(device_t parent, device_t self, void *aux) bus_space_tag_t iot; const char *intrstr; int irq; + char intrbuf[EISA_INTRSTR_LEN]; ea = aux; sc = device_private(self); @@ -158,7 +159,7 @@ dpt_eisa_attach(device_t parent, device_t self, void *aux) return; } - intrstr = eisa_intr_string(ec, ih); + intrstr = eisa_intr_string(ec, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = eisa_intr_establish(ec, ih, IST_LEVEL, IPL_BIO, dpt_intr, sc); if (sc->sc_ih == NULL) { diff --git a/sys/dev/eisa/eisareg.h b/sys/dev/eisa/eisareg.h index 0f71e1596fd..5f3501123fb 100644 --- a/sys/dev/eisa/eisareg.h +++ b/sys/dev/eisa/eisareg.h @@ -1,4 +1,4 @@ -/* $NetBSD: eisareg.h,v 1.7 2005/12/11 12:21:20 christos Exp $ */ +/* $NetBSD: eisareg.h,v 1.8 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -96,4 +96,8 @@ #define EISA_PRODID_3(pid) \ (HEXDIGITS[(((pid)[1] >> 0) & 0xf)]) +/* + * Local defines + */ +#define EISA_INTRSTR_LEN 64 #endif /* !__DEV_EISA_EISAREG_H__ */ diff --git a/sys/dev/eisa/if_ep_eisa.c b/sys/dev/eisa/if_ep_eisa.c index 440f84b981f..775676f4c43 100644 --- a/sys/dev/eisa/if_ep_eisa.c +++ b/sys/dev/eisa/if_ep_eisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ep_eisa.c,v 1.42 2010/01/18 19:00:58 pooka Exp $ */ +/* $NetBSD: if_ep_eisa.c,v 1.43 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ep_eisa.c,v 1.42 2010/01/18 19:00:58 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ep_eisa.c,v 1.43 2014/03/29 19:28:24 christos Exp $"); #include "opt_inet.h" @@ -203,6 +203,7 @@ ep_eisa_attach(device_t parent, device_t self, void *aux) const char *intrstr; const struct ep_eisa_product *eep; u_int irq; + char intrbuf[EISA_INTRSTR_LEN]; /* Map i/o space. */ if (bus_space_map(iot, EISA_SLOT_ADDR(ea->ea_slot) + EP_EISA_CFG_BASE, @@ -253,7 +254,7 @@ ep_eisa_attach(device_t parent, device_t self, void *aux) irq); return; } - intrstr = eisa_intr_string(ec, ih); + intrstr = eisa_intr_string(ec, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = eisa_intr_establish(ec, ih, IST_EDGE, IPL_NET, epintr, sc); if (sc->sc_ih == NULL) { diff --git a/sys/dev/eisa/if_fea.c b/sys/dev/eisa/if_fea.c index 8c4fe5891e9..e3b11dec236 100644 --- a/sys/dev/eisa/if_fea.c +++ b/sys/dev/eisa/if_fea.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fea.c,v 1.45 2012/10/27 17:18:16 chs Exp $ */ +/* $NetBSD: if_fea.c,v 1.46 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com> @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.45 2012/10/27 17:18:16 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.46 2014/03/29 19:28:24 christos Exp $"); #include "opt_inet.h" @@ -462,6 +462,7 @@ pdq_eisa_attach( pdq_uint32_t irq, maddr, msiz; eisa_intr_handle_t ih; const char *intrstr; + char intrbuf[EISA_INTRSTR_LEN]; sc->sc_iotag = ea->ea_iot; sc->sc_dmatag = ea->ea_dmat; @@ -508,7 +509,7 @@ pdq_eisa_attach( aprint_error_dev(sc->sc_dev, "couldn't map interrupt (%d)\n", irq); return; } - intrstr = eisa_intr_string(ea->ea_ec, ih); + intrstr = eisa_intr_string(ea->ea_ec, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = eisa_intr_establish(ea->ea_ec, ih, IST_LEVEL, IPL_NET, (int (*)(void *)) pdq_interrupt, sc->sc_pdq); if (sc->sc_ih == NULL) { diff --git a/sys/dev/eisa/if_tlp_eisa.c b/sys/dev/eisa/if_tlp_eisa.c index 3e12e608ba4..054938b6c8e 100644 --- a/sys/dev/eisa/if_tlp_eisa.c +++ b/sys/dev/eisa/if_tlp_eisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tlp_eisa.c,v 1.24 2010/01/18 19:00:58 pooka Exp $ */ +/* $NetBSD: if_tlp_eisa.c,v 1.25 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tlp_eisa.c,v 1.24 2010/01/18 19:00:58 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tlp_eisa.c,v 1.25 2014/03/29 19:28:24 christos Exp $"); #include "opt_inet.h" @@ -162,6 +162,7 @@ tlp_eisa_attach(device_t parent, device_t self, void *aux) u_int8_t enaddr[ETHER_ADDR_LEN], tmpbuf[sizeof(testpat)]; u_int32_t val; int irq, i, cnt; + char intrbuf[EISA_INTRSTR_LEN]; /* * Map the device. @@ -264,7 +265,7 @@ tlp_eisa_attach(device_t parent, device_t self, void *aux) irq); return; } - intrstr = eisa_intr_string(ec, ih); + intrstr = eisa_intr_string(ec, ih, intrbuf, sizeof(intrbuf)); esc->sc_ih = eisa_intr_establish(ec, ih, (val & 0x01) ? IST_EDGE : IST_LEVEL, IPL_NET, tlp_intr, sc); if (esc->sc_ih == NULL) { diff --git a/sys/dev/eisa/mlx_eisa.c b/sys/dev/eisa/mlx_eisa.c index 147ad023aac..b2fa44bec2c 100644 --- a/sys/dev/eisa/mlx_eisa.c +++ b/sys/dev/eisa/mlx_eisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: mlx_eisa.c,v 1.23 2012/10/27 17:18:16 chs Exp $ */ +/* $NetBSD: mlx_eisa.c,v 1.24 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.23 2012/10/27 17:18:16 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.24 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -118,6 +118,7 @@ mlx_eisa_attach(device_t parent, device_t self, void *aux) bus_space_tag_t iot; const char *intrstr; int irq, i, icfg; + char intrbuf[EISA_INTRSTR_LEN]; ea = aux; mlx = device_private(self); @@ -163,7 +164,7 @@ mlx_eisa_attach(device_t parent, device_t self, void *aux) return; } - intrstr = eisa_intr_string(ec, ih); + intrstr = eisa_intr_string(ec, ih, intrbuf, sizeof(intrbuf)); mlx->mlx_ih = eisa_intr_establish(ec, ih, ((icfg & 0x08) != 0 ? IST_LEVEL : IST_EDGE), IPL_BIO, mlx_intr, mlx); diff --git a/sys/dev/eisa/uha_eisa.c b/sys/dev/eisa/uha_eisa.c index ec787ae5956..e26f7365305 100644 --- a/sys/dev/eisa/uha_eisa.c +++ b/sys/dev/eisa/uha_eisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: uha_eisa.c,v 1.35 2013/11/04 16:53:35 christos Exp $ */ +/* $NetBSD: uha_eisa.c,v 1.36 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.35 2013/11/04 16:53:35 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.36 2014/03/29 19:28:24 christos Exp $"); #include "opt_ddb.h" @@ -117,6 +117,7 @@ uha_eisa_attach(device_t parent, device_t self, void *aux) eisa_chipset_tag_t ec = ea->ea_ec; eisa_intr_handle_t ih; const char *model, *intrstr; + char intrbuf[EISA_INTRSTR_LEN]; if (!strncmp(ea->ea_idstring, "USC024", 6)) model = EISA_PRODUCT_USC0240; @@ -142,7 +143,7 @@ uha_eisa_attach(device_t parent, device_t self, void *aux) upd.sc_irq); return; } - intrstr = eisa_intr_string(ec, ih); + intrstr = eisa_intr_string(ec, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = eisa_intr_establish(ec, ih, IST_LEVEL, IPL_BIO, u24_intr, sc); if (sc->sc_ih == NULL) { diff --git a/sys/dev/pci/aac_pci.c b/sys/dev/pci/aac_pci.c index 776b136498f..a0a6896368c 100644 --- a/sys/dev/pci/aac_pci.c +++ b/sys/dev/pci/aac_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: aac_pci.c,v 1.35 2012/10/27 17:18:28 chs Exp $ */ +/* $NetBSD: aac_pci.c,v 1.36 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.35 2012/10/27 17:18:28 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.36 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -499,6 +499,7 @@ aac_pci_attach(device_t parent, device_t self, void *aux) const char *intrstr; int state; const struct aac_ident *m; + char intrbuf[PCI_INTRSTR_LEN]; pa = aux; pc = pa->pa_pc; @@ -545,7 +546,7 @@ aac_pci_attach(device_t parent, device_t self, void *aux) aprint_error("couldn't map interrupt\n"); goto bail_out; } - intrstr = pci_intr_string(pc, pcisc->sc_ih); + intrstr = pci_intr_string(pc, pcisc->sc_ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, pcisc->sc_ih, IPL_BIO, aac_intr, sc); if (sc->sc_ih == NULL) { aprint_error("couldn't establish interrupt"); diff --git a/sys/dev/pci/adv_pci.c b/sys/dev/pci/adv_pci.c index 2e3bdf035be..995f4778261 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.27 2012/10/27 17:18:28 chs Exp $ */ +/* $NetBSD: adv_pci.c,v 1.28 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.27 2012/10/27 17:18:28 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.28 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -116,6 +116,7 @@ adv_pci_attach(device_t parent, device_t self, void *aux) pci_chipset_tag_t pc = pa->pa_pc; u_int32_t command; const char *intrstr; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive(": SCSI controller\n"); @@ -218,7 +219,7 @@ adv_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); /* * Establish Interrupt handler diff --git a/sys/dev/pci/adw_pci.c b/sys/dev/pci/adw_pci.c index 2915b33bb95..9c0f62229b4 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.26 2012/10/27 17:18:28 chs Exp $ */ +/* $NetBSD: adw_pci.c,v 1.27 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.26 2012/10/27 17:18:28 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.27 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -103,6 +103,7 @@ adw_pci_attach(device_t parent, device_t self, void *aux) pci_chipset_tag_t pc = pa->pa_pc; u_int32_t command; const char *intrstr; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -172,7 +173,7 @@ adw_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); /* * Establish Interrupt handler diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c index 26e28c38bd2..8a1524ea8bb 100644 --- a/sys/dev/pci/ahc_pci.c +++ b/sys/dev/pci/ahc_pci.c @@ -39,7 +39,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: ahc_pci.c,v 1.69 2014/02/18 12:32:12 macallan Exp $ + * $Id: ahc_pci.c,v 1.70 2014/03/29 19:28:24 christos Exp $ * * //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $ * @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.69 2014/02/18 12:32:12 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.70 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -780,6 +780,7 @@ ahc_pci_attach(device_t parent, device_t self, void *aux) const char *intrstr; struct ahc_pci_busdata *bd; bool override_ultra; + char intrbuf[PCI_INTRSTR_LEN]; ahc->sc_dev = self; ahc_set_name(ahc, device_xname(ahc->sc_dev)); @@ -953,7 +954,7 @@ ahc_pci_attach(device_t parent, device_t self, void *aux) ahc_free(ahc); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); ahc->ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, ahc_intr, ahc); if (ahc->ih == NULL) { aprint_error_dev(ahc->sc_dev, diff --git a/sys/dev/pci/ahcisata_pci.c b/sys/dev/pci/ahcisata_pci.c index 80ee33879e9..a8b0c7fb6bc 100644 --- a/sys/dev/pci/ahcisata_pci.c +++ b/sys/dev/pci/ahcisata_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisata_pci.c,v 1.35 2014/01/21 09:26:47 msaitoh Exp $ */ +/* $NetBSD: ahcisata_pci.c,v 1.36 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.35 2014/01/21 09:26:47 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.36 2014/03/29 19:28:24 christos Exp $"); #include <sys/types.h> #include <sys/malloc.h> @@ -271,6 +271,7 @@ ahci_pci_attach(device_t parent, device_t self, void *aux) bool ahci_cap_64bit; bool ahci_bad_64bit; pci_intr_handle_t intrhandle; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_atac.atac_dev = self; @@ -289,14 +290,14 @@ ahci_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, + intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO, ahci_intr, sc); if (psc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt\n"); return; } - aprint_normal_dev(self, "interrupting at %s\n", - intrstr ? intrstr : "unknown interrupt"); + aprint_normal_dev(self, "interrupting at %s\n", intrstr); sc->sc_dmat = pa->pa_dmat; diff --git a/sys/dev/pci/ahd_pci.c b/sys/dev/pci/ahd_pci.c index 9fa313d8283..9517c6253a3 100644 --- a/sys/dev/pci/ahd_pci.c +++ b/sys/dev/pci/ahd_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ahd_pci.c,v 1.34 2013/04/21 19:59:40 msaitoh Exp $ */ +/* $NetBSD: ahd_pci.c,v 1.35 2014/03/29 19:28:24 christos Exp $ */ /* * Product specific probe and attach routines for: @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.34 2013/04/21 19:59:40 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.35 2014/03/29 19:28:24 christos Exp $"); #define AHD_PCI_IOADDR PCI_MAPREG_START /* I/O Address */ #define AHD_PCI_MEMADDR (PCI_MAPREG_START + 4) /* Mem I/O Address */ @@ -324,6 +324,7 @@ ahd_pci_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; const char *intrstr; struct ahd_pci_busdata *bd; + char intrbuf[PCI_INTRSTR_LEN]; ahd->sc_dev = self; ahd_set_name(ahd, device_xname(self)); @@ -537,7 +538,7 @@ ahd_pci_attach(device_t parent, device_t self, void *aux) ahd_free(ahd); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); ahd->ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, ahd_intr, ahd); if (ahd->ih == NULL) { aprint_error("%s: couldn't establish interrupt", diff --git a/sys/dev/pci/amr.c b/sys/dev/pci/amr.c index 01639ef653a..a502954f696 100644 --- a/sys/dev/pci/amr.c +++ b/sys/dev/pci/amr.c @@ -1,4 +1,4 @@ -/* $NetBSD: amr.c,v 1.56 2014/03/16 05:20:28 dholland Exp $ */ +/* $NetBSD: amr.c,v 1.57 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.56 2014/03/16 05:20:28 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.57 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -275,6 +275,7 @@ amr_attach(device_t parent, device_t self, void *aux) int rseg, i, j, size, rv, memreg, ioreg; struct amr_ccb *ac; int locs[AMRCF_NLOCS]; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive(": RAID controller\n"); @@ -332,7 +333,7 @@ amr_attach(device_t parent, device_t self, void *aux) amr_teardown(amr); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); amr->amr_ih = pci_intr_establish(pc, ih, IPL_BIO, amr_intr, amr); if (amr->amr_ih == NULL) { aprint_error("can't establish interrupt"); diff --git a/sys/dev/pci/arcmsr.c b/sys/dev/pci/arcmsr.c index 8ebed59e8be..beaa839dacf 100644 --- a/sys/dev/pci/arcmsr.c +++ b/sys/dev/pci/arcmsr.c @@ -1,4 +1,4 @@ -/* $NetBSD: arcmsr.c,v 1.30 2011/06/20 22:03:16 pgoyette Exp $ */ +/* $NetBSD: arcmsr.c,v 1.31 2014/03/29 19:28:24 christos Exp $ */ /* $OpenBSD: arc.c,v 1.68 2007/10/27 03:28:27 dlg Exp $ */ /* @@ -21,7 +21,7 @@ #include "bio.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.30 2011/06/20 22:03:16 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.31 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -548,6 +548,7 @@ arc_map_pci_resources(device_t self, struct pci_attach_args *pa) struct arc_softc *sc = device_private(self); pcireg_t memtype; pci_intr_handle_t ih; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_pc = pa->pa_pc; sc->sc_tag = pa->pa_tag; @@ -574,7 +575,7 @@ arc_map_pci_resources(device_t self, struct pci_attach_args *pa) aprint_normal("\n"); aprint_normal_dev(self, "interrupting at %s\n", - pci_intr_string(pa->pa_pc, ih)); + pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf))); return 0; diff --git a/sys/dev/pci/artsata.c b/sys/dev/pci/artsata.c index e026d2d305d..22ceecaee8f 100644 --- a/sys/dev/pci/artsata.c +++ b/sys/dev/pci/artsata.c @@ -1,4 +1,4 @@ -/* $NetBSD: artsata.c,v 1.25 2013/10/07 19:51:55 jakllsch Exp $ */ +/* $NetBSD: artsata.c,v 1.26 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: artsata.c,v 1.25 2013/10/07 19:51:55 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: artsata.c,v 1.26 2014/03/29 19:28:24 christos Exp $"); #include "opt_pciide.h" @@ -128,6 +128,7 @@ artisea_mapregs(const struct pci_attach_args *pa, struct pciide_channel *cp, const char *intrstr; pci_intr_handle_t intrhandle; int i; + char intrbuf[PCI_INTRSTR_LEN]; cp->compat = 0; @@ -137,13 +138,13 @@ artisea_mapregs(const struct pci_attach_args *pa, struct pciide_channel *cp, "couldn't map native-PCI interrupt\n"); goto bad; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, + intrbuf, sizeof(intrbuf)); sc->sc_pci_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO, pci_intr, sc); if (sc->sc_pci_ih != NULL) { aprint_normal_dev(sc->sc_wdcdev.sc_atac.atac_dev, - "using %s for native-PCI interrupt\n", - intrstr ? intrstr : "unknown interrupt"); + "using %s for native-PCI interrupt\n", intrstr); } else { aprint_error_dev(sc->sc_wdcdev.sc_atac.atac_dev, "couldn't establish native-PCI interrupt"); diff --git a/sys/dev/pci/atppc_puc.c b/sys/dev/pci/atppc_puc.c index 0863350fcfb..ed0a18d495a 100644 --- a/sys/dev/pci/atppc_puc.c +++ b/sys/dev/pci/atppc_puc.c @@ -1,4 +1,4 @@ -/* $NetBSD: atppc_puc.c,v 1.13 2012/10/27 17:18:28 chs Exp $ */ +/* $NetBSD: atppc_puc.c,v 1.14 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include "opt_atppc.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: atppc_puc.c,v 1.13 2012/10/27 17:18:28 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atppc_puc.c,v 1.14 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -97,6 +97,7 @@ atppc_puc_attach(device_t parent, device_t self, void *aux) struct atppc_puc_softc *psc = device_private(self); struct puc_attach_args *aa = aux; const char *intrstr; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev_ok = ATPPC_NOATTACH; @@ -109,7 +110,8 @@ atppc_puc_attach(device_t parent, device_t self, void *aux) sc->sc_dmat = aa->dmat; sc->sc_has = 0; - intrstr = pci_intr_string(aa->pc, aa->intrhandle); + intrstr = pci_intr_string(aa->pc, aa->intrhandle, intrbuf, + sizeof(intrbuf)); sc->sc_ieh = pci_intr_establish(aa->pc, aa->intrhandle, IPL_TTY, atppcintr, sc); if (sc->sc_ieh == NULL) { diff --git a/sys/dev/pci/auacer.c b/sys/dev/pci/auacer.c index 9d915a14f65..3836265a8b8 100644 --- a/sys/dev/pci/auacer.c +++ b/sys/dev/pci/auacer.c @@ -1,4 +1,4 @@ -/* $NetBSD: auacer.c,v 1.31 2012/10/27 17:18:28 chs Exp $ */ +/* $NetBSD: auacer.c,v 1.32 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2004, 2008 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.31 2012/10/27 17:18:28 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.32 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -258,6 +258,7 @@ auacer_attach(device_t parent, device_t self, void *aux) pcireg_t v; const char *intrstr; int i; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); sc->sc_dev = self; @@ -291,7 +292,7 @@ auacer_attach(device_t parent, device_t self, void *aux) mutex_destroy(&sc->sc_intr_lock); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, auacer_intr, sc); if (sc->sc_ih == NULL) { diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c index 588b03f5f6c..6b45dc18893 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $NetBSD: auich.c,v 1.142 2014/02/25 18:30:10 pooka Exp $ */ +/* $NetBSD: auich.c,v 1.143 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2000, 2004, 2005, 2008 The NetBSD Foundation, Inc. @@ -111,7 +111,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.142 2014/02/25 18:30:10 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.143 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -457,6 +457,7 @@ auich_attach(device_t parent, device_t self, void *aux) const struct auich_devtype *d; const struct sysctlnode *node, *node_ac97clock; int err, node_mib, i; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; pa = aux; @@ -533,7 +534,7 @@ map_done: aprint_error_dev(self, "can't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, sc->intrh); + intrstr = pci_intr_string(pa->pa_pc, sc->intrh, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, sc->intrh, IPL_AUDIO, auich_intr, sc); if (sc->sc_ih == NULL) { diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c index 62a3acc1ccc..57dce8dc12a 100644 --- a/sys/dev/pci/auixp.c +++ b/sys/dev/pci/auixp.c @@ -1,4 +1,4 @@ -/* $NetBSD: auixp.c,v 1.39 2012/10/27 17:18:28 chs Exp $ */ +/* $NetBSD: auixp.c,v 1.40 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2004, 2005 Reinoud Zandijk <reinoud@netbsd.org> @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.39 2012/10/27 17:18:28 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.40 2014/03/29 19:28:24 christos Exp $"); #include <sys/types.h> #include <sys/errno.h> @@ -1101,6 +1101,7 @@ auixp_attach(device_t parent, device_t self, void *aux) const char *intrstr; uint32_t data; int error; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); sc->sc_dev = self; @@ -1162,7 +1163,7 @@ auixp_attach(device_t parent, device_t self, void *aux) } /* where are we connected at ? */ - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE); mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO); diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c index 235178b9b5f..73d0f7267e2 100644 --- a/sys/dev/pci/autri.c +++ b/sys/dev/pci/autri.c @@ -1,4 +1,4 @@ -/* $NetBSD: autri.c,v 1.50 2012/03/17 20:29:59 martin Exp $ */ +/* $NetBSD: autri.c,v 1.51 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.50 2012/03/17 20:29:59 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.51 2014/03/29 19:28:24 christos Exp $"); #include "midi.h" @@ -522,6 +522,7 @@ autri_attach(device_t parent, device_t self, void *aux) char const *intrstr; int r; uint32_t reg; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); sc->sc_dev = self; @@ -549,7 +550,7 @@ autri_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, autri_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "couldn't establish interrupt"); diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c index 12c8dbec7f7..f9ecb6f3f0d 100644 --- a/sys/dev/pci/auvia.c +++ b/sys/dev/pci/auvia.c @@ -1,4 +1,4 @@ -/* $NetBSD: auvia.c,v 1.76 2013/10/16 18:20:16 christos Exp $ */ +/* $NetBSD: auvia.c,v 1.77 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2000, 2008 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.76 2013/10/16 18:20:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.77 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -345,6 +345,7 @@ auvia_attach(device_t parent, device_t self, void *aux) pcireg_t pr; int r; const char *revnum; /* VT823xx revision number */ + char intrbuf[PCI_INTRSTR_LEN]; pa = aux; sc = device_private(self); @@ -423,7 +424,7 @@ auvia_attach(device_t parent, device_t self, void *aux) bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_iosize); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE); mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO); diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c index e47ecf89bf5..c2f061b7d0b 100644 --- a/sys/dev/pci/azalia.c +++ b/sys/dev/pci/azalia.c @@ -1,4 +1,4 @@ -/* $NetBSD: azalia.c,v 1.80 2013/10/20 21:06:09 christos Exp $ */ +/* $NetBSD: azalia.c,v 1.81 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2005, 2008 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.80 2013/10/20 21:06:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.81 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -305,6 +305,7 @@ azalia_pci_attach(device_t parent, device_t self, void *aux) const char *intrrupt_str; const char *name; const char *vendor; + char intrbuf[PCI_INTRSTR_LEN]; sc->dev = self; sc->dmat = pa->pa_dmat; @@ -335,7 +336,7 @@ azalia_pci_attach(device_t parent, device_t self, void *aux) sc->pc = pa->pa_pc; sc->tag = pa->pa_tag; - intrrupt_str = pci_intr_string(pa->pa_pc, ih); + intrrupt_str = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, azalia_intr, sc); if (sc->ih == NULL) { aprint_error_dev(self, "can't establish interrupt"); diff --git a/sys/dev/pci/bha_pci.c b/sys/dev/pci/bha_pci.c index c0c8ef13c2a..25e2af63595 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.38 2012/10/27 17:18:28 chs Exp $ */ +/* $NetBSD: bha_pci.c,v 1.39 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.38 2012/10/27 17:18:28 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.39 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -96,6 +96,7 @@ bha_pci_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; pcireg_t csr; const char *model, *intrstr; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -131,7 +132,7 @@ bha_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_BIO, bha_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "couldn't establish interrupt"); diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c index 16913e9ffde..a2f64bd3ae1 100644 --- a/sys/dev/pci/bktr/bktr_os.c +++ b/sys/dev/pci/bktr/bktr_os.c @@ -1,6 +1,6 @@ /* $SourceForge: bktr_os.c,v 1.5 2003/03/11 23:11:25 thomasklausner Exp $ */ -/* $NetBSD: bktr_os.c,v 1.63 2014/03/16 05:20:28 dholland Exp $ */ +/* $NetBSD: bktr_os.c,v 1.64 2014/03/29 19:28:25 christos Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp$ */ /* @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.63 2014/03/16 05:20:28 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.64 2014/03/29 19:28:25 christos Exp $"); #ifdef __FreeBSD__ #include "bktr.h" @@ -1403,6 +1403,7 @@ bktr_attach(device_t parent, device_t self, void *aux) const char *intrstr; int retval; int unit; + char intrbuf[PCI_INTRSTR_LEN]; bktr = (bktr_ptr_t)self; unit = bktr->bktr_dev.dv_unit; @@ -1434,7 +1435,7 @@ bktr_attach(device_t parent, device_t self, void *aux) printf(": couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); bktr->ih = pci_intr_establish(pa->pa_pc, ih, IPL_VIDEO, bktr_intr, bktr, device_xname(bktr->bktr_dev)); @@ -1457,6 +1458,7 @@ bktr_attach(device_t parent, device_t self, void *aux) const char *intrstr; int retval; int unit; + char intrbuf[PCI_INTRSTR_LEN]; bktr = device_private(self); bktr->bktr_dev = self; @@ -1501,7 +1503,7 @@ bktr_attach(device_t parent, device_t self, void *aux) bktr_name(bktr)); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); bktr->ih = pci_intr_establish(pa->pa_pc, ih, IPL_VIDEO, bktr_intr, bktr); if (bktr->ih == NULL) { diff --git a/sys/dev/pci/btvmei.c b/sys/dev/pci/btvmei.c index cbb33867153..9ca76c28ce4 100644 --- a/sys/dev/pci/btvmei.c +++ b/sys/dev/pci/btvmei.c @@ -1,4 +1,4 @@ -/* $NetBSD: btvmei.c,v 1.29 2012/10/27 17:18:28 chs Exp $ */ +/* $NetBSD: btvmei.c,v 1.30 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 1999 @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.29 2012/10/27 17:18:28 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.30 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -93,6 +93,7 @@ b3_617_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; const char *intrstr; struct vmebus_attach_args vaa; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_pc = pc; @@ -135,7 +136,7 @@ b3_617_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); /* * Use a low interrupt level (the lowest?). * We will raise before calling a subdevice's handler. diff --git a/sys/dev/pci/cac_pci.c b/sys/dev/pci/cac_pci.c index f2ece181081..17c7774bdb1 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.33 2012/10/27 17:18:28 chs Exp $ */ +/* $NetBSD: cac_pci.c,v 1.34 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cac_pci.c,v 1.33 2012/10/27 17:18:28 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cac_pci.c,v 1.34 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -147,6 +147,7 @@ cac_pci_attach(device_t parent, device_t self, void *aux) const char *intrstr; pcireg_t reg; int memr, ior, i; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive(": RAID controller\n"); @@ -202,7 +203,7 @@ cac_pci_attach(device_t parent, device_t self, void *aux) aprint_error("can't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_BIO, cac_intr, sc); if (sc->sc_ih == NULL) { aprint_error("can't establish interrupt"); diff --git a/sys/dev/pci/ciss_pci.c b/sys/dev/pci/ciss_pci.c index ab59ecfbb46..6fd90de2dbc 100644 --- a/sys/dev/pci/ciss_pci.c +++ b/sys/dev/pci/ciss_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ciss_pci.c,v 1.10 2012/10/27 17:18:28 chs Exp $ */ +/* $NetBSD: ciss_pci.c,v 1.11 2014/03/29 19:28:24 christos Exp $ */ /* $OpenBSD: ciss_pci.c,v 1.9 2005/12/13 15:56:01 brad Exp $ */ /* @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.10 2012/10/27 17:18:28 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.11 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -254,6 +254,7 @@ ciss_pci_attach(device_t parent, device_t self, void *aux) int cfg_bar, memtype; pcireg_t reg = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_SUBSYS_ID_REG); int i; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -323,7 +324,7 @@ ciss_pci_attach(device_t parent, device_t self, void *aux) bus_space_unmap(sc->sc_iot, sc->cfg_ioh, cfgsz); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, ciss_intr, sc); if (!sc->sc_ih) { aprint_error_dev(sc->sc_dev, "can't establish interrupt"); diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c index 061926455c1..e020e2344e8 100644 --- a/sys/dev/pci/cmpci.c +++ b/sys/dev/pci/cmpci.c @@ -1,4 +1,4 @@ -/* $NetBSD: cmpci.c,v 1.46 2012/10/27 17:18:28 chs Exp $ */ +/* $NetBSD: cmpci.c,v 1.47 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2000, 2001, 2008 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.46 2012/10/27 17:18:28 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.47 2014/03/29 19:28:24 christos Exp $"); #if defined(AUDIO_DEBUG) || defined(DEBUG) #define DPRINTF(x) if (cmpcidebug) printf x @@ -382,6 +382,7 @@ cmpci_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; char const *strintr; int i, v; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); sc->sc_dev = self; @@ -418,7 +419,7 @@ cmpci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "failed to map interrupt\n"); return; } - strintr = pci_intr_string(pa->pa_pc, ih); + strintr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, cmpci_intr, sc); if (sc->sc_ih == NULL) { diff --git a/sys/dev/pci/com_puc.c b/sys/dev/pci/com_puc.c index bcb6c615937..208a3a227bd 100644 --- a/sys/dev/pci/com_puc.c +++ b/sys/dev/pci/com_puc.c @@ -1,4 +1,4 @@ -/* $NetBSD: com_puc.c,v 1.21 2013/07/31 14:31:01 soren Exp $ */ +/* $NetBSD: com_puc.c,v 1.22 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 1998 Christopher G. Demetriou. All rights reserved. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_puc.c,v 1.21 2013/07/31 14:31:01 soren Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_puc.c,v 1.22 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -81,6 +81,7 @@ com_puc_attach(device_t parent, device_t self, void *aux) struct com_softc *sc = &psc->sc_com; struct puc_attach_args *aa = aux; const char *intrstr; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -90,7 +91,7 @@ com_puc_attach(device_t parent, device_t self, void *aux) COM_INIT_REGS(sc->sc_regs, aa->t, aa->h, aa->a); sc->sc_frequency = aa->flags & PUC_COM_CLOCKMASK; - intrstr = pci_intr_string(aa->pc, aa->intrhandle); + intrstr = pci_intr_string(aa->pc, aa->intrhandle, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(aa->pc, aa->intrhandle, IPL_SERIAL, comintr, sc); if (psc->sc_ih == NULL) { diff --git a/sys/dev/pci/coram.c b/sys/dev/pci/coram.c index 34145085dcf..c26c9b02c91 100644 --- a/sys/dev/pci/coram.c +++ b/sys/dev/pci/coram.c @@ -1,4 +1,4 @@ -/* $NetBSD: coram.c,v 1.12 2013/10/16 18:20:16 christos Exp $ */ +/* $NetBSD: coram.c,v 1.13 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2008, 2011 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.12 2013/10/16 18:20:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.13 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -170,6 +170,7 @@ coram_attach(device_t parent, device_t self, void *aux) #ifdef CORAM_ATTACH_I2C struct i2cbus_attach_args iba; #endif + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -192,7 +193,7 @@ coram_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_VM, coram_intr, self); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c index 9fd63dcf45a..b7e63e7cc99 100644 --- a/sys/dev/pci/cs4280.c +++ b/sys/dev/pci/cs4280.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4280.c,v 1.65 2012/10/27 17:18:28 chs Exp $ */ +/* $NetBSD: cs4280.c,v 1.66 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.65 2012/10/27 17:18:28 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.66 2014/03/29 19:28:24 christos Exp $"); #include "midi.h" @@ -245,6 +245,7 @@ cs4280_attach(device_t parent, device_t self, void *aux) pcireg_t reg; uint32_t mem; int error; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); sc->sc_dev = self; @@ -320,7 +321,7 @@ cs4280_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, sc->intrh); + intrstr = pci_intr_string(pc, sc->intrh, intrbuf, sizeof(intrbuf)); mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE); mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO); diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c index 9c2a3b70fae..ed74e530e44 100644 --- a/sys/dev/pci/cs4281.c +++ b/sys/dev/pci/cs4281.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4281.c,v 1.50 2013/10/16 19:32:30 christos Exp $ */ +/* $NetBSD: cs4281.c,v 1.51 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2000 Tatoku Ogaito. All rights reserved. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.50 2013/10/16 19:32:30 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.51 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -190,6 +190,7 @@ cs4281_attach(device_t parent, device_t self, void *aux) char const *intrstr; pcireg_t reg; int error; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); sc->sc_dev = self; @@ -244,7 +245,7 @@ cs4281_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, sc->intrh); + intrstr = pci_intr_string(pc, sc->intrh, intrbuf, sizeof(intrbuf)); mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE); mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO); diff --git a/sys/dev/pci/cxdtv.c b/sys/dev/pci/cxdtv.c index 3e9f1c745b9..5705a6a1fae 100644 --- a/sys/dev/pci/cxdtv.c +++ b/sys/dev/pci/cxdtv.c @@ -1,4 +1,4 @@ -/* $NetBSD: cxdtv.c,v 1.13 2013/10/16 18:20:16 christos Exp $ */ +/* $NetBSD: cxdtv.c,v 1.14 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2008, 2011 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cxdtv.c,v 1.13 2013/10/16 18:20:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cxdtv.c,v 1.14 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -187,6 +187,7 @@ cxdtv_attach(device_t parent, device_t self, void *aux) pcireg_t reg; const char *intrstr; struct i2cbus_attach_args iba; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); @@ -215,7 +216,7 @@ cxdtv_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_VM, cxdtv_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/cy_pci.c b/sys/dev/pci/cy_pci.c index 36870d085f3..ea5730d69c1 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.23 2008/03/26 17:50:32 matt Exp $ */ +/* $NetBSD: cy_pci.c,v 1.24 2014/03/29 19:28:24 christos Exp $ */ /* * cy_pci.c @@ -10,7 +10,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cy_pci.c,v 1.23 2008/03/26 17:50:32 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cy_pci.c,v 1.24 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -93,6 +93,7 @@ cy_pci_attach(device_t parent, device_t self, void *aux) const struct cy_pci_product *cp; const char *intrstr; int plx_ver; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -134,7 +135,7 @@ cy_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_TTY, cy_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "unable to establish interrupt"); diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c index b0e5c795252..495f236f9a2 100644 --- a/sys/dev/pci/cz.c +++ b/sys/dev/pci/cz.c @@ -1,4 +1,4 @@ -/* $NetBSD: cz.c,v 1.58 2014/03/16 05:20:28 dholland Exp $ */ +/* $NetBSD: cz.c,v 1.59 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2000 Zembu Labs, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.58 2014/03/16 05:20:28 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.59 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -291,6 +291,7 @@ cz_attach(device_t parent, device_t self, void *aux) struct cztty_softc *sc; struct tty *tp; int i; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive(": Multi-port serial controller\n"); aprint_normal(": Cyclades-Z multiport serial\n"); @@ -342,7 +343,7 @@ cz_attach(device_t parent, device_t self, void *aux) cz->cz_ih = NULL; goto polling_mode; } else { - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); cz->cz_ih = pci_intr_establish(pa->pa_pc, ih, IPL_TTY, cz_intr, cz); } diff --git a/sys/dev/pci/dpt_pci.c b/sys/dev/pci/dpt_pci.c index 18acd2485b7..380eaa41ecd 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.26 2012/10/27 17:18:31 chs Exp $ */ +/* $NetBSD: dpt_pci.c,v 1.27 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org> @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dpt_pci.c,v 1.26 2012/10/27 17:18:31 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dpt_pci.c,v 1.27 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -86,6 +86,7 @@ dpt_pci_attach(device_t parent, device_t self, void *aux) bus_space_handle_t ioh; const char *intrstr; pcireg_t csr; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive(": Storage controller\n"); @@ -119,7 +120,7 @@ dpt_pci_attach(device_t parent, device_t self, void *aux) aprint_error("can't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_BIO, dpt_intr, sc); if (sc->sc_ih == NULL) { aprint_error("can't establish interrupt"); diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c index b518e660160..e085852c5f9 100644 --- a/sys/dev/pci/eap.c +++ b/sys/dev/pci/eap.c @@ -1,4 +1,4 @@ -/* $NetBSD: eap.c,v 1.94 2011/11/24 03:35:58 mrg Exp $ */ +/* $NetBSD: eap.c,v 1.95 2014/03/29 19:28:24 christos Exp $ */ /* $OpenBSD: eap.c,v 1.6 1999/10/05 19:24:42 csapuntz Exp $ */ /* @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.94 2011/11/24 03:35:58 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.95 2014/03/29 19:28:24 christos Exp $"); #include "midi.h" #include "joy_eap.h" @@ -533,6 +533,7 @@ eap_attach(device_t parent, device_t self, void *aux) #if NJOY_EAP > 0 struct eap_gameport_args gpargs; #endif + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); sc->sc_dev = self; @@ -599,7 +600,7 @@ eap_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, eap_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "couldn't establish interrupt"); diff --git a/sys/dev/pci/ehci_pci.c b/sys/dev/pci/ehci_pci.c index 9634075fd8c..5bd32815f53 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.57 2012/09/22 14:27:24 tsutsui Exp $ */ +/* $NetBSD: ehci_pci.c,v 1.58 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.57 2012/09/22 14:27:24 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.58 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -124,6 +124,7 @@ ehci_pci_attach(device_t parent, device_t self, void *aux) int ncomp; struct usb_pci *up; int quirk; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc.sc_dev = self; sc->sc.sc_bus.hci_private = sc; @@ -176,7 +177,7 @@ ehci_pci_attach(device_t parent, device_t self, void *aux) /* * Allocate IRQ */ - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, ehci_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c index 96926ebc59b..bce09dcc932 100644 --- a/sys/dev/pci/emuxki.c +++ b/sys/dev/pci/emuxki.c @@ -1,4 +1,4 @@ -/* $NetBSD: emuxki.c,v 1.62 2012/01/30 19:41:19 drochner Exp $ */ +/* $NetBSD: emuxki.c,v 1.63 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2001, 2007 The NetBSD Foundation, Inc. @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.62 2012/01/30 19:41:19 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.63 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -406,6 +406,7 @@ emuxki_attach(device_t parent, device_t self, void *aux) struct pci_attach_args *pa; pci_intr_handle_t ih; const char *intrstr; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); sc->sc_dev = self; @@ -437,7 +438,7 @@ emuxki_attach(device_t parent, device_t self, void *aux) return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, emuxki_intr, sc); if (sc->sc_ih == NULL) { diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c index 6e776ecc3db..e63a4e7e75b 100644 --- a/sys/dev/pci/esa.c +++ b/sys/dev/pci/esa.c @@ -1,4 +1,4 @@ -/* $NetBSD: esa.c,v 1.59 2013/10/16 17:39:09 christos Exp $ */ +/* $NetBSD: esa.c,v 1.60 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2001-2008 Jared D. McNeill <jmcneill@invisible.ca> @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.59 2013/10/16 17:39:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.60 2014/03/29 19:28:24 christos Exp $"); #include <sys/types.h> #include <sys/errno.h> @@ -1009,6 +1009,7 @@ esa_attach(device_t parent, device_t self, void *aux) const char *intrstr; uint32_t data; int revision, i, error; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); pa = (struct pci_attach_args *)aux; @@ -1056,7 +1057,7 @@ esa_attach(device_t parent, device_t self, void *aux) mutex_destroy(&sc->sc_intr_lock); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, esa_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "can't establish interrupt"); diff --git a/sys/dev/pci/esm.c b/sys/dev/pci/esm.c index c03f1978a19..76306c4fb81 100644 --- a/sys/dev/pci/esm.c +++ b/sys/dev/pci/esm.c @@ -1,4 +1,4 @@ -/* $NetBSD: esm.c,v 1.57 2013/09/14 13:12:41 joerg Exp $ */ +/* $NetBSD: esm.c,v 1.58 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2002, 2003 Matt Fredette @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.57 2013/09/14 13:12:41 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.58 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1581,6 +1581,7 @@ esm_attach(device_t parent, device_t self, void *aux) uint16_t codec_data; uint16_t pcmbar; int error; + char intrbuf[PCI_INTRSTR_LEN]; ess = device_private(self); ess->sc_dev = self; @@ -1627,7 +1628,7 @@ esm_attach(device_t parent, device_t self, void *aux) mutex_destroy(&ess->sc_intr_lock); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); ess->ih = pci_intr_establish(pc, ih, IPL_AUDIO, esm_intr, self); if (ess->ih == NULL) { aprint_error_dev(ess->sc_dev, "can't establish interrupt"); diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c index edd830f57bc..9303b06bbfb 100644 --- a/sys/dev/pci/eso.c +++ b/sys/dev/pci/eso.c @@ -1,4 +1,4 @@ -/* $NetBSD: eso.c,v 1.64 2013/10/16 18:20:16 christos Exp $ */ +/* $NetBSD: eso.c,v 1.65 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.64 2013/10/16 18:20:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.65 2014/03/29 19:28:24 christos Exp $"); #include "mpu.h" @@ -259,6 +259,7 @@ eso_attach(device_t parent, device_t self, void *aux) const char *intrstring; int idx, error; uint8_t a2mode, mvctl; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); sc->sc_dev = self; @@ -390,7 +391,7 @@ eso_attach(device_t parent, device_t self, void *aux) return; } - intrstring = pci_intr_string(pa->pa_pc, ih); + intrstring = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, eso_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "couldn't establish interrupt"); diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c index 63bd3a79619..66d3ffafd6d 100644 --- a/sys/dev/pci/fms.c +++ b/sys/dev/pci/fms.c @@ -1,4 +1,4 @@ -/* $NetBSD: fms.c,v 1.41 2012/10/27 17:18:32 chs Exp $ */ +/* $NetBSD: fms.c,v 1.42 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 1999, 2008 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.41 2012/10/27 17:18:32 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.42 2014/03/29 19:28:24 christos Exp $"); #include "mpu.h" @@ -232,6 +232,7 @@ fms_attach(device_t parent, device_t self, void *aux) pcitag_t pt; pci_intr_handle_t ih; uint16_t k1; + char intrbuf[PCI_INTRSTR_LEN]; pa = aux; sc = device_private(self); @@ -258,7 +259,7 @@ fms_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE); mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO); diff --git a/sys/dev/pci/fwohci_pci.c b/sys/dev/pci/fwohci_pci.c index aab9b52f2f8..f74a43c0515 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.41 2012/08/04 03:55:44 riastradh Exp $ */ +/* $NetBSD: fwohci_pci.c,v 1.42 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.41 2012/08/04 03:55:44 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.42 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -99,6 +99,7 @@ fwohci_pci_attach(device_t parent, device_t self, void *aux) char const *intrstr; pci_intr_handle_t ih; uint32_t csr; + char intrbuf[PCI_INTRSTR_LEN]; pci_aprint_devinfo(pa, "IEEE 1394 Controller"); @@ -139,7 +140,7 @@ fwohci_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); goto fail; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); psc->psc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, fwohci_intr, &psc->psc_sc); if (psc->psc_ih == NULL) { diff --git a/sys/dev/pci/gcscaudio.c b/sys/dev/pci/gcscaudio.c index 8862b90c648..4be16f3c007 100644 --- a/sys/dev/pci/gcscaudio.c +++ b/sys/dev/pci/gcscaudio.c @@ -1,4 +1,4 @@ -/* $NetBSD: gcscaudio.c,v 1.13 2014/01/31 08:38:13 ryo Exp $ */ +/* $NetBSD: gcscaudio.c,v 1.14 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2008 SHIMIZU Ryo <ryo@nerv.org> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.13 2014/01/31 08:38:13 ryo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.14 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -263,6 +263,7 @@ gcscaudio_attach(device_t parent, device_t self, void *aux) const char *intrstr; pci_intr_handle_t ih; int rc, i; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); @@ -291,7 +292,7 @@ gcscaudio_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); goto attach_failure_unmap; } - intrstr = pci_intr_string(sc->sc_pc, ih); + intrstr = pci_intr_string(sc->sc_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(sc->sc_pc, ih, IPL_AUDIO, gcscaudio_intr, sc); diff --git a/sys/dev/pci/hdaudio/hdaudio_pci.c b/sys/dev/pci/hdaudio/hdaudio_pci.c index 2b9f885c998..7d475bc077a 100644 --- a/sys/dev/pci/hdaudio/hdaudio_pci.c +++ b/sys/dev/pci/hdaudio/hdaudio_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: hdaudio_pci.c,v 1.11 2012/02/01 16:56:34 jakllsch Exp $ */ +/* $NetBSD: hdaudio_pci.c,v 1.12 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2009 Precedence Technologies Ltd <support@precedence.co.uk> @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.11 2012/02/01 16:56:34 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.12 2014/03/29 19:28:25 christos Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -108,6 +108,7 @@ hdaudio_pci_attach(device_t parent, device_t self, void *opaque) const char *intrstr; pcireg_t csr; int err; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive("\n"); aprint_normal(": HD Audio Controller\n"); @@ -143,7 +144,7 @@ hdaudio_pci_attach(device_t parent, device_t self, void *opaque) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, hdaudio_pci_intr, sc); if (sc->sc_ih == NULL) { diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c index 9311b9ef775..7cfbdec40c7 100644 --- a/sys/dev/pci/hifn7751.c +++ b/sys/dev/pci/hifn7751.c @@ -1,4 +1,4 @@ -/* $NetBSD: hifn7751.c,v 1.53 2014/01/03 16:09:22 pgoyette Exp $ */ +/* $NetBSD: hifn7751.c,v 1.54 2014/03/29 19:28:24 christos Exp $ */ /* $FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */ /* $OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $ */ @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.53 2014/01/03 16:09:22 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.54 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -260,6 +260,7 @@ hifn_attach(device_t parent, device_t self, void *aux) bus_dmamap_t dmamap; int rseg; void *kva; + char intrbuf[PCI_INTRSTR_LEN]; hp = hifn_lookup(pa); if (hp == NULL) { @@ -365,7 +366,7 @@ hifn_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dv, "couldn't map interrupt\n"); goto fail_mem; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); #ifdef __OpenBSD__ sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, hifn_intr, sc, device_xname(self)); diff --git a/sys/dev/pci/iavc_pci.c b/sys/dev/pci/iavc_pci.c index 6dd5abf6bae..95772db726d 100644 --- a/sys/dev/pci/iavc_pci.c +++ b/sys/dev/pci/iavc_pci.c @@ -1,6 +1,7 @@ -/* $NetBSD: iavc_pci.c,v 1.15 2013/09/25 18:54:48 martin Exp $ */ +/* $NetBSD: iavc_pci.c,v 1.16 2014/03/29 19:28:24 christos Exp $ */ /* + char intrbuf[PCI_INTRSTR_LEN]; * Copyright (c) 2001-2003 Cubical Solutions Ltd. * All rights reserved. * @@ -32,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iavc_pci.c,v 1.15 2013/09/25 18:54:48 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iavc_pci.c,v 1.16 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -129,6 +130,7 @@ iavc_pci_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; const char *intrstr; int ret; + char intrbuf[PCI_INTRSTR_LEN]; pp = find_cardname(pa); if (pp == NULL) @@ -207,7 +209,7 @@ iavc_pci_attach(device_t parent, device_t self, void *aux) return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, iavc_pci_intr, psc); if (psc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "couldn't establish interrupt"); diff --git a/sys/dev/pci/ichsmb.c b/sys/dev/pci/ichsmb.c index 3dfb294999b..2e65c93d406 100644 --- a/sys/dev/pci/ichsmb.c +++ b/sys/dev/pci/ichsmb.c @@ -1,4 +1,4 @@ -/* $NetBSD: ichsmb.c,v 1.34 2013/12/28 11:15:43 msaitoh Exp $ */ +/* $NetBSD: ichsmb.c,v 1.35 2014/03/29 19:28:24 christos Exp $ */ /* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */ /* @@ -22,7 +22,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.34 2013/12/28 11:15:43 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.35 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -132,6 +132,7 @@ ichsmb_attach(device_t parent, device_t self, void *aux) bus_size_t iosize; pci_intr_handle_t ih; const char *intrstr = NULL; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -160,7 +161,7 @@ ichsmb_attach(device_t parent, device_t self, void *aux) } else { /* Install interrupt handler */ if (pci_intr_map(pa, &ih) == 0) { - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, ichsmb_intr, sc); if (sc->sc_ih != NULL) { diff --git a/sys/dev/pci/icp_pci.c b/sys/dev/pci/icp_pci.c index 67b6f984dcb..e11362e409e 100644 --- a/sys/dev/pci/icp_pci.c +++ b/sys/dev/pci/icp_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: icp_pci.c,v 1.21 2012/10/27 17:18:32 chs Exp $ */ +/* $NetBSD: icp_pci.c,v 1.22 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.21 2012/10/27 17:18:32 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.22 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -250,6 +250,7 @@ icp_pci_attach(device_t parent, device_t self, void *aux) u_int8_t protocol; pci_intr_handle_t ih; const char *intrstr; + char intrbuf[PCI_INTRSTR_LEN]; pa = aux; status = 0; @@ -547,7 +548,7 @@ icp_pci_attach(device_t parent, device_t self, void *aux) aprint_error("couldn't map interrupt\n"); goto bail_out; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); icp->icp_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, icp_intr, icp); if (icp->icp_ih == NULL) { aprint_error("couldn't establish interrupt"); diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c index 821d15b89a4..3ba20a902fa 100644 --- a/sys/dev/pci/if_age.c +++ b/sys/dev/pci/if_age.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_age.c,v 1.43 2014/02/21 02:10:40 christos Exp $ */ +/* $NetBSD: if_age.c,v 1.44 2014/03/29 19:28:24 christos Exp $ */ /* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */ /*- @@ -31,7 +31,7 @@ /* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.43 2014/02/21 02:10:40 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.44 2014/03/29 19:28:24 christos Exp $"); #include "vlan.h" @@ -148,6 +148,7 @@ age_attach(device_t parent, device_t self, void *aux) struct ifnet *ifp = &sc->sc_ec.ec_if; pcireg_t memtype; int error = 0; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive("\n"); aprint_normal(": Attansic/Atheros L1 Gigabit Ethernet\n"); @@ -185,7 +186,7 @@ age_attach(device_t parent, device_t self, void *aux) /* * Allocate IRQ */ - intrstr = pci_intr_string(sc->sc_pct, ih); + intrstr = pci_intr_string(sc->sc_pct, ih, intrbuf, sizeof(intrbuf)); sc->sc_irq_handle = pci_intr_establish(sc->sc_pct, ih, IPL_NET, age_intr, sc); if (sc->sc_irq_handle == NULL) { diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c index 415bc3ed8e3..fd6483d9f20 100644 --- a/sys/dev/pci/if_alc.c +++ b/sys/dev/pci/if_alc.c @@ -657,6 +657,7 @@ alc_attach(device_t parent, device_t self, void *aux) uint16_t burst; int base, mii_flags, state, error = 0; uint32_t cap, ctl, val; + char intrbuf[PCI_INTRSTR_LEN]; sc->alc_ident = alc_find_ident(pa); @@ -696,7 +697,7 @@ alc_attach(device_t parent, device_t self, void *aux) /* * Allocate IRQ */ - intrstr = pci_intr_string(sc->sc_pct, ih); + intrstr = pci_intr_string(sc->sc_pct, ih, intrbuf, sizeof(intrbuf)); sc->sc_irq_handle = pci_intr_establish(pc, ih, IPL_NET, alc_intr, sc); if (sc->sc_irq_handle == NULL) { printf(": could not establish interrupt"); diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c index 19676701676..403e7f1c062 100644 --- a/sys/dev/pci/if_ale.c +++ b/sys/dev/pci/if_ale.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ale.c,v 1.16 2014/02/21 02:10:40 christos Exp $ */ +/* $NetBSD: if_ale.c,v 1.17 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> @@ -32,7 +32,7 @@ /* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.16 2014/02/21 02:10:40 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.17 2014/03/29 19:28:24 christos Exp $"); #include "vlan.h" @@ -389,6 +389,7 @@ ale_attach(device_t parent, device_t self, void *aux) int mii_flags, error = 0; uint32_t rxf_len, txf_len; const char *chipname; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive("\n"); aprint_normal(": Attansic/Atheros L1E Ethernet\n"); @@ -426,7 +427,7 @@ ale_attach(device_t parent, device_t self, void *aux) /* * Allocate IRQ */ - intrstr = pci_intr_string(sc->sc_pct, ih); + intrstr = pci_intr_string(sc->sc_pct, ih, intrbuf, sizeof(intrbuf)); sc->sc_irq_handle = pci_intr_establish(pc, ih, IPL_NET, ale_intr, sc); if (sc->sc_irq_handle == NULL) { aprint_error_dev(self, "could not establish interrupt"); diff --git a/sys/dev/pci/if_an_pci.c b/sys/dev/pci/if_an_pci.c index 6b8e27390c4..bfc69fc0b21 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.34 2012/09/23 01:10:59 chs Exp $ */ +/* $NetBSD: if_an_pci.c,v 1.35 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.34 2012/09/23 01:10:59 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.35 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -123,6 +123,7 @@ an_pci_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; bus_size_t iosize; u_int32_t csr; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; psc->sc_pct = pa->pa_pc; @@ -147,7 +148,7 @@ an_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_NET, an_intr, sc); if (psc->sc_ih == NULL) { aprint_error_dev(self, "unable to establish interrupt"); diff --git a/sys/dev/pci/if_ath_pci.c b/sys/dev/pci/if_ath_pci.c index 0bf87038472..11d08996c7d 100644 --- a/sys/dev/pci/if_ath_pci.c +++ b/sys/dev/pci/if_ath_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ath_pci.c,v 1.47 2013/03/30 03:21:03 christos Exp $ */ +/* $NetBSD: if_ath_pci.c,v 1.48 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.47 2013/03/30 03:21:03 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.48 2014/03/29 19:28:24 christos Exp $"); /* * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver. @@ -156,6 +156,7 @@ ath_pci_attach(device_t parent, device_t self, void *aux) const char *intrstr = NULL; const char *devname; pcireg_t mem_type; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_dmat = pa->pa_dmat; @@ -195,7 +196,7 @@ ath_pci_attach(device_t parent, device_t self, void *aux) goto bad1; } - intrstr = pci_intr_string(pc, psc->sc_pih); + intrstr = pci_intr_string(pc, psc->sc_pih, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(pc, psc->sc_pih, IPL_NET, ath_intr, sc); if (psc->sc_ih == NULL) { aprint_error("couldn't map interrupt\n"); diff --git a/sys/dev/pci/if_athn_pci.c b/sys/dev/pci/if_athn_pci.c index d6607a61599..6665c5c340f 100644 --- a/sys/dev/pci/if_athn_pci.c +++ b/sys/dev/pci/if_athn_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_athn_pci.c,v 1.9 2013/12/08 11:32:51 martin Exp $ */ +/* $NetBSD: if_athn_pci.c,v 1.10 2014/03/29 19:28:24 christos Exp $ */ /* $OpenBSD: if_athn_pci.c,v 1.11 2011/01/08 10:02:32 damien Exp $ */ /*- @@ -22,7 +22,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_athn_pci.c,v 1.9 2013/12/08 11:32:51 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_athn_pci.c,v 1.10 2014/03/29 19:28:24 christos Exp $"); #include "opt_inet.h" @@ -135,6 +135,7 @@ athn_pci_attach(device_t parent, device_t self, void *aux) pcireg_t memtype, reg; pci_product_id_t subsysid; int error; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_dmat = pa->pa_dmat; @@ -204,7 +205,7 @@ athn_pci_attach(device_t parent, device_t self, void *aux) goto fail1; } - intrstr = pci_intr_string(psc->psc_pc, psc->psc_pih); + intrstr = pci_intr_string(psc->psc_pc, psc->psc_pih, intrbuf, sizeof(intrbuf)); psc->psc_ih = pci_intr_establish(psc->psc_pc, psc->psc_pih, IPL_NET, athn_intr, sc); if (psc->psc_ih == NULL) { diff --git a/sys/dev/pci/if_atw_pci.c b/sys/dev/pci/if_atw_pci.c index 6bb0173fe57..849c63a7834 100644 --- a/sys/dev/pci/if_atw_pci.c +++ b/sys/dev/pci/if_atw_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_atw_pci.c,v 1.25 2011/07/26 20:51:24 dyoung Exp $ */ +/* $NetBSD: if_atw_pci.c,v 1.26 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_atw_pci.c,v 1.25 2011/07/26 20:51:24 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_atw_pci.c,v 1.26 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -175,6 +175,7 @@ atw_pci_attach(device_t parent, device_t self, void *aux) int ioh_valid, memh_valid; const struct atw_pci_product *app; int error; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -254,7 +255,7 @@ atw_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(pc, psc->psc_ih); + intrstr = pci_intr_string(pc, psc->psc_ih, intrbuf, sizeof(intrbuf)); psc->psc_intrcookie = pci_intr_establish(pc, psc->psc_ih, IPL_NET, atw_intr, sc); if (psc->psc_intrcookie == NULL) { diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c index 5e278666b3a..2a423f6f405 100644 --- a/sys/dev/pci/if_bce.c +++ b/sys/dev/pci/if_bce.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bce.c,v 1.37 2012/07/22 14:33:01 matt Exp $ */ +/* $NetBSD: if_bce.c,v 1.38 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2003 Clifford Wright. All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.37 2012/07/22 14:33:01 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.38 2014/03/29 19:28:24 christos Exp $"); #include "vlan.h" @@ -251,6 +251,7 @@ bce_attach(device_t parent, device_t self, void *aux) bus_dma_segment_t seg; int error, i, pmreg, rseg; struct ifnet *ifp; + char intrbuf[PCI_INTRSTR_LEN]; sc->bce_dev = self; @@ -317,7 +318,7 @@ bce_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->bce_intrhand = pci_intr_establish(pc, ih, IPL_NET, bce_intr, sc); diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index dd89efe1aa4..8a3f530a468 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bge.c,v 1.265 2014/02/25 18:30:10 pooka Exp $ */ +/* $NetBSD: if_bge.c,v 1.266 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.265 2014/02/25 18:30:10 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.266 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -3304,6 +3304,7 @@ bge_attach(device_t parent, device_t self, void *aux) uint32_t pm_ctl; bool no_seeprom; int capmask; + char intrbuf[PCI_INTRSTR_LEN]; bp = bge_lookup(pa); KASSERT(bp != NULL); @@ -3355,7 +3356,7 @@ bge_attach(device_t parent, device_t self, void *aux) } DPRINTFN(5, ("pci_intr_string\n")); - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); DPRINTFN(5, ("pci_intr_establish\n")); sc->bge_intrhand = pci_intr_establish(pc, ih, IPL_NET, bge_intr, sc); diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c index e1a9532d262..40bc0d79b5e 100644 --- a/sys/dev/pci/if_bnx.c +++ b/sys/dev/pci/if_bnx.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bnx.c,v 1.50 2014/03/13 16:33:52 hannken Exp $ */ +/* $NetBSD: if_bnx.c,v 1.51 2014/03/29 19:28:24 christos Exp $ */ /* $OpenBSD: if_bnx.c,v 1.85 2009/11/09 14:32:41 dlg Exp $ */ /*- @@ -35,7 +35,7 @@ #if 0 __FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $"); #endif -__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.50 2014/03/13 16:33:52 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.51 2014/03/29 19:28:24 christos Exp $"); /* * The following controllers are supported by this driver: @@ -470,6 +470,7 @@ bnx_attach(device_t parent, device_t self, void *aux) u_int32_t val; int mii_flags = MIIF_FORCEANEG; pcireg_t memtype; + char intrbuf[PCI_INTRSTR_LEN]; if (bnx_tx_pool == NULL) { bnx_tx_pool = malloc(sizeof(*bnx_tx_pool), M_DEVBUF, M_NOWAIT); @@ -519,7 +520,7 @@ bnx_attach(device_t parent, device_t self, void *aux) goto bnx_attach_fail; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); /* * Configure byte swap and enable indirect register access. diff --git a/sys/dev/pci/if_bwi_pci.c b/sys/dev/pci/if_bwi_pci.c index 9aba69356d9..e5408e9c62d 100644 --- a/sys/dev/pci/if_bwi_pci.c +++ b/sys/dev/pci/if_bwi_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bwi_pci.c,v 1.13 2013/03/30 03:21:04 christos Exp $ */ +/* $NetBSD: if_bwi_pci.c,v 1.14 2014/03/29 19:28:24 christos Exp $ */ /* $OpenBSD: if_bwi_pci.c,v 1.6 2008/02/14 22:10:02 brad Exp $ */ /* @@ -24,7 +24,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_bwi_pci.c,v 1.13 2013/03/30 03:21:04 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bwi_pci.c,v 1.14 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/callout.h> @@ -111,6 +111,7 @@ bwi_pci_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; pcireg_t memtype, reg; int error = 0; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive("\n"); aprint_normal(": Broadcom Wireless\n"); @@ -146,7 +147,7 @@ bwi_pci_attach(device_t parent, device_t self, void *aux) } /* establish interrupt */ - intrstr = pci_intr_string(psc->psc_pc, ih); + intrstr = pci_intr_string(psc->psc_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(psc->psc_pc, ih, IPL_NET, bwi_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "could not establish interrupt"); diff --git a/sys/dev/pci/if_cas.c b/sys/dev/pci/if_cas.c index d5166c68cdd..66e240c7d57 100644 --- a/sys/dev/pci/if_cas.c +++ b/sys/dev/pci/if_cas.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cas.c,v 1.20 2013/09/13 20:56:17 martin Exp $ */ +/* $NetBSD: if_cas.c,v 1.21 2014/03/29 19:28:24 christos Exp $ */ /* $OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $ */ /* @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.20 2013/09/13 20:56:17 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.21 2014/03/29 19:28:24 christos Exp $"); #ifndef _MODULE #include "opt_inet.h" @@ -1819,10 +1819,11 @@ cas_estintr(struct cas_softc *sc, int what) bus_space_tag_t t = sc->sc_memt; bus_space_handle_t h = sc->sc_memh; const char *intrstr = NULL; + char intrbuf[PCI_INTRSTR_LEN]; /* PCI interrupts */ if (what & CAS_INTR_PCI) { - intrstr = pci_intr_string(sc->sc_pc, sc->sc_handle); + intrstr = pci_intr_string(sc->sc_pc, sc->sc_handle, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(sc->sc_pc, sc->sc_handle, IPL_NET, cas_intr, sc); if (sc->sc_ih == NULL) { diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index a9037792426..4890798886d 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,5 @@ -/* $NetBSD: if_de.c,v 1.141 2013/03/30 03:21:04 christos Exp $ */ +/* $NetBSD: if_de.c,v 1.142 2014/03/29 19:28:24 christos Exp $ */ + char intrbuf[PCI_INTRSTR_LEN]; /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -37,7 +38,7 @@ * board which support 21040, 21041, or 21140 (mostly). */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.141 2013/03/30 03:21:04 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.142 2014/03/29 19:28:24 christos Exp $"); #define TULIP_HDR_DATA @@ -5638,6 +5639,7 @@ tulip_pci_attach( unsigned csrsize = TULIP_PCI_CSRSIZE; tulip_csrptr_t csr_base; tulip_chipid_t chipid = TULIP_CHIPID_UNKNOWN; + char intrbuf[PCI_INTRSTR_LEN]; if (unit >= TULIP_MAX_DEVICES) { #ifdef __FreeBSD__ @@ -5875,7 +5877,7 @@ tulip_pci_attach( aprint_error_dev(sc->tulip_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf)); sc->tulip_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET, intr_rtn, sc); if (sc->tulip_ih == NULL) { diff --git a/sys/dev/pci/if_dge.c b/sys/dev/pci/if_dge.c index 1dbeb2f4af3..0cfb804e8be 100644 --- a/sys/dev/pci/if_dge.c +++ b/sys/dev/pci/if_dge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_dge.c,v 1.36 2013/10/17 21:06:15 christos Exp $ */ +/* $NetBSD: if_dge.c,v 1.37 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2004, SUNET, Swedish University Computer Network. @@ -80,7 +80,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.36 2013/10/17 21:06:15 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.37 2014/03/29 19:28:24 christos Exp $"); @@ -669,6 +669,7 @@ dge_attach(device_t parent, device_t self, void *aux) uint8_t enaddr[ETHER_ADDR_LEN]; pcireg_t preg, memtype; uint32_t reg; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_dmat = pa->pa_dmat; @@ -697,7 +698,7 @@ dge_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, dge_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "unable to establish interrupt"); diff --git a/sys/dev/pci/if_en_pci.c b/sys/dev/pci/if_en_pci.c index 1029cbc774c..c8228798bb6 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.36 2011/07/26 20:51:24 dyoung Exp $ */ +/* $NetBSD: if_en_pci.c,v 1.37 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 1996 Charles D. Cranor and Washington University. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_en_pci.c,v 1.36 2011/07/26 20:51:24 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_en_pci.c,v 1.37 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -186,6 +186,7 @@ en_pci_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; const char *intrstr; int retval; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -210,7 +211,7 @@ en_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(scp->en_pc, ih); + intrstr = pci_intr_string(scp->en_pc, ih, intrbuf, sizeof(intrbuf)); scp->sc_ih = pci_intr_establish(scp->en_pc, ih, IPL_NET, en_intr, sc); if (scp->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "couldn't establish interrupt\n"); diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c index 5ec7119150a..23d7de5673b 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.52 2011/07/26 20:51:24 dyoung Exp $ */ +/* $NetBSD: if_ep_pci.c,v 1.53 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ep_pci.c,v 1.52 2011/07/26 20:51:24 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ep_pci.c,v 1.53 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -181,6 +181,7 @@ ep_pci_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; const struct ep_pci_product *epp; const char *intrstr = NULL; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive(": Ethernet controller\n"); @@ -216,7 +217,7 @@ ep_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, epintr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "couldn't establish interrupt"); diff --git a/sys/dev/pci/if_epic_pci.c b/sys/dev/pci/if_epic_pci.c index 90aaff5c3a1..b792a29b43f 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.40 2012/01/30 19:41:19 drochner Exp $ */ +/* $NetBSD: if_epic_pci.c,v 1.41 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_epic_pci.c,v 1.40 2012/01/30 19:41:19 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_epic_pci.c,v 1.41 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -164,6 +164,7 @@ epic_pci_attach(device_t parent, device_t self, void *aux) bus_space_handle_t ioh, memh; int ioh_valid, memh_valid; int error; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -217,7 +218,7 @@ epic_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, epic_intr, sc); if (psc->sc_ih == NULL) { aprint_error_dev(self, "unable to establish interrupt"); diff --git a/sys/dev/pci/if_esh_pci.c b/sys/dev/pci/if_esh_pci.c index f40c97c14b3..ff43d4bc6b8 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.30 2012/10/27 17:18:32 chs Exp $ */ +/* $NetBSD: if_esh_pci.c,v 1.31 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.30 2012/10/27 17:18:32 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.31 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -109,6 +109,7 @@ esh_pci_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; const char *model; const char *intrstr = NULL; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive(": HIPPI controller\n"); @@ -151,7 +152,7 @@ esh_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, eshintr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "couldn't establish interrupt"); diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c index fca721746aa..ac5dcb4d258 100644 --- a/sys/dev/pci/if_et.c +++ b/sys/dev/pci/if_et.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_et.c,v 1.7 2013/03/30 03:21:04 christos Exp $ */ +/* $NetBSD: if_et.c,v 1.8 2014/03/29 19:28:24 christos Exp $ */ /* $OpenBSD: if_et.c,v 1.11 2008/06/08 06:18:07 jsg Exp $ */ /* * Copyright (c) 2007 The DragonFly Project. All rights reserved. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.7 2013/03/30 03:21:04 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.8 2014/03/29 19:28:24 christos Exp $"); #include "opt_inet.h" #include "vlan.h" @@ -191,6 +191,7 @@ et_attach(device_t parent, device_t self, void *aux) struct ifnet *ifp = &sc->sc_ethercom.ec_if; pcireg_t memtype; int error; + char intrbuf[PCI_INTRSTR_LEN]; pci_aprint_devinfo(pa, "Ethernet controller"); @@ -216,7 +217,7 @@ et_attach(device_t parent, device_t self, void *aux) goto fail; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_irq_handle = pci_intr_establish(pc, ih, IPL_NET, et_intr, sc); if (sc->sc_irq_handle == NULL) { aprint_error_dev(self, "could not establish interrupt"); diff --git a/sys/dev/pci/if_ex_pci.c b/sys/dev/pci/if_ex_pci.c index 74c0de055a1..5301e2b2af4 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.56 2013/09/13 21:03:04 martin Exp $ */ +/* $NetBSD: if_ex_pci.c,v 1.57 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.56 2013/09/13 21:03:04 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.57 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -211,6 +211,7 @@ ex_pci_attach(device_t parent, device_t self, void *aux) const char *intrstr = NULL; int rev; int error; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive(": Ethernet controller\n"); @@ -286,7 +287,7 @@ ex_pci_attach(device_t parent, device_t self, void *aux) return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, ex_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c index 5ca0e4fc6c4..40041212962 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.58 2012/10/27 17:18:32 chs Exp $ */ +/* $NetBSD: if_fpa.c,v 1.59 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com> @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.58 2012/10/27 17:18:32 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.59 2014/03/29 19:28:24 christos Exp $"); #ifdef __NetBSD__ #include "opt_inet.h" @@ -406,6 +406,7 @@ pdq_pci_attach(device_t const parent, device_t const self, void *const aux) bus_space_tag_t iot, memt; bus_space_handle_t ioh, memh; int ioh_valid, memh_valid; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive(": FDDI controller\n"); @@ -470,7 +471,7 @@ pdq_pci_attach(device_t const parent, device_t const self, void *const aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET, pdq_pci_ifintr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c index ad8e97d8539..5bc29694c2a 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.80 2013/03/30 03:21:05 christos Exp $ */ +/* $NetBSD: if_fxp_pci.c,v 1.81 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.80 2013/03/30 03:21:05 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.81 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -307,6 +307,7 @@ fxp_pci_attach(device_t parent, device_t self, void *aux) bus_addr_t addr; int flags; int error; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -507,7 +508,7 @@ fxp_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, fxp_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c index 72f29815057..3c28f2853ce 100644 --- a/sys/dev/pci/if_gem_pci.c +++ b/sys/dev/pci/if_gem_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_gem_pci.c,v 1.46 2013/03/30 03:21:05 christos Exp $ */ +/* $NetBSD: if_gem_pci.c,v 1.47 2014/03/29 19:28:24 christos Exp $ */ /* * @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.46 2013/03/30 03:21:05 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.47 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -386,8 +386,9 @@ gem_pci_estintr(struct gem_pci_softc *gsc) { struct gem_softc *sc = &gsc->gsc_gem; const char *intrstr; + char intrbuf[PCI_INTRSTR_LEN]; - intrstr = pci_intr_string(gsc->gsc_pc, gsc->gsc_handle); + intrstr = pci_intr_string(gsc->gsc_pc, gsc->gsc_handle, intrbuf, sizeof(intrbuf)); gsc->gsc_ih = pci_intr_establish(gsc->gsc_pc, gsc->gsc_handle, IPL_NET, gem_intr, sc); if (gsc->gsc_ih == NULL) { diff --git a/sys/dev/pci/if_hme_pci.c b/sys/dev/pci/if_hme_pci.c index d94de90ad16..5a90638de60 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.36 2011/05/10 18:31:33 dyoung Exp $ */ +/* $NetBSD: if_hme_pci.c,v 1.37 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2000 Matthew R. Green @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.36 2011/05/10 18:31:33 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.37 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -139,6 +139,7 @@ hmeattach_pci(device_t parent, device_t self, void *aux) }; #define PROMDATA_PTR_VPD 0x08 #define PROMDATA_DATA2 0x0a + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -304,7 +305,7 @@ got_eaddr: aprint_error_dev(self, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); hsc->hsc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_NET, hme_intr, sc); if (hsc->hsc_ih == NULL) { aprint_error_dev(self, "unable to establish interrupt"); diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c index 5d93479997c..1cff08d0ba4 100644 --- a/sys/dev/pci/if_ipw.c +++ b/sys/dev/pci/if_ipw.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ipw.c,v 1.56 2014/02/25 18:30:10 pooka Exp $ */ +/* $NetBSD: if_ipw.c,v 1.57 2014/03/29 19:28:24 christos Exp $ */ /* FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.15 2005/11/13 17:17:40 damien Exp */ /*- @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.56 2014/02/25 18:30:10 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.57 2014/03/29 19:28:24 christos Exp $"); /*- * Intel(R) PRO/Wireless 2100 MiniPCI driver @@ -185,6 +185,7 @@ ipw_attach(device_t parent, device_t self, void *aux) uint32_t data; uint16_t val; int i, error; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_pct = pa->pa_pc; @@ -218,7 +219,7 @@ ipw_attach(device_t parent, device_t self, void *aux) return; } - intrstr = pci_intr_string(sc->sc_pct, ih); + intrstr = pci_intr_string(sc->sc_pct, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(sc->sc_pct, ih, IPL_NET, ipw_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "could not establish interrupt"); diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index f6064235355..368d78dd4fd 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwi.c,v 1.96 2014/02/25 18:30:10 pooka Exp $ */ +/* $NetBSD: if_iwi.c,v 1.97 2014/03/29 19:28:24 christos Exp $ */ /* $OpenBSD: if_iwi.c,v 1.111 2010/11/15 19:11:57 damien Exp $ */ /*- @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.96 2014/02/25 18:30:10 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.97 2014/03/29 19:28:24 christos Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -209,6 +209,7 @@ iwi_attach(device_t parent, device_t self, void *aux) pcireg_t data; uint16_t val; int error, i; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_pct = pa->pa_pc; @@ -257,7 +258,7 @@ iwi_attach(device_t parent, device_t self, void *aux) return; } - intrstr = pci_intr_string(sc->sc_pct, ih); + intrstr = pci_intr_string(sc->sc_pct, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(sc->sc_pct, ih, IPL_NET, iwi_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "could not establish interrupt"); diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index ceeda2f40aa..5399b5a077e 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwn.c,v 1.70 2013/10/17 21:06:15 christos Exp $ */ +/* $NetBSD: if_iwn.c,v 1.71 2014/03/29 19:28:24 christos Exp $ */ /* $OpenBSD: if_iwn.c,v 1.119 2013/05/29 23:16:52 yuo Exp $ */ /*- @@ -22,7 +22,7 @@ * adapters. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.70 2013/10/17 21:06:15 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.71 2014/03/29 19:28:24 christos Exp $"); #define IWN_USE_RBUF /* Use local storage for RX */ #undef IWN_HWCRYPTO /* XXX does not even compile yet */ @@ -351,6 +351,7 @@ iwn_attach(device_t parent __unused, device_t self, void *aux) pci_intr_handle_t ih; pcireg_t memtype, reg; int i, error; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_pct = pa->pa_pc; @@ -402,7 +403,7 @@ iwn_attach(device_t parent __unused, device_t self, void *aux) aprint_error(": can't map interrupt\n"); return; } - intrstr = pci_intr_string(sc->sc_pct, ih); + intrstr = pci_intr_string(sc->sc_pct, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(sc->sc_pct, ih, IPL_NET, iwn_intr, sc); if (sc->sc_ih == NULL) { aprint_error(": can't establish interrupt"); diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c index 1563b5ec41d..b82b1ada3e6 100644 --- a/sys/dev/pci/if_jme.c +++ b/sys/dev/pci/if_jme.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_jme.c,v 1.24 2014/02/25 18:30:10 pooka Exp $ */ +/* $NetBSD: if_jme.c,v 1.25 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2008 Manuel Bouyer. All rights reserved. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.24 2014/02/25 18:30:10 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.25 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> @@ -278,6 +278,7 @@ jme_pci_attach(device_t parent, device_t self, void *aux) int nsegs, i; const struct sysctlnode *node; int jme_nodenum; + char intrbuf[PCI_INTRSTR_LEN]; sc->jme_dev = self; aprint_normal("\n"); @@ -392,7 +393,7 @@ jme_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf)); sc->jme_if.if_softc = sc; sc->jme_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET, jme_intr, sc); diff --git a/sys/dev/pci/if_kse.c b/sys/dev/pci/if_kse.c index 99181415f8b..bd1fdaae130 100644 --- a/sys/dev/pci/if_kse.c +++ b/sys/dev/pci/if_kse.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_kse.c,v 1.26 2014/03/25 16:19:13 christos Exp $ */ +/* $NetBSD: if_kse.c,v 1.27 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.26 2014/03/25 16:19:13 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.27 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> @@ -353,6 +353,7 @@ kse_attach(device_t parent, device_t self, void *aux) int i, error, nseg; pcireg_t pmode; int pmreg; + char intrbuf[PCI_INTRSTR_LEN]; if (pci_mapreg_map(pa, 0x10, PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, @@ -418,7 +419,7 @@ kse_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, kse_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "unable to establish interrupt"); diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c index 15acfaa2fc3..25c874f8b93 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.51 2011/07/26 20:51:24 dyoung Exp $ */ +/* $NetBSD: if_le_pci.c,v 1.52 2014/03/29 19:28:24 christos Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.51 2011/07/26 20:51:24 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.52 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -234,6 +234,7 @@ le_pci_attach(device_t parent, device_t self, void *aux) pcireg_t csr; int i, rseg; const char *model, *intrstr; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -335,7 +336,7 @@ le_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); lesc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, am79900_intr, sc); if (lesc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/if_lii.c b/sys/dev/pci/if_lii.c index 7c10c5635e3..f494b6e0193 100644 --- a/sys/dev/pci/if_lii.c +++ b/sys/dev/pci/if_lii.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_lii.c,v 1.12 2013/03/30 03:21:06 christos Exp $ */ +/* $NetBSD: if_lii.c,v 1.13 2014/03/29 19:28:24 christos Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.12 2013/03/30 03:21:06 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.13 2014/03/29 19:28:24 christos Exp $"); #include <sys/param.h> @@ -241,6 +241,7 @@ lii_attach(device_t parent, device_t self, void *aux) const char *intrstr; pcireg_t cmd; bus_size_t memsize = 0; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive("\n"); aprint_normal(": Attansic/Atheros L2 Fast Ethernet\n"); @@ -291,7 +292,7 @@ lii_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "failed to map interrupt\n"); goto fail; } - intrstr = pci_intr_string(sc->sc_pc, ih); + intrstr = pci_intr_string(sc->sc_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(sc->sc_pc, ih, IPL_NET, lii_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "failed to establish interrupt"); diff --git a/sys/dev/pci/if_lmc.c b/sys/dev/pci/if_lmc.c index 40318ff9e64..ad72d18c2e3 100644 --- a/sys/dev/pci/if_lmc.c +++ b/sys/dev/pci/if_lmc.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_lmc.c,v 1.53 2013/03/30 03:21:06 christos Exp $ */ +/* $NetBSD: if_lmc.c,v 1.54 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2002-2006 David Boggs. <boggs@boggs.palo-alto.ca.us> @@ -74,7 +74,7 @@ */ # include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.53 2013/03/30 03:21:06 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.54 2014/03/29 19:28:25 christos Exp $"); # include <sys/param.h> /* OS version */ # include "opt_inet.h" /* INET6, INET */ # include "opt_altq_enabled.h" /* ALTQ */ @@ -5411,6 +5411,7 @@ nbsd_attach(device_t parent, device_t self, void *aux) const char *intrstr; bus_addr_t csr_addr; int error; + char intrbuf[PCI_INTRSTR_LEN]; /* for READ/WRITE_PCI_CFG() */ sc->sc_dev = self; @@ -5471,7 +5472,7 @@ nbsd_attach(device_t parent, device_t self, void *aux) nbsd_detach(self, 0); return; } - intrstr = pci_intr_string(pa->pa_pc, sc->intr_handle); + intrstr = pci_intr_string(pa->pa_pc, sc->intr_handle, intrbuf, sizeof(intrbuf)); aprint_normal(" %s: %s\n", intrstr, sc->dev_desc); aprint_naive(": %s\n", sc->dev_desc); diff --git a/sys/dev/pci/if_malo_pci.c b/sys/dev/pci/if_malo_pci.c index 02e37f72a5b..d2a14bb78cd 100644 --- a/sys/dev/pci/if_malo_pci.c +++ b/sys/dev/pci/if_malo_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_malo_pci.c,v 1.4 2013/03/30 03:21:06 christos Exp $ */ +/* $NetBSD: if_malo_pci.c,v 1.5 2014/03/29 19:28:25 christos Exp $ */ /* $OpenBSD: if_malo_pci.c,v 1.6 2010/08/28 23:19:29 deraadt Exp $ */ /* @@ -22,7 +22,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_malo_pci.c,v 1.4 2013/03/30 03:21:06 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_malo_pci.c,v 1.5 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/sockio.h> @@ -103,6 +103,7 @@ malo_pci_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; pcireg_t memtype1, memtype2; int error; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_dmat = pa->pa_dmat; @@ -156,7 +157,7 @@ malo_pci_attach(device_t parent, device_t self, void *aux) } /* establish interrupt */ - intrstr = pci_intr_string(psc->sc_pc, ih); + intrstr = pci_intr_string(psc->sc_pc, ih, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(psc->sc_pc, ih, IPL_NET, malo_intr, sc); if (psc->sc_ih == NULL) { aprint_error_dev(self, "could not establish interrupt"); diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 08b9ca8fe08..57357ba5782 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_msk.c,v 1.44 2014/02/25 18:30:10 pooka Exp $ */ +/* $NetBSD: if_msk.c,v 1.45 2014/03/29 19:28:25 christos Exp $ */ /* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */ /* @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.44 2014/02/25 18:30:10 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.45 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1167,6 +1167,7 @@ mskc_attach(device_t parent, device_t self, void *aux) void *kva; bus_dma_segment_t seg; int rseg; + char intrbuf[PCI_INTRSTR_LEN]; DPRINTFN(2, ("begin mskc_attach\n")); @@ -1241,7 +1242,7 @@ mskc_attach(device_t parent, device_t self, void *aux) goto fail_1; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sk_intrhand = pci_intr_establish(pc, ih, IPL_NET, msk_intr, sc); if (sc->sk_intrhand == NULL) { aprint_error(": couldn't establish interrupt"); diff --git a/sys/dev/pci/if_mtd_pci.c b/sys/dev/pci/if_mtd_pci.c index a7f418c52ad..dc1df2aaf29 100644 --- a/sys/dev/pci/if_mtd_pci.c +++ b/sys/dev/pci/if_mtd_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_mtd_pci.c,v 1.18 2012/10/27 17:18:33 chs Exp $ */ +/* $NetBSD: if_mtd_pci.c,v 1.19 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ /* TODO: Check why in IO space, the MII won't work. Memory mapped works */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_mtd_pci.c,v 1.18 2012/10/27 17:18:33 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mtd_pci.c,v 1.19 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -97,6 +97,7 @@ mtd_pci_attach(device_t parent, device_t self, void *aux) bus_space_tag_t iot, memt; bus_space_handle_t ioh, memh; int io_valid, mem_valid; + char intrbuf[PCI_INTRSTR_LEN]; sc->dev = self; pci_aprint_devinfo(pa, NULL); @@ -126,7 +127,7 @@ mtd_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->dev, "could not map interrupt\n"); return; } - intrstring = pci_intr_string(pa->pa_pc, ih); + intrstring = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); if (pci_intr_establish(pa->pa_pc, ih, IPL_NET, mtd_irq_h, sc) == NULL) { aprint_error_dev(sc->dev, "could not establish interrupt"); diff --git a/sys/dev/pci/if_ne_pci.c b/sys/dev/pci/if_ne_pci.c index c51af212032..33733f855e8 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.36 2011/07/26 20:51:24 dyoung Exp $ */ +/* $NetBSD: if_ne_pci.c,v 1.37 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ne_pci.c,v 1.36 2011/07/26 20:51:24 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ne_pci.c,v 1.37 2014/03/29 19:28:25 christos Exp $"); #include "opt_ipkdb.h" @@ -198,6 +198,7 @@ ne_pci_attach(device_t parent, device_t self, void *aux) const struct ne_pci_product *npp; pci_intr_handle_t ih; pcireg_t csr; + char intrbuf[PCI_INTRSTR_LEN]; npp = ne_pci_lookup(pa); if (npp == NULL) { @@ -260,7 +261,7 @@ ne_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(dsc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, dp8390_intr, dsc); if (psc->sc_ih == NULL) { aprint_error_dev(dsc->sc_dev, "couldn't establish interrupt"); diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c index 7fda39c76fe..6c172419e0c 100644 --- a/sys/dev/pci/if_nfe.c +++ b/sys/dev/pci/if_nfe.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_nfe.c,v 1.58 2013/03/30 03:21:06 christos Exp $ */ +/* $NetBSD: if_nfe.c,v 1.59 2014/03/29 19:28:25 christos Exp $ */ /* $OpenBSD: if_nfe.c,v 1.77 2008/02/05 16:52:50 brad Exp $ */ /*- @@ -21,7 +21,7 @@ /* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.58 2013/03/30 03:21:06 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.59 2014/03/29 19:28:25 christos Exp $"); #include "opt_inet.h" #include "vlan.h" @@ -221,6 +221,7 @@ nfe_attach(device_t parent, device_t self, void *aux) struct ifnet *ifp; pcireg_t memtype, csr; int mii_flags = 0; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_pc = pa->pa_pc; @@ -244,7 +245,7 @@ nfe_attach(device_t parent, device_t self, void *aux) goto fail; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, nfe_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "could not establish interrupt"); diff --git a/sys/dev/pci/if_ntwoc_pci.c b/sys/dev/pci/if_ntwoc_pci.c index 13433d78a9c..bedefb9fd29 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.28 2012/10/27 17:18:33 chs Exp $ */ +/* $NetBSD: if_ntwoc_pci.c,v 1.29 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1998 Vixie Enterprises @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.28 2012/10/27 17:18:33 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.29 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -200,6 +200,7 @@ ntwoc_pci_attach(device_t parent, device_t self, void *aux) u_int16_t db0, db1; u_int32_t flags; u_int numports; + char intrbuf[PCI_INTRSTR_LEN]; printf(": N2 Serial Interface\n"); flags = device_cfdata(self)->cf_flags; @@ -234,7 +235,7 @@ ntwoc_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_NET, ntwoc_pci_intr, sc); if (sc->sc_ih == NULL) { diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c index 445347fe49a..ed527cd71bf 100644 --- a/sys/dev/pci/if_pcn.c +++ b/sys/dev/pci/if_pcn.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_pcn.c,v 1.56 2013/03/30 03:21:07 christos Exp $ */ +/* $NetBSD: if_pcn.c,v 1.57 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.56 2013/03/30 03:21:07 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.57 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -578,6 +578,7 @@ pcn_attach(device_t parent, device_t self, void *aux) uint8_t enaddr[ETHER_ADDR_LEN]; prop_object_t obj; bool is_vmware; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; callout_init(&sc->sc_tick_ch, 0); @@ -682,7 +683,7 @@ pcn_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, pcn_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "unable to establish interrupt"); diff --git a/sys/dev/pci/if_ral_pci.c b/sys/dev/pci/if_ral_pci.c index f3311d60276..86316d70bca 100644 --- a/sys/dev/pci/if_ral_pci.c +++ b/sys/dev/pci/if_ral_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ral_pci.c,v 1.20 2012/02/18 13:38:36 drochner Exp $ */ +/* $NetBSD: if_ral_pci.c,v 1.21 2014/03/29 19:28:25 christos Exp $ */ /* $OpenBSD: if_ral_pci.c,v 1.6 2006/01/09 20:03:43 damien Exp $ */ /*- @@ -22,7 +22,7 @@ * PCI front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.20 2012/02/18 13:38:36 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.21 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> @@ -128,6 +128,7 @@ ral_pci_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; pcireg_t reg; int error; + char intrbuf[PCI_INTRSTR_LEN]; pci_aprint_devinfo(pa, NULL); @@ -158,7 +159,7 @@ ral_pci_attach(device_t parent, device_t self, void *aux) return; } - intrstr = pci_intr_string(psc->sc_pc, ih); + intrstr = pci_intr_string(psc->sc_pc, ih, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(psc->sc_pc, ih, IPL_NET, psc->sc_opns->intr, sc); diff --git a/sys/dev/pci/if_re_pci.c b/sys/dev/pci/if_re_pci.c index 6ae3e6c3a1e..aca4c03541a 100644 --- a/sys/dev/pci/if_re_pci.c +++ b/sys/dev/pci/if_re_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_re_pci.c,v 1.42 2013/03/30 03:21:07 christos Exp $ */ +/* $NetBSD: if_re_pci.c,v 1.43 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.42 2013/03/30 03:21:07 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.43 2014/03/29 19:28:25 christos Exp $"); #include <sys/types.h> @@ -183,6 +183,7 @@ re_pci_attach(device_t parent, device_t self, void *aux) bus_space_tag_t iot, memt; bus_space_handle_t ioh, memh; bus_size_t iosize, memsize; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; psc->sc_pc = pa->pa_pc; @@ -252,7 +253,7 @@ re_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, re_intr, sc); if (psc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/if_rtk_pci.c b/sys/dev/pci/if_rtk_pci.c index f3578bf2a4e..1fd364b6971 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.44 2013/03/30 03:21:07 christos Exp $ */ +/* $NetBSD: if_rtk_pci.c,v 1.45 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1997, 1998 @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.44 2013/03/30 03:21:07 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.45 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -162,6 +162,7 @@ rtk_pci_attach(device_t parent, device_t self, void *aux) const char *intrstr = NULL; const struct rtk_type *t; bool ioh_valid, memh_valid; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; psc->sc_pc = pa->pa_pc; @@ -211,7 +212,7 @@ rtk_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, rtk_intr, sc); if (psc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/if_rtw_pci.c b/sys/dev/pci/if_rtw_pci.c index 45add74f316..ca3ce8b9d0e 100644 --- a/sys/dev/pci/if_rtw_pci.c +++ b/sys/dev/pci/if_rtw_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_rtw_pci.c,v 1.22 2012/09/30 11:29:42 dsl Exp $ */ +/* $NetBSD: if_rtw_pci.c,v 1.23 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2004, 2005, 2010 David Young. All rights reserved. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_rtw_pci.c,v 1.22 2012/09/30 11:29:42 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rtw_pci.c,v 1.23 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -188,6 +188,7 @@ rtw_pci_attach(device_t parent, device_t self, void *aux) struct pci_attach_args *pa = aux; const char *intrstr = NULL; const struct rtw_pci_product *rpp; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_dmat = pa->pa_dmat; @@ -246,7 +247,7 @@ rtw_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(psc->psc_pc, psc->psc_pih); + intrstr = pci_intr_string(psc->psc_pc, psc->psc_pih, intrbuf, sizeof(intrbuf)); psc->psc_ih = pci_intr_establish(psc->psc_pc, psc->psc_pih, IPL_NET, rtw_intr, sc); if (psc->psc_ih == NULL) { diff --git a/sys/dev/pci/if_sf_pci.c b/sys/dev/pci/if_sf_pci.c index fd9958fcc07..9d3af734f38 100644 --- a/sys/dev/pci/if_sf_pci.c +++ b/sys/dev/pci/if_sf_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sf_pci.c,v 1.19 2012/10/27 17:18:33 chs Exp $ */ +/* $NetBSD: if_sf_pci.c,v 1.20 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sf_pci.c,v 1.19 2012/10/27 17:18:33 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sf_pci.c,v 1.20 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -176,6 +176,7 @@ sf_pci_attach(device_t parent, device_t self, void *aux) bus_space_handle_t ioh, memh; pcireg_t reg; int error, ioh_valid, memh_valid; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; spp = sf_pci_lookup(pa); @@ -241,7 +242,7 @@ sf_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_NET, sf_intr, sc); if (psc->sc_ih == NULL) { aprint_error_dev(self, "unable to establish interrupt"); diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c index 2b0271371f9..bf77b2d2ac5 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.156 2013/03/30 03:21:07 christos Exp $ */ +/* $NetBSD: if_sip.c,v 1.157 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.156 2013/03/30 03:21:07 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.157 2014/03/29 19:28:25 christos Exp $"); @@ -994,6 +994,7 @@ sipcom_attach(device_t parent, device_t self, void *aux) bus_size_t tx_dmamap_size; int ntxsegs_alloc; cfdata_t cf = device_cfdata(self); + char intrbuf[PCI_INTRSTR_LEN]; callout_init(&sc->sc_tick_ch, 0); @@ -1100,7 +1101,7 @@ sipcom_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, sipcom_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "unable to establish interrupt"); diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index a214be151e4..d3d6c2e53c6 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sk.c,v 1.76 2014/02/25 18:30:10 pooka Exp $ */ +/* $NetBSD: if_sk.c,v 1.77 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -115,7 +115,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.76 2014/02/25 18:30:10 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.77 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1513,6 +1513,7 @@ skc_attach(device_t parent, device_t self, void *aux) u_int32_t command; const char *revstr; const struct sysctlnode *node; + char intrbuf[PCI_INTRSTR_LEN]; sc->sk_dev = self; aprint_naive("\n"); @@ -1626,7 +1627,7 @@ skc_attach(device_t parent, device_t self, void *aux) goto fail; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sk_intrhand = pci_intr_establish(pc, ih, IPL_NET, sk_intr, sc); if (sc->sk_intrhand == NULL) { aprint_error(": couldn't establish interrupt"); diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c index 88ce2471e94..b6053c08752 100644 --- a/sys/dev/pci/if_ste.c +++ b/sys/dev/pci/if_ste.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ste.c,v 1.44 2012/10/27 17:18:33 chs Exp $ */ +/* $NetBSD: if_ste.c,v 1.45 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.44 2012/10/27 17:18:33 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.45 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> @@ -304,6 +304,7 @@ ste_attach(device_t parent, device_t self, void *aux) const struct ste_product *sp; uint8_t enaddr[ETHER_ADDR_LEN]; uint16_t myea[ETHER_ADDR_LEN / 2]; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -360,7 +361,7 @@ ste_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, ste_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "unable to establish interrupt"); diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c index 8fc7f9e2bba..a8cd774e224 100644 --- a/sys/dev/pci/if_stge.c +++ b/sys/dev/pci/if_stge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_stge.c,v 1.56 2013/03/30 03:21:07 christos Exp $ */ +/* $NetBSD: if_stge.c,v 1.57 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.56 2013/03/30 03:21:07 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.57 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> @@ -386,6 +386,7 @@ stge_attach(device_t parent, device_t self, void *aux) int i, rseg, error; const struct stge_product *sp; uint8_t enaddr[ETHER_ADDR_LEN]; + char intrbuf[PCI_INTRSTR_LEN]; callout_init(&sc->sc_tick_ch, 0); @@ -441,7 +442,7 @@ stge_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, stge_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "unable to establish interrupt"); diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c index 8326d6b9dcf..3d3693387ab 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.92 2014/02/27 01:30:42 joerg Exp $ */ +/* $NetBSD: if_ti.c,v 1.93 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.92 2014/02/27 01:30:42 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.93 2014/03/29 19:28:25 christos Exp $"); #include "opt_inet.h" @@ -1616,6 +1616,7 @@ ti_attach(device_t parent, device_t self, void *aux) bus_dma_segment_t dmaseg; int error, dmanseg, nolinear; const struct ti_type *t; + char intrbuf[PCI_INTRSTR_LEN]; t = ti_type_match(pa); if (t == NULL) { @@ -1658,7 +1659,7 @@ ti_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, ti_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "couldn't establish interrupt"); diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index da3bea3eb12..8400779bcc9 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.99 2013/03/30 03:21:08 christos Exp $ */ +/* $NetBSD: if_tl.c,v 1.100 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.99 2013/03/30 03:21:08 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.100 2014/03/29 19:28:25 christos Exp $"); #undef TLDEBUG #define TL_PRIV_STATS @@ -295,6 +295,7 @@ tl_pci_attach(device_t parent, device_t self, void *aux) int reg_io, reg_mem; pcireg_t reg10, reg14; pcireg_t csr; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; aprint_normal("\n"); @@ -391,7 +392,7 @@ tl_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf)); sc->tl_if.if_softc = sc; sc->tl_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET, tl_intr, sc); diff --git a/sys/dev/pci/if_tlp_pci.c b/sys/dev/pci/if_tlp_pci.c index fcaf5b3a9c0..e38745e6100 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.122 2012/09/23 01:10:59 chs Exp $ */ +/* $NetBSD: if_tlp_pci.c,v 1.123 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.122 2012/09/23 01:10:59 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.123 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -357,6 +357,7 @@ tlp_pci_attach(device_t parent, device_t self, void *aux) pcireg_t reg; int error; bus_size_t iosize = 0, memsize = 0; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_devno = pa->pa_device; @@ -1010,7 +1011,7 @@ tlp_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "unable to map interrupt\n"); goto fail; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, (psc->sc_flags & TULIP_PCI_SHAREDINTR) ? tlp_pci_shared_intr : tlp_intr, sc); diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c index eb33d194a56..b21bda1019f 100644 --- a/sys/dev/pci/if_txp.c +++ b/sys/dev/pci/if_txp.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_txp.c,v 1.39 2012/10/27 17:18:34 chs Exp $ */ +/* $NetBSD: if_txp.c,v 1.40 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2001 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.39 2012/10/27 17:18:34 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.40 2014/03/29 19:28:25 christos Exp $"); #include "opt_inet.h" @@ -197,6 +197,7 @@ txp_attach(device_t parent, device_t self, void *aux) u_int16_t subsys; int i, flags; char devinfo[256]; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_cold = 1; @@ -247,7 +248,7 @@ txp_attach(device_t parent, device_t self, void *aux) return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, txp_intr, sc); if (sc->sc_ih == NULL) { printf(": couldn't establish interrupt"); diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c index 28ed855c471..3c4da7e0445 100644 --- a/sys/dev/pci/if_vge.c +++ b/sys/dev/pci/if_vge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_vge.c,v 1.55 2013/09/13 21:14:58 martin Exp $ */ +/* $NetBSD: if_vge.c,v 1.56 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2004 @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.55 2013/09/13 21:14:58 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.56 2014/03/29 19:28:25 christos Exp $"); /* * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver. @@ -941,6 +941,7 @@ vge_attach(device_t parent, device_t self, void *aux) const char *intrstr; pci_intr_handle_t ih; uint16_t val; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -967,7 +968,7 @@ vge_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_intrhand = pci_intr_establish(pc, ih, IPL_NET, vge_intr, sc); if (sc->sc_intrhand == NULL) { aprint_error_dev(self, "unable to establish interrupt"); diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index 8fa000a9719..8696fc5f043 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.112 2012/12/27 16:23:48 jmcneill Exp $ */ +/* $NetBSD: if_vr.c,v 1.113 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.112 2012/12/27 16:23:48 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.113 2014/03/29 19:28:25 christos Exp $"); @@ -1490,6 +1490,7 @@ vr_attach(device_t parent, device_t self, void *aux) struct ifnet *ifp; uint8_t eaddr[ETHER_ADDR_LEN], mac; int i, rseg, error; + char intrbuf[PCI_INTRSTR_LEN]; #define PCI_CONF_WRITE(r, v) pci_conf_write(sc->vr_pc, sc->vr_tag, (r), (v)) #define PCI_CONF_READ(r) pci_conf_read(sc->vr_pc, sc->vr_tag, (r)) @@ -1570,7 +1571,7 @@ vr_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf)); sc->vr_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET, vr_intr, sc); if (sc->vr_ih == NULL) { diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c index 4a0566fed15..03be63f1c2a 100644 --- a/sys/dev/pci/if_vte.c +++ b/sys/dev/pci/if_vte.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_vte.c,v 1.9 2014/02/25 18:30:10 pooka Exp $ */ +/* $NetBSD: if_vte.c,v 1.10 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2011 Manuel Bouyer. All rights reserved. @@ -55,7 +55,7 @@ /* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.9 2014/02/25 18:30:10 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.10 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -174,6 +174,7 @@ vte_attach(device_t parent, device_t self, void *aux) int error; const struct sysctlnode *node; int vte_nodenum; + char intrbuf[PCI_INTRSTR_LEN]; sc->vte_dev = self; @@ -224,7 +225,7 @@ vte_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf)); sc->vte_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET, vte_intr, sc); if (sc->vte_ih == NULL) { diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c index 4b386b74e60..e65a1118033 100644 --- a/sys/dev/pci/if_wi_pci.c +++ b/sys/dev/pci/if_wi_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wi_pci.c,v 1.54 2012/01/30 19:41:21 drochner Exp $ */ +/* $NetBSD: if_wi_pci.c,v 1.55 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.54 2012/01/30 19:41:21 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.55 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -219,6 +219,7 @@ wi_pci_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; bus_space_tag_t memt, iot, plxt, tmdt; bus_space_handle_t memh, ioh, plxh, tmdh; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; psc->psc_pc = pc; @@ -316,7 +317,7 @@ wi_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); psc->psc_ih = ih; sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, wi_intr, sc); diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c index a4e9599af67..83ef08602d8 100644 --- a/sys/dev/pci/if_wm.c +++ b/sys/dev/pci/if_wm.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.267 2014/03/25 16:19:13 christos Exp $ */ +/* $NetBSD: if_wm.c,v 1.268 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -76,7 +76,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.267 2014/03/25 16:19:13 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.268 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1181,6 +1181,7 @@ wm_attach(device_t parent, device_t self, void *aux) pcireg_t preg, memtype; uint16_t eeprom_data, apme_mask; uint32_t reg; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; callout_init(&sc->sc_tick_ch, 0); @@ -1313,7 +1314,7 @@ wm_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->sc_dev, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, wm_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "unable to establish interrupt"); diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 2e51806e4ef..8264cee70d6 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wpi.c,v 1.57 2014/02/25 18:30:10 pooka Exp $ */ +/* $NetBSD: if_wpi.c,v 1.58 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2006, 2007 @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.57 2014/02/25 18:30:10 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.58 2014/03/29 19:28:25 christos Exp $"); /* * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters. @@ -218,6 +218,7 @@ wpi_attach(device_t parent __unused, device_t self, void *aux) pci_intr_handle_t ih; pcireg_t data; int error, ac; + char intrbuf[PCI_INTRSTR_LEN]; RUN_ONCE(&wpi_firmware_init, wpi_attach_once); sc->fw_used = false; @@ -253,7 +254,7 @@ wpi_attach(device_t parent __unused, device_t self, void *aux) return; } - intrstr = pci_intr_string(sc->sc_pct, ih); + intrstr = pci_intr_string(sc->sc_pct, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(sc->sc_pct, ih, IPL_NET, wpi_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "could not establish interrupt"); diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c index 40d6fb44b55..4a949744c7a 100644 --- a/sys/dev/pci/if_xge.c +++ b/sys/dev/pci/if_xge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_xge.c,v 1.18 2013/03/30 03:21:09 christos Exp $ */ +/* $NetBSD: if_xge.c,v 1.19 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2004, SUNET, Swedish University Computer Network. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.18 2013/03/30 03:21:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.19 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> @@ -287,6 +287,7 @@ xge_attach(device_t parent, device_t self, void *aux) uint8_t enaddr[ETHER_ADDR_LEN]; uint64_t val; int i; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); sc->sc_dev = self; @@ -549,7 +550,7 @@ xge_attach(device_t parent, device_t self, void *aux) */ if (pci_intr_map(pa, &ih)) return aprint_error_dev(sc->sc_dev, "unable to map interrupt\n"); - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); if ((sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, xge_intr, sc)) == NULL) return aprint_error_dev(sc->sc_dev, "unable to establish interrupt at %s\n", diff --git a/sys/dev/pci/ifpci.c b/sys/dev/pci/ifpci.c index eebd1ca8430..f4e591f253e 100644 --- a/sys/dev/pci/ifpci.c +++ b/sys/dev/pci/ifpci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ifpci.c,v 1.31 2012/10/27 17:18:34 chs Exp $ */ +/* $NetBSD: ifpci.c,v 1.32 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1999 Gary Jennejohn. All rights reserved. * @@ -36,14 +36,14 @@ * Fritz!Card PCI driver * ------------------------------------------------ * - * $Id: ifpci.c,v 1.31 2012/10/27 17:18:34 chs Exp $ + * $Id: ifpci.c,v 1.32 2014/03/29 19:28:25 christos Exp $ * * last edit-date: [Fri Jan 5 11:38:58 2001] * *---------------------------------------------------------------------------*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ifpci.c,v 1.31 2012/10/27 17:18:34 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ifpci.c,v 1.32 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> @@ -955,6 +955,7 @@ avma1pp_map_int(struct ifpci_softc *psc, struct pci_attach_args *pa) pci_chipset_tag_t pc = pa->pa_pc; pci_intr_handle_t ih; const char *intrstr; + char intrbuf[PCI_INTRSTR_LEN]; /* Map and establish the interrupt. */ if (pci_intr_map(pa, &ih)) { @@ -963,7 +964,7 @@ avma1pp_map_int(struct ifpci_softc *psc, struct pci_attach_args *pa) return; } psc->sc_pc = pc; - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, avma1pp_intr, sc); if (psc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "couldn't establish interrupt"); diff --git a/sys/dev/pci/ifpci2.c b/sys/dev/pci/ifpci2.c index a9e1b1187c7..522bd5ba0ab 100644 --- a/sys/dev/pci/ifpci2.c +++ b/sys/dev/pci/ifpci2.c @@ -1,4 +1,4 @@ -/* $NetBSD: ifpci2.c,v 1.21 2014/03/23 02:45:30 christos Exp $ */ +/* $NetBSD: ifpci2.c,v 1.22 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1999 Gary Jennejohn. All rights reserved. * @@ -36,14 +36,14 @@ * Fritz!Card PCI driver * ------------------------------------------------ * - * $Id: ifpci2.c,v 1.21 2014/03/23 02:45:30 christos Exp $ + * $Id: ifpci2.c,v 1.22 2014/03/29 19:28:25 christos Exp $ * * last edit-date: [Fri Jan 5 11:38:58 2001] * *---------------------------------------------------------------------------*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.21 2014/03/23 02:45:30 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.22 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> @@ -944,6 +944,7 @@ avma1pp2_map_int(struct ifpci_softc *psc, struct pci_attach_args *pa) pci_chipset_tag_t pc = pa->pa_pc; pci_intr_handle_t ih; const char *intrstr; + char intrbuf[PCI_INTRSTR_LEN]; /* Map and establish the interrupt. */ if (pci_intr_map(pa, &ih)) { @@ -952,7 +953,7 @@ avma1pp2_map_int(struct ifpci_softc *psc, struct pci_attach_args *pa) return; } psc->sc_pc = pc; - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, avma1pp2_intr, sc); if (psc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "couldn't establish interrupt"); diff --git a/sys/dev/pci/iha_pci.c b/sys/dev/pci/iha_pci.c index 9baa666a8c7..ea2ee6c5ca2 100644 --- a/sys/dev/pci/iha_pci.c +++ b/sys/dev/pci/iha_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: iha_pci.c,v 1.18 2012/01/30 19:41:21 drochner Exp $ */ +/* $NetBSD: iha_pci.c,v 1.19 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2001 Izumi Tsutsui. All rights reserved. @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iha_pci.c,v 1.18 2012/01/30 19:41:21 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iha_pci.c,v 1.19 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -111,6 +111,7 @@ iha_pci_attach(device_t parent, device_t self, void *aux) const char *intrstr; pcireg_t command; int ioh_valid; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -141,7 +142,7 @@ iha_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, iha_intr, sc); diff --git a/sys/dev/pci/iop_pci.c b/sys/dev/pci/iop_pci.c index a1034295273..7a07ddafafa 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.27 2012/10/27 17:18:34 chs Exp $ */ +/* $NetBSD: iop_pci.c,v 1.28 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iop_pci.c,v 1.27 2012/10/27 17:18:34 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iop_pci.c,v 1.28 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -114,6 +114,7 @@ iop_pci_attach(device_t parent, device_t self, void *aux) const char *intrstr; pcireg_t reg; int i; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); sc->sc_dev = self; @@ -185,7 +186,7 @@ iop_pci_attach(device_t parent, device_t self, void *aux) printf("can't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_BIO, iop_intr, sc); if (sc->sc_ih == NULL) { printf("can't establish interrupt"); diff --git a/sys/dev/pci/isic_pci.c b/sys/dev/pci/isic_pci.c index f337450f9cf..f9adccd3916 100644 --- a/sys/dev/pci/isic_pci.c +++ b/sys/dev/pci/isic_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: isic_pci.c,v 1.39 2012/10/27 17:18:34 chs Exp $ */ +/* $NetBSD: isic_pci.c,v 1.40 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.39 2012/10/27 17:18:34 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.40 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -164,6 +164,7 @@ isic_pci_isdn_attach(struct pci_isic_softc *psc, struct pci_attach_args *pa, con pci_chipset_tag_t pc = pa->pa_pc; pci_intr_handle_t ih; const char *intrstr; + char intrbuf[PCI_INTRSTR_LEN]; static const char *ISACversion[] = { "2085 Version A1/A2 or 2086/2186 Version 1.1", @@ -253,7 +254,7 @@ isic_pci_isdn_attach(struct pci_isic_softc *psc, struct pci_attach_args *pa, con aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, isic_intr_qs1p, psc); if (psc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "couldn't establish interrupt"); diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c index 3f0a9ac3485..67619abe9ba 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.116 2013/09/14 12:44:17 martin Exp $ */ +/* $NetBSD: isp_pci.c,v 1.117 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (C) 1997, 1998, 1999 National Aeronautics & Space Administration * All rights reserved. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.116 2013/09/14 12:44:17 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.117 2014/03/29 19:28:25 christos Exp $"); #include <dev/ic/isp_netbsd.h> #include <dev/pci/pcireg.h> @@ -493,6 +493,7 @@ isp_pci_attach(device_t parent, device_t self, void *aux) const char *intrstr; int ioh_valid, memh_valid; size_t mamt; + char intrbuf[PCI_INTRSTR_LEN]; isp->isp_osinfo.dev = self; @@ -762,7 +763,7 @@ isp_pci_attach(device_t parent, device_t self, void *aux) free(isp->isp_osinfo.chan, M_DEVBUF); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); if (intrstr == NULL) intrstr = "<I dunno>"; pcs->pci_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, diff --git a/sys/dev/pci/iwic_pci.c b/sys/dev/pci/iwic_pci.c index 8dbea8d7101..c045d8f963c 100644 --- a/sys/dev/pci/iwic_pci.c +++ b/sys/dev/pci/iwic_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: iwic_pci.c,v 1.18 2012/10/27 17:18:34 chs Exp $ */ +/* $NetBSD: iwic_pci.c,v 1.19 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1999, 2000 Dave Boyce. All rights reserved. @@ -36,7 +36,7 @@ *---------------------------------------------------------------------------*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iwic_pci.c,v 1.18 2012/10/27 17:18:34 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iwic_pci.c,v 1.19 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -234,6 +234,7 @@ iwic_pci_attach(device_t parent, device_t dev, void *aux) const char *intrstr; struct pci_attach_args *pa = aux; pci_chipset_tag_t pc = pa->pa_pc; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = dev; sc->sc_cardname = iwic_find_card(pa); @@ -252,7 +253,7 @@ iwic_pci_attach(device_t parent, device_t dev, void *aux) aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, iwic_pci_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(sc->sc_dev, "couldn't establish interrupt"); diff --git a/sys/dev/pci/ixgbe/ixgbe.c b/sys/dev/pci/ixgbe/ixgbe.c index d3f800e34bb..4e5dae3f38b 100644 --- a/sys/dev/pci/ixgbe/ixgbe.c +++ b/sys/dev/pci/ixgbe/ixgbe.c @@ -59,7 +59,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ /*$FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.51 2011/04/25 23:34:21 jfv Exp $*/ -/*$NetBSD: ixgbe.c,v 1.7 2014/02/25 18:30:10 pooka Exp $*/ +/*$NetBSD: ixgbe.c,v 1.8 2014/03/29 19:28:25 christos Exp $*/ #include "opt_inet.h" @@ -2262,6 +2262,7 @@ ixgbe_allocate_legacy(struct adapter *adapter, const struct pci_attach_args *pa) device_t dev = adapter->dev; struct ix_queue *que = adapter->queues; int rid = 0; + char intrbuf[PCI_INTRSTR_LEN]; /* MSI RID at 1 */ if (adapter->msix == 1) @@ -2273,7 +2274,7 @@ ixgbe_allocate_legacy(struct adapter *adapter, const struct pci_attach_args *pa) return ENXIO; } else { aprint_normal_dev(dev, "interrupting at %s\n", - pci_intr_string(adapter->osdep.pc, adapter->osdep.ih)); + pci_intr_string(adapter->osdep.pc, adapter->osdep.ih), intrbuf, sizeof(intrbuf)); } /* diff --git a/sys/dev/pci/jmide.c b/sys/dev/pci/jmide.c index cb8928f0916..5b2f531e01d 100644 --- a/sys/dev/pci/jmide.c +++ b/sys/dev/pci/jmide.c @@ -1,4 +1,4 @@ -/* $NetBSD: jmide.c,v 1.18 2012/07/31 15:50:36 bouyer Exp $ */ +/* $NetBSD: jmide.c,v 1.19 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2007 Manuel Bouyer. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: jmide.c,v 1.18 2012/07/31 15:50:36 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: jmide.c,v 1.19 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -158,6 +158,7 @@ jmide_attach(device_t parent, device_t self, void *aux) PCI_JM_CONTROL1); struct pciide_product_desc *pp; int ahci_used = 0; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_pciide.sc_wdcdev.sc_atac.atac_dev = self; @@ -184,7 +185,7 @@ jmide_attach(device_t parent, device_t self, void *aux) aprint_error("%s: couldn't map interrupt\n", JM_NAME(sc)); return; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf)); sc->sc_pciide.sc_pci_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO, jmide_intr, sc); if (sc->sc_pciide.sc_pci_ih == NULL) { diff --git a/sys/dev/pci/lpt_puc.c b/sys/dev/pci/lpt_puc.c index a34b0e86b71..0bf49be1eb5 100644 --- a/sys/dev/pci/lpt_puc.c +++ b/sys/dev/pci/lpt_puc.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpt_puc.c,v 1.16 2013/07/31 14:31:01 soren Exp $ */ +/* $NetBSD: lpt_puc.c,v 1.17 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1998 Christopher G. Demetriou. All rights reserved. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lpt_puc.c,v 1.16 2013/07/31 14:31:01 soren Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lpt_puc.c,v 1.17 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -70,6 +70,7 @@ lpt_puc_attach(device_t parent, device_t self, void *aux) struct lpt_softc *sc = device_private(self); struct puc_attach_args *aa = aux; const char *intrstr; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_iot = aa->t; @@ -78,7 +79,7 @@ lpt_puc_attach(device_t parent, device_t self, void *aux) aprint_naive(": Parallel port"); aprint_normal(": "); - intrstr = pci_intr_string(aa->pc, aa->intrhandle); + intrstr = pci_intr_string(aa->pc, aa->intrhandle, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(aa->pc, aa->intrhandle, IPL_TTY, lptintr, sc); if (sc->sc_ih == NULL) { diff --git a/sys/dev/pci/mfi_pci.c b/sys/dev/pci/mfi_pci.c index 99b070a85fd..d0d6c671499 100644 --- a/sys/dev/pci/mfi_pci.c +++ b/sys/dev/pci/mfi_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: mfi_pci.c,v 1.17 2012/08/31 05:22:17 jnemeth Exp $ */ +/* $NetBSD: mfi_pci.c,v 1.18 2014/03/29 19:28:25 christos Exp $ */ /* $OpenBSD: mfi_pci.c,v 1.11 2006/08/06 04:40:08 brad Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> @@ -17,7 +17,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.17 2012/08/31 05:22:17 jnemeth Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.18 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -199,6 +199,7 @@ mfi_pci_attach(device_t parent, device_t self, void *aux) int regbar; const char *subtype = NULL; uint32_t subsysid; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; psc->psc_pc = pa->pa_pc; @@ -237,7 +238,7 @@ mfi_pci_attach(device_t parent, device_t self, void *aux) bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_size); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); if (mpd->mpd_iop == MFI_IOP_TBOLT) { sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, mfi_tbolt_intrh, sc); diff --git a/sys/dev/pci/mlx_pci.c b/sys/dev/pci/mlx_pci.c index 28d874ca354..daab88e7caa 100644 --- a/sys/dev/pci/mlx_pci.c +++ b/sys/dev/pci/mlx_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: mlx_pci.c,v 1.24 2012/10/27 17:18:35 chs Exp $ */ +/* $NetBSD: mlx_pci.c,v 1.25 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.24 2012/10/27 17:18:35 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.25 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -200,6 +200,7 @@ mlx_pci_attach(device_t parent, device_t self, void *aux) const char *intrstr; int ior, memr, i; const struct mlx_pci_ident *mpi; + char intrbuf[PCI_INTRSTR_LEN]; mlx = device_private(self); pa = aux; @@ -260,7 +261,7 @@ mlx_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "can't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); mlx->mlx_ih = pci_intr_establish(pc, ih, IPL_BIO, mlx_intr, mlx); if (mlx->mlx_ih == NULL) { aprint_error_dev(self, "can't establish interrupt"); diff --git a/sys/dev/pci/mly.c b/sys/dev/pci/mly.c index 3aa4d14beff..39a750ade19 100644 --- a/sys/dev/pci/mly.c +++ b/sys/dev/pci/mly.c @@ -1,4 +1,4 @@ -/* $NetBSD: mly.c,v 1.47 2014/03/16 05:20:28 dholland Exp $ */ +/* $NetBSD: mly.c,v 1.48 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.47 2014/03/16 05:20:28 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.48 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -289,6 +289,7 @@ mly_attach(device_t parent, device_t self, void *aux) int ior, memr, i, rv, state; struct scsipi_adapter *adapt; struct scsipi_channel *chan; + char intrbuf[PCI_INTRSTR_LEN]; mly = device_private(self); mly->mly_dv = self; @@ -354,7 +355,7 @@ mly_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "can't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); mly->mly_ih = pci_intr_establish(pc, ih, IPL_BIO, mly_intr, mly); if (mly->mly_ih == NULL) { aprint_error_dev(self, "can't establish interrupt"); diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c index cf6037f1d0a..af69a0c579c 100644 --- a/sys/dev/pci/mpii.c +++ b/sys/dev/pci/mpii.c @@ -1,4 +1,4 @@ -/* $NetBSD: mpii.c,v 1.4 2013/10/17 21:06:15 christos Exp $ */ +/* $NetBSD: mpii.c,v 1.5 2014/03/29 19:28:25 christos Exp $ */ /* OpenBSD: mpii.c,v 1.51 2012/04/11 13:29:14 naddy Exp */ /* * Copyright (c) 2010 Mike Belopuhov <mkb@crypt.org.ru> @@ -20,7 +20,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.4 2013/10/17 21:06:15 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.5 2014/03/29 19:28:25 christos Exp $"); #include "bio.h" @@ -2134,6 +2134,7 @@ mpii_attach(device_t parent, device_t self, void *aux) struct scsipi_adapter *adapt = &sc->sc_adapt; struct scsipi_channel *chan = &sc->sc_chan; char wkname[15]; + char intrbuf[PCI_INTRSTR_LEN]; pci_aprint_devinfo(pa, NULL); @@ -2195,7 +2196,7 @@ mpii_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "unable to map interrupt\n"); goto unmap; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); if (mpii_init(sc) != 0) { aprint_error_dev(self, "unable to initialize ioc\n"); diff --git a/sys/dev/pci/mpt_pci.c b/sys/dev/pci/mpt_pci.c index 3ada7308763..c6ff9832773 100644 --- a/sys/dev/pci/mpt_pci.c +++ b/sys/dev/pci/mpt_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: mpt_pci.c,v 1.22 2012/03/18 21:05:21 martin Exp $ */ +/* $NetBSD: mpt_pci.c,v 1.23 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpt_pci.c,v 1.22 2012/03/18 21:05:21 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpt_pci.c,v 1.23 2014/03/29 19:28:25 christos Exp $"); #include <dev/ic/mpt.h> /* pulls in all headers */ @@ -134,6 +134,7 @@ mpt_pci_attach(device_t parent, device_t self, void *aux) bus_space_tag_t memt; bus_space_handle_t memh; int memh_valid; + char intrbuf[PCI_INTRSTR_LEN]; pci_aprint_devinfo(pa, NULL); @@ -202,7 +203,7 @@ mpt_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(mpt->sc_dev, "unable to map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, mpt_intr, mpt); if (psc->sc_ih == NULL) { aprint_error_dev(mpt->sc_dev, "unable to establish interrupt"); diff --git a/sys/dev/pci/mvsata_pci.c b/sys/dev/pci/mvsata_pci.c index beb51664173..2300954f114 100644 --- a/sys/dev/pci/mvsata_pci.c +++ b/sys/dev/pci/mvsata_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: mvsata_pci.c,v 1.7 2012/01/30 19:41:22 drochner Exp $ */ +/* $NetBSD: mvsata_pci.c,v 1.8 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2008 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mvsata_pci.c,v 1.7 2012/01/30 19:41:22 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mvsata_pci.c,v 1.8 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -156,6 +156,7 @@ mvsata_pci_attach(device_t parent, device_t self, void *aux) uint32_t reg, mask; int read_pre_amps, hc, port, rv, i; const char *intrstr; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_wdcdev.sc_atac.atac_dev = self; sc->sc_model = PCI_PRODUCT(pa->pa_id); @@ -192,7 +193,7 @@ mvsata_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(psc->psc_pc, intrhandle); + intrstr = pci_intr_string(psc->psc_pc, intrhandle, intrbuf, sizeof(intrbuf)); psc->psc_ih = pci_intr_establish(psc->psc_pc, intrhandle, IPL_BIO, mvsata_pci_intr, sc); if (psc->psc_ih == NULL) { diff --git a/sys/dev/pci/n8/nsp.c b/sys/dev/pci/n8/nsp.c index 85494d7b27c..52de45da305 100644 --- a/sys/dev/pci/n8/nsp.c +++ b/sys/dev/pci/n8/nsp.c @@ -323,6 +323,7 @@ nsp_attach(device_t parent, device_t self, void *aux) u_int32_t cmd; int res; int ind; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); sc->sc_dev = self; @@ -400,7 +401,7 @@ nsp_attach(device_t parent, device_t self, void *aux) sc->unit); goto fail; } - intrstr = pci_intr_string(sc->pa_pc, ih); + intrstr = pci_intr_string(sc->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->int_handle = pci_intr_establish(sc->pa_pc, ih, IPL_NET, nsp_intr, sc); if (sc->int_handle == NULL) { diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c index af53c45ae1f..a3b93dddd2e 100644 --- a/sys/dev/pci/neo.c +++ b/sys/dev/pci/neo.c @@ -1,4 +1,4 @@ -/* $NetBSD: neo.c,v 1.49 2012/10/27 17:18:35 chs Exp $ */ +/* $NetBSD: neo.c,v 1.50 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk> @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.49 2012/10/27 17:18:35 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.50 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -576,6 +576,7 @@ neo_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; pcireg_t csr; int error; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); pa = aux; @@ -608,7 +609,7 @@ neo_attach(device_t parent, device_t self, void *aux) mutex_init(&sc->lock, MUTEX_DEFAULT, IPL_NONE); mutex_init(&sc->intr_lock, MUTEX_DEFAULT, IPL_AUDIO); - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->ih = pci_intr_establish(pc, ih, IPL_AUDIO, neo_intr, sc); if (sc->ih == NULL) { diff --git a/sys/dev/pci/njs_pci.c b/sys/dev/pci/njs_pci.c index 84b1c775838..8f71a0e2419 100644 --- a/sys/dev/pci/njs_pci.c +++ b/sys/dev/pci/njs_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: njs_pci.c,v 1.9 2008/07/09 19:08:44 joerg Exp $ */ +/* $NetBSD: njs_pci.c,v 1.10 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: njs_pci.c,v 1.9 2008/07/09 19:08:44 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: njs_pci.c,v 1.10 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -125,6 +125,7 @@ njs_pci_attach(device_t parent, device_t self, void *aux) pci_chipset_tag_t pc = pa->pa_pc; pcireg_t reg; const char *str_intr, *str_at; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive(": SCSI controller\n"); if ((prod = njs_pci_lookup(pa)) == NULL) @@ -184,7 +185,7 @@ njs_pci_attach(device_t parent, device_t self, void *aux) return; } - str_intr = pci_intr_string(pa->pa_pc, ih); + str_intr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); str_at = " at "; if (str_intr == NULL) str_at = str_intr = ""; diff --git a/sys/dev/pci/oboe.c b/sys/dev/pci/oboe.c index 0d13f7a9e96..5d31858db67 100644 --- a/sys/dev/pci/oboe.c +++ b/sys/dev/pci/oboe.c @@ -1,4 +1,4 @@ -/* $NetBSD: oboe.c,v 1.41 2014/03/20 21:30:52 christos Exp $ */ +/* $NetBSD: oboe.c,v 1.42 2014/03/29 19:28:25 christos Exp $ */ /* XXXXFVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage */ @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.41 2014/03/20 21:30:52 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.42 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -177,6 +177,7 @@ oboe_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; struct ir_attach_args ia; const char *intrstring; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_revision = PCI_REVISION(pa->pa_class); printf(": Toshiba Fast Infrared Type O, revision %d\n", @@ -213,7 +214,7 @@ oboe_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstring = pci_intr_string(pa->pa_pc, ih); + intrstring = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_IR, oboe_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c index 4cf35fc67e7..5bc7177842e 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.51 2014/01/28 17:24:42 skrll Exp $ */ +/* $NetBSD: ohci_pci.c,v 1.52 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.51 2014/01/28 17:24:42 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.52 2014/03/29 19:28:25 christos Exp $"); #include "ehci.h" @@ -91,6 +91,7 @@ ohci_pci_attach(device_t parent, device_t self, void *aux) pcireg_t csr; usbd_status r; const char *vendor; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc.sc_dev = self; sc->sc.sc_bus.hci_private = sc; @@ -141,7 +142,7 @@ ohci_pci_attach(device_t parent, device_t self, void *aux) /* * Allocate IRQ */ - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, ohci_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index 248ba15d25b..3ee03967707 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $NetBSD: pccbb.c,v 1.205 2013/10/17 21:06:15 christos Exp $ */ +/* $NetBSD: pccbb.c,v 1.206 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1998, 1999 and 2000 @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.205 2013/10/17 21:06:15 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.206 2014/03/29 19:28:25 christos Exp $"); /* #define CBB_DEBUG @@ -916,13 +916,14 @@ pccbb_intrinit(struct pccbb_softc *sc) pci_chipset_tag_t pc = sc->sc_pc; bus_space_tag_t bmt = sc->sc_base_memt; bus_space_handle_t bmh = sc->sc_base_memh; + char intrbuf[PCI_INTRSTR_LEN]; /* Map and establish the interrupt. */ if (pci_intr_map(&sc->sc_pa, &ih)) { aprint_error_dev(sc->sc_dev, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); /* * XXX pccbbintr should be called under the priority lower diff --git a/sys/dev/pci/pciide_common.c b/sys/dev/pci/pciide_common.c index 228864da036..324aa66e763 100644 --- a/sys/dev/pci/pciide_common.c +++ b/sys/dev/pci/pciide_common.c @@ -1,4 +1,4 @@ -/* $NetBSD: pciide_common.c,v 1.59 2013/06/22 05:37:06 matt Exp $ */ +/* $NetBSD: pciide_common.c,v 1.60 2014/03/29 19:28:25 christos Exp $ */ /* @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.59 2013/06/22 05:37:06 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.60 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -341,6 +341,7 @@ pciide_mapregs_native(const struct pci_attach_args *pa, const char *intrstr; pci_intr_handle_t intrhandle; int i; + char intrbuf[PCI_INTRSTR_LEN]; cp->compat = 0; @@ -350,7 +351,7 @@ pciide_mapregs_native(const struct pci_attach_args *pa, "couldn't map native-PCI interrupt\n"); goto bad; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf)); sc->sc_pci_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO, pci_intr, sc); if (sc->sc_pci_ih != NULL) { diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h index 61550f4dc6f..69138d9349d 100644 --- a/sys/dev/pci/pcireg.h +++ b/sys/dev/pci/pcireg.h @@ -1,4 +1,4 @@ -/* $NetBSD: pcireg.h,v 1.84 2013/04/21 23:46:06 msaitoh Exp $ */ +/* $NetBSD: pcireg.h,v 1.85 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1995, 1996, 1999, 2000 @@ -1026,4 +1026,9 @@ struct pci_rom { #define PCI_EXTCAPLIST_VERSION(ecr) (((ecr) >> 16) & 0xf) #define PCI_EXTCAPLIST_NEXT(ecr) (((ecr) >> 20) & 0xfff) +/* + * Local constants + */ +#define PCI_INTRSTR_LEN 64 + #endif /* _DEV_PCI_PCIREG_H_ */ diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 9caa4bfd15d..6d03fd7d71d 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pcivar.h,v 1.98 2012/01/29 11:31:38 drochner Exp $ */ +/* $NetBSD: pcivar.h,v 1.99 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. @@ -80,7 +80,7 @@ struct pci_overrides { int (*ov_intr_map)(void *, const struct pci_attach_args *, pci_intr_handle_t *); const char *(*ov_intr_string)(void *, pci_chipset_tag_t, - pci_intr_handle_t); + pci_intr_handle_t, char *, size_t); const struct evcnt *(*ov_intr_evcnt)(void *, pci_chipset_tag_t, pci_intr_handle_t); void *(*ov_intr_establish)(void *, pci_chipset_tag_t, pci_intr_handle_t, diff --git a/sys/dev/pci/pcscp.c b/sys/dev/pci/pcscp.c index d210142172b..12f21b8cf6e 100644 --- a/sys/dev/pci/pcscp.c +++ b/sys/dev/pci/pcscp.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcscp.c,v 1.46 2012/01/30 19:41:22 drochner Exp $ */ +/* $NetBSD: pcscp.c,v 1.47 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.46 2012/01/30 19:41:22 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.47 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -161,6 +161,7 @@ pcscp_attach(device_t parent, device_t self, void *aux) pcireg_t csr; bus_dma_segment_t seg; int error, rseg; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; pci_aprint_devinfo(pa, NULL); @@ -282,7 +283,7 @@ pcscp_attach(device_t parent, device_t self, void *aux) goto fail_4; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); esc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, ncr53c9x_intr, esc); if (esc->sc_ih == NULL) { diff --git a/sys/dev/pci/pdcsata.c b/sys/dev/pci/pdcsata.c index ac1527d60ab..8b178013ee9 100644 --- a/sys/dev/pci/pdcsata.c +++ b/sys/dev/pci/pdcsata.c @@ -1,4 +1,4 @@ -/* $NetBSD: pdcsata.c,v 1.26 2013/10/07 19:51:55 jakllsch Exp $ */ +/* $NetBSD: pdcsata.c,v 1.27 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2004, Manuel Bouyer. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pdcsata.c,v 1.26 2013/10/07 19:51:55 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pdcsata.c,v 1.27 2014/03/29 19:28:25 christos Exp $"); #include <sys/types.h> #include <sys/malloc.h> @@ -229,6 +229,7 @@ pdcsata_chip_map(struct pciide_softc *sc, const struct pci_attach_args *pa) int channel, i; pci_intr_handle_t intrhandle; const char *intrstr; + char intrbuf[PCI_INTRSTR_LEN]; /* * Promise SATA controllers have 3 or 4 channels, @@ -239,7 +240,7 @@ pdcsata_chip_map(struct pciide_softc *sc, const struct pci_attach_args *pa) "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf)); sc->sc_pci_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO, pdcsata_pci_intr, sc); diff --git a/sys/dev/pci/piixpm.c b/sys/dev/pci/piixpm.c index cccc5f825ae..c0dbe3e85d9 100644 --- a/sys/dev/pci/piixpm.c +++ b/sys/dev/pci/piixpm.c @@ -1,4 +1,4 @@ -/* $NetBSD: piixpm.c,v 1.43 2014/03/18 18:20:41 riastradh Exp $ */ +/* $NetBSD: piixpm.c,v 1.44 2014/03/29 19:28:25 christos Exp $ */ /* $OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $ */ /* @@ -22,7 +22,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.43 2014/03/18 18:20:41 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.44 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -156,6 +156,7 @@ piixpm_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; const char *intrstr = NULL; int i, numbusses = 1; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_iot = pa->pa_iot; @@ -233,7 +234,7 @@ nopowermanagement: } else if ((conf & PIIX_SMB_HOSTC_INTMASK) == PIIX_SMB_HOSTC_IRQ) { /* Install interrupt handler */ if (pci_intr_map(pa, &ih) == 0) { - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_smb_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, piixpm_intr, sc); if (sc->sc_smb_ih != NULL) { diff --git a/sys/dev/pci/rtsx_pci.c b/sys/dev/pci/rtsx_pci.c index b08be819a57..cf6fd3a8aa2 100644 --- a/sys/dev/pci/rtsx_pci.c +++ b/sys/dev/pci/rtsx_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtsx_pci.c,v 1.1 2014/03/19 15:26:41 nonaka Exp $ */ +/* $NetBSD: rtsx_pci.c,v 1.2 2014/03/29 19:28:25 christos Exp $ */ /* $OpenBSD: rtsx_pci.c,v 1.4 2013/11/06 13:51:02 stsp Exp $ */ /* @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtsx_pci.c,v 1.1 2014/03/19 15:26:41 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtsx_pci.c,v 1.2 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -92,6 +92,7 @@ rtsx_pci_attach(device_t parent, device_t self, void *aux) bus_space_handle_t ioh; bus_size_t size; uint32_t flags; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc.sc_dev = self; sc->sc_pc = pc; @@ -113,7 +114,7 @@ rtsx_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_SDMMC, rtsx_intr, &sc->sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt\n"); diff --git a/sys/dev/pci/satalink.c b/sys/dev/pci/satalink.c index edc694b6d62..a41720a55f7 100644 --- a/sys/dev/pci/satalink.c +++ b/sys/dev/pci/satalink.c @@ -1,4 +1,4 @@ -/* $NetBSD: satalink.c,v 1.51 2013/10/07 19:51:55 jakllsch Exp $ */ +/* $NetBSD: satalink.c,v 1.52 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: satalink.c,v 1.51 2013/10/07 19:51:55 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: satalink.c,v 1.52 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -674,6 +674,7 @@ sii3114_chip_map(struct pciide_softc *sc, const struct pci_attach_args *pa) pci_intr_handle_t intrhandle; const char *intrstr; int channel; + char intrbuf[PCI_INTRSTR_LEN]; if (pciide_chipen(sc, pa) == 0) return; @@ -760,7 +761,7 @@ sii3114_chip_map(struct pciide_softc *sc, const struct pci_attach_args *pa) "couldn't map native-PCI interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf)); sc->sc_pci_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO, /* XXX */ pciide_pci_intr, sc); diff --git a/sys/dev/pci/sdhc_pci.c b/sys/dev/pci/sdhc_pci.c index 77329798841..b1c6aa57693 100644 --- a/sys/dev/pci/sdhc_pci.c +++ b/sys/dev/pci/sdhc_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: sdhc_pci.c,v 1.10 2012/12/20 14:41:35 jakllsch Exp $ */ +/* $NetBSD: sdhc_pci.c,v 1.11 2014/03/29 19:28:25 christos Exp $ */ /* $OpenBSD: sdhc_pci.c,v 1.7 2007/10/30 18:13:45 chl Exp $ */ /* @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sdhc_pci.c,v 1.10 2012/12/20 14:41:35 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdhc_pci.c,v 1.11 2014/03/29 19:28:25 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_sdmmc.h" @@ -221,6 +221,7 @@ sdhc_pci_attach(device_t parent, device_t self, void *aux) bus_space_handle_t ioh; bus_size_t size; uint32_t flags; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc.sc_dev = self; sc->sc.sc_dmat = pa->pa_dmat; @@ -266,7 +267,7 @@ sdhc_pci_attach(device_t parent, device_t self, void *aux) goto err; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_SDMMC, sdhc_intr, &sc->sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt\n"); diff --git a/sys/dev/pci/siisata_pci.c b/sys/dev/pci/siisata_pci.c index b6f596bc99b..dfb8af70cfb 100644 --- a/sys/dev/pci/siisata_pci.c +++ b/sys/dev/pci/siisata_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: siisata_pci.c,v 1.12 2013/08/17 14:39:54 jakllsch Exp $ */ +/* $NetBSD: siisata_pci.c,v 1.13 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: siisata_pci.c,v 1.12 2013/08/17 14:39:54 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: siisata_pci.c,v 1.13 2014/03/29 19:28:25 christos Exp $"); #include <sys/types.h> #include <sys/malloc.h> @@ -147,6 +147,7 @@ siisata_pci_attach(device_t parent, device_t self, void *aux) uint32_t gcreg; int memh_valid; bus_size_t grsize, prsize; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_atac.atac_dev = self; @@ -208,7 +209,7 @@ siisata_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf)); psc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO, siisata_intr, sc); if (psc->sc_ih == NULL) { diff --git a/sys/dev/pci/siop_pci_common.c b/sys/dev/pci/siop_pci_common.c index 087b8cdd26a..c93366a1a5a 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.34 2010/11/13 13:52:08 uebayasi Exp $ */ +/* $NetBSD: siop_pci_common.c,v 1.35 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2000 Manuel Bouyer. @@ -27,7 +27,7 @@ /* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.34 2010/11/13 13:52:08 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.35 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -239,6 +239,7 @@ siop_pci_attach_common(struct siop_pci_common_softc *pci_sc, int memh_valid, ioh_valid; bus_addr_t ioaddr, memaddr; bool use_pciclock; + char intrbuf[PCI_INTRSTR_LEN]; aprint_naive(": SCSI controller\n"); @@ -328,7 +329,7 @@ siop_pci_attach_common(struct siop_pci_common_softc *pci_sc, aprint_error_dev(siop_sc->sc_dev, "couldn't map interrupt\n"); return 0; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf)); pci_sc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO, intr, siop_sc); if (pci_sc->sc_ih != NULL) { diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c index d074b9ecd97..5fd8ff534e5 100644 --- a/sys/dev/pci/sv.c +++ b/sys/dev/pci/sv.c @@ -1,4 +1,4 @@ -/* $NetBSD: sv.c,v 1.49 2014/03/18 18:20:42 riastradh Exp $ */ +/* $NetBSD: sv.c,v 1.50 2014/03/29 19:28:25 christos Exp $ */ /* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */ /* @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.49 2014/03/18 18:20:42 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.50 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -344,6 +344,7 @@ sv_attach(device_t parent, device_t self, void *aux) char const *intrstr; uint8_t reg; struct audio_attach_args arg; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); pa = aux; @@ -426,7 +427,7 @@ sv_attach(device_t parent, device_t self, void *aux) mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE); mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO); - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, sv_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/svwsata.c b/sys/dev/pci/svwsata.c index 93b71a9a78e..c2fab548553 100644 --- a/sys/dev/pci/svwsata.c +++ b/sys/dev/pci/svwsata.c @@ -1,4 +1,4 @@ -/* $NetBSD: svwsata.c,v 1.18 2013/10/07 19:51:55 jakllsch Exp $ */ +/* $NetBSD: svwsata.c,v 1.19 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2005 Mark Kettenis @@ -17,7 +17,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svwsata.c,v 1.18 2013/10/07 19:51:55 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svwsata.c,v 1.19 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -109,6 +109,7 @@ svwsata_chip_map(struct pciide_softc *sc, const struct pci_attach_args *pa) pcireg_t interface; const char *intrstr; int channel; + char intrbuf[PCI_INTRSTR_LEN]; /* The 4-port version has a dummy second function. */ if (pci_conf_read(sc->sc_pc, sc->sc_tag, @@ -158,7 +159,7 @@ svwsata_chip_map(struct pciide_softc *sc, const struct pci_attach_args *pa) "couldn't map native-PCI interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf)); sc->sc_pci_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO, pciide_pci_intr, sc); if (sc->sc_pci_ih != NULL) { diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c index e9e426377d7..c2936d57088 100644 --- a/sys/dev/pci/tga.c +++ b/sys/dev/pci/tga.c @@ -1,4 +1,4 @@ -/* $NetBSD: tga.c,v 1.84 2013/11/04 16:54:12 christos Exp $ */ +/* $NetBSD: tga.c,v 1.85 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.84 2013/11/04 16:54:12 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.85 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -394,6 +394,7 @@ tgaattach(device_t parent, device_t self, void *aux) const char *intrstr; uint8_t rev; int console; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -422,7 +423,7 @@ tgaattach(device_t parent, device_t self, void *aux) aprint_error(": couldn't map interrupt"); return; } - intrstr = pci_intr_string(pa->pa_pc, intrh); + intrstr = pci_intr_string(pa->pa_pc, intrh, intrbuf, sizeof(intrbuf)); sc->sc_intr = pci_intr_establish(pa->pa_pc, intrh, IPL_TTY, tga_intr, sc->sc_dc); if (sc->sc_intr == NULL) { diff --git a/sys/dev/pci/trm.c b/sys/dev/pci/trm.c index ea7c95eea63..9474866a504 100644 --- a/sys/dev/pci/trm.c +++ b/sys/dev/pci/trm.c @@ -1,4 +1,4 @@ -/* $NetBSD: trm.c,v 1.35 2013/11/24 18:02:08 bouyer Exp $ */ +/* $NetBSD: trm.c,v 1.36 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2002 Izumi Tsutsui. All rights reserved. * @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.35 2013/11/24 18:02:08 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.36 2014/03/29 19:28:25 christos Exp $"); /* #define TRM_DEBUG */ #ifdef TRM_DEBUG @@ -413,6 +413,7 @@ trm_attach(device_t parent, device_t self, void *aux) pcireg_t command; const char *intrstr; int fl = 0; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; @@ -474,7 +475,7 @@ trm_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, ih); + intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf)); if (pci_intr_establish(pa->pa_pc, ih, IPL_BIO, trm_intr, sc) == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/twa.c b/sys/dev/pci/twa.c index 5e861d0c4c4..2089715d34b 100644 --- a/sys/dev/pci/twa.c +++ b/sys/dev/pci/twa.c @@ -1,4 +1,4 @@ -/* $NetBSD: twa.c,v 1.48 2014/03/16 05:20:28 dholland Exp $ */ +/* $NetBSD: twa.c,v 1.49 2014/03/29 19:28:25 christos Exp $ */ /* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */ /*- @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.48 2014/03/16 05:20:28 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.49 2014/03/29 19:28:25 christos Exp $"); //#define TWA_DEBUG @@ -1505,6 +1505,7 @@ twa_attach(device_t parent, device_t self, void *aux) const struct twa_pci_identity *entry; int i; bool use_64bit; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); @@ -1584,7 +1585,7 @@ twa_attach(device_t parent, device_t self, void *aux) aprint_error_dev(sc->twa_dv, "can't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->twa_ih = pci_intr_establish(pc, ih, IPL_BIO, twa_intr, sc); if (sc->twa_ih == NULL) { diff --git a/sys/dev/pci/twe.c b/sys/dev/pci/twe.c index 8bb6292362c..548ae61589b 100644 --- a/sys/dev/pci/twe.c +++ b/sys/dev/pci/twe.c @@ -1,4 +1,4 @@ -/* $NetBSD: twe.c,v 1.101 2014/03/16 05:20:28 dholland Exp $ */ +/* $NetBSD: twe.c,v 1.102 2014/03/29 19:28:25 christos Exp $ */ /*- * Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.101 2014/03/16 05:20:28 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.102 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -318,6 +318,7 @@ twe_attach(device_t parent, device_t self, void *aux) const struct sysctlnode *node; struct twe_cmd *tc; struct twe_ccb *ccb; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); sc->sc_dev = self; @@ -348,7 +349,7 @@ twe_attach(device_t parent, device_t self, void *aux) return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_BIO, twe_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "can't establish interrupt%s%s\n", diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c index 15ee7e4aabe..f891cc513e4 100644 --- a/sys/dev/pci/ubsec.c +++ b/sys/dev/pci/ubsec.c @@ -1,4 +1,4 @@ -/* $NetBSD: ubsec.c,v 1.37 2014/02/25 18:30:10 pooka Exp $ */ +/* $NetBSD: ubsec.c,v 1.38 2014/03/29 19:28:25 christos Exp $ */ /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */ /* $OpenBSD: ubsec.c,v 1.127 2003/06/04 14:04:58 jason Exp $ */ @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.37 2014/02/25 18:30:10 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.38 2014/03/29 19:28:25 christos Exp $"); #undef UBSEC_DEBUG @@ -366,6 +366,7 @@ ubsec_attach(device_t parent, device_t self, void *aux) pcireg_t memtype; struct ubsec_dma *dmap; u_int32_t cmd, i; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_pct = pc; @@ -407,7 +408,7 @@ ubsec_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, ubsec_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c index 39a8ec3b744..3c1e4baf06c 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.56 2013/03/17 18:30:00 martin Exp $ */ +/* $NetBSD: uhci_pci.c,v 1.57 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.56 2013/03/17 18:30:00 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.57 2014/03/29 19:28:25 christos Exp $"); #include "ehci.h" @@ -96,6 +96,7 @@ uhci_pci_attach(device_t parent, device_t self, void *aux) const char *vendor; usbd_status r; int s; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc.sc_dev = self; sc->sc.sc_bus.hci_private = sc; @@ -131,7 +132,7 @@ uhci_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't map interrupt\n"); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, uhci_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/universe_pci.c b/sys/dev/pci/universe_pci.c index c41d204979e..0f9509b89d2 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.11 2009/11/26 15:17:10 njoly Exp $ */ +/* $NetBSD: universe_pci.c,v 1.12 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1999 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.11 2009/11/26 15:17:10 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.12 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -94,6 +94,7 @@ univ_pci_attach(struct univ_pci_data *d, struct pci_attach_args *pa, const char const char *intrstr = NULL; u_int32_t reg; int i; + char intrbuf[PCI_INTRSTR_LEN]; d->pc = pc; strncpy(d->devname, name, sizeof(d->devname)); @@ -140,7 +141,7 @@ univ_pci_attach(struct univ_pci_data *d, struct pci_attach_args *pa, const char aprint_error("%s: couldn't map interrupt\n", name); return (-1); } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); /* * Use a low interrupt level (the lowest?). * We will raise before calling a subdevice's handler. diff --git a/sys/dev/pci/viaide.c b/sys/dev/pci/viaide.c index a215fab2da1..ef535cc09dc 100644 --- a/sys/dev/pci/viaide.c +++ b/sys/dev/pci/viaide.c @@ -1,4 +1,4 @@ -/* $NetBSD: viaide.c,v 1.83 2012/07/31 15:50:37 bouyer Exp $ */ +/* $NetBSD: viaide.c,v 1.84 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.83 2012/07/31 15:50:37 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.84 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1093,6 +1093,7 @@ via_sata_chip_map_new(struct pciide_softc *sc, pci_intr_handle_t intrhandle; const char *intrstr; int i; + char intrbuf[PCI_INTRSTR_LEN]; if (pciide_chipen(sc, pa) == 0) return; @@ -1131,7 +1132,7 @@ via_sata_chip_map_new(struct pciide_softc *sc, "couldn't map native-PCI interrupt\n"); return; } - intrstr = pci_intr_string(pa->pa_pc, intrhandle); + intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf)); sc->sc_pci_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO, pciide_pci_intr, sc); if (sc->sc_pci_ih == NULL) { diff --git a/sys/dev/pci/virtio.c b/sys/dev/pci/virtio.c index dd187a4114d..cdcc7ab3153 100644 --- a/sys/dev/pci/virtio.c +++ b/sys/dev/pci/virtio.c @@ -1,4 +1,4 @@ -/* $NetBSD: virtio.c,v 1.4 2013/08/10 18:01:31 tsutsui Exp $ */ +/* $NetBSD: virtio.c,v 1.5 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2010 Minoura Makoto. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.4 2013/08/10 18:01:31 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.5 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -114,6 +114,7 @@ virtio_attach(device_t parent, device_t self, void *aux) pcireg_t id; char const *intrstr; pci_intr_handle_t ih; + char intrbuf[PCI_INTRSTR_LEN]; revision = PCI_REVISION(pa->pa_class); if (revision != 0) { @@ -169,7 +170,7 @@ virtio_attach(device_t parent, device_t self, void *aux) virtio_set_status(sc, VIRTIO_CONFIG_DEVICE_STATUS_FAILED); return; } - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, sc->sc_ipl, virtio_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/voodoofb.c b/sys/dev/pci/voodoofb.c index cd9e1d9de43..e7b17b2a5c4 100644 --- a/sys/dev/pci/voodoofb.c +++ b/sys/dev/pci/voodoofb.c @@ -1,4 +1,4 @@ -/* $NetBSD: voodoofb.c,v 1.47 2013/11/19 06:37:42 macallan Exp $ */ +/* $NetBSD: voodoofb.c,v 1.48 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2005, 2006, 2012 Michael Lorenz @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.47 2013/11/19 06:37:42 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.48 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -514,13 +514,14 @@ voodoofb_attach(device_t parent, device_t self, void *aux) } #ifdef VOODOOFB_ENABLE_INTR + char intrbuf[PCI_INTRSTR_LEN]; /* Interrupt. We don't use it for anything yet */ if (pci_intr_map(pa, &ih)) { aprint_error_dev(self, "failed to map interrupt\n"); return; } - intrstr = pci_intr_string(sc->sc_pc, ih); + intrstr = pci_intr_string(sc->sc_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(sc->sc_pc, ih, IPL_NET, voodoofb_intr, sc); if (sc->sc_ih == NULL) { diff --git a/sys/dev/pci/voyager.c b/sys/dev/pci/voyager.c index 9c30e9b58ab..ad5acc97904 100644 --- a/sys/dev/pci/voyager.c +++ b/sys/dev/pci/voyager.c @@ -1,4 +1,4 @@ -/* $NetBSD: voyager.c,v 1.9 2012/01/30 19:41:23 drochner Exp $ */ +/* $NetBSD: voyager.c,v 1.10 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2009, 2011 Michael Lorenz @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: voyager.c,v 1.9 2012/01/30 19:41:23 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: voyager.c,v 1.10 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -154,6 +154,7 @@ voyager_attach(device_t parent, device_t self, void *aux) uint32_t reg; const char *intrstr; int i; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_pc = pa->pa_pc; sc->sc_pcitag = pa->pa_tag; @@ -193,7 +194,7 @@ voyager_attach(device_t parent, device_t self, void *aux) return; } - intrstr = pci_intr_string(sc->sc_pc, ih); + intrstr = pci_intr_string(sc->sc_pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(sc->sc_pc, ih, IPL_AUDIO, voyager_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/xhci_pci.c b/sys/dev/pci/xhci_pci.c index e344bf2ec38..e4cf9ecdf89 100644 --- a/sys/dev/pci/xhci_pci.c +++ b/sys/dev/pci/xhci_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: xhci_pci.c,v 1.2 2014/03/10 13:10:41 skrll Exp $ */ +/* $NetBSD: xhci_pci.c,v 1.3 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.2 2014/03/10 13:10:41 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.3 2014/03/29 19:28:25 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -85,6 +85,7 @@ xhci_pci_attach(device_t parent, device_t self, void *aux) int err; //const char *vendor; uint32_t hccparams; + char intrbuf[PCI_INTRSTR_LEN]; sc->sc_dev = self; sc->sc_bus.hci_private = sc; @@ -142,7 +143,7 @@ xhci_pci_attach(device_t parent, device_t self, void *aux) /* * Allocate IRQ */ - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_USB, xhci_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c index c3a779c3a89..e6a9909fe3e 100644 --- a/sys/dev/pci/yds.c +++ b/sys/dev/pci/yds.c @@ -1,4 +1,4 @@ -/* $NetBSD: yds.c,v 1.54 2013/10/17 21:05:41 christos Exp $ */ +/* $NetBSD: yds.c,v 1.55 2014/03/29 19:28:25 christos Exp $ */ /* * Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.54 2013/10/17 21:05:41 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.55 2014/03/29 19:28:25 christos Exp $"); #include "mpu.h" @@ -746,6 +746,7 @@ yds_attach(device_t parent, device_t self, void *aux) int i, r, to; int revision; int ac97_id2; + char intrbuf[PCI_INTRSTR_LEN]; sc = device_private(self); sc->sc_dev = self; @@ -771,7 +772,7 @@ yds_attach(device_t parent, device_t self, void *aux) mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_AUDIO); /* XXX IPL_NONE? */ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO); - intrstr = pci_intr_string(pc, ih); + intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf)); sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, yds_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt"); |
