Merge ELF loader.

[netwatch.git] / grubload / multiboot_c.c

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index 7c6a4fd11063d350ef055143ab222e1d2e85ca6a..03e2143ba7d6970a8ab967f9ee33fd0f4024ac0b 100644 (file)
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -1,6 +1,62 @@
-void c_start(unsigned int magic, void *wee)
+#include "console.h"
+
+extern char _binary_realmode_bin_start[];
+extern int _binary_realmode_bin_size;
+
+struct mb_info

 {
 {

-       *(unsigned char *)0xB8000 = 'A';
-       while (1)
-               ;
+       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;
+};
+
+void c_start(unsigned int magic, struct mb_info *wee)
+{
+       unsigned short *grubptr = 0x7CFE;
+       int i;
+       
+       void (*realmode)() = 0x4000;
+       
+       puts("Magic is: ");
+       puthex(magic);
+       puts("\nMultiboot header is: ");
+       puthex(wee);
+       puts("\n");
+       show_cursor();
+       
+       puts("Grubptr is: ");
+       puthex(*grubptr);
+       puts("\n");
+
+
+       for (i = 0; i < wee->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");
+       }
+
+       if ((wee->mod_cnt != 1) || (strcmp(wee->mods[0].mod_string, "aseg.elf")))
+       {
+               puts("Expected 1 module called aseg.elf.\n");
+               while(1) asm("hlt");
+       }
+
+       load_elf(wee->mods[0].mod_start, wee->mods[0].mod_end - wee->mods[0].mod_start);
+
+       puts("Now returning to real mode.\n");  
+       memcpy(0x4000, _binary_realmode_bin_start, (int)&_binary_realmode_bin_size);
+       realmode();     // goodbye!

 }
 }