Improve correctness of backtrace library.

[netwatch.git] / grubload / multiboot_c.c

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index be11ab14c4314bb2f17d3122987073230987bf46..9806ca41e3c23c233b4bfde6269c29effaf4f1b5 100644 (file)
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -1,6 +1,16 @@
+/* multiboot_c.c
+ * Main program for starting SMM code
+ * NetWatch multiboot loader
+ *
+ * Copyright (c) 2008 Jacob Potter and Joshua Wise.  All rights reserved.
+ * This program is free software; you can redistribute and/or modify it under
+ * the terms found in the file LICENSE in the root of this source tree. 
+ *
+ */
+
 #include "console.h"
 #include "loader.h"
-
+#include <output.h>
 #include <minilib.h>
 #include <io.h>
 #include <smram.h>
@@ -13,8 +23,6 @@
 extern char _binary_realmode_bin_start[];
 extern int _binary_realmode_bin_size;
 
-
-
 struct info_section
 {
        unsigned int signature;
@@ -23,9 +31,7 @@ struct info_section
 
 void panic(const char *msg)
 {
-       puts("PANIC: ");
-       puts(msg);
-       puts("\nSystem halted\n");
+       outputf("PANIC: %s\nSystem halted\n", msg);
        while(1) { __asm__("hlt"); }
 }
 
@@ -39,25 +45,24 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
        void (*realmode)() = (void (*)()) 0x4000;
        
        show_cursor();
-       puts("NetWatch loader\n");
+       outputf("NetWatch loader");
        
        if (magic != MULTIBOOT_LOADER_MAGIC)
                panic("Bootloader was not multiboot compliant; cannot continue.");
        
        for (i = 0; i < mbinfo->mod_cnt; i++)
        {
-               puts("Module found:\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");
+               outputf("Module found:");
+               outputf("  Start: %08x", (unsigned long) mods[i].mod_start);
+               outputf("  Size: %08x", (unsigned long)mods[i].mod_end - (unsigned long)mods[i].mod_start);
+               outputf("  Name: %s", mods[i].mod_string);
        }
 
        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");
+       outputf("Current SMRAMC state is: %02x", pci_read8(0, 0, 0, 0x70));
+       outputf("Current USB state is: %04x %04x", pci_read16(0, 31, 2, 0xC0), pci_read16(0, 31, 4, 0xC0));
+       outputf("Current SMI state is: %08x", inl(0x830));
        
        smi_disable();
        
@@ -66,7 +71,9 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
        pci_write16(0, 31, 2, 0xC0, 0);
        pci_write16(0, 31, 4, 0xC0, pci_read16(0, 31, 4, 0xC0));
        pci_write16(0, 31, 4, 0xC0, 0);
-
+/*     
+       pci_bus_enum();
+*/
        /* Open the SMRAM aperture and load our ELF. */
        old_smramc = smram_save_state();
 
@@ -84,6 +91,8 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
 
        info->firstrun();
        smram_restore_state(old_smramc);
+       
+       outputf("New SMRAMC state is: %02x", pci_read8(0, 0, 0, 0x70));
 
        puts("Waiting for a bit before returning to real mode...");
        for (i=0; i<0x500000; i++)
@@ -94,7 +103,7 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
        }
        puts("\n");
 
-       puts("Now returning to real mode.\n");  
+       outputf("Now returning to real mode.");
        memcpy((void *)0x4000, _binary_realmode_bin_start, (int)&_binary_realmode_bin_size);
        realmode();     // goodbye!
 }