Verify ebda segment looks sane before using during resume.

[seabios.git] / src / post.c

diff --git a/src/post.c b/src/post.c
index bfa6562151335ac9e24031d01a5db7338c3feeb4..97fe6accf2dfca0d7e1dd5bb6f5147a951c301dc 100644 (file)
--- a/src/post.c
+++ b/src/post.c
@@ -16,6 +16,7 @@
 #include "pci.h" // create_pirtable
 #include "acpi.h" // acpi_bios_init
 #include "bregs.h" // struct bregs
+#include "mptable.h" // mptable_init
 #include "boot.h" // IPL
 
 void
@@ -34,10 +35,10 @@ init_ivt()
 {
     dprintf(3, "init ivt\n");
 
-    // Initialize all vectors to a dummy handler.
+    // Initialize all vectors to the default handler.
     int i;
     for (i=0; i<256; i++)
-        set_irq(i, dummy_iret_handler);
+        set_irq(i, entry_iret_official);
 
     // Initialize all hw vectors to a default hw handler.
     for (i=0x08; i<=0x0f; i++)
@@ -46,9 +47,10 @@ init_ivt()
         set_irq(i, entry_hwpic2);
 
     // Initialize software handlers.
+    set_irq(0x02, entry_02);
     set_irq(0x10, entry_10);
-    set_irq(0x11, entry_11_official);
-    set_irq(0x12, entry_12_official);
+    set_irq(0x11, entry_11);
+    set_irq(0x12, entry_12);
     set_irq(0x13, entry_13_official);
     set_irq(0x14, entry_14);
     set_irq(0x15, entry_15);
@@ -57,7 +59,6 @@ init_ivt()
     set_irq(0x18, entry_18);
     set_irq(0x19, entry_19_official);
     set_irq(0x1a, entry_1a);
-    set_irq(0x1c, entry_1c);
     set_irq(0x40, entry_40);
 
     // set vector 0x79 to zero
@@ -72,12 +73,12 @@ init_bda()
 {
     dprintf(3, "init bda\n");
 
-    struct bios_data_area_s *bda = MAKE_FARPTR(SEG_BDA, 0);
+    struct bios_data_area_s *bda = MAKE_FLATPTR(SEG_BDA, 0);
     memset(bda, 0, sizeof(*bda));
 
-    int esize = DIV_ROUND_UP(sizeof(struct extended_bios_data_area_s), 1024);
+    int esize = EBDA_SIZE_START;
     SET_BDA(mem_size_kb, 640 - esize);
-    u16 eseg = FARPTR_TO_SEG((640 - esize) * 1024);
+    u16 eseg = EBDA_SEGMENT_START;
     SET_BDA(ebda_seg, eseg);
 
     struct extended_bios_data_area_s *ebda = get_ebda_ptr();
@@ -92,7 +93,7 @@ ram_probe(void)
 {
     dprintf(3, "Find memory size\n");
     if (CONFIG_COREBOOT) {
-        coreboot_fill_map();
+        coreboot_setup();
     } else {
         // On emulators, get memory size from nvram.
         u32 rs = ((inb_cmos(CMOS_MEM_EXTMEM2_LOW) << 16)
@@ -122,7 +123,7 @@ ram_probe(void)
 
     // Mark known areas as reserved.
     u16 ebda_seg = get_ebda_seg();
-    add_e820((u32)MAKE_FARPTR(ebda_seg, 0), GET_EBDA2(ebda_seg, size) * 1024
+    add_e820((u32)MAKE_FLATPTR(ebda_seg, 0), GET_EBDA2(ebda_seg, size) * 1024
              , E820_RESERVED);
     add_e820(BUILD_BIOS_ADDR, BUILD_BIOS_SIZE, E820_RESERVED);
 
@@ -150,43 +151,6 @@ init_bios_tables(void)
     acpi_bios_init();
 }
 
-static void
-init_boot_vectors()
-{
-    if (! CONFIG_BOOT)
-        return;
-    dprintf(3, "init boot device ordering\n");
-
-    // Floppy drive
-    struct ipl_entry_s *ip = &IPL.table[0];
-    ip->type = IPL_TYPE_FLOPPY;
-    ip++;
-
-    // First HDD
-    ip->type = IPL_TYPE_HARDDISK;
-    ip++;
-
-    // CDROM
-    if (CONFIG_CDROM_BOOT) {
-        ip->type = IPL_TYPE_CDROM;
-        ip++;
-    }
-
-    IPL.count = ip - IPL.table;
-    SET_EBDA(boot_sequence, 0xffff);
-    if (CONFIG_COREBOOT) {
-        // XXX - hardcode defaults for coreboot.
-        IPL.bootorder = 0x00000231;
-        IPL.checkfloppysig = 1;
-    } else {
-        // On emulators, get boot order from nvram.
-        IPL.bootorder = (inb_cmos(CMOS_BIOS_BOOTFLAG2)
-                         | ((inb_cmos(CMOS_BIOS_BOOTFLAG1) & 0xf0) << 4));
-        if (!(inb_cmos(CMOS_BIOS_BOOTFLAG1) & 1))
-            IPL.checkfloppysig = 1;
-    }
-}
-
 // Main setup code.
 static void
 post()
@@ -218,11 +182,11 @@ post()
     init_bios_tables();
     memmap_finalize();
 
+    boot_setup();
+
     floppy_drive_setup();
     hard_drive_setup();
 
-    init_boot_vectors();
-
     optionrom_setup();
 }
 
@@ -241,12 +205,11 @@ _start()
     // Perform main setup code.
     post();
 
-    // Present the user with a bootup menu.
-    interactive_bootmenu();
+    // Run BCVs
+    boot_prep();
 
     // Setup bios checksum.
-    extern char bios_checksum;
-    bios_checksum = -checksum((u8*)BUILD_BIOS_ADDR, BUILD_BIOS_SIZE - 1);
+    BiosChecksum = -checksum((u8*)BUILD_BIOS_ADDR, BUILD_BIOS_SIZE - 1);
 
     // Prep for boot process.
     make_bios_readonly();