Merge branch 'master' of /storage/git/netwatch

diff --git a/aseg/counter.c b/aseg/counter.c
index 055ceec1609f8da0a4f917273bb34f2185d0a217..ab200c107c8c73e441c7ba9211a72688a80e70b4 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -93,6 +93,7 @@ void pci_dump() {
                dolog("Unhandled PCI cycle");
        }
        
+       outl(0x840, 0x0);
        outl(0x844, 0x1000);
        outl(0x848, 0x1000);
 }

diff --git a/net/net.c b/net/net.c
index eac5d0e0b4cb0e81285b646be2098340a9cf8c40..7164746a56f389a1da1a2290a5c8f11dcff01c8e 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -5,6 +5,7 @@
 #include <pci-bother.h>
 #include <output.h>
 #include <minilib.h>
+#include <lwip/init.h>
 #include "net.h"
 #include "../aseg/keyboard.h"
 
@@ -124,4 +125,5 @@ void eth_init()
        /* Required for DMA to work. :( */
        smram_tseg_set_state(SMRAM_TSEG_OPEN);
        pci_probe_driver(a3c90x_driver);
+       lwip_init();
 }