X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/c34aba053b84fc15e91e96e04291d911bcd2adb0..9cfcd0ca09a4eccaadaedca17cee1a7516b99980:/grubload/multiboot_c.c diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c index c75e830..be11ab1 100644 --- a/grubload/multiboot_c.c +++ b/grubload/multiboot_c.c @@ -1,33 +1,39 @@ #include "console.h" +#include "loader.h" + +#include #include #include +#include +#include +#include + +#define INFO_SIGNATURE 0x5754454E extern char _binary_realmode_bin_start[]; extern int _binary_realmode_bin_size; -struct mb_info + + +struct info_section { - unsigned long flags; - unsigned long mem_lower, mem_upper; - unsigned long boot_dev; - char *cmdline; - unsigned long mod_cnt; - struct mod_info *mods; + unsigned int signature; + void (*firstrun)(); }; -struct mod_info +void panic(const char *msg) { - void *mod_start; - void *mod_end; - char *mod_string; - void *reserved; -}; + puts("PANIC: "); + puts(msg); + puts("\nSystem halted\n"); + while(1) { __asm__("hlt"); } +} -void c_start(unsigned int magic, struct mb_info *info) +void c_start(unsigned int magic, struct mb_info *mbinfo) { - struct mod_info *mods = mods; - unsigned short *grubptr = (unsigned short *)0x7CFE; - unsigned char smramc; + struct mod_info *mods = mbinfo->mods; + smram_state_t old_smramc; + struct info_section * info; int i; void (*realmode)() = (void (*)()) 0x4000; @@ -35,31 +41,25 @@ void c_start(unsigned int magic, struct mb_info *info) show_cursor(); puts("NetWatch loader\n"); - if (magic != 0x2BADB002) - { - puts("Bootloader was not multiboot compliant; cannot continue.\n"); - while(1) asm("hlt"); - } + if (magic != MULTIBOOT_LOADER_MAGIC) + panic("Bootloader was not multiboot compliant; cannot continue."); - for (i = 0; i < info->mod_cnt; i++) + for (i = 0; i < mbinfo->mod_cnt; i++) { puts("Module found:\n"); - puts(" Start: "); puthex(mods[i].mod_start); puts("\n"); - puts(" Size: "); puthex(mods[i].mod_end - mods[i].mod_start); puts("\n"); + puts(" Start: "); puthex((unsigned long) mods[i].mod_start); puts("\n"); + puts(" Size: "); puthex((unsigned long)mods[i].mod_end - (unsigned long)mods[i].mod_start); puts("\n"); puts(" Name: "); puts(mods[i].mod_string); puts("\n"); } - if (info->mod_cnt != 1) - { - puts("Expected exactly one module; cannot continue.\n"); - while(1) asm("hlt"); - } + if (mbinfo->mod_cnt != 1) + panic("Expected exactly one module; cannot continue."); puts("Current USB state is: "); puthex(pci_read16(0, 31, 2, 0xC0)); puts(" "); puthex(pci_read16(0, 31, 4, 0xC0)); puts("\n"); puts("Current SMI state is: "); puthex(inl(0x830)); puts("\n"); puts("Current SMRAMC state is: "); puthex(pci_read8(0, 0, 0, 0x70)); puts("\n"); - outl(0x830, inl(0x830) & ~0x1); /* turn off SMIs */ + smi_disable(); /* Try really hard to shut up USB_LEGKEY. */ pci_write16(0, 31, 2, 0xC0, pci_read16(0, 31, 2, 0xC0)); @@ -67,22 +67,24 @@ void c_start(unsigned int magic, struct mb_info *info) pci_write16(0, 31, 4, 0xC0, pci_read16(0, 31, 4, 0xC0)); pci_write16(0, 31, 4, 0xC0, 0); - /* Open the SMRAM aperture and load our ELF. */ - smram_state_t old_smramc = smram_save_state(); + old_smramc = smram_save_state(); if (smram_aseg_set_state(SMRAM_ASEG_OPEN) != 0) + panic("Opening SMRAM failed; cannot load ELF."); + + load_elf(mods[0].mod_start, (unsigned long)mods[0].mod_end - (unsigned long)mods[0].mod_start); + + info = (struct info_section *)0x10000; + if (info->signature != INFO_SIGNATURE) { - puts("Opening SMRAM failed; cannot load ELF.\n"); - } - else - { - load_elf(mods[0].mod_start, mods[0].mod_end - mods[0].mod_start); - smram_restore_state(old_smramc); + smram_restore_state(old_smramc); /* Restore so that video ram is touchable again. */ + panic("Info section signature mismatch."); } - outb(0x830, inb(0x830) | 0x41); /* turn on the SMIs we want */ - + info->firstrun(); + smram_restore_state(old_smramc); + puts("Waiting for a bit before returning to real mode..."); for (i=0; i<0x500000; i++) { @@ -93,6 +95,6 @@ void c_start(unsigned int magic, struct mb_info *info) puts("\n"); puts("Now returning to real mode.\n"); - memcpy(0x4000, _binary_realmode_bin_start, (int)&_binary_realmode_bin_size); + memcpy((void *)0x4000, _binary_realmode_bin_start, (int)&_binary_realmode_bin_size); realmode(); // goodbye! }