system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-18 22:33:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the printf messages when routing interrupts more consistent in the

Browse source 
various PCI bridge drivers.
This commit is contained in:
John Baldwin 2002-09-05 17:08:35 +00:00
parent 5264a94f3f
commit c6a121ab5e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=102977
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/dev/acpica/acpi_pcib.c
View file

@ -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 * 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)) { if ((crsres->Data.Irq.NumberOfInterrupts == 1) && (crsres->Data.Irq.Interrupts[0] != 0)) {
device_printf(pcib, "device is routed to IRQ %d\n", device_printf(pcib, "slot %d INT%c is routed to irq %d\n",
crsres->Data.Irq.Interrupts[0]); pci_get_slot(dev), 'A' + pin, crsres->Data.Irq.Interrupts[0]);
interrupt = crsres->Data.Irq.Interrupts[0]; interrupt = crsres->Data.Irq.Interrupts[0];
goto out; 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.NumberOfInterrupts = 1;
resbuf.Data.Irq.Interrupts[0] = prsres->Data.Irq.Interrupts[0]; /* just take first... */ resbuf.Data.Irq.Interrupts[0] = prsres->Data.Irq.Interrupts[0]; /* just take first... */
if (ACPI_FAILURE(status = acpi_AppendBufferResource(&crsbuf, &resbuf))) { 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)); prsres->Data.Irq.Interrupts[0], acpi_name(lnkdev), AcpiFormatException(status));
goto out; 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 */ /* successful, return the interrupt we just routed */
device_printf(pcib, "routed interrupt %d via %s\n", device_printf(pcib, "slot %d INT%c routed to irq %d via %s\n",
prsres->Data.Irq.Interrupts[0], acpi_name(lnkdev)); pci_get_slot(dev), 'A' + pin, prsres->Data.Irq.Interrupts[0],
acpi_name(lnkdev));
interrupt = prsres->Data.Irq.Interrupts[0]; interrupt = prsres->Data.Irq.Interrupts[0];
out: out:

4
sys/dev/pci/pci_pci.c
View file

@ -426,8 +426,8 @@ pcib_route_interrupt(device_t pcib, device_t dev, int pin)
bus = device_get_parent(pcib); bus = device_get_parent(pcib);
intnum = PCIB_ROUTE_INTERRUPT(device_get_parent(bus), pcib, parent_intpin + 1); intnum = PCIB_ROUTE_INTERRUPT(device_get_parent(bus), pcib, parent_intpin + 1);
if (PCI_INTERRUPT_VALID(intnum)) { if (PCI_INTERRUPT_VALID(intnum)) {
device_printf(pcib, "routed slot %d INT%c to irq %d\n", pci_get_slot(dev), device_printf(pcib, "slot %d INT%c is routed to irq %d\n",
'A' + pin - 1, intnum); pci_get_slot(dev), 'A' + pin - 1, intnum);
} }
return(intnum); return(intnum);
} }