X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/36ce375d87e8dd0fdee14de4fbc35c1aef56d7e9..9cfcd0ca09a4eccaadaedca17cee1a7516b99980:/aseg/firstrun.c?ds=sidebyside

diff --git a/aseg/firstrun.c b/aseg/firstrun.c
index 355fb9a..c6eab7b 100644
--- a/aseg/firstrun.c
+++ b/aseg/firstrun.c
@@ -1,20 +1,11 @@
 #include <io.h>
+#include <smi.h>
 #include <pci.h>
+#include <reg-82801b.h>
+#include "vga-overlay.h"
 
 void __firstrun_start() {
-/*
-	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");
-*/
+	dologf("NetWatch running");
 
 	/* Try really hard to shut up USB_LEGKEY. */
 	pci_write16(0, 31, 2, 0xC0, pci_read16(0, 31, 2, 0xC0));
@@ -23,6 +14,8 @@ void __firstrun_start() {
 	pci_write16(0, 31, 4, 0xC0, 0);
 
 	/* Turn on the SMIs we want */
-	outb(0x830, inb(0x830) | 0x41);
+	outb(0x830, inb(0x830) | ICH2_SMI_EN_SWSMI_TMR_EN);
+	outb(0x848, ICH2_DEVTRAP_EN_KBC_TRP_EN);
+	smi_enable();
 }