add printf/dologf

[netwatch.git] / grubload / multiboot_c.c

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index 890a003471db280f15a6941821a9d2c04e81b265..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
 {
@@ -51,7 +38,7 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
        show_cursor();
        puts("NetWatch loader\n");
        
-       if (magic != 0x2BADB002)
+       if (magic != MULTIBOOT_LOADER_MAGIC)
                panic("Bootloader was not multiboot compliant; cannot continue.");
        
        for (i = 0; i < mbinfo->mod_cnt; i++)
@@ -69,7 +56,7 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
        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));
@@ -77,7 +64,6 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
        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();