vserver 2.0 rc7

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

diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c
index fc29ad7..a600220 100644 (file)
--- a/drivers/input/joystick/cobra.c
+++ b/drivers/input/joystick/cobra.c
@@ -35,12 +35,13 @@
 #include <linux/gameport.h>
 #include <linux/input.h>
 
+#define DRIVER_DESC    "Creative Labs Blaster GamePad Cobra driver"
+
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
-MODULE_DESCRIPTION("Creative Labs Blaster GamePad Cobra driver");
+MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 
 #define COBRA_MAX_STROBE       45      /* 45 us max wait for first strobe */
-#define COBRA_REFRESH_TIME     HZ/50   /* 20 ms between reads */
 #define COBRA_LENGTH           36
 
 static char* cobra_name = "Creative Labs Blaster GamePad Cobra";
@@ -49,9 +50,7 @@ static int cobra_btn[] = { BTN_START, BTN_SELECT, BTN_TL, BTN_TR, BTN_X, BTN_Y,
 
 struct cobra {
        struct gameport *gameport;
-       struct timer_list timer;
        struct input_dev dev[2];
-       int used;
        int reads;
        int bads;
        unsigned char exists;
@@ -112,18 +111,19 @@ static unsigned char cobra_read_packet(struct gameport *gameport, unsigned int *
        return ret;
 }
 
-static void cobra_timer(unsigned long private)
+static void cobra_poll(struct gameport *gameport)
 {
-       struct cobra *cobra = (void *) private;
+       struct cobra *cobra = gameport_get_drvdata(gameport);
        struct input_dev *dev;
        unsigned int data[2];
        int i, j, r;
 
        cobra->reads++;
 
-       if ((r = cobra_read_packet(cobra->gameport, data)) != cobra->exists)
+       if ((r = cobra_read_packet(gameport, data)) != cobra->exists) {
                cobra->bads++;
-       else
+               return;
+       }
 
        for (i = 0; i < 2; i++)
                if (cobra->exists & r & (1 << i)) {
@@ -139,43 +139,39 @@ static void cobra_timer(unsigned long private)
                        input_sync(dev);
 
                }
-
-       mod_timer(&cobra->timer, jiffies + COBRA_REFRESH_TIME);
 }
 
 static int cobra_open(struct input_dev *dev)
 {
        struct cobra *cobra = dev->private;
-       if (!cobra->used++)
-               mod_timer(&cobra->timer, jiffies + COBRA_REFRESH_TIME);
+
+       gameport_start_polling(cobra->gameport);
        return 0;
 }
 
 static void cobra_close(struct input_dev *dev)
 {
        struct cobra *cobra = dev->private;
-       if (!--cobra->used)
-               del_timer(&cobra->timer);
+
+       gameport_stop_polling(cobra->gameport);
 }
 
-static void cobra_connect(struct gameport *gameport, struct gameport_dev *dev)
+static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv)
 {
        struct cobra *cobra;
        unsigned int data[2];
        int i, j;
+       int err;
 
-       if (!(cobra = kmalloc(sizeof(struct cobra), GFP_KERNEL)))
-               return;
-       memset(cobra, 0, sizeof(struct cobra));
-
-       gameport->private = cobra;
+       if (!(cobra = kcalloc(1, sizeof(struct cobra), GFP_KERNEL)))
+               return -ENOMEM;
 
        cobra->gameport = gameport;
-       init_timer(&cobra->timer);
-       cobra->timer.data = (long) cobra;
-       cobra->timer.function = cobra_timer;
 
-       if (gameport_open(gameport, dev, GAMEPORT_MODE_RAW))
+       gameport_set_drvdata(gameport, cobra);
+
+       err = gameport_open(gameport, drv, GAMEPORT_MODE_RAW);
+       if (err)
                goto fail1;
 
        cobra->exists = cobra_read_packet(gameport, data);
@@ -187,8 +183,13 @@ static void cobra_connect(struct gameport *gameport, struct gameport_dev *dev)
                        cobra->exists &= ~(1 << i);
                }
 
-       if (!cobra->exists)
+       if (!cobra->exists) {
+               err = -ENODEV;
                goto fail2;
+       }
+
+       gameport_set_poll_handler(gameport, cobra_poll);
+       gameport_set_poll_interval(gameport, 20);
 
        for (i = 0; i < 2; i++)
                if ((cobra->exists >> i) & 1) {
@@ -207,49 +208,56 @@ static void cobra_connect(struct gameport *gameport, struct gameport_dev *dev)
                        cobra->dev[i].id.version = 0x0100;
 
                        cobra->dev[i].evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-                       cobra->dev[i].absbit[0] = BIT(ABS_X) | BIT(ABS_Y);
+
+                       input_set_abs_params(&cobra->dev[i], ABS_X, -1, 1, 0, 0);
+                       input_set_abs_params(&cobra->dev[i], ABS_Y, -1, 1, 0, 0);
 
                        for (j = 0; cobra_btn[j]; j++)
                                set_bit(cobra_btn[j], cobra->dev[i].keybit);
 
-                       cobra->dev[i].absmin[ABS_X] = -1; cobra->dev[i].absmax[ABS_X] = 1;
-                       cobra->dev[i].absmin[ABS_Y] = -1; cobra->dev[i].absmax[ABS_Y] = 1;
-
-                       input_register_device(cobra->dev + i);
+                       input_register_device(&cobra->dev[i]);
                        printk(KERN_INFO "input: %s on %s\n", cobra_name, gameport->phys);
                }
 
-       return;
+       return 0;
+
 fail2: gameport_close(gameport);
-fail1: kfree(cobra);
+fail1: gameport_set_drvdata(gameport, NULL);
+       kfree(cobra);
+       return err;
 }
 
 static void cobra_disconnect(struct gameport *gameport)
 {
+       struct cobra *cobra = gameport_get_drvdata(gameport);
        int i;
 
-       struct cobra *cobra = gameport->private;
        for (i = 0; i < 2; i++)
                if ((cobra->exists >> i) & 1)
                        input_unregister_device(cobra->dev + i);
        gameport_close(gameport);
+       gameport_set_drvdata(gameport, NULL);
        kfree(cobra);
 }
 
-static struct gameport_dev cobra_dev = {
-       .connect =      cobra_connect,
-       .disconnect =   cobra_disconnect,
+static struct gameport_driver cobra_drv = {
+       .driver         = {
+               .name   = "cobra",
+       },
+       .description    = DRIVER_DESC,
+       .connect        = cobra_connect,
+       .disconnect     = cobra_disconnect,
 };
 
-int __init cobra_init(void)
+static int __init cobra_init(void)
 {
-       gameport_register_device(&cobra_dev);
+       gameport_register_driver(&cobra_drv);
        return 0;
 }
 
-void __exit cobra_exit(void)
+static void __exit cobra_exit(void)
 {
-       gameport_unregister_device(&cobra_dev);
+       gameport_unregister_driver(&cobra_drv);
 }
 
 module_init(cobra_init);