D61311.1794343181.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D61311.1794343181.diff
View Options

	diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c
	--- a/sys/dev/acpica/acpi_pci_link.c
	+++ b/sys/dev/acpica/acpi_pci_link.c
	@@ -95,8 +95,8 @@
	struct link {
	struct acpi_pci_link_softc *l_sc;
	uint8_t l_bios_irq;
	- uint8_t l_irq;
	- uint8_t l_initial_irq;
	+ u_int l_irq;
	+ u_int l_initial_irq;
	UINT32 l_crs_type;
	int l_res_index;
	int l_num_irqs;
	@@ -430,7 +430,7 @@
	}
	for (i = 0; i < sc->pl_num_links; i++) {
	link = &sc->pl_links[i];
	- printf(" %-14.14s %5d %3d %c %3d ", i == 0 ? tag : "", i,
	+ printf(" %-14.14s %5d %3u %c %3d ", i == 0 ? tag : "", i,
	link->l_irq, link->l_routed ? 'Y' : 'N',
	link->l_references);
	if (link->l_num_irqs == 0)
	@@ -773,7 +773,7 @@
	res->Data.Irq.InterruptCount = 1;
	if (PCI_INTERRUPT_VALID(link->l_irq)) {
	KASSERT(link->l_irq < NUM_ISA_INTERRUPTS,
	- ("%s: can't put non-ISA IRQ %d in legacy IRQ resource type",
	+ ("%s: can't put non-ISA IRQ %u in legacy IRQ resource type",
	__func__, link->l_irq));
	res->Data.Irq.Interrupts[0] = link->l_irq;
	} else
	@@ -824,7 +824,7 @@
	newres.Data.Irq.InterruptCount = 1;
	if (PCI_INTERRUPT_VALID(link->l_irq)) {
	KASSERT(link->l_irq < NUM_ISA_INTERRUPTS,
	- ("%s: can't put non-ISA IRQ %d in legacy IRQ resource type",
	+ ("%s: can't put non-ISA IRQ %u in legacy IRQ resource type",
	__func__, link->l_irq));
	newres.Data.Irq.Interrupts[0] = link->l_irq;
	} else
	@@ -959,7 +959,7 @@
	/*
	* Pick an IRQ to use for this unrouted link.
	*/
	-static uint8_t
	+static u_int
	acpi_pci_link_choose_irq(device_t dev, struct link *link)
	{
	char tunable_buffer[64], link_name[5];