X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/d6f56afa7470cf4c29f4f9fa4bf2dd1bd0ba9193..42125f27f3d2a77966f2015c545a88c4113368ef:/net/3c90x.c diff --git a/net/3c90x.c b/net/3c90x.c index 37fd34d..711b69d 100644 --- a/net/3c90x.c +++ b/net/3c90x.c @@ -38,6 +38,7 @@ */ #include "etherboot-compat.h" +#include "net.h" #include #include #include @@ -712,8 +713,8 @@ static int a3c90x_probe(struct pci_dev * pci, void * data) /* adjust_pci_dev(pci); */ - nic->ioaddr = ioaddr & ~3; - nic->irqno = 0; + nic.ioaddr = ioaddr & ~3; + nic.irqno = 0; INF_3C90X.IOAddr = ioaddr & ~3; INF_3C90X.CurrentWindow = 255; @@ -823,7 +824,7 @@ static int a3c90x_probe(struct pci_dev * pci, void * data) /** Fill in our entry in the etherboot arp table **/ /* XXX ? for lwip? for(i=0;inode_addr[i] = (eeprom[HWADDR_OFFSET + i/2] >> (8*((i&1)^1))) & 0xff; + nic.node_addr[i] = (eeprom[HWADDR_OFFSET + i/2] >> (8*((i&1)^1))) & 0xff; */ /** Read the media options register, print a message and set default @@ -963,8 +964,8 @@ static int a3c90x_probe(struct pci_dev * pci, void * data) cmdAcknowledgeInterrupt, 0x661); /* * Set our exported functions **/ - nic->poll = a3c90x_poll; - nic->transmit = a3c90x_transmit; + nic.poll = a3c90x_poll; + nic.transmit = a3c90x_transmit; return 1; }