mptable: Refactor mptable generation some more

[coreboot.git] / src / mainboard / asus / a8v-e_deluxe / mptable.c

diff --git a/src/mainboard/asus/a8v-e_deluxe/mptable.c b/src/mainboard/asus/a8v-e_deluxe/mptable.c
index 583fd1e7ac5effb87530ebe3a5808d9f01dc1b3f..999dd6cd33bf64bba70853351eef1dae7a8125fc 100644 (file)
--- a/src/mainboard/asus/a8v-e_deluxe/mptable.c
+++ b/src/mainboard/asus/a8v-e_deluxe/mptable.c
@@ -27,23 +27,15 @@
 static void *smp_write_config_table(void *v)
 {
        struct mp_config_table *mc;
-       int bus_isa = 42;
+       int bus_isa;
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, "A8V-E Deluxe", LAPIC_ADDR);
+       mptable_init(mc, LAPIC_ADDR);
 
        smp_write_processors(mc);
 
-       /* Bus:         Bus ID  Type */
-       smp_write_bus(mc, 0, "PCI   ");
-       smp_write_bus(mc, 1, "PCI   ");
-       smp_write_bus(mc, 2, "PCI   ");
-       smp_write_bus(mc, 3, "PCI   ");
-       smp_write_bus(mc, 4, "PCI   ");
-       smp_write_bus(mc, 5, "PCI   ");
-       smp_write_bus(mc, 6, "PCI   ");
-       smp_write_bus(mc, bus_isa, "ISA   ");
+       mptable_write_buses(mc, NULL, &bus_isa);
 
        /* I/O APICs:   APIC ID Version State           Address */
        smp_write_ioapic(mc, VT8237R_APIC_ID, 0x20, IO_APIC_ADDR);
@@ -109,21 +101,16 @@ static void *smp_write_config_table(void *v)
        smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0x6,  (0x00 << 2) | 3, K8T890_APIC_ID, 0x13);
 
        /* Local Ints:  Type    Polarity    Trigger     Bus ID   IRQ    APIC ID PIN# */
-       smp_write_lintsrc(mc, mp_ExtINT,        MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH, bus_isa, 0x0, MP_APIC_ALL, 0x0);
-       smp_write_lintsrc(mc, mp_NMI,   MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH, bus_isa, 0x0, MP_APIC_ALL, 0x1);
+       mptable_lintsrc(mc, bus_isa);
        /* There is no extension information... */
 
        /* Compute the checksums. */
-       mc->mpe_checksum = smp_compute_checksum(smp_next_mpc_entry(mc),
-                                               mc->mpe_length);
-       mc->mpc_checksum = smp_compute_checksum(mc, mc->mpc_length);
-
-       return smp_next_mpe_entry(mc);
+       return mptable_finalize(mc);
 }
 
 unsigned long write_smp_table(unsigned long addr)
 {
        void *v;
-       v = smp_write_floating_table(addr);
+       v = smp_write_floating_table(addr, 0);
        return (unsigned long)smp_write_config_table(v);
 }