more aseg/grubload rearrangements

[netwatch.git] / grubload / multiboot_c.c

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index c75e830aa90fdcb9f6a6eea3659a87ce78e8c117..50aca06e665d2e2abb9a5f13fa845640cd9e45ac 100644 (file)
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -2,6 +2,8 @@
 #include <io.h>
 #include <smram.h>
 
 #include <io.h>
 #include <smram.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;
 


@@ -23,9 +25,15 @@ struct mod_info
        void *reserved;
 };
 
        void *reserved;
 };
 

+struct info_section
+{
+       unsigned int signature;
+       void (*firstrun)();
+};
+

 void c_start(unsigned int magic, struct mb_info *info)
 {
 void c_start(unsigned int magic, struct mb_info *info)
 {

-       struct mod_info *mods = mods;
+       struct mod_info *mods = info->mods;

        unsigned short *grubptr = (unsigned short *)0x7CFE;
        unsigned char smramc;
        int i;
        unsigned short *grubptr = (unsigned short *)0x7CFE;
        unsigned char smramc;
        int i;


@@ -78,11 +86,19 @@ void c_start(unsigned int magic, struct mb_info *info)
        else
        {
                load_elf(mods[0].mod_start, mods[0].mod_end - mods[0].mod_start);
        else
        {
                load_elf(mods[0].mod_start, mods[0].mod_end - mods[0].mod_start);

-               smram_restore_state(old_smramc);
+
+               struct info_section * info = (struct info_section *)0x10000;
+               if (info->signature != INFO_SIGNATURE)
+               {
+                       smram_restore_state(old_smramc);
+                       puts("Info section signature mismatch.\n");
+               }
+               else {
+                       info->firstrun();
+                       smram_restore_state(old_smramc);
+               }

        }
 
        }
 

-       outb(0x830, inb(0x830) | 0x41); /* turn on the SMIs we want */
-       

        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++)
        {