[src/trunk]: src/sys/arch/evbarm/integrator Fix pci_conf_interrupt lossage.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d1548b6ac258
branches:  trunk
changeset: 781452:d1548b6ac258
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Sep 07 03:06:05 2012 +0000

description:
Fix pci_conf_interrupt lossage.

diffstat:

 sys/arch/evbarm/integrator/pci_machdep.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r 3ad500df49a4 -r d1548b6ac258 sys/arch/evbarm/integrator/pci_machdep.c
--- a/sys/arch/evbarm/integrator/pci_machdep.c  Fri Sep 07 03:05:11 2012 +0000
+++ b/sys/arch/evbarm/integrator/pci_machdep.c  Fri Sep 07 03:06:05 2012 +0000
@@ -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 @@
 #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);
 }