Bother the 3c905 every time we take an IRQ, which makes the bothering 'stick'.

[netwatch.git] / aseg / firstrun.c

diff --git a/aseg/firstrun.c b/aseg/firstrun.c
index 323f1ab751f0f3c825379dbf92104e2af85f4d34..75bcccc9f85e9966030b19857c558fd9f36c1253 100644 (file)
--- a/aseg/firstrun.c
+++ b/aseg/firstrun.c
@@ -2,12 +2,47 @@
 #include <smi.h>
 #include <pci.h>
 #include <reg-82801b.h>
 #include <smi.h>
 #include <pci.h>
 #include <reg-82801b.h>

+#include <output.h>

 #include "vga-overlay.h"
 #include <smram.h>
 
 extern int _bss, _bssend;
 
 extern void timer_handler(smi_event_t ev);
 #include "vga-overlay.h"
 #include <smram.h>
 
 extern int _bss, _bssend;
 
 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;
 
 void __firstrun_start() {
        unsigned char *bp;


@@ -19,7 +54,7 @@ void __firstrun_start() {
        for (bp = (void *)&_bss; (void *)bp < (void *)&_bssend; bp++)
                *bp = 0;
        
        for (bp = (void *)&_bss; (void *)bp < (void *)&_bssend; bp++)
                *bp = 0;
        

-       dologf("NetWatch running");
+       outputf("NetWatch running");

 
        /* Try really hard to shut up USB_LEGKEY. */
        pci_write16(0, 31, 2, 0xC0, pci_read16(0, 31, 2, 0xC0));
 
        /* Try really hard to shut up USB_LEGKEY. */
        pci_write16(0, 31, 2, 0xC0, pci_read16(0, 31, 2, 0xC0));


@@ -29,9 +64,18 @@ void __firstrun_start() {
 
        /* Turn on the SMIs we want */
        smi_disable();
 
        /* Turn on the SMIs we want */
        smi_disable();

+       
+       pci_probe(bother_3c905);
+       

        smi_register_handler(SMI_EVENT_FAST_TIMER, timer_handler);
        smi_enable_event(SMI_EVENT_FAST_TIMER);
        smi_register_handler(SMI_EVENT_FAST_TIMER, timer_handler);
        smi_enable_event(SMI_EVENT_FAST_TIMER);

-       outb(0x848, ICH2_DEVTRAP_EN_KBC_TRP_EN);
+       
+       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();
        
        smram_restore_state(smram);
        smi_enable();
        
        smram_restore_state(smram);