[src/sommerfeld_i386mp_1]: src/sys/arch/i386/pci Adapt to pci_intr_map API ch...

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

details:   https://anonhg.NetBSD.org/src/rev/195c9be5a2ec
branches:  sommerfeld_i386mp_1
changeset: 482325:195c9be5a2ec
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Fri Dec 29 21:21:58 2000 +0000

description:
Adapt to pci_intr_map API change.

Use pa->pa_tag rather than pa->pa_intrtag to find the interrupt
mapping since the MP tables use the real device id and pin rather than
the device id of the bridge and the swizzled pin.

diffstat:

 sys/arch/i386/pci/pci_machdep.c |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 77f535915b88 -r 195c9be5a2ec sys/arch/i386/pci/pci_machdep.c
--- a/sys/arch/i386/pci/pci_machdep.c   Sun Dec 17 07:59:15 2000 +0000
+++ b/sys/arch/i386/pci/pci_machdep.c   Fri Dec 29 21:21:58 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.c,v 1.35.2.4 2000/08/26 15:31:49 sommerfeld Exp $  */
+/*     $NetBSD: pci_machdep.c,v 1.35.2.5 2000/12/29 21:21:58 sommerfeld Exp $  */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -471,13 +471,14 @@
 }
 
 int
-pci_intr_map(pc, intrtag, pin, line, ihp)
-       pci_chipset_tag_t pc;
-       pcitag_t intrtag;
-       int pin, line;
+pci_intr_map(pa, ihp)
+       struct pci_attach_args *pa;
        pci_intr_handle_t *ihp;
 {
+       int pin = pa->pa_intrpin;
+       int line = pa->pa_intrline;
 #if NIOAPIC > 0
+       pci_chipset_tag_t pc = pa->pa_pc;
        struct mp_intr_map *mip;
        int bus, dev, func;
 #endif
@@ -520,7 +521,7 @@
                }
        }
 #if NIOAPIC > 0
-       pci_decompose_tag (pc, intrtag, &bus, &dev, &func);
+       pci_decompose_tag (pc, pa->pa_tag, &bus, &dev, &func);
 #if 0
        printf("pci_intr_map: bus %d dev %d func %d pin %d; line %d\n",
            bus, dev, func, pin, line);