#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
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
{
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);
SET_BDA(mem_size_kb, 640 - esize);
- u16 eseg = FARPTR_TO_SEG((640 - esize) * 1024);
+ u16 eseg = FLATPTR_TO_SEG((640 - esize) * 1024);
SET_BDA(ebda_seg, eseg);
struct extended_bios_data_area_s *ebda = get_ebda_ptr();
// 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);
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()
init_bios_tables();
memmap_finalize();
+ boot_setup();
+
floppy_drive_setup();
hard_drive_setup();
- init_boot_vectors();
-
optionrom_setup();
}
// Perform main setup code.
post();
- // Present the user with a bootup menu.
- interactive_bootmenu();
+ // Run BCVs
+ boot_prep();
// Setup bios checksum.
BiosChecksum = -checksum((u8*)BUILD_BIOS_ADDR, BUILD_BIOS_SIZE - 1);