From 7519e35d837ff5ee4303ba6f335d0f3647aab1c3 Mon Sep 17 00:00:00 2001
From: Joshua Wise <joshua@nyus.joshuawise.com>
Date: Tue, 30 Sep 2008 05:15:31 -0400
Subject: [PATCH 01/16] Update the TODO list a bit

---
 TODO | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/TODO b/TODO
index 72accf9..7bb07b3 100644
--- a/TODO
+++ b/TODO
@@ -7,12 +7,12 @@ To do list:
     presentation
     Requested by de0u 9/11/2008
 [ ] Fix ACPI (0xB2/B3 emulation -- can we fake it?)
-[ ] PCI scan / module instantiation
+[.] PCI scan / module instantiation
 [.] Refactor smram_* 
     First cut at splitting out ICH2 code done by jdpotter 9/12/2008
     PCI scan can be done later
-[ ] Update blog as needed
-[ ] Refactor SMI management (moving it all out to an ich2/x.c would be fine
+[.] Update blog as needed
+[X] Refactor SMI management (moving it all out to an ich2/x.c would be fine
     as pass 1 -- later it can use the PCI scan)
 [ ] Synchronize headers
 [ ] Fix build system...
-- 
2.43.0


From 3b3161a197d32df3f889809e88bfe3b407b80148 Mon Sep 17 00:00:00 2001
From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Tue, 30 Sep 2008 18:00:35 -0400
Subject: [PATCH 02/16] Move 3c905 out to its own file.

---
 aseg/3c905.c    | 36 ++++++++++++++++++++++++++++++++++++
 aseg/3c905.h    |  7 +++++++
 aseg/Makefile   |  2 +-
 aseg/counter.c  |  4 ++--
 aseg/firstrun.c | 35 ++---------------------------------
 5 files changed, 48 insertions(+), 36 deletions(-)
 create mode 100644 aseg/3c905.c
 create mode 100644 aseg/3c905.h

diff --git a/aseg/3c905.c b/aseg/3c905.c
new file mode 100644
index 0000000..82ad695
--- /dev/null
+++ b/aseg/3c905.c
@@ -0,0 +1,36 @@
+#include <pci.h>
+#include <output.h>
+#include "3c905.h"
+
+static int found = 0, _bus, _dev, _fn;
+
+static int bother_3c905(pci_dev_t *dev)
+{
+	if (dev->vid == 0x10B7 || dev->did == 0x9200)
+	{
+		outputf("Found a 3c905 to bother");
+		
+		_bus = dev->bus;
+		_dev = dev->dev;
+		_fn = dev->fn;
+		found = 1;
+		
+		return 1;
+	}
+	return 0;
+}
+
+void eth_poll()
+{
+	if (!found)
+		return;
+		
+	pci_write16(_bus, _dev, _fn, 0x04, 0xFF);
+	
+	pci_write16(_bus, _dev, _fn, 0x04, 0x00);
+}
+
+void eth_init()
+{
+	pci_probe(bother_3c905);
+}
diff --git a/aseg/3c905.h b/aseg/3c905.h
new file mode 100644
index 0000000..708069b
--- /dev/null
+++ b/aseg/3c905.h
@@ -0,0 +1,7 @@
+#ifndef _3C905_H
+#define _3C905_H
+
+extern void eth_init();
+extern void eth_poll();
+
+#endif
diff --git a/aseg/Makefile b/aseg/Makefile
index c5f33f4..8283648 100644
--- a/aseg/Makefile
+++ b/aseg/Makefile
@@ -1,6 +1,6 @@
 CC=gcc
 CFLAGS=-I../include -I../include/raw -nostdlib -nostdinc -fno-builtin -D__RAW__ -Wall -Werror -pedantic -ansi -std=gnu99
-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
+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
 
 all: aseg.elf
 
diff --git a/aseg/counter.c b/aseg/counter.c
index 5c88850..eaeec52 100644
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -3,6 +3,7 @@
 #include <video_defines.h>
 #include <minilib.h>
 #include <smi.h>
+#include "3c905.h"
 #include "vga-overlay.h"
 #include "packet.h"
 
@@ -100,8 +101,7 @@ void smi_entry(void)
 	sprintf(statstr, "15-412! %08x %08x", smi_status(), counter);
 	strblit(statstr, 0, 0);
 	
-	extern void do_bother();
-	do_bother();
+	eth_poll();
 	
 	if (inl(0x840) & 0x1000)
 	{
diff --git a/aseg/firstrun.c b/aseg/firstrun.c
index 75bcccc..d45bc81 100644
--- a/aseg/firstrun.c
+++ b/aseg/firstrun.c
@@ -5,6 +5,7 @@
 #include <output.h>
 #include "vga-overlay.h"
 #include <smram.h>
+#include "3c905.h"
 
 extern int _bss, _bssend;
 
@@ -12,38 +13,6 @@ extern void timer_handler(smi_event_t ev);
 extern void kbc_handler(smi_event_t ev);
 extern void gbl_rls_handler(smi_event_t ev);
 
-static int found = 0, _bus, _dev, _fn;
-
-void do_bother()
-{
-	int bar;
-
-	if (!found)
-		return;
-		
-	pci_write16(_bus, _dev, _fn, 0x04, 0x00);
-	for (bar = 0; bar < 6; bar++)
-		pci_write32(_bus, _dev, _fn, 0x10 + bar*4, 0x1FFFFFFF);
-}
-
-int bother_3c905(pci_dev_t *dev)
-{
-	if (dev->vid == 0x10B7 || dev->did == 0x9200)
-	{
-		outputf("Found a 3c905 to bother");
-		
-		_bus = dev->bus;
-		_dev = dev->dev;
-		_fn = dev->fn;
-		found = 1;
-		
-		do_bother();
-		
-		return 1;
-	}
-	return 0;
-}
-
 void __firstrun_start() {
 	unsigned char *bp;
 	smram_state_t smram;
@@ -65,7 +34,7 @@ void __firstrun_start() {
 	/* Turn on the SMIs we want */
 	smi_disable();
 	
-	pci_probe(bother_3c905);
+	eth_init();
 	
 	smi_register_handler(SMI_EVENT_FAST_TIMER, timer_handler);
 	smi_enable_event(SMI_EVENT_FAST_TIMER);
-- 
2.43.0


From e9d467b3917e60b4523fcaa22f7bb6abaff7845d Mon Sep 17 00:00:00 2001
From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Thu, 2 Oct 2008 18:25:40 -0400
Subject: [PATCH 03/16] Add a 'pci_driver' probe function.

---
 aseg/3c905.c  |   4 +-
 include/pci.h |  20 ++++++++-
 pci/pci.c     | 111 ++++++++++++++++++++++++++++++--------------------
 3 files changed, 86 insertions(+), 49 deletions(-)

diff --git a/aseg/3c905.c b/aseg/3c905.c
index 82ad695..b89abe2 100644
--- a/aseg/3c905.c
+++ b/aseg/3c905.c
@@ -4,7 +4,7 @@
 
 static int found = 0, _bus, _dev, _fn;
 
-static int bother_3c905(pci_dev_t *dev)
+static int bother_3c905(pci_dev_t *dev, void *nutrinus)
 {
 	if (dev->vid == 0x10B7 || dev->did == 0x9200)
 	{
@@ -32,5 +32,5 @@ void eth_poll()
 
 void eth_init()
 {
-	pci_probe(bother_3c905);
+	pci_probe(bother_3c905, 0x0);
 }
diff --git a/include/pci.h b/include/pci.h
index 313b3e0..9f7e6b9 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -36,9 +36,25 @@ typedef struct pci_dev {
 	pci_bar_t bars[6];
 } pci_dev_t;
 
-typedef int (*pci_probe_fn_t)(pci_dev_t *);
+typedef int (*pci_probe_fn_t)(pci_dev_t *, void *data);
 
 void pci_bus_enum();
-int pci_probe(pci_probe_fn_t probe);
+int pci_probe(pci_probe_fn_t probe, void *data);
+
+typedef struct pci_id {
+	unsigned short vid, did;
+	const char *name, *friendlyname;
+} pci_id_t;
+
+#define PCI_ROM(a,b,c,d) {(a),(b),(c),(d)}
+
+typedef struct pci_driver {
+	const char *name;
+	pci_probe_fn_t probe;
+	pci_id_t *ids;
+	int id_count;
+} pci_driver_t;
+
+int pci_probe_driver(pci_driver_t driver);
 
 #endif
diff --git a/pci/pci.c b/pci/pci.c
index e5ab816..c7385de 100644
--- a/pci/pci.c
+++ b/pci/pci.c
@@ -1,7 +1,7 @@
 #include <pci.h>
 #include <output.h>
 
-int pci_probe(pci_probe_fn_t probe)
+int pci_probe(pci_probe_fn_t probe, void *data)
 {
 	int devsfound = 0;
 	pci_dev_t pdev;
@@ -11,62 +11,65 @@ int pci_probe(pci_probe_fn_t probe)
 	
 	for (bus = 0; bus < 0x100; bus++)
 		for (dev = 0; dev < 0x20; dev++)
-			if (pci_read32(bus, dev, 0, 0) != 0xFFFFFFFF)
-				for (fn = 0; fn < 8; fn++)
+		{
+			if (pci_read32(bus, dev, 0, 0) == 0xFFFFFFFF)
+				continue;
+			for (fn = 0; fn < 8; fn++)
+			{
+				int bar;
+				
+				if (pci_read32(bus, dev, fn, 0) == 0xFFFFFFFF)
+					continue;
+				
+				if ((fn != 0) && !(pci_read8(bus, dev, 0, 0x0E) & 0x80))
+					continue;
+				
+				pdev.bus = bus;
+				pdev.dev = dev;
+				pdev.fn = fn;
+				pdev.vid = pci_read16(bus, dev, fn, 0);
+				pdev.did = pci_read16(bus, dev, fn, 2);
+				
+				for (bar = 0; bar < 6; bar++)
 				{
-					int bar;
-					
-					if (pci_read32(bus, dev, fn, 0) == 0xFFFFFFFF)
-						continue;
-					
-					if ((fn != 0) && !(pci_read8(bus, dev, 0, 0x0E) & 0x80))
+					unsigned long bardat = pci_read32(bus, dev, fn, 0x10 + bar*4);
+					if (bardat == 0)
+					{
+						pdev.bars[bar].type = PCI_BAR_NONE;
 						continue;
-					
-					pdev.bus = bus;
-					pdev.dev = dev;
-					pdev.fn = fn;
-					pdev.vid = pci_read16(bus, dev, fn, 0);
-					pdev.did = pci_read16(bus, dev, fn, 2);
-					
-					for (bar = 0; bar < 6; bar++)
+					}
+					if (bardat & 1)
 					{
-						unsigned long bardat = pci_read32(bus, dev, fn, 0x10 + bar*4);
-						if (bardat == 0)
+						pdev.bars[bar].type = PCI_BAR_IO;
+						pdev.bars[bar].addr = bardat & ~0x3;
+					} else {
+						pdev.bars[bar].prefetchable = (bardat >> 3) & 1;
+						switch ((bardat >> 1) & 0x3)
 						{
+						case 0:
+							pdev.bars[bar].type = PCI_BAR_MEMORY32;
+							pdev.bars[bar].addr = bardat & ~0xF;
+							break;
+						case 2:
+							pdev.bars[bar].type = PCI_BAR_MEMORY64;
+							bar++;
+							pdev.bars[bar].type = PCI_BAR_NONE;
+							break;
+						default:
 							pdev.bars[bar].type = PCI_BAR_NONE;
 							continue;
 						}
-						if (bardat & 1)
-						{
-							pdev.bars[bar].type = PCI_BAR_IO;
-							pdev.bars[bar].addr = bardat & ~0x3;
-						} else {
-							pdev.bars[bar].prefetchable = (bardat >> 3) & 1;
-							switch ((bardat >> 1) & 0x3)
-							{
-							case 0:
-								pdev.bars[bar].type = PCI_BAR_MEMORY32;
-								pdev.bars[bar].addr = bardat & ~0xF;
-								break;
-							case 2:
-								pdev.bars[bar].type = PCI_BAR_MEMORY64;
-								bar++;
-								pdev.bars[bar].type = PCI_BAR_NONE;
-								break;
-							default:
-								pdev.bars[bar].type = PCI_BAR_NONE;
-								continue;
-							}
-						}
 					}
-					
-					devsfound += probe(&pdev);
 				}
+				
+				devsfound += probe(&pdev, data);
+			}
+		}
 	
 	return devsfound;
 }
 
-static int _enumfn(pci_dev_t *pdev)
+static int _enumfn(pci_dev_t *pdev, void *data)
 {
 	int bar;
 	
@@ -95,6 +98,24 @@ static int _enumfn(pci_dev_t *pdev)
 
 void pci_bus_enum()
 {
-	pci_probe(_enumfn);
+	pci_probe(_enumfn, 0x0);
 }
 
+static int _probefn(pci_dev_t *dev, void *d)
+{
+	pci_driver_t *driver = d;
+	int i;
+	
+	for (i = 0; i < driver->id_count; i++)
+		if ((dev->vid == driver->ids[i].vid) && (dev->did == driver->ids[i].did))
+		{
+			outputf("Probing PCI device: %s (%s)", driver->ids[i].name ? driver->ids[i].name : driver->name, driver->ids[i].friendlyname ? driver->ids[i].friendlyname : "no friendly name");
+			return driver->probe(dev, d);
+		}
+	return 0;
+}
+
+int pci_probe_driver(pci_driver_t driver)
+{
+	return pci_probe(_probefn, &driver);
+}
-- 
2.43.0


From 04ddaf73f0395918dec32dce6652e6c195e2d6b0 Mon Sep 17 00:00:00 2001
From: Jacob Potter <jacob@J4CBO-MBP-R7.RES.CMU.EDU>
Date: Thu, 2 Oct 2008 18:27:29 -0400
Subject: [PATCH 04/16] add timer.h

---
 include/timer.h | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 include/timer.h

diff --git a/include/timer.h b/include/timer.h
new file mode 100644
index 0000000..56054b0
--- /dev/null
+++ b/include/timer.h
@@ -0,0 +1,7 @@
+#ifndef TIMER_H
+#define TIMER_H
+
+void oneshot_start_ms(unsigned long milliseconds);
+int oneshot_running(void);
+
+#endif TIMER_H
-- 
2.43.0


From 42e26afa5bd5fa75849fb51d0e7918aa51cffda7 Mon Sep 17 00:00:00 2001
From: Jacob Potter <jacob@J4CBO-MBP-R7.RES.CMU.EDU>
Date: Thu, 2 Oct 2008 18:32:59 -0400
Subject: [PATCH 05/16] second arg of memcpy should be const

---
 include/minilib.h | 2 +-
 lib/minilib.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/minilib.h b/include/minilib.h
index aa8bf73..3704bca 100644
--- a/include/minilib.h
+++ b/include/minilib.h
@@ -3,7 +3,7 @@
 
 #include <stdarg.h>
 
-extern void memcpy(void *dest, void *src, int bytes);
+extern void memcpy(void *dest, const void *src, int bytes);
 extern void memmove(void *dest, void *src, int bytes);
 extern int memcmp(const char *a2, const char *a1, int bytes);
 extern int strcmp(const char *a2, const char *a1);
diff --git a/lib/minilib.c b/lib/minilib.c
index 7baca59..48d7948 100644
--- a/lib/minilib.c
+++ b/lib/minilib.c
@@ -1,7 +1,7 @@
 #include "console.h"
 #include <minilib.h>
 
-void memcpy(void *dest, void *src, int bytes)
+void memcpy(void *dest, const void *src, int bytes)
 {
 	char * cdest = dest;
 	char * csrc = src;
-- 
2.43.0


From ee681ad4b4f2ace24beb4d401d425573b450bbd7 Mon Sep 17 00:00:00 2001
From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Thu, 2 Oct 2008 18:34:06 -0400
Subject: [PATCH 06/16] needs moar const

---
 lib/minilib.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/minilib.c b/lib/minilib.c
index 48d7948..0407d3f 100644
--- a/lib/minilib.c
+++ b/lib/minilib.c
@@ -3,8 +3,8 @@
 
 void memcpy(void *dest, const void *src, int bytes)
 {
-	char * cdest = dest;
-	char * csrc = src;
+	char *cdest = dest;
+	const char *csrc = src;
 	while (bytes--)
 		*(cdest++) = *(csrc++);
 }
-- 
2.43.0


From 644af6b41a9ecbefecb70ec4cca307974e1300c4 Mon Sep 17 00:00:00 2001
From: Jacob Potter <jacob@J4CBO-MBP-R7.RES.CMU.EDU>
Date: Thu, 2 Oct 2008 18:43:32 -0400
Subject: [PATCH 07/16] add htons

---
 include/minilib.h | 1 +
 lib/minilib.c     | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/include/minilib.h b/include/minilib.h
index 3704bca..90abfc9 100644
--- a/include/minilib.h
+++ b/include/minilib.h
@@ -16,5 +16,6 @@ extern int vsprintf(char *s, const char *fmt, va_list args);
 extern int vsnprintf(char *s, int size, const char *fmt, va_list args);
 extern int sprintf(char *s, const char *fmt, ...);
 extern int snprintf(char *s, int size, const char *fmt, ...);
+extern unsigned short htons(unsigned short in);
 
 #endif
diff --git a/lib/minilib.c b/lib/minilib.c
index 48d7948..0e5786e 100644
--- a/lib/minilib.c
+++ b/lib/minilib.c
@@ -81,3 +81,8 @@ void puthex(unsigned long l)
 	tohex(d, l);
 	puts(d);
 }
+
+unsigned short htons(unsigned short in)
+{
+	return (in >> 8) | (in << 8);
+}
-- 
2.43.0


From 20ef12080950c328702f590b53c50e328a03b971 Mon Sep 17 00:00:00 2001
From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Thu, 2 Oct 2008 18:49:42 -0400
Subject: [PATCH 08/16] Add ich2-timer.

---
 aseg/Makefile        |  5 ++++-
 ich2/ich2-timer.c    | 39 +++++++++++++++++++++++++++++++++++++++
 include/reg-82801b.h |  3 +++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 ich2/ich2-timer.c

diff --git a/aseg/Makefile b/aseg/Makefile
index 8283648..3015bd7 100644
--- a/aseg/Makefile
+++ b/aseg/Makefile
@@ -1,6 +1,9 @@
 CC=gcc
 CFLAGS=-I../include -I../include/raw -nostdlib -nostdinc -fno-builtin -D__RAW__ -Wall -Werror -pedantic -ansi -std=gnu99
-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
+
+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
 
 all: aseg.elf
 
diff --git a/ich2/ich2-timer.c b/ich2/ich2-timer.c
new file mode 100644
index 0000000..b98e381
--- /dev/null
+++ b/ich2/ich2-timer.c
@@ -0,0 +1,39 @@
+#include <pci.h>
+#include <io.h>
+#include <reg-82801b.h>
+
+static uint16_t _get_PMBASE()
+{
+	static long pmbase = -1;
+	
+	if (pmbase == -1)	/* Memoize it so that we don't have to hit PCI so often. */
+		pmbase = pci_read32(ICH2_LPC_BUS, ICH2_LPC_DEV, ICH2_LPC_FN, ICH2_LPC_PCI_PMBASE) & ICH2_PMBASE_MASK;
+	
+	return pmbase;
+}
+
+static unsigned long _curtmr()
+{
+	return inl(_get_PMBASE + ICH2_PMBASE_PM1_TMR) & 0xFFFFFF;
+}
+
+/* This is kind of a heuristic, since we can't get interrupts. */
+static unsigned long starttmr = 0, endtmr = 0;
+
+void oneshot_start_ms(unsigned long milliseconds)
+{
+	starttmr = _curtmr();
+	endtmr = (starttmr + milliseconds*(ICH2_PM1_TMR_FREQ/1000)) % 0xFFFFFF;
+}
+
+int oneshot_running(void)
+{
+	if (endtmr == 0 && starttmr == 0)
+		return 0;
+	if ((endtmr < starttmr) && ((_curtmr() > starttmr) || (_curtmr() < endtmr)))
+		return 1;
+	else if ((_curtmr() < endtmr) && (_curtmr() > starttmr))
+		return 1;
+	endtmr = starttmr = 0;
+	return 0;
+}
diff --git a/include/reg-82801b.h b/include/reg-82801b.h
index a60c458..4e116c2 100644
--- a/include/reg-82801b.h
+++ b/include/reg-82801b.h
@@ -44,6 +44,9 @@
 #define ICH2_PM1_EN_GBL_EN		(1 << 5)
 #define ICH2_PM1_EN_TMROF_EN		(1 << 0
 
+#define ICH2_PMBASE_PM1_TMR		0x08
+#define ICH2_PM1_TMR_FREQ		3579545		/* This will be the encryption key for a question on the test. */
+
 #define ICH2_PMBASE_SMI_EN		0x30
 #define ICH2_SMI_EN_PERIODIC_EN		(1 << 14)
 #define ICH2_SMI_EN_TCO_EN		(1 << 13)
-- 
2.43.0


From 748534f490f9da36041ad8e2ecc046c6a8238d81 Mon Sep 17 00:00:00 2001
From: Jacob Potter <jacob@J4CBO-MBP-R7.RES.CMU.EDU>
Date: Thu, 2 Oct 2008 19:01:41 -0400
Subject: [PATCH 09/16] add net

---
 net/3c90x.c            | 1006 ++++++++++++++++++++++++++++++++++++++++
 net/etherboot-compat.h |   18 +
 2 files changed, 1024 insertions(+)
 create mode 100644 net/3c90x.c
 create mode 100644 net/etherboot-compat.h

diff --git a/net/3c90x.c b/net/3c90x.c
new file mode 100644
index 0000000..e7b95e9
--- /dev/null
+++ b/net/3c90x.c
@@ -0,0 +1,1006 @@
+/*
+ * 3c90x.c -- This file implements the 3c90x driver for etherboot.  Written
+ * by Greg Beeley, Greg.Beeley@LightSys.org.  Modified by Steve Smith,
+ * Steve.Smith@Juno.Com. Alignment bug fix Neil Newell (nn@icenoir.net).
+ *
+ * This program Copyright (C) 1999 LightSys Technology Services, Inc.
+ * Portions Copyright (C) 1999 Steve Smith
+ *
+ * This program may be re-distributed in source or binary form, modified,
+ * sold, or copied for any purpose, provided that the above copyright message
+ * and this text are included with all source copies or derivative works, and
+ * provided that the above copyright message and this text are included in the
+ * documentation of any binary-only distributions.  This program is distributed
+ * WITHOUT ANY WARRANTY, without even the warranty of FITNESS FOR A PARTICULAR
+ * PURPOSE or MERCHANTABILITY.  Please read the associated documentation
+ * "3c90x.txt" before compiling and using this driver.
+ *
+ * --------
+ *
+ * Program written with the assistance of the 3com documentation for
+ * the 3c905B-TX card, as well as with some assistance from the 3c59x
+ * driver Donald Becker wrote for the Linux kernel, and with some assistance
+ * from the remainder of the Etherboot distribution.
+ *
+ * REVISION HISTORY:
+ *
+ * v0.10	1-26-1998	GRB	Initial implementation.
+ * v0.90	1-27-1998	GRB	System works.
+ * v1.00pre1	2-11-1998	GRB	Got prom boot issue fixed.
+ * v2.0		9-24-1999	SCS	Modified for 3c905 (from 3c905b code)
+ *					Re-wrote poll and transmit for
+ *					better error recovery and heavy
+ *					network traffic operation
+ * v2.01    5-26-2003 NN Fixed driver alignment issue which
+ *                  caused system lockups if driver structures
+ *                  not 8-byte aligned.
+ *
+ */
+
+#include "etherboot-compat.h"
+#include <timer.h>
+#include <io.h>
+#include <pci.h>
+#include <minilib.h>
+#include <output.h>
+
+#define	XCVR_MAGIC	(0x5A00)
+/** any single transmission fails after 16 collisions or other errors
+ ** this is the number of times to retry the transmission -- this should
+ ** be plenty
+ **/
+#define	XMIT_RETRIES	250
+
+/*** Register definitions for the 3c905 ***/
+enum Registers
+    {
+    regPowerMgmtCtrl_w = 0x7c,        /** 905B Revision Only                 **/
+    regUpMaxBurst_w = 0x7a,           /** 905B Revision Only                 **/
+    regDnMaxBurst_w = 0x78,           /** 905B Revision Only                 **/
+    regDebugControl_w = 0x74,         /** 905B Revision Only                 **/
+    regDebugData_l = 0x70,            /** 905B Revision Only                 **/
+    regRealTimeCnt_l = 0x40,          /** Universal                          **/
+    regUpBurstThresh_b = 0x3e,        /** 905B Revision Only                 **/
+    regUpPoll_b = 0x3d,               /** 905B Revision Only                 **/
+    regUpPriorityThresh_b = 0x3c,     /** 905B Revision Only                 **/
+    regUpListPtr_l = 0x38,            /** Universal                          **/
+    regCountdown_w = 0x36,            /** Universal                          **/
+    regFreeTimer_w = 0x34,            /** Universal                          **/
+    regUpPktStatus_l = 0x30,          /** Universal with Exception, pg 130   **/
+    regTxFreeThresh_b = 0x2f,         /** 90X Revision Only                  **/
+    regDnPoll_b = 0x2d,               /** 905B Revision Only                 **/
+    regDnPriorityThresh_b = 0x2c,     /** 905B Revision Only                 **/
+    regDnBurstThresh_b = 0x2a,        /** 905B Revision Only                 **/
+    regDnListPtr_l = 0x24,            /** Universal with Exception, pg 107   **/
+    regDmaCtrl_l = 0x20,              /** Universal with Exception, pg 106   **/
+                                      /**                                    **/
+    regIntStatusAuto_w = 0x1e,        /** 905B Revision Only                 **/
+    regTxStatus_b = 0x1b,             /** Universal with Exception, pg 113   **/
+    regTimer_b = 0x1a,                /** Universal                          **/
+    regTxPktId_b = 0x18,              /** 905B Revision Only                 **/
+    regCommandIntStatus_w = 0x0e,     /** Universal (Command Variations)     **/
+    };
+
+/** following are windowed registers **/
+enum Registers7
+    {
+    regPowerMgmtEvent_7_w = 0x0c,     /** 905B Revision Only                 **/
+    regVlanEtherType_7_w = 0x04,      /** 905B Revision Only                 **/
+    regVlanMask_7_w = 0x00,           /** 905B Revision Only                 **/
+    };
+
+enum Registers6
+    {
+    regBytesXmittedOk_6_w = 0x0c,     /** Universal                          **/
+    regBytesRcvdOk_6_w = 0x0a,        /** Universal                          **/
+    regUpperFramesOk_6_b = 0x09,      /** Universal                          **/
+    regFramesDeferred_6_b = 0x08,     /** Universal                          **/
+    regFramesRecdOk_6_b = 0x07,       /** Universal with Exceptions, pg 142  **/
+    regFramesXmittedOk_6_b = 0x06,    /** Universal                          **/
+    regRxOverruns_6_b = 0x05,         /** Universal                          **/
+    regLateCollisions_6_b = 0x04,     /** Universal                          **/
+    regSingleCollisions_6_b = 0x03,   /** Universal                          **/
+    regMultipleCollisions_6_b = 0x02, /** Universal                          **/
+    regSqeErrors_6_b = 0x01,          /** Universal                          **/
+    regCarrierLost_6_b = 0x00,        /** Universal                          **/
+    };
+
+enum Registers5
+    {
+    regIndicationEnable_5_w = 0x0c,   /** Universal                          **/
+    regInterruptEnable_5_w = 0x0a,    /** Universal                          **/
+    regTxReclaimThresh_5_b = 0x09,    /** 905B Revision Only                 **/
+    regRxFilter_5_b = 0x08,           /** Universal                          **/
+    regRxEarlyThresh_5_w = 0x06,      /** Universal                          **/
+    regTxStartThresh_5_w = 0x00,      /** Universal                          **/
+    };
+
+enum Registers4
+    {
+    regUpperBytesOk_4_b = 0x0d,       /** Universal                          **/
+    regBadSSD_4_b = 0x0c,             /** Universal                          **/
+    regMediaStatus_4_w = 0x0a,        /** Universal with Exceptions, pg 201  **/
+    regPhysicalMgmt_4_w = 0x08,       /** Universal                          **/
+    regNetworkDiagnostic_4_w = 0x06,  /** Universal with Exceptions, pg 203  **/
+    regFifoDiagnostic_4_w = 0x04,     /** Universal with Exceptions, pg 196  **/
+    regVcoDiagnostic_4_w = 0x02,      /** Undocumented?                      **/
+    };
+
+enum Registers3
+    {
+    regTxFree_3_w = 0x0c,             /** Universal                          **/
+    regRxFree_3_w = 0x0a,             /** Universal with Exceptions, pg 125  **/
+    regResetMediaOptions_3_w = 0x08,  /** Media Options on B Revision,       **/
+                                      /** Reset Options on Non-B Revision    **/
+    regMacControl_3_w = 0x06,         /** Universal with Exceptions, pg 199  **/
+    regMaxPktSize_3_w = 0x04,         /** 905B Revision Only                 **/
+    regInternalConfig_3_l = 0x00,     /** Universal, different bit           **/
+                                      /** definitions, pg 59                 **/
+    };
+
+enum Registers2
+    {
+    regResetOptions_2_w = 0x0c,       /** 905B Revision Only                 **/
+    regStationMask_2_3w = 0x06,       /** Universal with Exceptions, pg 127  **/
+    regStationAddress_2_3w = 0x00,    /** Universal with Exceptions, pg 127  **/
+    };
+
+enum Registers1
+    {
+    regRxStatus_1_w = 0x0a,           /** 90X Revision Only, Pg 126          **/
+    };
+
+enum Registers0
+    {
+    regEepromData_0_w = 0x0c,         /** Universal                          **/
+    regEepromCommand_0_w = 0x0a,      /** Universal                          **/
+    regBiosRomData_0_b = 0x08,        /** 905B Revision Only                 **/
+    regBiosRomAddr_0_l = 0x04,        /** 905B Revision Only                 **/
+    };
+
+
+/*** The names for the eight register windows ***/
+enum Windows
+    {
+    winPowerVlan7 = 0x07,
+    winStatistics6 = 0x06,
+    winTxRxControl5 = 0x05,
+    winDiagnostics4 = 0x04,
+    winTxRxOptions3 = 0x03,
+    winAddressing2 = 0x02,
+    winUnused1 = 0x01,
+    winEepromBios0 = 0x00,
+    };
+
+
+/*** Command definitions for the 3c90X ***/
+enum Commands
+    {
+    cmdGlobalReset = 0x00,             /** Universal with Exceptions, pg 151 **/
+    cmdSelectRegisterWindow = 0x01,    /** Universal                         **/
+    cmdEnableDcConverter = 0x02,       /**                                   **/
+    cmdRxDisable = 0x03,               /**                                   **/
+    cmdRxEnable = 0x04,                /** Universal                         **/
+    cmdRxReset = 0x05,                 /** Universal                         **/
+    cmdStallCtl = 0x06,                /** Universal                         **/
+    cmdTxEnable = 0x09,                /** Universal                         **/
+    cmdTxDisable = 0x0A,               /**                                   **/
+    cmdTxReset = 0x0B,                 /** Universal                         **/
+    cmdRequestInterrupt = 0x0C,        /**                                   **/
+    cmdAcknowledgeInterrupt = 0x0D,    /** Universal                         **/
+    cmdSetInterruptEnable = 0x0E,      /** Universal                         **/
+    cmdSetIndicationEnable = 0x0F,     /** Universal                         **/
+    cmdSetRxFilter = 0x10,             /** Universal                         **/
+    cmdSetRxEarlyThresh = 0x11,        /**                                   **/
+    cmdSetTxStartThresh = 0x13,        /**                                   **/
+    cmdStatisticsEnable = 0x15,        /**                                   **/
+    cmdStatisticsDisable = 0x16,       /**                                   **/
+    cmdDisableDcConverter = 0x17,      /**                                   **/
+    cmdSetTxReclaimThresh = 0x18,      /**                                   **/
+    cmdSetHashFilterBit = 0x19,        /**                                   **/
+    };
+
+
+/*** Values for int status register bitmask **/
+#define	INT_INTERRUPTLATCH	(1<<0)
+#define INT_HOSTERROR		(1<<1)
+#define INT_TXCOMPLETE		(1<<2)
+#define INT_RXCOMPLETE		(1<<4)
+#define INT_RXEARLY		(1<<5)
+#define INT_INTREQUESTED	(1<<6)
+#define INT_UPDATESTATS		(1<<7)
+#define INT_LINKEVENT		(1<<8)
+#define INT_DNCOMPLETE		(1<<9)
+#define INT_UPCOMPLETE		(1<<10)
+#define INT_CMDINPROGRESS	(1<<12)
+#define INT_WINDOWNUMBER	(7<<13)
+
+
+/*** TX descriptor ***/
+typedef struct
+    {
+    unsigned int	DnNextPtr;
+    unsigned int	FrameStartHeader;
+    unsigned int	HdrAddr;
+    unsigned int	HdrLength;
+    unsigned int	DataAddr;
+    unsigned int	DataLength;
+    }
+    TXD __attribute__ ((aligned(8))); /* 64-bit aligned for bus mastering */
+
+/*** RX descriptor ***/
+typedef struct
+    {
+    unsigned int	UpNextPtr;
+    unsigned int	UpPktStatus;
+    unsigned int	DataAddr;
+    unsigned int	DataLength;
+    }
+    RXD __attribute__ ((aligned(8))); /* 64-bit aligned for bus mastering */
+
+/*** Global variables ***/
+static struct
+    {
+    unsigned int	is3c556;
+    unsigned char	isBrev;
+    unsigned char	CurrentWindow;
+    unsigned int	IOAddr;
+    unsigned char	HWAddr[ETH_ALEN];
+    TXD			TransmitDPD;
+    RXD			ReceiveUPD;
+    }
+    INF_3C90X;
+
+
+/*** a3c90x_internal_IssueCommand: sends a command to the 3c90x card
+ ***/
+static int
+a3c90x_internal_IssueCommand(int ioaddr, int cmd, int param)
+    {
+    unsigned int val;
+
+	/** Build the cmd. **/
+	val = cmd;
+	val <<= 11;
+	val |= param;
+
+	/** Send the cmd to the cmd register **/
+	outw(val, ioaddr + regCommandIntStatus_w);
+
+	/** Wait for the cmd to complete, if necessary **/
+	while (inw(ioaddr + regCommandIntStatus_w) & INT_CMDINPROGRESS);
+
+    return 0;
+    }
+
+
+/*** a3c90x_internal_SetWindow: selects a register window set.
+ ***/
+static int
+a3c90x_internal_SetWindow(int ioaddr, int window)
+    {
+
+	/** Window already as set? **/
+	if (INF_3C90X.CurrentWindow == window) return 0;
+
+	/** Issue the window command. **/
+	a3c90x_internal_IssueCommand(ioaddr, cmdSelectRegisterWindow, window);
+	INF_3C90X.CurrentWindow = window;
+
+    return 0;
+    }
+
+
+/*** a3c90x_internal_ReadEeprom - read data from the serial eeprom.
+ ***/
+static unsigned short
+a3c90x_internal_ReadEeprom(int ioaddr, int address)
+    {
+    unsigned short val;
+
+	/** Select correct window **/
+        a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winEepromBios0);
+
+	/** Make sure the eeprom isn't busy **/
+	while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
+
+	/** Read the value. **/
+	if (INF_3C90X.is3c556)
+	 {
+	     outw(address + (0x230), ioaddr + regEepromCommand_0_w);
+	 }
+	else
+	 {
+	     outw(address + ((0x02)<<6), ioaddr + regEepromCommand_0_w);
+	 }
+ 
+	while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
+	val = inw(ioaddr + regEepromData_0_w);
+
+    return val;
+    }
+
+
+#ifdef	CFG_3C90X_BOOTROM_FIX
+/*** a3c90x_internal_WriteEepromWord - write a physical word of
+ *** data to the onboard serial eeprom (not the BIOS prom, but the
+ *** nvram in the card that stores, among other things, the MAC
+ *** address).
+ ***/
+static int
+a3c90x_internal_WriteEepromWord(int ioaddr, int address, unsigned short value)
+    {
+	/** Select register window **/
+        a3c90x_internal_SetWindow(ioaddr, winEepromBios0);
+
+	/** Verify Eeprom not busy **/
+	while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
+
+	/** Issue WriteEnable, and wait for completion. **/
+	outw(0x30, ioaddr + regEepromCommand_0_w);
+	while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
+
+	/** Issue EraseRegister, and wait for completion. **/
+	outw(address + ((0x03)<<6), ioaddr + regEepromCommand_0_w);
+	while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
+
+	/** Send the new data to the eeprom, and wait for completion. **/
+	outw(value, ioaddr + regEepromData_0_w);
+	outw(0x30, ioaddr + regEepromCommand_0_w);
+	while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
+
+	/** Burn the new data into the eeprom, and wait for completion. **/
+	outw(address + ((0x01)<<6), ioaddr + regEepromCommand_0_w);
+	while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
+
+    return 0;
+    }
+#endif
+
+#ifdef	CFG_3C90X_BOOTROM_FIX
+/*** a3c90x_internal_WriteEeprom - write data to the serial eeprom,
+ *** and re-compute the eeprom checksum.
+ ***/
+static int
+a3c90x_internal_WriteEeprom(int ioaddr, int address, unsigned short value)
+    {
+    int cksum = 0,v;
+    int i;
+    int maxAddress, cksumAddress;
+
+	if (INF_3C90X.isBrev)
+	    {
+	    maxAddress=0x1f;
+	    cksumAddress=0x20;
+	    }
+	else
+	    {
+	    maxAddress=0x16;
+	    cksumAddress=0x17;
+	    }
+
+	/** Write the value. **/
+	if (a3c90x_internal_WriteEepromWord(ioaddr, address, value) == -1)
+	    return -1;
+
+	/** Recompute the checksum. **/
+	for(i=0;i<=maxAddress;i++)
+	    {
+	    v = a3c90x_internal_ReadEeprom(ioaddr, i);
+	    cksum ^= (v & 0xFF);
+	    cksum ^= ((v>>8) & 0xFF);
+	    }
+	/** Write the checksum to the location in the eeprom **/
+	if (a3c90x_internal_WriteEepromWord(ioaddr, cksumAddress, cksum) == -1)
+	    return -1;
+
+    return 0;
+    }
+#endif
+
+/*** a3c90x_reset: exported function that resets the card to its default
+ *** state.  This is so the Linux driver can re-set the card up the way
+ *** it wants to.  If CFG_3C90X_PRESERVE_XCVR is defined, then the reset will
+ *** not alter the selected transceiver that we used to download the boot
+ *** image.
+ ***/
+static void a3c90x_reset(void)
+    {
+#ifdef	CFG_3C90X_PRESERVE_XCVR
+    int cfg;
+    /** Read the current InternalConfig value. **/
+    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winTxRxOptions3);
+    cfg = inl(INF_3C90X.IOAddr + regInternalConfig_3_l);
+#endif
+
+    /** Send the reset command to the card **/
+    outputf("Issuing RESET:");
+    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdGlobalReset, 0);
+
+    /** wait for reset command to complete **/
+    while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS);
+
+    /** global reset command resets station mask, non-B revision cards
+     ** require explicit reset of values
+     **/
+    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winAddressing2);
+    outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+0);
+    outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+2);
+    outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+4);
+
+#ifdef	CFG_3C90X_PRESERVE_XCVR
+    /** Re-set the original InternalConfig value from before reset **/
+    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winTxRxOptions3);
+    outl(cfg, INF_3C90X.IOAddr + regInternalConfig_3_l);
+
+    /** enable DC converter for 10-Base-T **/
+    if ((cfg&0x0300) == 0x0300)
+	{
+	a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdEnableDcConverter, 0);
+	}
+#endif
+
+    /** Issue transmit reset, wait for command completion **/
+    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxReset, 0);
+    while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS)
+	;
+    if (! INF_3C90X.isBrev)
+	outb(0x01, INF_3C90X.IOAddr + regTxFreeThresh_b);
+    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxEnable, 0);
+
+    /**
+     ** reset of the receiver on B-revision cards re-negotiates the link
+     ** takes several seconds (a computer eternity)
+     **/
+    if (INF_3C90X.isBrev)
+	a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxReset, 0x04);
+    else
+	a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxReset, 0x00);
+    while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS);
+	;
+    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxEnable, 0);
+
+    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr,
+                                 cmdSetInterruptEnable, 0);
+    /** enable rxComplete and txComplete **/
+    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr,
+                                 cmdSetIndicationEnable, 0x0014);
+    /** acknowledge any pending status flags **/
+    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr,
+                                 cmdAcknowledgeInterrupt, 0x661);
+
+    return;
+    }
+
+
+
+/*** a3c90x_transmit: exported function that transmits a packet.  Does not
+ *** return any particular status.  Parameters are:
+ *** dest_addr[6] - destination address, ethernet;
+ *** proto - protocol type (ARP, IP, etc);
+ *** size - size of the non-header part of the packet that needs transmitted;
+ *** pkt - the pointer to the packet data itself.
+ ***/
+static void
+a3c90x_transmit(const char *dest_addr, unsigned int proto,
+                unsigned int size, const char *pkt)
+    {
+
+    struct eth_hdr
+	{
+	unsigned char dst_addr[ETH_ALEN];
+	unsigned char src_addr[ETH_ALEN];
+	unsigned short type;
+	} hdr;
+
+    unsigned char status;
+    unsigned i, retries;
+
+    for (retries=0; retries < XMIT_RETRIES ; retries++)
+	{
+	/** Stall the download engine **/
+	a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdStallCtl, 2);
+
+	/** Make sure the card is not waiting on us **/
+	inw(INF_3C90X.IOAddr + regCommandIntStatus_w);
+	inw(INF_3C90X.IOAddr + regCommandIntStatus_w);
+
+	while (inw(INF_3C90X.IOAddr+regCommandIntStatus_w) &
+	       INT_CMDINPROGRESS)
+	    ;
+
+	/** Set the ethernet packet type **/
+	hdr.type = htons(proto);
+
+	/** Copy the destination address **/
+	memcpy(hdr.dst_addr, dest_addr, ETH_ALEN);
+
+	/** Copy our MAC address **/
+	memcpy(hdr.src_addr, INF_3C90X.HWAddr, ETH_ALEN);
+
+	/** Setup the DPD (download descriptor) **/
+	INF_3C90X.TransmitDPD.DnNextPtr = 0;
+	/** set notification for transmission completion (bit 15) **/
+	INF_3C90X.TransmitDPD.FrameStartHeader = (size + sizeof(hdr)) | 0x8000;
+	INF_3C90X.TransmitDPD.HdrAddr = virt_to_bus(&hdr);
+	INF_3C90X.TransmitDPD.HdrLength = sizeof(hdr);
+	INF_3C90X.TransmitDPD.DataAddr = virt_to_bus(pkt);
+	INF_3C90X.TransmitDPD.DataLength = size + (1<<31);
+
+	/** Send the packet **/
+	outl(virt_to_bus(&(INF_3C90X.TransmitDPD)),
+	     INF_3C90X.IOAddr + regDnListPtr_l);
+
+	/** End Stall and Wait for upload to complete. **/
+	a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdStallCtl, 3);
+	while(inl(INF_3C90X.IOAddr + regDnListPtr_l) != 0)
+	    ;
+
+	/** Wait for NIC Transmit to Complete **/
+	oneshot_start_ms(10);	/* Give it 10 ms */
+	while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w)&0x0004) &&
+		oneshot_running())
+		;
+
+	if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w)&0x0004))
+	    {
+	    outputf("3C90X: Tx Timeout");
+	    continue;
+	    }
+
+	status = inb(INF_3C90X.IOAddr + regTxStatus_b);
+
+	/** acknowledge transmit interrupt by writing status **/
+	outb(0x00, INF_3C90X.IOAddr + regTxStatus_b);
+
+	/** successful completion (sans "interrupt Requested" bit) **/
+	if ((status & 0xbf) == 0x80)
+	    return;
+
+	   outputf("3C90X: Status (%hhX)", status);
+	/** check error codes **/
+	if (status & 0x02)
+	    {
+	    outputf("3C90X: Tx Reclaim Error (%hhX)", status);
+	    a3c90x_reset();
+	    }
+	else if (status & 0x04)
+	    {
+	    outputf("3C90X: Tx Status Overflow (%hhX)", status);
+	    for (i=0; i<32; i++)
+		outb(0x00, INF_3C90X.IOAddr + regTxStatus_b);
+	    /** must re-enable after max collisions before re-issuing tx **/
+	    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxEnable, 0);
+	    }
+	else if (status & 0x08)
+	    {
+	    outputf("3C90X: Tx Max Collisions (%hhX)", status);
+	    /** must re-enable after max collisions before re-issuing tx **/
+	    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxEnable, 0);
+	    }
+	else if (status & 0x10)
+	    {
+	    outputf("3C90X: Tx Underrun (%hhX)", status);
+	    a3c90x_reset();
+	    }
+	else if (status & 0x20)
+	    {
+	    outputf("3C90X: Tx Jabber (%hhX)", status);
+	    a3c90x_reset();
+	    }
+	else if ((status & 0x80) != 0x80)
+	    {
+	    outputf("3C90X: Internal Error - Incomplete Transmission (%hhX)",
+	           status);
+	    a3c90x_reset();
+	    }
+	}
+
+    /** failed after RETRY attempts **/
+    outputf("Failed to send after %d retries", retries);
+    return;
+
+    }
+
+
+
+/*** a3c90x_poll: exported routine that waits for a certain length of time
+ *** for a packet, and if it sees none, returns 0.  This routine should
+ *** copy the packet to nic->packet if it gets a packet and set the size
+ *** in nic->packetlen.  Return 1 if a packet was found.
+ ***/
+static int
+a3c90x_poll(struct nic *nic, int retrieve)
+    {
+    int i, errcode;
+
+    if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w)&0x0010))
+	{
+	return 0;
+	}
+
+    if ( ! retrieve ) return 1;
+
+    /** we don't need to acknowledge rxComplete -- the upload engine
+     ** does it for us.
+     **/
+
+    /** Build the up-load descriptor **/
+    INF_3C90X.ReceiveUPD.UpNextPtr = 0;
+    INF_3C90X.ReceiveUPD.UpPktStatus = 0;
+    INF_3C90X.ReceiveUPD.DataAddr = virt_to_bus(nic->packet);
+    INF_3C90X.ReceiveUPD.DataLength = 1536 + (1<<31);
+
+    /** Submit the upload descriptor to the NIC **/
+    outl(virt_to_bus(&(INF_3C90X.ReceiveUPD)),
+         INF_3C90X.IOAddr + regUpListPtr_l);
+
+    /** Wait for upload completion (upComplete(15) or upError (14)) **/
+    for(i=0;i<40000;i++);
+    while((INF_3C90X.ReceiveUPD.UpPktStatus & ((1<<14) | (1<<15))) == 0)
+	for(i=0;i<40000;i++);
+
+    /** Check for Error (else we have good packet) **/
+    if (INF_3C90X.ReceiveUPD.UpPktStatus & (1<<14))
+	{
+	errcode = INF_3C90X.ReceiveUPD.UpPktStatus;
+	if (errcode & (1<<16))
+	    outputf("3C90X: Rx Overrun (%hX)",errcode>>16);
+	else if (errcode & (1<<17))
+	    outputf("3C90X: Runt Frame (%hX)",errcode>>16);
+	else if (errcode & (1<<18))
+	    outputf("3C90X: Alignment Error (%hX)",errcode>>16);
+	else if (errcode & (1<<19))
+	    outputf("3C90X: CRC Error (%hX)",errcode>>16);
+	else if (errcode & (1<<20))
+	    outputf("3C90X: Oversized Frame (%hX)",errcode>>16);
+	else
+	    outputf("3C90X: Packet error (%hX)",errcode>>16);
+	return 0;
+	}
+
+    /** Ok, got packet.  Set length in nic->packetlen. **/
+    nic->packetlen = (INF_3C90X.ReceiveUPD.UpPktStatus & 0x1FFF);
+
+    return 1;
+    }
+
+
+
+/*** a3c90x_disable: exported routine to disable the card.  What's this for?
+ *** the eepro100.c driver didn't have one, so I just left this one empty too.
+ *** Ideas anyone?
+ *** Must turn off receiver at least so stray packets will not corrupt memory
+ *** [Ken]
+ ***/
+void a3c90x_disable(struct dev *dev)
+{
+	/* reset and disable merge */
+	a3c90x_reset();
+	/* Disable the receiver and transmitter. */
+	outw(cmdRxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w);
+	outw(cmdTxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w);
+}
+
+
+/*** a3c90x_probe: exported routine to probe for the 3c905 card and perform
+ *** initialization.  If this routine is called, the pci functions did find the
+ *** card.  We just have to init it here.
+ ***/
+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;
+    unsigned short eeprom[0x21];
+    unsigned int cfg;
+    unsigned int mopt;
+    unsigned int mstat;
+    unsigned short linktype;
+#define	HWADDR_OFFSET	10
+
+    unsigned long ioaddr = 0;
+    for (i = 0; i < 6; i++) {
+        if (pci->bars[i].type == PCI_BAR_IO) {
+            ioaddr = pci->bars[i].addr;
+            break;
+        }
+    }
+
+    if (ioaddr == 0)
+          return 0;
+/*
+    adjust_pci_dev(pci);
+*/
+    nic->ioaddr = ioaddr & ~3;
+    nic->irqno = 0;
+
+    INF_3C90X.IOAddr = ioaddr & ~3;
+    INF_3C90X.CurrentWindow = 255;
+    switch (a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, 0x03))
+	{
+	case 0x9000: /** 10 Base TPO             **/
+	case 0x9001: /** 10/100 T4               **/
+	case 0x9050: /** 10/100 TPO              **/
+	case 0x9051: /** 10 Base Combo           **/
+		INF_3C90X.isBrev = 0;
+		break;
+
+	case 0x9004: /** 10 Base TPO             **/
+	case 0x9005: /** 10 Base Combo           **/
+	case 0x9006: /** 10 Base TPO and Base2   **/
+	case 0x900A: /** 10 Base FL              **/
+	case 0x9055: /** 10/100 TPO              **/
+	case 0x9056: /** 10/100 T4               **/
+	case 0x905A: /** 10 Base FX              **/
+	default:
+		INF_3C90X.isBrev = 1;
+		break;
+	}
+
+    /** Load the EEPROM contents **/
+    if (INF_3C90X.isBrev)
+	{
+	for(i=0;i<=0x20;i++)
+	    {
+	    eeprom[i] = a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, i);
+	    }
+
+#ifdef	CFG_3C90X_BOOTROM_FIX
+	/** Set xcvrSelect in InternalConfig in eeprom. **/
+	/* only necessary for 3c905b revision cards with boot PROM bug!!! */
+	a3c90x_internal_WriteEeprom(INF_3C90X.IOAddr, 0x13, 0x0160);
+#endif
+
+#ifdef	CFG_3C90X_XCVR
+	if (CFG_3C90X_XCVR == 255)
+	    {
+	    /** Clear the LanWorks register **/
+	    a3c90x_internal_WriteEeprom(INF_3C90X.IOAddr, 0x16, 0);
+	    }
+	else
+	    {
+	    /** Set the selected permanent-xcvrSelect in the
+	     ** LanWorks register
+	     **/
+	    a3c90x_internal_WriteEeprom(INF_3C90X.IOAddr, 0x16,
+	                    XCVR_MAGIC + ((CFG_3C90X_XCVR) & 0x000F));
+	    }
+#endif
+	}
+    else
+	{
+	for(i=0;i<=0x17;i++)
+	    {
+	    eeprom[i] = a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, i);
+	    }
+	}
+
+    /** Print identification message **/
+#ifdef	CFG_3C90X_BOOTROM_FIX
+    if (INF_3C90X.isBrev)
+        {
+        outputf("NOTE: 3c905b bootrom fix enabled; has side "
+	   "effects.  See 3c90x.txt for info.");
+	}
+#endif
+
+    /** Retrieve the Hardware address and print it on the screen. **/
+    INF_3C90X.HWAddr[0] = eeprom[HWADDR_OFFSET + 0]>>8;
+    INF_3C90X.HWAddr[1] = eeprom[HWADDR_OFFSET + 0]&0xFF;
+    INF_3C90X.HWAddr[2] = eeprom[HWADDR_OFFSET + 1]>>8;
+    INF_3C90X.HWAddr[3] = eeprom[HWADDR_OFFSET + 1]&0xFF;
+    INF_3C90X.HWAddr[4] = eeprom[HWADDR_OFFSET + 2]>>8;
+    INF_3C90X.HWAddr[5] = eeprom[HWADDR_OFFSET + 2]&0xFF;
+    outputf("MAC Address = %!", INF_3C90X.HWAddr);
+
+    /** 3C556: Invert MII power **/
+    if (INF_3C90X.is3c556) {
+	unsigned int tmp;
+	a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winAddressing2);
+	tmp = inw(INF_3C90X.IOAddr + regResetOptions_2_w);
+	tmp |= 0x4000;
+	outw(tmp, INF_3C90X.IOAddr + regResetOptions_2_w);
+    }
+
+    /* Test if the link is good, if not continue */
+    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winDiagnostics4);
+    mstat = inw(INF_3C90X.IOAddr + regMediaStatus_4_w);
+    if((mstat & (1<<11)) == 0) {
+	outputf("Valid link not established");
+	return 0;
+    }
+
+    /** Program the MAC address into the station address registers **/
+    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winAddressing2);
+    outw(htons(eeprom[HWADDR_OFFSET + 0]), INF_3C90X.IOAddr + regStationAddress_2_3w);
+    outw(htons(eeprom[HWADDR_OFFSET + 1]), INF_3C90X.IOAddr + regStationAddress_2_3w+2);
+    outw(htons(eeprom[HWADDR_OFFSET + 2]), INF_3C90X.IOAddr + regStationAddress_2_3w+4);
+    outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+0);
+    outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+2);
+    outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+4);
+
+    /** Fill in our entry in the etherboot arp table **/
+/* XXX ? for lwip? 
+    for(i=0;i<ETH_ALEN;i++)
+	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
+     ** xcvr.
+     **
+     ** Uses Media Option command on B revision, Reset Option on non-B
+     ** revision cards -- same register address
+     **/
+    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winTxRxOptions3);
+    mopt = inw(INF_3C90X.IOAddr + regResetMediaOptions_3_w);
+
+    /** mask out VCO bit that is defined as 10baseFL bit on B-rev cards **/
+    if (! INF_3C90X.isBrev)
+	{
+	mopt &= 0x7F;
+	}
+
+    outputf("Connectors present: ");
+    c = 0;
+    linktype = 0x0008;
+    if (mopt & 0x01)
+	{
+	outputf("%s100Base-T4",(c++)?", ":"");
+	linktype = 0x0006;
+	}
+    if (mopt & 0x04)
+	{
+	outputf("%s100Base-FX",(c++)?", ":"");
+	linktype = 0x0005;
+	}
+    if (mopt & 0x10)
+	{
+	outputf("%s10Base-2",(c++)?", ":"");
+	linktype = 0x0003;
+	}
+    if (mopt & 0x20)
+	{
+	outputf("%sAUI",(c++)?", ":"");
+	linktype = 0x0001;
+	}
+    if (mopt & 0x40)
+	{
+	outputf("%sMII",(c++)?", ":"");
+	linktype = 0x0006;
+	}
+    if ((mopt & 0xA) == 0xA)
+	{
+	outputf("%s10Base-T / 100Base-TX",(c++)?", ":"");
+	linktype = 0x0008;
+	}
+    else if ((mopt & 0xA) == 0x2)
+	{
+	outputf("%s100Base-TX",(c++)?", ":"");
+	linktype = 0x0008;
+	}
+    else if ((mopt & 0xA) == 0x8)
+	{
+	outputf("%s10Base-T",(c++)?", ":"");
+	linktype = 0x0008;
+	}
+    outputf(".");
+
+    /** Determine transceiver type to use, depending on value stored in
+     ** eeprom 0x16
+     **/
+    if (INF_3C90X.isBrev)
+	{
+	if ((eeprom[0x16] & 0xFF00) == XCVR_MAGIC)
+	    {
+	    /** User-defined **/
+	    linktype = eeprom[0x16] & 0x000F;
+	    }
+	}
+    else
+	{
+#ifdef	CFG_3C90X_XCVR
+	    if (CFG_3C90X_XCVR != 255)
+		linktype = CFG_3C90X_XCVR;
+#endif	/* CFG_3C90X_XCVR */
+
+	    /** I don't know what MII MAC only mode is!!! **/
+	    if (linktype == 0x0009)
+		{
+		if (INF_3C90X.isBrev)
+			outputf("WARNING: MII External MAC Mode only supported on B-revision "
+			       "cards!!!!\nFalling Back to MII Mode\n");
+		linktype = 0x0006;
+		}
+	}
+
+    /** enable DC converter for 10-Base-T **/
+    if (linktype == 0x0003)
+	{
+	a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdEnableDcConverter, 0);
+	}
+
+    /** Set the link to the type we just determined. **/
+    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winTxRxOptions3);
+    cfg = inl(INF_3C90X.IOAddr + regInternalConfig_3_l);
+    cfg &= ~(0xF<<20);
+    cfg |= (linktype<<20);
+    outl(cfg, INF_3C90X.IOAddr + regInternalConfig_3_l);
+
+    /** Now that we set the xcvr type, reset the Tx and Rx, re-enable. **/
+    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxReset, 0x00);
+    while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS)
+	;
+
+    if (!INF_3C90X.isBrev)
+	outb(0x01, INF_3C90X.IOAddr + regTxFreeThresh_b);
+
+    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxEnable, 0);
+
+    /**
+     ** reset of the receiver on B-revision cards re-negotiates the link
+     ** takes several seconds (a computer eternity)
+     **/
+    if (INF_3C90X.isBrev)
+	a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxReset, 0x04);
+    else
+	a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxReset, 0x00);
+    while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS)
+	;
+
+    /** Set the RX filter = receive only individual pkts & multicast & bcast. **/
+    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdSetRxFilter, 0x01 + 0x02 + 0x04);
+    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxEnable, 0);
+
+
+    /**
+     ** set Indication and Interrupt flags , acknowledge any IRQ's
+     **/
+    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdSetInterruptEnable, 0);
+    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr,
+                                 cmdSetIndicationEnable, 0x0014);
+    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr,
+                                 cmdAcknowledgeInterrupt, 0x661);
+
+    /* * Set our exported functions **/
+    nic->poll     = a3c90x_poll;
+    nic->transmit = a3c90x_transmit;
+
+    return 1;
+}
+
+static struct pci_id a3c90x_nics[] = {
+/* Original 90x revisions: */
+PCI_ROM(0x10b7, 0x6055, "3c556",	 "3C556"),		/* Huricane */
+PCI_ROM(0x10b7, 0x9000, "3c905-tpo",     "3Com900-TPO"),	/* 10 Base TPO */
+PCI_ROM(0x10b7, 0x9001, "3c905-t4",      "3Com900-Combo"),	/* 10/100 T4 */
+PCI_ROM(0x10b7, 0x9050, "3c905-tpo100",  "3Com905-TX"),		/* 100 Base TX / 10/100 TPO */
+PCI_ROM(0x10b7, 0x9051, "3c905-combo",   "3Com905-T4"),		/* 100 Base T4 / 10 Base Combo */
+/* Newer 90xB revisions: */
+PCI_ROM(0x10b7, 0x9004, "3c905b-tpo",    "3Com900B-TPO"),	/* 10 Base TPO */
+PCI_ROM(0x10b7, 0x9005, "3c905b-combo",  "3Com900B-Combo"),	/* 10 Base Combo */
+PCI_ROM(0x10b7, 0x9006, "3c905b-tpb2",   "3Com900B-2/T"),	/* 10 Base TP and Base2 */
+PCI_ROM(0x10b7, 0x900a, "3c905b-fl",     "3Com900B-FL"),	/* 10 Base FL */
+PCI_ROM(0x10b7, 0x9055, "3c905b-tpo100", "3Com905B-TX"),	/* 10/100 TPO */
+PCI_ROM(0x10b7, 0x9056, "3c905b-t4",     "3Com905B-T4"),	/* 10/100 T4 */
+PCI_ROM(0x10b7, 0x9058, "3c905b-9058",   "3Com905B-9058"),	/* Cyclone 10/100/BNC */
+PCI_ROM(0x10b7, 0x905a, "3c905b-fx",     "3Com905B-FL"),	/* 100 Base FX / 10 Base FX */
+/* Newer 90xC revision: */
+PCI_ROM(0x10b7, 0x9200, "3c905c-tpo",    "3Com905C-TXM"),	/* 10/100 TPO (3C905C-TXM) */
+PCI_ROM(0x10b7, 0x9202, "3c920b-emb-ati", "3c920B-EMB-WNM (ATI Radeon 9100 IGP)"),	/* 3c920B-EMB-WNM (ATI Radeon 9100 IGP) */
+PCI_ROM(0x10b7, 0x9210, "3c920b-emb-wnm","3Com20B-EMB WNM"),
+PCI_ROM(0x10b7, 0x9800, "3c980",         "3Com980-Cyclone"),	/* Cyclone */
+PCI_ROM(0x10b7, 0x9805, "3c9805",        "3Com9805"),		/* Dual Port Server Cyclone */
+PCI_ROM(0x10b7, 0x7646, "3csoho100-tx",  "3CSOHO100-TX"),	/* Hurricane */
+PCI_ROM(0x10b7, 0x4500, "3c450",         "3Com450 HomePNA Tornado"),
+PCI_ROM(0x10b7, 0x1201, "3c982a",        "3Com982A"),
+PCI_ROM(0x10b7, 0x1202, "3c982b",        "3Com982B"),
+};
+
+struct pci_driver a3c90x_driver = {
+	.name     = "3C90X",
+	.probe    = a3c90x_probe,
+	.ids      = a3c90x_nics,
+	.id_count = sizeof(a3c90x_nics)/sizeof(a3c90x_nics[0]),
+};
diff --git a/net/etherboot-compat.h b/net/etherboot-compat.h
new file mode 100644
index 0000000..6c96458
--- /dev/null
+++ b/net/etherboot-compat.h
@@ -0,0 +1,18 @@
+#define ETH_ALEN	6
+
+struct dev {
+	void (*disable) (struct dev *dev);
+};
+
+struct nic {
+	char * packet;
+	int packetlen;
+
+	unsigned int ioaddr;
+	unsigned int irqno;
+
+	int (*poll) (struct nic *nic, int retrieve);
+	void (*transmit) (const char *dest_addr, unsigned int proto, unsigned int size, const char *pkt);
+};
+
+#define virt_to_bus(x) ((unsigned long)x)
-- 
2.43.0


From 3c2c3b0dd358924410d12f8a71b5fee7a3f02e83 Mon Sep 17 00:00:00 2001
From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Thu, 2 Oct 2008 19:11:19 -0400
Subject: [PATCH 10/16] move 3c905.* from aseg to net/net.*

---
 aseg/3c905.c => net/net.c | 0
 aseg/3c905.h => net/net.h | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename aseg/3c905.c => net/net.c (100%)
 rename aseg/3c905.h => net/net.h (100%)

diff --git a/aseg/3c905.c b/net/net.c
similarity index 100%
rename from aseg/3c905.c
rename to net/net.c
diff --git a/aseg/3c905.h b/net/net.h
similarity index 100%
rename from aseg/3c905.h
rename to net/net.h
-- 
2.43.0


From 3e6d61061b77ac328abf5a3283ff9870afa92258 Mon Sep 17 00:00:00 2001
From: Jacob Potter <jdpotter@andrew.cmu.edu>
Date: Thu, 2 Oct 2008 19:17:37 -0400
Subject: [PATCH 11/16] rearrangements

---
 aseg/Makefile   | 2 +-
 aseg/counter.c  | 2 +-
 aseg/firstrun.c | 2 +-
 net/3c90x.c     | 1 -
 net/net.c       | 4 +++-
 net/net.h       | 2 ++
 6 files changed, 8 insertions(+), 5 deletions(-)

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 <video_defines.h>
 #include <minilib.h>
 #include <smi.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 d45bc81..6df8d7d 100644
--- 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 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 <pci.h>
 #include <output.h>
-#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();
 
-- 
2.43.0


From 8f4ff5c04e3dd5a339493c9fb625ce3dbe6597a7 Mon Sep 17 00:00:00 2001
From: Jacob Potter <jacob@J4CBO-MBP-R7.RES.CMU.EDU>
Date: Thu, 2 Oct 2008 19:19:37 -0400
Subject: [PATCH 12/16] 3c90x change

---
 net/3c90x.c | 1 -
 1 file changed, 1 deletion(-)

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;
-- 
2.43.0


From ec2d61895a6b60afbed9661240d868405310dc7f Mon Sep 17 00:00:00 2001
From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Thu, 2 Oct 2008 19:20:20 -0400
Subject: [PATCH 13/16] Add the mechanism by which we bother PCI, generically.

---
 include/pci-bother.h | 12 ++++++++++++
 pci/pci-bother.c     | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 include/pci-bother.h
 create mode 100644 pci/pci-bother.c

diff --git a/include/pci-bother.h b/include/pci-bother.h
new file mode 100644
index 0000000..ff71755
--- /dev/null
+++ b/include/pci-bother.h
@@ -0,0 +1,12 @@
+#ifndef _PCI_BOTHER_H
+#define _PCI_BOTHER_H
+
+#include <pci.h>
+
+#define MAX_BOTHERS 5
+
+extern int pci_bother_add(pci_dev_t *dev);
+extern void pci_bother_all();
+extern void pci_unbother_all();
+
+#endif
diff --git a/pci/pci-bother.c b/pci/pci-bother.c
new file mode 100644
index 0000000..0c3c0ec
--- /dev/null
+++ b/pci/pci-bother.c
@@ -0,0 +1,41 @@
+#include <pci.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, 0x0);
+}
+
+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);
+}
-- 
2.43.0


From 4d898e0be101cef5e2a09fe78a04c695c44cdb6b Mon Sep 17 00:00:00 2001
From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Thu, 2 Oct 2008 19:20:28 -0400
Subject: [PATCH 14/16] Add the mechanism by which we bother PCI, generically.

---
 aseg/Makefile  |  5 +++--
 aseg/counter.c |  3 +++
 net/net.c      | 18 ++++--------------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/aseg/Makefile b/aseg/Makefile
index 3015bd7..4072606 100644
--- a/aseg/Makefile
+++ b/aseg/Makefile
@@ -2,8 +2,9 @@ CC=gcc
 CFLAGS=-I../include -I../include/raw -nostdlib -nostdinc -fno-builtin -D__RAW__ -Wall -Werror -pedantic -ansi -std=gnu99
 
 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
+	../ich2/smram-ich2.o ../ich2/smi.o vga-overlay.o packet.o \
+	../lib/sprintf.o ../lib/doprnt.o ../pci/pci.o ../net/net.o \
+	../ich2/ich2-timer.o ../pci/pci-bother.o
 
 all: aseg.elf
 
diff --git a/aseg/counter.c b/aseg/counter.c
index eaeec52..bf60ffd 100644
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -3,6 +3,7 @@
 #include <video_defines.h>
 #include <minilib.h>
 #include <smi.h>
+#include <pci-bother.h>
 #include "3c905.h"
 #include "vga-overlay.h"
 #include "packet.h"
@@ -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);
@@ -112,6 +114,7 @@ void smi_entry(void)
 
 	smi_poll();
 	
+	pci_bother_all();
 	outl(0xCF8, pcisave);
 	outb(0x3D4, vgasave);
 }
diff --git a/net/net.c b/net/net.c
index b89abe2..488f52b 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1,8 +1,7 @@
 #include <pci.h>
+#include <pci-bother.h>
 #include <output.h>
-#include "3c905.h"
-
-static int found = 0, _bus, _dev, _fn;
+#include "net.h"
 
 static int bother_3c905(pci_dev_t *dev, void *nutrinus)
 {
@@ -10,11 +9,7 @@ static int bother_3c905(pci_dev_t *dev, void *nutrinus)
 	{
 		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;
@@ -22,12 +17,7 @@ static int bother_3c905(pci_dev_t *dev, void *nutrinus)
 
 void eth_poll()
 {
-	if (!found)
-		return;
-		
-	pci_write16(_bus, _dev, _fn, 0x04, 0xFF);
-	
-	pci_write16(_bus, _dev, _fn, 0x04, 0x00);
+	/* ... */
 }
 
 void eth_init()
-- 
2.43.0


From 42125f27f3d2a77966f2015c545a88c4113368ef Mon Sep 17 00:00:00 2001
From: Jacob Potter <jdpotter@andrew.cmu.edu>
Date: Thu, 2 Oct 2008 19:34:35 -0400
Subject: [PATCH 15/16] changes to make it compile

---
 aseg/Makefile          |  2 +-
 include/timer.h        |  2 +-
 net/3c90x.c            | 11 ++++++-----
 net/etherboot-compat.h |  5 +++++
 net/net.h              |  2 ++
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/aseg/Makefile b/aseg/Makefile
index 4072606..64b3c5a 100644
--- a/aseg/Makefile
+++ b/aseg/Makefile
@@ -4,7 +4,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 ../net/net.o \
-	../ich2/ich2-timer.o ../pci/pci-bother.o
+	../ich2/ich2-timer.o ../pci/pci-bother.o ../net/3c90x.o
 
 all: aseg.elf
 
diff --git a/include/timer.h b/include/timer.h
index 56054b0..b3b6985 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -4,4 +4,4 @@
 void oneshot_start_ms(unsigned long milliseconds);
 int oneshot_running(void);
 
-#endif TIMER_H
+#endif /* TIMER_H */
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 <timer.h>
 #include <io.h>
 #include <pci.h>
@@ -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;i<ETH_ALEN;i++)
-	nic->node_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;
 }
diff --git a/net/etherboot-compat.h b/net/etherboot-compat.h
index 6c96458..2d8d98f 100644
--- a/net/etherboot-compat.h
+++ b/net/etherboot-compat.h
@@ -1,3 +1,6 @@
+#ifndef _ETHERBOOT_COMPAT_H
+#define _ETHERBOOT_COMPAT_H
+
 #define ETH_ALEN	6
 
 struct dev {
@@ -16,3 +19,5 @@ struct nic {
 };
 
 #define virt_to_bus(x) ((unsigned long)x)
+
+#endif
diff --git a/net/net.h b/net/net.h
index f10e304..01505ab 100644
--- a/net/net.h
+++ b/net/net.h
@@ -6,4 +6,6 @@
 extern void eth_init();
 extern void eth_poll();
 
+extern struct nic nic;
+
 #endif
-- 
2.43.0


From 7a914840b833dba82398623bbde04a1744627398 Mon Sep 17 00:00:00 2001
From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Thu, 2 Oct 2008 19:52:36 -0400
Subject: [PATCH 16/16] Actually invoke the 3c90x driver load routine.

---
 net/3c90x.c |  3 +++
 net/net.c   | 26 +++++++++++++-------------
 net/net.h   |  3 +--
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/net/3c90x.c b/net/3c90x.c
index 711b69d..f678aaf 100644
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -42,6 +42,7 @@
 #include <timer.h>
 #include <io.h>
 #include <pci.h>
+#include <pci-bother.h>
 #include <minilib.h>
 #include <output.h>
 
@@ -251,6 +252,7 @@ static struct
     RXD			ReceiveUPD;
     }
     INF_3C90X;
+static struct nic nic;
 
 
 /*** a3c90x_internal_IssueCommand: sends a command to the 3c90x card
@@ -713,6 +715,7 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
 /*
     adjust_pci_dev(pci);
 */
+    pci_bother_add(pci);
     nic.ioaddr = ioaddr & ~3;
     nic.irqno = 0;
 
diff --git a/net/net.c b/net/net.c
index 18eaddf..575b5e4 100644
--- a/net/net.c
+++ b/net/net.c
@@ -3,26 +3,26 @@
 #include <output.h>
 #include "net.h"
 
-struct nic nic;
+static struct nic *_nic = 0x0;
 
-static int bother_3c905(pci_dev_t *dev, void *nutrinus)
+extern struct pci_driver a3c90x_driver;
+
+void eth_poll()
 {
-	if (dev->vid == 0x10B7 || dev->did == 0x9200)
-	{
-		outputf("Found a 3c905 to bother");
-		
-		pci_bother_add(dev);
-		return 1;
-	}
-	return 0;
+	if (_nic)
+		_nic->poll(_nic, 0);
 }
 
-void eth_poll()
+int eth_register(struct nic *nic)
 {
-	/* ... */
+	if (_nic)
+		return -1;
+	_nic = nic;
+	return 0;
 }
 
 void eth_init()
 {
-	pci_probe(bother_3c905, 0x0);
+	if (pci_probe_driver(a3c90x_driver))
+		outputf("found 3c90x, hopefully!");
 }
diff --git a/net/net.h b/net/net.h
index 01505ab..c665216 100644
--- a/net/net.h
+++ b/net/net.h
@@ -5,7 +5,6 @@
 
 extern void eth_init();
 extern void eth_poll();
-
-extern struct nic nic;
+extern int eth_register(struct nic *nic);
 
 #endif
-- 
2.43.0