Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/hpcmips/vr adjust to new pci_intr_string signature



details:   https://anonhg.NetBSD.org/src/rev/76c79044a845
branches:  trunk
changeset: 328341:76c79044a845
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Mar 31 20:46:41 2014 +0000

description:
adjust to new pci_intr_string signature

diffstat:

 sys/arch/hpcmips/vr/vrpciu.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (49 lines):

diff -r 3afcee5f6a29 -r 76c79044a845 sys/arch/hpcmips/vr/vrpciu.c
--- a/sys/arch/hpcmips/vr/vrpciu.c      Mon Mar 31 20:44:19 2014 +0000
+++ b/sys/arch/hpcmips/vr/vrpciu.c      Mon Mar 31 20:46:41 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vrpciu.c,v 1.20 2012/10/27 17:17:56 chs Exp $  */
+/*     $NetBSD: vrpciu.c,v 1.21 2014/03/31 20:46:41 christos Exp $     */
 
 /*-
  * Copyright (c) 2001 Enami Tsugutomo.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrpciu.c,v 1.20 2012/10/27 17:17:56 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrpciu.c,v 1.21 2014/03/31 20:46:41 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -91,7 +91,8 @@
 static pcireg_t        vrpciu_conf_read(pci_chipset_tag_t, pcitag_t, int); 
 static void    vrpciu_conf_write(pci_chipset_tag_t, pcitag_t, int, pcireg_t);
 static int     vrpciu_intr_map(const struct pci_attach_args *, pci_intr_handle_t *);
-static const char *vrpciu_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
+static const char *vrpciu_intr_string(pci_chipset_tag_t, pci_intr_handle_t,
+                   char *, size_t);
 static const struct evcnt *vrpciu_intr_evcnt(pci_chipset_tag_t,
                    pci_intr_handle_t);
 static void    *vrpciu_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
@@ -484,16 +485,15 @@
 }
 
 const char *
-vrpciu_intr_string(pci_chipset_tag_t pc, pci_intr_handle_t ih)
+vrpciu_intr_string(pci_chipset_tag_t pc, pci_intr_handle_t ih, char *buf,
+    size_t len)
 {
-       static char irqstr[sizeof("pciintr") + 16];
-
-       snprintf(irqstr, sizeof(irqstr), "pciintr %d:%d:%d",
+       snprintf(buf, len, "pciintr %d:%d:%d",
            CONFIG_HOOK_PCIINTR_BUS((int)ih),
            CONFIG_HOOK_PCIINTR_DEVICE((int)ih),
            CONFIG_HOOK_PCIINTR_FUNCTION((int)ih));
 
-       return (irqstr);
+       return buf;
 }
 
 const struct evcnt *



Home | Main Index | Thread Index | Old Index