vserver 2.0 rc7

[linux-2.6.git] / drivers / input / joystick / interact.c

diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c
index b2d7cad..9d3f8c3 100644 (file)
--- a/drivers/input/joystick/interact.c
+++ b/drivers/input/joystick/interact.c
@@ -39,14 +39,15 @@
 #include <linux/gameport.h>
 #include <linux/input.h>
 
+#define DRIVER_DESC    "InterAct digital joystick driver"
+
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
-MODULE_DESCRIPTION("InterAct digital joystick driver");
+MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 
-#define INTERACT_MAX_START     400     /* 400 us */
-#define INTERACT_MAX_STROBE    40      /* 40 us */
+#define INTERACT_MAX_START     600     /* 400 us */
+#define INTERACT_MAX_STROBE    60      /* 40 us */
 #define INTERACT_MAX_LENGTH    32      /* 32 bits */
-#define INTERACT_REFRESH_TIME  HZ/50   /* 20 ms */
 
 #define INTERACT_TYPE_HHFX     0       /* HammerHead/FX */
 #define INTERACT_TYPE_PP8D     1       /* ProPad 8 */
@@ -54,8 +55,6 @@ MODULE_LICENSE("GPL");
 struct interact {
        struct gameport *gameport;
        struct input_dev dev;
-       struct timer_list timer;
-       int used;
        int bads;
        int reads;
        unsigned char type;
@@ -125,12 +124,12 @@ static int interact_read_packet(struct gameport *gameport, int length, u32 *data
 }
 
 /*
- * interact_timer() reads and analyzes InterAct joystick data.
+ * interact_poll() reads and analyzes InterAct joystick data.
  */
 
-static void interact_timer(unsigned long private)
+static void interact_poll(struct gameport *gameport)
 {
-       struct interact *interact = (struct interact *) private;
+       struct interact *interact = gameport_get_drvdata(gameport);
        struct input_dev *dev = &interact->dev;
        u32 data[3];
        int i;
@@ -177,9 +176,6 @@ static void interact_timer(unsigned long private)
        }
 
        input_sync(dev);
-
-       mod_timer(&interact->timer, jiffies + INTERACT_REFRESH_TIME);
-
 }
 
 /*
@@ -189,8 +185,8 @@ static void interact_timer(unsigned long private)
 static int interact_open(struct input_dev *dev)
 {
        struct interact *interact = dev->private;
-       if (!interact->used++)
-               mod_timer(&interact->timer, jiffies + INTERACT_REFRESH_TIME);
+
+       gameport_start_polling(interact->gameport);
        return 0;
 }
 
@@ -201,37 +197,36 @@ static int interact_open(struct input_dev *dev)
 static void interact_close(struct input_dev *dev)
 {
        struct interact *interact = dev->private;
-       if (!--interact->used)
-               del_timer(&interact->timer);
+
+       gameport_stop_polling(interact->gameport);
 }
 
 /*
  * interact_connect() probes for InterAct joysticks.
  */
 
-static void interact_connect(struct gameport *gameport, struct gameport_dev *dev)
+static int interact_connect(struct gameport *gameport, struct gameport_driver *drv)
 {
        struct interact *interact;
        __u32 data[3];
        int i, t;
+       int err;
 
-       if (!(interact = kmalloc(sizeof(struct interact), GFP_KERNEL)))
-               return;
-       memset(interact, 0, sizeof(struct interact));
-
-       gameport->private = interact;
+       if (!(interact = kcalloc(1, sizeof(struct interact), GFP_KERNEL)))
+               return -ENOMEM;
 
        interact->gameport = gameport;
-       init_timer(&interact->timer);
-       interact->timer.data = (long) interact;
-       interact->timer.function = interact_timer;
 
-       if (gameport_open(gameport, dev, GAMEPORT_MODE_RAW))
+       gameport_set_drvdata(gameport, interact);
+
+       err = gameport_open(gameport, drv, GAMEPORT_MODE_RAW);
+       if (err)
                goto fail1;
 
        i = interact_read_packet(gameport, INTERACT_MAX_LENGTH * 2, data);
 
        if (i != 32 || (data[0] >> 24) != 0x0c || (data[1] >> 24) != 0x02) {
+               err = -ENODEV;
                goto fail2;
        }
 
@@ -242,9 +237,13 @@ static void interact_connect(struct gameport *gameport, struct gameport_dev *dev
        if (!interact_type[i].length) {
                printk(KERN_WARNING "interact.c: Unknown joystick on %s. [len %d d0 %08x d1 %08x i2 %08x]\n",
                        gameport->phys, i, data[0], data[1], data[2]);
+               err = -ENODEV;
                goto fail2;
        }
 
+       gameport_set_poll_handler(gameport, interact_poll);
+       gameport_set_poll_interval(gameport, 20);
+
        sprintf(interact->phys, "%s/input0", gameport->phys);
 
        interact->type = i;
@@ -281,33 +280,42 @@ static void interact_connect(struct gameport *gameport, struct gameport_dev *dev
        printk(KERN_INFO "input: %s on %s\n",
                interact_type[interact->type].name, gameport->phys);
 
-       return;
+       return 0;
+
 fail2: gameport_close(gameport);
-fail1:  kfree(interact);
+fail1:  gameport_set_drvdata(gameport, NULL);
+       kfree(interact);
+       return err;
 }
 
 static void interact_disconnect(struct gameport *gameport)
 {
-       struct interact *interact = gameport->private;
+       struct interact *interact = gameport_get_drvdata(gameport);
+
        input_unregister_device(&interact->dev);
        gameport_close(gameport);
+       gameport_set_drvdata(gameport, NULL);
        kfree(interact);
 }
 
-static struct gameport_dev interact_dev = {
-       .connect =      interact_connect,
-       .disconnect =   interact_disconnect,
+static struct gameport_driver interact_drv = {
+       .driver         = {
+               .name   = "interact",
+       },
+       .description    = DRIVER_DESC,
+       .connect        = interact_connect,
+       .disconnect     = interact_disconnect,
 };
 
-int __init interact_init(void)
+static int __init interact_init(void)
 {
-       gameport_register_device(&interact_dev);
+       gameport_register_driver(&interact_drv);
        return 0;
 }
 
-void __exit interact_exit(void)
+static void __exit interact_exit(void)
 {
-       gameport_unregister_device(&interact_dev);
+       gameport_unregister_driver(&interact_drv);
 }
 
 module_init(interact_init);