fix get_PMBASE bug

[netwatch.git] / grubload / multiboot_c.c

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index 890a003471db280f15a6941821a9d2c04e81b265..be11ab14c4314bb2f17d3122987073230987bf46 100644 (file)
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -1,29 +1,19 @@
 #include "console.h"
 #include "console.h"

+#include "loader.h"
+
+#include <minilib.h>

 #include <io.h>
 #include <smram.h>
 #include <io.h>
 #include <smram.h>

+#include <multiboot.h>
+#include <smi.h>
+#include <pci.h>

 
 #define INFO_SIGNATURE 0x5754454E
 
 extern char _binary_realmode_bin_start[];
 extern int _binary_realmode_bin_size;
 
 
 #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
 {
 
 struct info_section
 {


@@ -36,14 +26,14 @@ void panic(const char *msg)
        puts("PANIC: ");
        puts(msg);
        puts("\nSystem halted\n");
        puts("PANIC: ");
        puts(msg);
        puts("\nSystem halted\n");

-       while(1) asm("hlt");
+       while(1) { __asm__("hlt"); }

 }
 
 void c_start(unsigned int magic, struct mb_info *mbinfo)
 {
        struct mod_info *mods = mbinfo->mods;
 }
 
 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;
+       smram_state_t old_smramc;
+       struct info_section * info;

        int i;
        
        void (*realmode)() = (void (*)()) 0x4000;
        int i;
        
        void (*realmode)() = (void (*)()) 0x4000;


@@ -51,14 +41,14 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
        show_cursor();
        puts("NetWatch loader\n");
        
        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++)
        {
                puts("Module found:\n");
                panic("Bootloader was not multiboot compliant; cannot continue.");
        
        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");
        }
 
                puts("  Name: "); puts(mods[i].mod_string); puts("\n");
        }
 


@@ -69,7 +59,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");
        
        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));
        
        /* Try really hard to shut up USB_LEGKEY. */
        pci_write16(0, 31, 2, 0xC0, pci_read16(0, 31, 2, 0xC0));


@@ -77,16 +67,15 @@ 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);
 
        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. */
        /* 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.");
 
 
        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);
+       load_elf(mods[0].mod_start, (unsigned long)mods[0].mod_end - (unsigned long)mods[0].mod_start);

 
 

-       struct info_section * info = (struct info_section *)0x10000;
+       info = (struct info_section *)0x10000;

        if (info->signature != INFO_SIGNATURE)
        {
                smram_restore_state(old_smramc);                /* Restore so that video ram is touchable again. */
        if (info->signature != INFO_SIGNATURE)
        {
                smram_restore_state(old_smramc);                /* Restore so that video ram is touchable again. */


@@ -106,6 +95,6 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
        puts("\n");
 
        puts("Now returning to real mode.\n");  
        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!
 }
        realmode();     // goodbye!
 }