Replace common segment/offset pairs with struct segoff_s.

[seabios.git] / src / post.c

diff --git a/src/post.c b/src/post.c
index b0189356cf45597d3efc86dd560c42ca274735d8..7edd1f611fff4e666362f97bd2237c95fbf9358d 100644 (file)
--- a/src/post.c
+++ b/src/post.c
@@ -1,6 +1,6 @@
 // 32bit code to Power On Self Test (POST) a machine.
 //
-// Copyright (C) 2008  Kevin O'Connor <kevin@koconnor.net>
+// Copyright (C) 2008,2009  Kevin O'Connor <kevin@koconnor.net>
 // Copyright (C) 2002  MandrakeSoft S.A.
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
@@ -11,6 +11,7 @@
 #include "util.h" // memset
 #include "biosvar.h" // struct bios_data_area_s
 #include "disk.h" // floppy_drive_setup
+#include "ata.h" // ata_setup
 #include "memmap.h" // add_e820
 #include "pic.h" // pic_setup
 #include "pci.h" // create_pirtable
@@ -22,7 +23,7 @@
 void
 __set_irq(int vector, void *loc)
 {
-    SET_IVT(vector, SEG_BIOS, (u32)loc - BUILD_BIOS_ADDR);
+    SET_IVT(vector, SEGOFF(SEG_BIOS, (u32)loc - BUILD_BIOS_ADDR));
 }
 
 #define set_irq(vector, func) do {              \
@@ -63,7 +64,7 @@ init_ivt()
 
     // set vector 0x79 to zero
     // this is used by 'gardian angel' protection system
-    SET_IVT(0x79, 0, 0);
+    SET_IVT(0x79, SEGOFF(0, 0));
 
     __set_irq(0x1E, &diskette_param_table2);
 }
@@ -81,11 +82,10 @@ init_bda()
     u16 eseg = EBDA_SEGMENT_START;
     SET_BDA(ebda_seg, eseg);
 
+    // Init ebda
     struct extended_bios_data_area_s *ebda = get_ebda_ptr();
     memset(ebda, 0, sizeof(*ebda));
     ebda->size = esize;
-    SET_IVT(0x41, eseg, offsetof(struct extended_bios_data_area_s, fdpt[0]));
-    SET_IVT(0x46, eseg, offsetof(struct extended_bios_data_area_s, fdpt[1]));
 }
 
 static void
@@ -138,9 +138,10 @@ ram_probe(void)
 static void
 init_bios_tables(void)
 {
-    if (CONFIG_COREBOOT)
-        // XXX - not supported on coreboot yet.
+    if (CONFIG_COREBOOT) {
+        coreboot_copy_biostable();
         return;
+    }
 
     create_pirtable();
 
@@ -167,6 +168,8 @@ post()
     ram_probe();
     mtrr_setup();
     smp_probe();
+    malloc_setup();
+    pmm_setup();
 
     pnp_setup();
     vga_setup();
@@ -180,14 +183,22 @@ post()
     smm_init();
 
     init_bios_tables();
-    memmap_finalize();
 
     boot_setup();
 
-    floppy_drive_setup();
-    hard_drive_setup();
+    drive_setup();
+    floppy_setup();
+    ata_setup();
+    ramdisk_setup();
 
     optionrom_setup();
+
+    // Run BCVs
+    boot_prep();
+
+    pmm_finalize();
+    malloc_finalize();
+    memmap_finalize();
 }
 
 // 32-bit entry point.
@@ -197,7 +208,7 @@ _start()
     init_dma();
 
     debug_serial_setup();
-    dprintf(1, "Start bios\n");
+    dprintf(1, "Start bios (version %s)\n", VERSION);
 
     // Allow writes to modify bios area (0xf0000)
     make_bios_writable();
@@ -205,13 +216,10 @@ _start()
     // Perform main setup code.
     post();
 
-    // Run BCVs
-    boot_prep();
-
     // Setup bios checksum.
     BiosChecksum -= checksum((u8*)BUILD_BIOS_ADDR, BUILD_BIOS_SIZE);
 
-    // Prep for boot process.
+    // Write protect bios memory.
     make_bios_readonly();
 
     // Invoke int 19 to start boot process.