Studied the tech docs for the Voodoo3 and Banshee, and hopefully fixed the

errors that plagued those cards with XFree86 4.0. They have two memory
ranges as well as an IO port range to them. Also cleaned up the three
warning messages that I got, from inb(), outb() and linuxulator. Also, I
noticed that the DRI and Glide support for the Voodoo4 and 5 has been
placed upon linux.3dfx.com, too bad they haven't released the tech docs
yet. Apparently, they are still pushing glide for all of us, so I will try
and add support once those tech docs are up.

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/dev/tdfx/tdfx_vars.h b/sys/dev/tdfx/tdfx_vars.h
index bbfd3d3..7af036f 100644
--- a/sys/dev/tdfx/tdfx_vars.h
+++ b/sys/dev/tdfx/tdfx_vars.h
@@ -78,13 +78,13 @@
 
 struct tdfx_softc {
 	int cardno;
-	vm_offset_t addr;
-	struct resource *memrange, *piorange;
-	int memrid, piorid;
+	vm_offset_t addr, addr2;
+	struct resource *memrange, *memrange2, *piorange;
+	int memrid, memrid2, piorid;
 	long range;
 	int vendor;
 	int type;
-	int addr0;
+	int addr0, addr1;
 	unsigned char bus;
 	unsigned char dv;
 	struct file *curFile;