patch-2.4.10 linux/drivers/char/joystick/a3d.c

• Lines: 57
• Date: Wed Sep 12 15:34:06 2001
• Orig file: v2.4.9/linux/drivers/char/joystick/a3d.c
• Orig date: Fri Feb 9 11:30:23 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/char/joystick/a3d.c linux/drivers/char/joystick/a3d.c
@@ -1,7 +1,7 @@
 /*
- * $Id: a3d.c,v 1.10 2000/05/29 11:19:50 vojtech Exp $
+ * $Id: a3d.c,v 1.14 2001/04/26 10:24:46 vojtech Exp $
  *
- *  Copyright (c) 1998-2000 Vojtech Pavlik
+ *  Copyright (c) 1998-2001 Vojtech Pavlik
  *
  *  Sponsored by SuSE
  */
@@ -190,7 +190,7 @@
 
 int a3d_adc_cooked_read(struct gameport *gameport, int *axes, int *buttons)
 {
-	struct a3d *a3d = gameport->driver;
+	struct a3d *a3d = gameport->private;
 	int i;
 	for (i = 0; i < 4; i++)
 		axes[i] = (a3d->axes[i] < 254) ? a3d->axes[i] : -1;
@@ -205,7 +205,7 @@
 
 int a3d_adc_open(struct gameport *gameport, int mode)
 {
-	struct a3d *a3d = gameport->driver;
+	struct a3d *a3d = gameport->private;
 	if (mode != GAMEPORT_MODE_COOKED)
 		return -1;
 	if (!a3d->used++)
@@ -219,7 +219,7 @@
 
 static void a3d_adc_close(struct gameport *gameport)
 {
-	struct a3d *a3d = gameport->driver;
+	struct a3d *a3d = gameport->private;
 	if (!--a3d->used)
 		del_timer(&a3d->timer);
 }
@@ -323,12 +323,11 @@
 		a3d->dev.relbit[0] |= BIT(REL_X) | BIT(REL_Y);
 		a3d->dev.keybit[LONG(BTN_MOUSE)] |= BIT(BTN_RIGHT) | BIT(BTN_LEFT) | BIT(BTN_MIDDLE);
 
-		a3d->adc.driver = a3d;
+		a3d->adc.private = a3d;
 		a3d->adc.open = a3d_adc_open;
 		a3d->adc.close = a3d_adc_close;
 		a3d->adc.cooked_read = a3d_adc_cooked_read;
 		a3d->adc.fuzz = 1; 
-		a3d->adc.type = GAMEPORT_EXT; 
 
 		a3d_read(a3d, data);
 
@@ -385,3 +384,5 @@
 
 module_init(a3d_init);
 module_exit(a3d_exit);
+
+MODULE_LICENSE("GPL");