From 5244e1ba63e5f3ea12066734bfb0d864a8f1f11d Mon Sep 17 00:00:00 2001
From: Patrick Georgi <patrick@georgi-clan.de>
Date: Sun, 21 Nov 2010 14:41:07 +0000
Subject: Convert more boards to use mptable_write_buses.

Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6106 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c | 22 +---------------------
 src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c   |  3 ---
 src/mainboard/gigabyte/ga_2761gxdk/mptable.c      | 13 ++-----------
 3 files changed, 3 insertions(+), 35 deletions(-)

(limited to 'src/mainboard/gigabyte/ga_2761gxdk')

diff --git a/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c
index 0b85340948..2fda60645a 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c
@@ -36,7 +36,6 @@
 
 // Global variables for MB layouts and these will be shared by irqtable mptable and acpi_tables
 //busnum is default
-        unsigned char bus_isa;
         unsigned char bus_sis966[8]; //1
         unsigned apicid_sis966;
 
@@ -64,9 +63,6 @@ unsigned hcdnx[] =
 //        0x20202020,
 //        0x20202020,
 };
-unsigned bus_type[256];
-
-
 
 static unsigned get_bus_conf_done = 0;
 
@@ -77,7 +73,7 @@ void get_bus_conf(void)
 	unsigned sbdn;
 
         device_t dev;
-        int i, j;
+        int i;
 
         if(get_bus_conf_done==1) return; //do it only once
 
@@ -98,23 +94,14 @@ void get_bus_conf(void)
 		bus_sis966[i] = 0;
 	}
 
-	for(i=0;i<256; i++) {
-		bus_type[i] = 0;
-	}
-
-	bus_type[0] = 1; //pci
-
 	bus_sis966[0] = (sysconf.pci1234[0] >> 16) & 0xff;
 
-	bus_type[bus_sis966[0]] = 1;
-
                 /* SIS966 */
                 dev = dev_find_slot(bus_sis966[0], PCI_DEVFN(sbdn + 0x06,0));
                 if (dev) {
                         bus_sis966[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
                         bus_sis966[2] = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
                         bus_sis966[2]++;
-			for(j=bus_sis966[1];j<bus_sis966[2]; j++) bus_type[j] = 1;
                 }
                 else {
                         printk(BIOS_DEBUG, "ERROR - could not find PCI 1:%02x.0, using defaults\n", sbdn + 0x06);
@@ -127,14 +114,7 @@ void get_bus_conf(void)
 	                dev = dev_find_slot(bus_sis966[0], PCI_DEVFN(sbdn + 0x0a + i - 2 , 0));
         	        if (dev) {
                 	        bus_sis966[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
-	                        bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-        	                bus_isa++;
-				for(j=bus_sis966[i];j<bus_isa; j++) bus_type[j] = 1;
 	                }
-        	        else {
-                	        printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:%02x.0, using defaults\n", bus_sis966[0], sbdn + 0x0a + i - 2 );
-	                        bus_isa = bus_sis966[i-1]+1;
-        	        }
 		}
 
 
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c b/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c
index aa4ef6034e..ad68cce2b1 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c
@@ -52,11 +52,8 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t dev
         pirq_info->slot = slot;
         pirq_info->rfu = rfu;
 }
-extern unsigned char bus_isa;
 extern unsigned char bus_sis966[8]; //1
 
-
-
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
 
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/mptable.c b/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
index b6356f055b..9c3f34121b 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
@@ -28,18 +28,15 @@
 #include <stdint.h>
 #include <cpu/amd/amdk8_sysconf.h>
 
-extern unsigned char bus_isa;
 extern unsigned char bus_sis966[8]; //1
 
 extern unsigned apicid_sis966;
 
-extern unsigned bus_type[256];
-
 static void *smp_write_config_table(void *v)
 {
         struct mp_config_table *mc;
 	unsigned sbdn;
-	int i,j;
+	int i, j, bus_isa;
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
@@ -50,13 +47,7 @@ static void *smp_write_config_table(void *v)
 	get_bus_conf();
 	sbdn = sysconf.sbdn;
 
-/*Bus:		Bus ID	Type*/
-       /* define bus and isa numbers */
-        for(j= 0; j < 256 ; j++) {
-		if(bus_type[j])
-			 smp_write_bus(mc, j, "PCI   ");
-        }
-        smp_write_bus(mc, bus_isa, "ISA   ");
+	mptable_write_buses(mc, NULL, &bus_isa);
 
 /*I/O APICs:	APIC ID	Version	State		Address*/
         {
-- 
cgit v1.2.3