X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/e8351f1a2c735e32d6fb81f180f25d751caf6fe7..67109eef29514092df311f5989fcd62c31e1d20f:/aseg/firstrun.c?ds=sidebyside

diff --git a/aseg/firstrun.c b/aseg/firstrun.c
index 75bcccc..d3cd16f 100644
--- a/aseg/firstrun.c
+++ b/aseg/firstrun.c
@@ -5,6 +5,7 @@
 #include <output.h>
 #include "vga-overlay.h"
 #include <smram.h>
+#include "../net/net.h"
 
 extern int _bss, _bssend;
 
@@ -12,38 +13,6 @@ 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);
 
-static int found = 0, _bus, _dev, _fn;
-
-void do_bother()
-{
-	int bar;
-
-	if (!found)
-		return;
-		
-	pci_write16(_bus, _dev, _fn, 0x04, 0x00);
-	for (bar = 0; bar < 6; bar++)
-		pci_write32(_bus, _dev, _fn, 0x10 + bar*4, 0x1FFFFFFF);
-}
-
-int bother_3c905(pci_dev_t *dev)
-{
-	if (dev->vid == 0x10B7 || dev->did == 0x9200)
-	{
-		outputf("Found a 3c905 to bother");
-		
-		_bus = dev->bus;
-		_dev = dev->dev;
-		_fn = dev->fn;
-		found = 1;
-		
-		do_bother();
-		
-		return 1;
-	}
-	return 0;
-}
-
 void __firstrun_start() {
 	unsigned char *bp;
 	smram_state_t smram;
@@ -54,6 +23,8 @@ void __firstrun_start() {
 	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. */
@@ -65,7 +36,7 @@ void __firstrun_start() {
 	/* Turn on the SMIs we want */
 	smi_disable();
 	
-	pci_probe(bother_3c905);
+	eth_init();
 	
 	smi_register_handler(SMI_EVENT_FAST_TIMER, timer_handler);
 	smi_enable_event(SMI_EVENT_FAST_TIMER);
@@ -78,6 +49,8 @@ void __firstrun_start() {
 
 	smi_enable();
 	
+	vga_flush_imm(1);
+	
 	smram_restore_state(smram);
 }