From: Jacob Potter Date: Thu, 2 Oct 2008 23:17:37 +0000 (-0400) Subject: rearrangements X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/3e6d61061b77ac328abf5a3283ff9870afa92258?ds=inline;hp=--cc rearrangements --- 3e6d61061b77ac328abf5a3283ff9870afa92258 diff --git a/aseg/Makefile b/aseg/Makefile index 3015bd7..dfedc2a 100644 --- a/aseg/Makefile +++ b/aseg/Makefile @@ -3,7 +3,7 @@ CFLAGS=-I../include -I../include/raw -nostdlib -nostdinc -fno-builtin -D__RAW__ OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o \ ../ich2/smram-ich2.o ../ich2/smi.o vga-overlay.o packet.o ../lib/sprintf.o \ - ../lib/doprnt.o ../pci/pci.o 3c905.o ../ich2/ich2-timer.o + ../lib/doprnt.o ../pci/pci.o ../net/net.o ../ich2/ich2-timer.o all: aseg.elf diff --git a/aseg/counter.c b/aseg/counter.c index eaeec52..868ec45 100644 --- a/aseg/counter.c +++ b/aseg/counter.c @@ -3,7 +3,7 @@ #include #include #include -#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 d45bc81..6df8d7d 100644 --- a/aseg/firstrun.c +++ b/aseg/firstrun.c @@ -5,7 +5,7 @@ #include #include "vga-overlay.h" #include -#include "3c905.h" +#include "../net/net.h" extern int _bss, _bssend; diff --git a/net/3c90x.c b/net/3c90x.c index e7b95e9..37fd34d 100644 --- 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 b89abe2..7f1932f 100644 --- a/net/net.c +++ b/net/net.c @@ -1,9 +1,11 @@ #include #include -#include "3c905.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) diff --git a/net/net.h b/net/net.h index 708069b..f10e304 100644 --- 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();