X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/bf47740a3f21a15c662193917bd86cd310af7638..cd96f5ed1a75bfcbe4c7858313f23dfa896a29af:/aseg-paging/firstrun.c?ds=sidebyside

diff --git a/aseg-paging/firstrun.c b/aseg-paging/firstrun.c
index 97e8692..0233a7c 100644
--- a/aseg-paging/firstrun.c
+++ b/aseg-paging/firstrun.c
@@ -5,6 +5,7 @@
 #include <output.h>
 #include "vga-overlay.h"
 #include <smram.h>
+#include <text.h>
 #include "../net/net.h"
 
 extern int _bss, _bssend;
@@ -13,20 +14,15 @@ extern void timer_handler(smi_event_t ev);
 extern void kbc_handler(smi_event_t ev);
 extern void gbl_rls_handler(smi_event_t ev);
 
-void __firstrun_start() {
-	unsigned char *bp;
+extern pci_driver_t *drivers[];
+
+void smi_init() {
 	smram_state_t smram;
+	pci_driver_t **driver;
 	
 	smram = smram_save_state();
 	smram_tseg_set_state(SMRAM_TSEG_OPEN);
-	serial_init();
-/*	
-	for (bp = (void *)&_bss; (void *)bp < (void *)&_bssend; bp++)
-		*bp = 0;
-	
-	vga_flush_imm(0);
-*/
-	
+
 	outputf("NetWatch running");
 
 	/* Try really hard to shut up USB_LEGKEY. */
@@ -37,19 +33,30 @@ void __firstrun_start() {
 
 	/* Turn on the SMIs we want */
 	smi_disable();
-	/*
 	
 	eth_init();
 	
+	/* After everything is initialized, load drivers. */
+	for (driver = drivers; *driver; driver++)
+	{
+		outputf("Probing driver: %s", (*driver)->name);
+		if (pci_probe_driver(*driver))
+			output("Found a card");
+	}
+	outputf("Driver probe complete");
+	
+	/* Load in fonts. */
+	text_init();
+
 	smi_register_handler(SMI_EVENT_FAST_TIMER, timer_handler);
 	smi_enable_event(SMI_EVENT_FAST_TIMER);
-	
+
 	smi_register_handler(SMI_EVENT_DEVTRAP_KBC, kbc_handler);
 	smi_enable_event(SMI_EVENT_DEVTRAP_KBC);
 	
 	smi_register_handler(SMI_EVENT_GBL_RLS, gbl_rls_handler);
 	smi_enable_event(SMI_EVENT_GBL_RLS);
-*/
+
 	smi_enable();
 	
 	vga_flush_imm(1);