Pass a pci_chipset_tag_t to pci_intr_line(), to eventually allow the

logic to be chipset dependent; no functional change yet.
ok kettenis@

2 files changed, 7 insertions, 6 deletions

diff --git a/sys/arch/amd64/include/pci_machdep.h b/sys/arch/amd64/include/pci_machdep.h
index 0a3006bdbd6..48d988ece77 100644
--- a/sys/arch/amd64/include/pci_machdep.h
+++ b/sys/arch/amd64/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.11 2009/04/21 19:18:09 kettenis Exp $	*/
+/*	$OpenBSD: pci_machdep.h,v 1.12 2009/07/20 23:40:41 miod Exp $	*/
 /*	$NetBSD: pci_machdep.h,v 1.1 2003/02/26 21:26:11 fvdl Exp $	*/
 
 /*
@@ -53,7 +53,7 @@ typedef struct {
 	int line, pin;
 } pci_intr_handle_t;
 
-#define	pci_intr_line(ih)	((ih.line) & 0xff)
+#define	pci_intr_line(pc,ih)	((ih.line) & 0xff)
 
 /*
  * amd64-specific PCI variables and functions.
diff --git a/sys/arch/amd64/pci/pci_machdep.c b/sys/arch/amd64/pci/pci_machdep.c
index 67fa23b429d..1d78b000998 100644
--- a/sys/arch/amd64/pci/pci_machdep.c
+++ b/sys/arch/amd64/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.c,v 1.29 2009/04/29 18:28:38 kettenis Exp $	*/
+/*	$OpenBSD: pci_machdep.c,v 1.30 2009/07/20 23:40:43 miod Exp $	*/
 /*	$NetBSD: pci_machdep.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $	*/
 
 /*-
@@ -309,11 +309,12 @@ pci_intr_string(pci_chipset_tag_t pc, pci_intr_handle_t ih)
 		snprintf(irqstr, sizeof(irqstr), "apic %d int %d (irq %d)",
 		    APIC_IRQ_APIC(ih.line),
 		    APIC_IRQ_PIN(ih.line),
-		    pci_intr_line(ih));
+		    pci_intr_line(pc, ih));
 	else
-		snprintf(irqstr, sizeof(irqstr), "irq %d", pci_intr_line(ih));
+		snprintf(irqstr, sizeof(irqstr), "irq %d",
+		    pci_intr_line(pc, ih));
 #else
-	snprintf(irqstr, sizeof(irqstr), "irq %d", pci_intr_line(ih));
+	snprintf(irqstr, sizeof(irqstr), "irq %d", pci_intr_line(pc, ih));
 #endif
 	return (irqstr);
 }