add printf/dologf

[netwatch.git] / grubload / multiboot_c.c

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index 50aca06e665d2e2abb9a5f13fa845640cd9e45ac..e4843c36da97e8b23e2a55521a21fb098b523dd5 100644 (file)
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -1,29 +1,16 @@
 #include "console.h"
+#include <minilib.h>
 #include <io.h>
 #include <smram.h>
+#include <multiboot.h>
+#include <smi.h>
 
 #define INFO_SIGNATURE 0x5754454E
 
 extern char _binary_realmode_bin_start[];
 extern int _binary_realmode_bin_size;
 
-struct mb_info
-{
-       unsigned long flags;
-       unsigned long mem_lower, mem_upper;
-       unsigned long boot_dev;
-       char *cmdline;
-       unsigned long mod_cnt;
-       struct mod_info *mods;
-};
 
-struct mod_info
-{
-       void *mod_start;
-       void *mod_end;
-       char *mod_string;
-       void *reserved;
-};
 
 struct info_section
 {
@@ -31,9 +18,17 @@ struct info_section
        void (*firstrun)();
 };
 
-void c_start(unsigned int magic, struct mb_info *info)
+void panic(const char *msg)
 {
-       struct mod_info *mods = info->mods;
+       puts("PANIC: ");
+       puts(msg);
+       puts("\nSystem halted\n");
+       while(1) asm("hlt");
+}
+
+void c_start(unsigned int magic, struct mb_info *mbinfo)
+{
+       struct mod_info *mods = mbinfo->mods;
        unsigned short *grubptr = (unsigned short *)0x7CFE;
        unsigned char smramc;
        int i;
@@ -43,13 +38,10 @@ 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");
@@ -57,17 +49,14 @@ void c_start(unsigned int magic, struct mb_info *info)
                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));
@@ -75,30 +64,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();
 
        if (smram_aseg_set_state(SMRAM_ASEG_OPEN) != 0)
+               panic("Opening SMRAM failed; cannot load ELF.");
+
+       load_elf(mods[0].mod_start, mods[0].mod_end - mods[0].mod_start);
+
+       struct info_section * 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);
-
-               struct info_section * info = (struct info_section *)0x10000;
-               if (info->signature != INFO_SIGNATURE)
-               {
-                       smram_restore_state(old_smramc);
-                       puts("Info section signature mismatch.\n");
-               }
-               else {
-                       info->firstrun();
-                       smram_restore_state(old_smramc);
-               }
+               smram_restore_state(old_smramc);                /* Restore so that video ram is touchable again. */
+               panic("Info section signature mismatch.");
        }
 
+       info->firstrun();
+       smram_restore_state(old_smramc);
+
        puts("Waiting for a bit before returning to real mode...");
        for (i=0; i<0x500000; i++)
        {