Module Name: src
Committed By: christos
Date: Fri Apr 4 01:41:06 UTC 2014
Modified Files:
src/sys/arch/mips/rmi: rmixl_pcie.c
Log Message:
adjust to pci_intr_string signature.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mips/rmi/rmixl_pcie.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/rmi/rmixl_pcie.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie.c:1.10 src/sys/arch/mips/rmi/rmixl_pcie.c:1.11
--- src/sys/arch/mips/rmi/rmixl_pcie.c:1.10 Sat Oct 27 13:18:02 2012
+++ src/sys/arch/mips/rmi/rmixl_pcie.c Thu Apr 3 21:41:05 2014
@@ -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 void rmixl_pcie_conf_write(void *
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 @@ rmixl_pcie_intr_map(const struct pci_att
}
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 @@ rmixl_pcie_intr_string(void *v, pci_intr
__func__, MIPS_PRID_IMPL(mips_options.mips_cpu_id));
}
- return name;
+ strlcpy(buf, name, len);
+ return buf;
}
const struct evcnt *
