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/a0a348b304fa
branches: trunk
changeset: 795236:a0a348b304fa
user: ozaki-r <ozaki-r%NetBSD.org@localhost>
date: Fri Apr 04 16:41:55 2014 +0000
description:
Adjust to pci_intr_string signature
diffstat:
sys/arch/mips/rmi/rmixl_pcix.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diffs (47 lines):
diff -r a6ec69f6e902 -r a0a348b304fa sys/arch/mips/rmi/rmixl_pcix.c
--- a/sys/arch/mips/rmi/rmixl_pcix.c Fri Apr 04 16:15:30 2014 +0000
+++ b/sys/arch/mips/rmi/rmixl_pcix.c Fri Apr 04 16:41:55 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcix.c,v 1.11 2014/03/11 08:19:45 mrg Exp $ */
+/* $NetBSD: rmixl_pcix.c,v 1.12 2014/04/04 16:41:55 ozaki-r Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.11 2014/03/11 08:19:45 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.12 2014/04/04 16:41:55 ozaki-r Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -242,7 +242,8 @@
static int rmixl_pcix_intr_map(const struct pci_attach_args *,
pci_intr_handle_t *);
static const char *
- rmixl_pcix_intr_string(void *, pci_intr_handle_t);
+ rmixl_pcix_intr_string(void *, pci_intr_handle_t,
+ char *, size_t);
static const struct evcnt *
rmixl_pcix_intr_evcnt(void *, pci_intr_handle_t);
static pci_intr_handle_t
@@ -787,7 +788,7 @@
}
const char *
-rmixl_pcix_intr_string(void *v, pci_intr_handle_t pih)
+rmixl_pcix_intr_string(void *v, pci_intr_handle_t pih, char *buf, size_t len)
{
u_int bitno, irq;
@@ -797,7 +798,8 @@
panic("%s: cpu %#x not supported\n",
__func__, mips_options.mips_cpu_id);
- return rmixl_intr_string(RMIXL_IRT_VECTOR(irq));
+ strlcpy(buf, rmixl_intr_string(RMIXL_IRT_VECTOR(irq)), len);
+ return buf;
}
const struct evcnt *
Home |
Main Index |
Thread Index |
Old Index