merge

diff --git a/aseg/counter.c b/aseg/counter.c
index bf60ffda0d1e568964b65d58d12d17c9bf921b8f..4876acf354535a4cd00db8c45a8a8684fca0bdea 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -4,7 +4,7 @@
 #include <minilib.h>
 #include <smi.h>
 #include <pci-bother.h>
-#include "3c905.h"
+#include "../net/net.h"
 #include "vga-overlay.h"
 #include "packet.h"
 

diff --git a/aseg/firstrun.c b/aseg/firstrun.c
index d45bc813336b88bdf28a153c90e1a6b3569fee65..6df8d7da9dee4e38c1c33f870cc659ef972bd5f7 100644 (file)
--- a/aseg/firstrun.c
+++ b/aseg/firstrun.c
@@ -5,7 +5,7 @@
 #include <output.h>
 #include "vga-overlay.h"
 #include <smram.h>
-#include "3c905.h"
+#include "../net/net.h"
 
 extern int _bss, _bssend;
 

diff --git a/net/3c90x.c b/net/3c90x.c
index e7b95e950a0c2e39b3a081d1ad39b9775feb8257..37fd34d9cce4f4a29a2b0dc56c75ef639d2fba8e 100644 (file)
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -689,7 +689,6 @@ void a3c90x_disable(struct dev *dev)
  ***/
 static int a3c90x_probe(struct pci_dev * pci, void * data)
 {
-    struct nic *nic = (struct nic *)data;
     INF_3C90X.is3c556 = (pci->did == 0x6055);
  
     int i, c;

diff --git a/net/net.c b/net/net.c
index 488f52b1f1be5c072559a69376d5c1348c94cee7..18eaddf2dc625729b5af87d7d9ee55c339d93cb9 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -3,6 +3,8 @@
 #include <output.h>
 #include "net.h"
 
+struct nic nic;
+
 static int bother_3c905(pci_dev_t *dev, void *nutrinus)
 {
        if (dev->vid == 0x10B7 || dev->did == 0x9200)

diff --git a/net/net.h b/net/net.h
index 708069b4bc8209a4ea4d1637a1251bf2db2340ff..f10e304ebaf09281464db300219d347acbc22731 100644 (file)
--- a/net/net.h
+++ b/net/net.h
@@ -1,6 +1,8 @@
 #ifndef _3C905_H
 #define _3C905_H
 
+#include "etherboot-compat.h"
+
 extern void eth_init();
 extern void eth_poll();
 

diff --git a/pci/pci-bother.c b/pci/pci-bother.c
index 0c3c0ec4d80703a2c19a68e325ea1414550e0be4..dd1ff2133048cbd7071b0ce37a076098d95c5738 100644 (file)
--- a/pci/pci-bother.c
+++ b/pci/pci-bother.c
@@ -1,4 +1,5 @@
 #include <pci.h>
+#include <pci-bother.h>
 
 struct pci_bother {
        int bus, dev, fn;
@@ -29,7 +30,7 @@ void pci_bother_all()
        int i;
        
        for (i = 0; i < nbothers; i++)
-               pci_write16(bothers[i].bus, bothers[i].dev, bothers[i].fn, 0x0);
+               pci_write16(bothers[i].bus, bothers[i].dev, bothers[i].fn, 0x04, 0x0);
 }
 
 void pci_unbother_all()
@@ -37,5 +38,5 @@ void pci_unbother_all()
        int i;
        
        for (i = 0; i < nbothers; i++)
-               pci_write16(bothers[i].bus, bothers[i].dev, bothers[i].fn, bothers[i].origstate);
+               pci_write16(bothers[i].bus, bothers[i].dev, bothers[i].fn, 0x04, bothers[i].origstate);
 }