Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/mips/rmi adjust to pci_intr_string signature.



details:   https://anonhg.NetBSD.org/src/rev/869cb08b2f7a
branches:  trunk
changeset: 795211:869cb08b2f7a
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Apr 04 01:41:05 2014 +0000

description:
adjust to pci_intr_string signature.

diffstat:

 sys/arch/mips/rmi/rmixl_pcie.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (47 lines):

diff -r 600aebea587d -r 869cb08b2f7a sys/arch/mips/rmi/rmixl_pcie.c
--- a/sys/arch/mips/rmi/rmixl_pcie.c    Fri Apr 04 01:35:11 2014 +0000
+++ b/sys/arch/mips/rmi/rmixl_pcie.c    Fri Apr 04 01:41:05 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rmixl_pcie.c,v 1.10 2012/10/27 17:18:02 chs Exp $      */
+/*     $NetBSD: rmixl_pcie.c,v 1.11 2014/04/04 01:41:05 christos Exp $ */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.10 2012/10/27 17:18:02 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.11 2014/04/04 01:41:05 christos Exp $");
 
 #include "opt_pci.h"
 #include "pci.h"
@@ -188,7 +188,8 @@
 static int     rmixl_pcie_intr_map(const struct pci_attach_args *,
                    pci_intr_handle_t *);
 static const char *
-               rmixl_pcie_intr_string(void *, pci_intr_handle_t);
+               rmixl_pcie_intr_string(void *, pci_intr_handle_t, char *,
+                   size_t);
 static const struct evcnt *
                rmixl_pcie_intr_evcnt(void *, pci_intr_handle_t);
 static pci_intr_handle_t
@@ -1094,7 +1095,7 @@
 }
 
 const char *
-rmixl_pcie_intr_string(void *v, pci_intr_handle_t pih)
+rmixl_pcie_intr_string(void *v, pci_intr_handle_t pih, char *buf, size_t len)
 {
        const char *name = "(illegal)";
        u_int link, bitno, irq;
@@ -1143,7 +1144,8 @@
                        __func__, MIPS_PRID_IMPL(mips_options.mips_cpu_id));
        }
 
-       return name;
+       strlcpy(buf, name, len);
+       return buf;
 }
 
 const struct evcnt *



Home | Main Index | Thread Index | Old Index