From 8046c4b99898ba8ea33f2b2e9a596f628457fd7b Mon Sep 17 00:00:00 2001 From: Mike Smith Date: Tue, 12 Feb 2002 01:28:49 +0000 Subject: [PATCH] Don't claim to have routed an interrupt when the method actually returned an error. --- sys/dev/pci/pci_pci.c | 6 ++++-- sys/dev/pci/pcivar.h | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index 9c1de44f88b..8b5eef5eddd 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -409,7 +409,9 @@ pcib_route_interrupt(device_t pcib, device_t dev, int pin) */ bus = device_get_parent(pcib); intnum = PCIB_ROUTE_INTERRUPT(device_get_parent(bus), pcib, parent_intpin + 1); - device_printf(pcib, "routed slot %d INT%c to irq %d\n", pci_get_slot(dev), - 'A' + pin - 1, intnum); + if (PCI_INTERRUPT_VALID(intnum)) { + device_printf(pcib, "routed slot %d INT%c to irq %d\n", pci_get_slot(dev), + 'A' + pin - 1, intnum); + } return(intnum); } diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 432f885d9ca..0b8cf149544 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -245,6 +245,11 @@ PCIB_ACCESSOR(bus, BUS, u_int32_t) #undef PCIB_ACCESSOR +/* + * PCI interrupt validation. + */ +#define PCI_INTERRUPT_VALID(x) (((x) != 0) && ((x) != 255)) + /* * Convenience functions. *