[Linuxconsole-commit]CVS: ruby/linux/drivers/input/gameport vortex.c,1.3,1.4

[Vojtech P. <vo...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/gameport
In directory usw-pr-cvs1:/tmp/cvs-serv2610/linux/drivers/input/gameport

Modified Files:
	vortex.c 
Log Message:
Moving, updating to latest versions.


Index: vortex.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/gameport/vortex.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vortex.c	2002/01/22 20:41:45	1.3
+++ vortex.c	2002/01/24 19:51:25	1.4
@@ -46,6 +46,9 @@
 MODULE_DESCRIPTION("Aureal Vortex and Vortex2 gameport driver");
 MODULE_LICENSE("GPL");
 
+#define VORTEX_GCR		0x0c	/* Gameport control register */
+#define VORTEX_LEG		0x08	/* Legacy port location */
+#define VORTEX_AXD		0x10	/* Axes start */
 #define VORTEX_DATA_WAIT	20	/* 20 ms */
 
 struct vortex {
@@ -90,7 +93,7 @@
 	switch (mode) {
 		case GAMEPORT_MODE_COOKED:
 			writeb(0x40, vortex->io + VORTEX_GCR);
-			wait_ms(PCIGAME_DATA_WAIT);
+			wait_ms(VORTEX_DATA_WAIT);
 			return 0;
 		case GAMEPORT_MODE_RAW:
 			writeb(0x00, vortex->io + VORTEX_GCR);
@@ -157,8 +160,8 @@
 }
 
 static struct pci_device_id vortex_id_table[] __devinitdata =
-{{ 0x12eb, 0x0001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x1100c },
- { 0x12eb, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x2880c },
+{{ 0x12eb, 0x0001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x11000 },
+ { 0x12eb, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x28800 },
  { 0 }};
 
 static struct pci_driver vortex_driver = {