Module Name: src
Committed By: christos
Date: Sun Mar 30 01:17:51 UTC 2014
Modified Files:
src/sys/dev/marvell: mvpex.c mvpexvar.h
Log Message:
catch up with pci_intr_string changes
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/marvell/mvpex.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/marvell/mvpexvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/marvell/mvpex.c
diff -u src/sys/dev/marvell/mvpex.c:1.9 src/sys/dev/marvell/mvpex.c:1.10
--- src/sys/dev/marvell/mvpex.c:1.9 Sat Mar 15 09:33:48 2014
+++ src/sys/dev/marvell/mvpex.c Sat Mar 29 21:17:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mvpex.c,v 1.9 2014/03/15 13:33:48 kiyohara Exp $ */
+/* $NetBSD: mvpex.c,v 1.10 2014/03/30 01:17:51 christos Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvpex.c,v 1.9 2014/03/15 13:33:48 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvpex.c,v 1.10 2014/03/30 01:17:51 christos Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -620,10 +620,8 @@ mvpex_intr_map(const struct pci_attach_a
/* ARGSUSED */
const char *
-mvpex_intr_string(void *v, pci_intr_handle_t pin)
+mvpex_intr_string(void *v, pci_intr_handle_t pin, char *buf size_t len)
{
- static char intrstr[32];
-
switch (pin) {
case PCI_INTERRUPT_PIN_A:
case PCI_INTERRUPT_PIN_B:
@@ -634,10 +632,9 @@ mvpex_intr_string(void *v, pci_intr_hand
default:
return NULL;
}
- snprintf(intrstr, sizeof(intrstr), "interrupt pin INT%c#",
- (char)('A' - 1 + pin));
+ snprintf(buf, len, "interrupt pin INT%c#", (char)('A' - 1 + pin));
- return intrstr;
+ return buf;
}
/* ARGSUSED */
Index: src/sys/dev/marvell/mvpexvar.h
diff -u src/sys/dev/marvell/mvpexvar.h:1.4 src/sys/dev/marvell/mvpexvar.h:1.5
--- src/sys/dev/marvell/mvpexvar.h:1.4 Sat Mar 15 09:33:48 2014
+++ src/sys/dev/marvell/mvpexvar.h Sat Mar 29 21:17:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mvpexvar.h,v 1.4 2014/03/15 13:33:48 kiyohara Exp $ */
+/* $NetBSD: mvpexvar.h,v 1.5 2014/03/30 01:17:51 christos Exp $ */
/*
* Copyright (c) 2009 KIYOHARA Takashi
* All rights reserved.
@@ -70,7 +70,7 @@ void mvpex_conf_write(void *, pcitag_t,
int mvpex_conf_hook(void *, int, int, int, pcireg_t);
void mvpex_conf_interrupt(void *, int, int, int, int, int *);
int mvpex_intr_map(const struct pci_attach_args *, pci_intr_handle_t *);
-const char *mvpex_intr_string(void *, pci_intr_handle_t);
+const char *mvpex_intr_string(void *, pci_intr_handle_t, char *, size_t);
const struct evcnt *mvpex_intr_evcnt(void *, pci_intr_handle_t);
void *mvpex_intr_establish(void *, pci_intr_handle_t, int, int (*)(void *),
void *);
