Fix the poller.

[netwatch.git] / grubload / multiboot_c.c

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index 572c3fd3ee6d80cb86ad3b8764b64badf6df601e..55f3a4fd8c253bfdf368153f00261c0e226d13d8 100644 (file)
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -1,78 +1,94 @@
 #include "console.h"
 #include "console.h"

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

 #include <io.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;
 
 
 extern char _binary_realmode_bin_start[];
 extern int _binary_realmode_bin_size;
 

-struct mb_info
+struct info_section

 {
 {

-       unsigned long flags;
-       unsigned long mem_lower, mem_upper;
-       unsigned long boot_dev;
-       char *cmdline;
-       unsigned long mod_cnt;
-       struct mod_info *mods;
+       unsigned int signature;
+       void (*firstrun)();

 };
 
 };
 

-struct mod_info
+void panic(const char *msg)

 {
 {

-       void *mod_start;
-       void *mod_end;
-       char *mod_string;
-       void *reserved;
-};
+       puts("PANIC: ");
+       puts(msg);
+       puts("\nSystem halted\n");
+       while(1) { __asm__("hlt"); }
+}
+
+void dolog(char *s)
+{
+       /* little shim -- need to unify logging */
+       puts(s);
+}

 
 

-void c_start(unsigned int magic, struct mb_info *wee)
+void c_start(unsigned int magic, struct mb_info *mbinfo)

 {
 {

-       unsigned short *grubptr = (unsigned short *)0x7CFE;
-       unsigned char smramc;
+       struct mod_info *mods = mbinfo->mods;
+       smram_state_t old_smramc;
+       struct info_section * info;

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

-       puts("Magic is: ");
-       puthex(magic);
-       puts("\nMultiboot header is: ");
-       puthex(wee);
-       puts("\n");

        show_cursor();
        show_cursor();

+       puts("NetWatch loader\n");

        
        

-       puts("Grubptr is: ");
-       puthex(*grubptr);
-       puts("\n");
-
-
-       for (i = 0; i < wee->mod_cnt; i++)
+       if (magic != MULTIBOOT_LOADER_MAGIC)
+               panic("Bootloader was not multiboot compliant; cannot continue.");
+       
+       for (i = 0; i < mbinfo->mod_cnt; i++)

        {
        {

-               puts("Module:\n");
-               puts("  Start: "); puthex(wee->mods[i].mod_start); puts("\n");
-               puts("  Size: "); puthex(wee->mods[i].mod_end - wee->mods[i].mod_start); puts("\n");
-               puts("  Name: "); puts(wee->mods[i].mod_string); puts("\n");
+               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");

        }
 
        }
 

-       if (wee->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");
        
 
        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) & ~0x2001);      /* 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));
        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);
        
        /* Try really hard to shut up USB_LEGKEY. */
        pci_write16(0, 31, 2, 0xC0, pci_read16(0, 31, 2, 0xC0));
        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);

-       smramc = pci_read8(0, 0, 0, 0x70);
-       pci_write8(0, 0, 0, 0x70, (smramc & 0xF0) | 0x04);
-       load_elf(wee->mods[0].mod_start, wee->mods[0].mod_end - wee->mods[0].mod_start);
-       pci_write8(0, 0, 0, 0x70, smramc);
-       outb(0x830, inb(0x830) | 0x41); /* turn on the SMIs we want */
-       
+
+       /* Open the SMRAM aperture and load our ELF. */
+       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, (unsigned long)mods[0].mod_end - (unsigned long)mods[0].mod_start);
+
+       info = (struct info_section *)0x10000;
+       if (info->signature != INFO_SIGNATURE)
+       {
+               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++)
        {
        puts("Waiting for a bit before returning to real mode...");
        for (i=0; i<0x500000; i++)
        {


@@ -83,6 +99,6 @@ void c_start(unsigned int magic, struct mb_info *wee)
        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!
 }