X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/86c89e89a88d25e85956b258005b52e0f2686b89..4122ee13ba211a913b04906c39e72e512cb15c08:/grubload/multiboot_c.c?ds=inline

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index 03e2143..990ffc6 100644
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -1,4 +1,5 @@
 #include "console.h"
+#include <io.h>
 
 extern char _binary_realmode_bin_start[];
 extern int _binary_realmode_bin_size;
@@ -23,38 +24,60 @@ struct mod_info
 
 void c_start(unsigned int magic, struct mb_info *wee)
 {
-	unsigned short *grubptr = 0x7CFE;
+	unsigned short *grubptr = (unsigned short *)0x7CFE;
+	unsigned char smramc;
 	int i;
 	
-	void (*realmode)() = 0x4000;
+	void (*realmode)() = (void (*)()) 0x4000;
 	
-	puts("Magic is: ");
-	puthex(magic);
-	puts("\nMultiboot header is: ");
-	puthex(wee);
-	puts("\n");
 	show_cursor();
+	puts("NetWatch loader\n");
+	
+	if (magic != 0x2BADB002)
+	{
+		puts("Bootloader was not multiboot compliant; cannot continue.\n");
+		while(1) asm("hlt");
+	}
 	
-	puts("Grubptr is: ");
-	puthex(*grubptr);
-	puts("\n");
-
-
 	for (i = 0; i < wee->mod_cnt; i++)
 	{
-		puts("Module:\n");
+		puts("Module found:\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")))
+	if (wee->mod_cnt != 1)
 	{
-		puts("Expected 1 module called aseg.elf.\n");
+		puts("Expected exactly one module; cannot continue.\n");
 		while(1) asm("hlt");
 	}
 
+	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) & ~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 */
+	
+	puts("Waiting for a bit before returning to real mode...");
+	for (i=0; i<0x500000; i++)
+	{
+		if ((i % 0x100000) == 0)
+			puts(".");
+		inb(0x80);
+	}
+	puts("\n");
 
 	puts("Now returning to real mode.\n");	
 	memcpy(0x4000, _binary_realmode_bin_start, (int)&_binary_realmode_bin_size);