Improve correctness of backtrace library.

[netwatch.git] / grubload / multiboot_c.c

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index 04f9b2f4f3bb3a901f9ba278b438753ac536dde9..9806ca41e3c23c233b4bfde6269c29effaf4f1b5 100644 (file)
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -1,3 +1,13 @@
+/* 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>
@@ -50,10 +60,9 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
 
        if (mbinfo->mod_cnt != 1)
                panic("Expected exactly one module; cannot continue.");
-
+       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));
-       outputf("Current SMRAMC state is: %02x", pci_read8(0, 0, 0, 0x70));
        
        smi_disable();
        
@@ -62,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();
 
@@ -80,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++)