Module Name: src
Committed By: matt
Date: Fri Sep 7 03:06:05 UTC 2012
Modified Files:
src/sys/arch/evbarm/integrator: pci_machdep.c
Log Message:
Fix pci_conf_interrupt lossage.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/integrator/pci_machdep.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/evbarm/integrator/pci_machdep.c
diff -u src/sys/arch/evbarm/integrator/pci_machdep.c:1.4 src/sys/arch/evbarm/integrator/pci_machdep.c:1.5
--- src/sys/arch/evbarm/integrator/pci_machdep.c:1.4 Sun Apr 27 18:58:46 2008
+++ src/sys/arch/evbarm/integrator/pci_machdep.c Fri Sep 7 03:06:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.4 2008/04/27 18:58:46 matt Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.5 2012/09/07 03:06:05 matt Exp $ */
/*-
* Copyright (c) 2001 ARM Ltd
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.4 2008/04/27 18:58:46 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.5 2012/09/07 03:06:05 matt Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -45,11 +45,10 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include <evbarm/ifpga/ifpgareg.h>
void
-pci_conf_interrupt(pci_chipset_tag_t pc, int bus, int dev, int func,
- int swiz, int *iline)
+pci_conf_interrupt(void *v, int bus, int dev, int ipin, int swiz, int *iline)
{
- printf("pci_conf_interrupt(pc(%lx), bus(%d), dev(%d), func(%d), swiz(%d), *iline(%p)\n", (unsigned long)pc, bus, dev, func, swiz, iline);
+ printf("pci_conf_interrupt(v(%p), bus(%d), dev(%d), ipin(%d), swiz(%d), *iline(%p)\n", v, bus, dev, ipin, swiz, iline);
if (dev >= 9)
*iline = IFPGA_INTRNUM_PCIINT0
- + (((dev - 9) + (func - 1)) & 3);
+ + (((dev - 9) + (ipin - 1)) & 3);
}
