merge

diff --combined aseg/counter.c
index bf60ffda0d1e568964b65d58d12d17c9bf921b8f,868ec459984ce8069f5f0d5e8ba2b53844cfaf07..4876acf354535a4cd00db8c45a8a8684fca0bdea
--- 1/aseg/counter.c
--- 2/aseg/counter.c
+++ b/aseg/counter.c
@@@ -3,8 -3,7 +3,8 @@@
  #include <video_defines.h>
  #include <minilib.h>
  #include <smi.h>
- #include "3c905.h"
 +#include <pci-bother.h>
+ #include "../net/net.h"
  #include "vga-overlay.h"
  #include "packet.h"
  
@@@ -97,7 -96,6 +97,7 @@@ void smi_entry(void
        
        pcisave = inl(0xCF8);
        vgasave = inb(0x3D4);
 +      pci_unbother_all();
        
        counter++;
        sprintf(statstr, "15-412! %08x %08x", smi_status(), counter);
@@@ -114,7 -112,6 +114,7 @@@
  
        smi_poll();
        
 +      pci_bother_all();
        outl(0xCF8, pcisave);
        outb(0x3D4, vgasave);
  }

diff --combined net/net.c
index 488f52b1f1be5c072559a69376d5c1348c94cee7,7f1932f3ba848d9e119cda80662053a4804b6956..18eaddf2dc625729b5af87d7d9ee55c339d93cb9
--- 1/net/net.c
--- 2/net/net.c
+++ b/net/net.c
@@@ -1,15 -1,22 +1,17 @@@
  #include <pci.h>
 +#include <pci-bother.h>
  #include <output.h>
  #include "net.h"
  
 -static int found = 0, _bus, _dev, _fn;
 -
+ struct nic nic;
+ 
  static int bother_3c905(pci_dev_t *dev, void *nutrinus)
  {
        if (dev->vid == 0x10B7 || dev->did == 0x9200)
        {
                outputf("Found a 3c905 to bother");
                
 -              _bus = dev->bus;
 -              _dev = dev->dev;
 -              _fn = dev->fn;
 -              found = 1;
 -              
 +              pci_bother_add(dev);
                return 1;
        }
        return 0;
@@@ -17,7 -24,12 +19,7 @@@
  
  void eth_poll()
  {
 -      if (!found)
 -              return;
 -              
 -      pci_write16(_bus, _dev, _fn, 0x04, 0xFF);
 -      
 -      pci_write16(_bus, _dev, _fn, 0x04, 0x00);
 +      /* ... */
  }
  
  void eth_init()

diff --combined pci/pci-bother.c
index 0c3c0ec4d80703a2c19a68e325ea1414550e0be4,0000000000000000000000000000000000000000..dd1ff2133048cbd7071b0ce37a076098d95c5738
mode 100644,000000..100644
--- 1/pci/pci-bother.c
--- /dev/null
+++ b/pci/pci-bother.c
@@@ -1,41 -1,0 +1,42 @@@
-               pci_write16(bothers[i].bus, bothers[i].dev, bothers[i].fn, 0x0);
 +#include <pci.h>
++#include <pci-bother.h>
 +
 +struct pci_bother {
 +      int bus, dev, fn;
 +      unsigned short origstate;
 +};
 +
 +static struct pci_bother bothers[MAX_BOTHERS];
 +static int nbothers = 0;
 +
 +int pci_bother_add(pci_dev_t *dev)
 +{
 +      if (nbothers == MAX_BOTHERS)
 +              return -1;
 +      
 +      bothers[nbothers].bus = dev->bus;
 +      bothers[nbothers].dev = dev->dev;
 +      bothers[nbothers].fn = dev->fn;
 +      
 +      bothers[nbothers].origstate = pci_read16(dev->bus, dev->dev, dev->fn, 0x04);
 +      
 +      nbothers++;
 +      
 +      return 0;
 +}
 +
 +void pci_bother_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, 0x0);
 +}
 +
 +void pci_unbother_all()
 +{
 +      int i;
 +      
 +      for (i = 0; i < nbothers; i++)
++              pci_write16(bothers[i].bus, bothers[i].dev, bothers[i].fn, 0x04, bothers[i].origstate);
 +}