diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-06-27 21:22:15 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-06-27 21:22:15 +0000 |
| commit | 3b04cdc3ff7ae587663d97378f727afa528c6ac5 (patch) | |
| tree | 88517e9548bcac06a71f9a2f649fe4cd1a113c88 /sys/arch/sparc64/dev/pci_machdep.c | |
| parent | ecc659c5fc44a1aedeab96ad777ecbe242dc948b (diff) | |
Fix interrupt mapping. This now seems to work on all machines, even with
pci cards that have a pci-pci bridge and lack fcode.
tested by many, ok jason@, dlg@
Diffstat (limited to 'sys/arch/sparc64/dev/pci_machdep.c')
| -rw-r--r-- | sys/arch/sparc64/dev/pci_machdep.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/sparc64/dev/pci_machdep.c b/sys/arch/sparc64/dev/pci_machdep.c index b4e4565b6ca..3d1dfada715 100644 --- a/sys/arch/sparc64/dev/pci_machdep.c +++ b/sys/arch/sparc64/dev/pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.c,v 1.24 2006/06/02 08:26:01 jason Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.25 2006/06/27 21:22:14 kettenis Exp $ */ /* $NetBSD: pci_machdep.c,v 1.22 2001/07/20 00:07:13 eeh Exp $ */ /* @@ -436,7 +436,7 @@ pci_intr_map(pa, ihp) if (OF_mapintr(node, &interrupts, sizeof(interrupts), sizeof(interrupts)) < 0) { - printf("OF_mapintr failed\n"); + interrupts = -1; } /* Try to find an IPL for this type of device. */ if (OF_getprop(node, "device_type", &devtype, sizeof(devtype)) > 0) { @@ -464,7 +464,7 @@ pci_intr_string(pc, ih) static char str[16]; DPRINTF(SPDB_INTR, ("pci_intr_string: ih %u", ih)); - snprintf(str, sizeof str, "ivec %x", ih); + snprintf(str, sizeof str, "ivec 0x%x", INTVEC(ih)); DPRINTF(SPDB_INTR, ("; returning %s\n", str)); return (str); |