diff options
author | jhb <jhb@FreeBSD.org> | 2002-09-05 17:08:35 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2002-09-05 17:08:35 +0000 |
commit | 1a872debf325d04a7c82a8adce7a7af88d41ddb4 (patch) | |
tree | 7cd3adf1decd20a6c4fe01c121d47446a1667b56 /sys/dev | |
parent | 55985c4b6c74a4581f534911def8a68308e54f11 (diff) | |
download | FreeBSD-src-1a872debf325d04a7c82a8adce7a7af88d41ddb4.zip FreeBSD-src-1a872debf325d04a7c82a8adce7a7af88d41ddb4.tar.gz |
Make the printf messages when routing interrupts more consistent in the
various PCI bridge drivers.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/acpica/acpi_pcib.c | 11 | ||||
-rw-r--r-- | sys/dev/pci/pci_pci.c | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c index 38cfba9..39600a7 100644 --- a/sys/dev/acpica/acpi_pcib.c +++ b/sys/dev/acpica/acpi_pcib.c @@ -254,8 +254,8 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin, * XXX check ASL examples to see if this is an acceptable set of tests */ if ((crsres->Data.Irq.NumberOfInterrupts == 1) && (crsres->Data.Irq.Interrupts[0] != 0)) { - device_printf(pcib, "device is routed to IRQ %d\n", - crsres->Data.Irq.Interrupts[0]); + device_printf(pcib, "slot %d INT%c is routed to irq %d\n", + pci_get_slot(dev), 'A' + pin, crsres->Data.Irq.Interrupts[0]); interrupt = crsres->Data.Irq.Interrupts[0]; goto out; } @@ -311,7 +311,7 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin, resbuf.Data.Irq.NumberOfInterrupts = 1; resbuf.Data.Irq.Interrupts[0] = prsres->Data.Irq.Interrupts[0]; /* just take first... */ if (ACPI_FAILURE(status = acpi_AppendBufferResource(&crsbuf, &resbuf))) { - device_printf(pcib, "couldn't route interrupt %d via %s, interupt resource build failed - %s\n", + device_printf(pcib, "couldn't route interrupt %d via %s, interrupt resource build failed - %s\n", prsres->Data.Irq.Interrupts[0], acpi_name(lnkdev), AcpiFormatException(status)); goto out; } @@ -322,8 +322,9 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin, } /* successful, return the interrupt we just routed */ - device_printf(pcib, "routed interrupt %d via %s\n", - prsres->Data.Irq.Interrupts[0], acpi_name(lnkdev)); + device_printf(pcib, "slot %d INT%c routed to irq %d via %s\n", + pci_get_slot(dev), 'A' + pin, prsres->Data.Irq.Interrupts[0], + acpi_name(lnkdev)); interrupt = prsres->Data.Irq.Interrupts[0]; out: diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index f310491..a7ccf6a 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -426,8 +426,8 @@ 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); 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); + device_printf(pcib, "slot %d INT%c is routed to irq %d\n", + pci_get_slot(dev), 'A' + pin - 1, intnum); } return(intnum); } |