X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/7e16b8e6b3c3aab2c91d9b54c8953201e111be50..987657404fb5d8c214a96d71f1e6acf4a8b0f00f:/grubload/multiboot_c.c?ds=inline

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index 572c3fd..50aca06 100644
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -1,5 +1,8 @@
 #include "console.h"
 #include <io.h>
+#include <smram.h>
+
+#define INFO_SIGNATURE 0x5754454E
 
 extern char _binary_realmode_bin_start[];
 extern int _binary_realmode_bin_size;
@@ -22,35 +25,39 @@ struct mod_info
 	void *reserved;
 };
 
-void c_start(unsigned int magic, struct mb_info *wee)
+struct info_section
+{
+	unsigned int signature;
+	void (*firstrun)();
+};
+
+void c_start(unsigned int magic, struct mb_info *info)
 {
+	struct mod_info *mods = info->mods;
 	unsigned short *grubptr = (unsigned short *)0x7CFE;
 	unsigned char smramc;
 	int i;
 	
 	void (*realmode)() = (void (*)()) 0x4000;
 	
-	puts("Magic is: ");
-	puthex(magic);
-	puts("\nMultiboot header is: ");
-	puthex(wee);
-	puts("\n");
 	show_cursor();
+	puts("NetWatch loader\n");
 	
-	puts("Grubptr is: ");
-	puthex(*grubptr);
-	puts("\n");
-
-
-	for (i = 0; i < wee->mod_cnt; i++)
+	if (magic != 0x2BADB002)
+	{
+		puts("Bootloader was not multiboot compliant; cannot continue.\n");
+		while(1) asm("hlt");
+	}
+	
+	for (i = 0; i < info->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(mods[i].mod_start); puts("\n");
+		puts("  Size: "); puthex(mods[i].mod_end - mods[i].mod_start); puts("\n");
+		puts("  Name: "); puts(mods[i].mod_string); puts("\n");
 	}
 
-	if (wee->mod_cnt != 1)
+	if (info->mod_cnt != 1)
 	{
 		puts("Expected exactly one module; cannot continue.\n");
 		while(1) asm("hlt");
@@ -60,19 +67,38 @@ void c_start(unsigned int magic, struct mb_info *wee)
 	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 */
+	outl(0x830, inl(0x830) & ~0x1);	/* turn off SMIs */
 	
 	/* 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. */
+	smram_state_t old_smramc = smram_save_state();
+
+	if (smram_aseg_set_state(SMRAM_ASEG_OPEN) != 0)
+	{
+		puts("Opening SMRAM failed; cannot load ELF.\n");
+	}
+	else
+	{
+		load_elf(mods[0].mod_start, mods[0].mod_end - mods[0].mod_start);
+
+		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);
+		}
+	}
+
 	puts("Waiting for a bit before returning to real mode...");
 	for (i=0; i<0x500000; i++)
 	{