X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/5ae81164883c737f0204dc26beb7bb7488693a1d..ee681ad4b4f2ace24beb4d401d425573b450bbd7:/grubload/multiboot_c.c

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index e4843c3..372363c 100644
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -1,17 +1,18 @@
 #include "console.h"
+#include "loader.h"
+#include <output.h>
 #include <minilib.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;
 
-
-
 struct info_section
 {
 	unsigned int signature;
@@ -20,41 +21,38 @@ struct info_section
 
 void panic(const char *msg)
 {
-	puts("PANIC: ");
-	puts(msg);
-	puts("\nSystem halted\n");
-	while(1) asm("hlt");
+	outputf("PANIC: %s\nSystem halted\n", msg);
+	while(1) { __asm__("hlt"); }
 }
 
 void c_start(unsigned int magic, struct mb_info *mbinfo)
 {
 	struct mod_info *mods = mbinfo->mods;
-	unsigned short *grubptr = (unsigned short *)0x7CFE;
-	unsigned char smramc;
+	smram_state_t old_smramc;
+	struct info_section * info;
 	int i;
 	
 	void (*realmode)() = (void (*)()) 0x4000;
 	
 	show_cursor();
-	puts("NetWatch loader\n");
+	outputf("NetWatch loader");
 	
 	if (magic != MULTIBOOT_LOADER_MAGIC)
 		panic("Bootloader was not multiboot compliant; cannot continue.");
 	
 	for (i = 0; i < mbinfo->mod_cnt; i++)
 	{
-		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");
+		outputf("Module found:");
+		outputf("  Start: %08x", (unsigned long) mods[i].mod_start);
+		outputf("  Size: %08x", (unsigned long)mods[i].mod_end - (unsigned long)mods[i].mod_start);
+		outputf("  Name: %s", mods[i].mod_string);
 	}
 
 	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");
+	outputf("Current SMRAMC state is: %02x", pci_read8(0, 0, 0, 0x70));
+	outputf("Current USB state is: %04x %04x", pci_read16(0, 31, 2, 0xC0), pci_read16(0, 31, 4, 0xC0));
+	outputf("Current SMI state is: %08x", inl(0x830));
 	
 	smi_disable();
 	
@@ -63,16 +61,18 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
 	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);
+	
+	pci_bus_enum();
 
 	/* Open the SMRAM aperture and load our ELF. */
-	smram_state_t old_smramc = smram_save_state();
+	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, mods[0].mod_end - mods[0].mod_start);
+	load_elf(mods[0].mod_start, (unsigned long)mods[0].mod_end - (unsigned long)mods[0].mod_start);
 
-	struct info_section * info = (struct info_section *)0x10000;
+	info = (struct info_section *)0x10000;
 	if (info->signature != INFO_SIGNATURE)
 	{
 		smram_restore_state(old_smramc);		/* Restore so that video ram is touchable again. */
@@ -81,6 +81,8 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
 
 	info->firstrun();
 	smram_restore_state(old_smramc);
+	
+	outputf("New SMRAMC state is: %02x", pci_read8(0, 0, 0, 0x70));
 
 	puts("Waiting for a bit before returning to real mode...");
 	for (i=0; i<0x500000; i++)
@@ -91,7 +93,7 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
 	}
 	puts("\n");
 
-	puts("Now returning to real mode.\n");	
-	memcpy(0x4000, _binary_realmode_bin_start, (int)&_binary_realmode_bin_size);
+	outputf("Now returning to real mode.");
+	memcpy((void *)0x4000, _binary_realmode_bin_start, (int)&_binary_realmode_bin_size);
 	realmode();	// goodbye!
 }