From a47bd91ccaf14626cab51a74b998d93f3d8af18c Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Thu, 15 Nov 2012 15:15:15 -0800 Subject: Fix PIRQ routing abstraction intel_irq_routing_table is a local structure that should not be used globally, because it might not be there on all mainboards. Instead, the API has to be corrected to allow passing a PIRQ table in where needed. Change-Id: Icf08928b67727a366639b648bf6aac8e1a87e765 Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/1862 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/mainboard/bcom/winnet100/irq_tables.c | 4 ++-- src/mainboard/bcom/winnetp680/irq_tables.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mainboard/bcom') diff --git a/src/mainboard/bcom/winnet100/irq_tables.c b/src/mainboard/bcom/winnet100/irq_tables.c index 8339c129f2..1b2628d2db 100644 --- a/src/mainboard/bcom/winnet100/irq_tables.c +++ b/src/mainboard/bcom/winnet100/irq_tables.c @@ -61,7 +61,7 @@ * Routing description. * Documentation at: http://www.microsoft.com/whdc/archive/pciirq.mspx */ -const struct irq_routing_table intel_irq_routing_table = { +static const struct irq_routing_table intel_irq_routing_table = { .signature = PIRQ_SIGNATURE, /* PIRQ signature */ .version = PIRQ_VERSION, /* PIRQ version */ .size = 32 +16 * CONFIG_IRQ_SLOT_COUNT,/* Max. CONFIG_IRQ_SLOT_COUNT devices */ @@ -117,5 +117,5 @@ const struct irq_routing_table intel_irq_routing_table = { */ unsigned long write_pirq_routing_table(unsigned long addr) { - return copy_pirq_routing_table(addr); + return copy_pirq_routing_table(addr, &intel_irq_routing_table); } diff --git a/src/mainboard/bcom/winnetp680/irq_tables.c b/src/mainboard/bcom/winnetp680/irq_tables.c index 9183aca103..ec7ec7c294 100644 --- a/src/mainboard/bcom/winnetp680/irq_tables.c +++ b/src/mainboard/bcom/winnetp680/irq_tables.c @@ -21,7 +21,7 @@ #include -const struct irq_routing_table intel_irq_routing_table = { +static const struct irq_routing_table intel_irq_routing_table = { PIRQ_SIGNATURE, PIRQ_VERSION, 32 + 16 * CONFIG_IRQ_SLOT_COUNT,/* Max. number of devices on the bus */ @@ -50,5 +50,5 @@ const struct irq_routing_table intel_irq_routing_table = { unsigned long write_pirq_routing_table(unsigned long addr) { - return copy_pirq_routing_table(addr); + return copy_pirq_routing_table(addr, &intel_irq_routing_table); } -- cgit v1.2.3