vserver 1.9.5.x5

[linux-2.6.git] / drivers / input / mouse / vsxxxaa.c

diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c
index 3845ca4..a14b76e 100644 (file)
--- a/drivers/input/mouse/vsxxxaa.c
+++ b/drivers/input/mouse/vsxxxaa.c
@@ -1,11 +1,14 @@
 /*
- * DEC VSXXX-AA and VSXXX-GA mouse driver.
+ * Driver for  DEC VSXXX-AA mouse (hockey-puck mouse, ball or two rollers)
+ *             DEC VSXXX-GA mouse (rectangular mouse, with ball)
+ *             DEC VSXXX-AB tablet (digitizer with hair cross or stylus)
  *
  * Copyright (C) 2003-2004 by Jan-Benedict Glaw <jbglaw@lug-owl.de>
  *
- * The packet format was taken from a patch to GPM which is (C) 2001
+ * The packet format was initially taken from a patch to GPM which is (C) 2001
  * by  Karsten Merker <merker@linuxtag.org>
  * and Maciej W. Rozycki <macro@ds2.pg.gda.pl>
+ * Later on, I had access to the device's documentation (referenced below).
  */
 
 /*
@@ -25,7 +28,7 @@
  */
 
 /*
- * Building an adaptor to DB9 / DB25 RS232
+ * Building an adaptor to DE9 / DB25 RS232
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
  * DISCLAIMER: Use this description AT YOUR OWN RISK! I'll not pay for
@@ -42,8 +45,8 @@
  *  | 4 --- 3 |
  *   \  2 1  /
  *    -------
- * 
- *     DEC socket      DB9     DB25    Note
+ *
+ *     DEC socket      DE9     DB25    Note
  *     1 (GND)         5       7       -
  *     2 (RxD)         2       3       -
  *     3 (TxD)         3       2       -
@@ -82,7 +85,7 @@
 #include <linux/serio.h>
 #include <linux/init.h>
 
-#define DRIVER_DESC    "Serial DEC VSXXX-AA/GA mouse / DEC tablet driver"
+#define DRIVER_DESC "Driver for DEC VSXXX-AA and -GA mice and VSXXX-AB tablet"
 
 MODULE_AUTHOR ("Jan-Benedict Glaw <jbglaw@lug-owl.de>");
 MODULE_DESCRIPTION (DRIVER_DESC);
@@ -104,7 +107,7 @@ MODULE_LICENSE ("GPL");
 #define VSXXXAA_PACKET_REL     0x80
 #define VSXXXAA_PACKET_ABS     0xc0
 #define VSXXXAA_PACKET_POR     0xa0
-#define MATCH_PACKET_TYPE(data, type)  (((data) & VSXXXAA_PACKET_MASK) == type)
+#define MATCH_PACKET_TYPE(data, type)  (((data) & VSXXXAA_PACKET_MASK) == (type))
 
 
 
@@ -150,7 +153,7 @@ vsxxxaa_detection_done (struct vsxxxaa *mouse)
 {
        switch (mouse->type) {
                case 0x02:
-                       sprintf (mouse->name, "DEC VSXXX-AA/GA mouse");
+                       sprintf (mouse->name, "DEC VSXXX-AA/-GA mouse");
                        break;
 
                case 0x04:
@@ -158,7 +161,8 @@ vsxxxaa_detection_done (struct vsxxxaa *mouse)
                        break;
 
                default:
-                       sprintf (mouse->name, "unknown DEC pointer device");
+                       sprintf (mouse->name, "unknown DEC pointer device "
+                                       "(type = 0x%02x)", mouse->type);
                        break;
        }
 
@@ -336,13 +340,10 @@ vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse, struct pt_regs *regs)
         *
         * M: manufacturer location code
         * R: revision code
-        * E: Error code. I'm not sure about these, but gpm's sources,
-        *    which support this mouse, too, tell about them:
-        *      E = [0x00 .. 0x1f]: no error, byte #3 is button state
-        *      E = 0x3d: button error, byte #3 tells which one.
-        *      E = <else>: other error
+        * E: Error code. If it's in the range of 0x00..0x1f, only some
+        *    minor problem occured. Errors >= 0x20 are considered bad
+        *    and the device may not work properly...
         * D: <0010> == mouse, <0100> == tablet
-        *
         */
 
        mouse->version = buf[0] & 0x0f;
@@ -363,28 +364,32 @@ vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse, struct pt_regs *regs)
        vsxxxaa_detection_done (mouse);
 
        if (error <= 0x1f) {
-               /* No error. Report buttons */
+               /* No (serious) error. Report buttons */
                input_regs (dev, regs);
                input_report_key (dev, BTN_LEFT, left);
                input_report_key (dev, BTN_MIDDLE, middle);
                input_report_key (dev, BTN_RIGHT, right);
                input_report_key (dev, BTN_TOUCH, 0);
                input_sync (dev);
-       } else {
-               printk (KERN_ERR "Your %s on %s reports an undefined error, "
-                               "please check it...\n", mouse->name,
-                               mouse->phys);
+
+               if (error != 0)
+                       printk (KERN_INFO "Your %s on %s reports error=0x%02x\n",
+                                       mouse->name, mouse->phys, error);
+
        }
 
        /*
         * If the mouse was hot-plugged, we need to force differential mode
         * now... However, give it a second to recover from it's reset.
         */
-       printk (KERN_NOTICE "%s on %s: Forceing standard packet format and "
-                       "streaming mode\n", mouse->name, mouse->phys);
-       mouse->serio->write (mouse->serio, 'S');
+       printk (KERN_NOTICE "%s on %s: Forceing standard packet format, "
+                       "incremental streaming mode and 72 samples/sec\n",
+                       mouse->name, mouse->phys);
+       mouse->serio->write (mouse->serio, 'S');        /* Standard format */
+       mdelay (50);
+       mouse->serio->write (mouse->serio, 'R');        /* Incremental */
        mdelay (50);
-       mouse->serio->write (mouse->serio, 'R');
+       mouse->serio->write (mouse->serio, 'L');        /* 72 samples/sec */
 }
 
 static void
@@ -519,11 +524,12 @@ vsxxxaa_connect (struct serio *serio, struct serio_driver *drv)
        mouse->dev.private = mouse;
        serio->private = mouse;
 
-       sprintf (mouse->name, "DEC VSXXX-AA/GA mouse or VSXXX-AB digitizer");
+       sprintf (mouse->name, "DEC VSXXX-AA/-GA mouse or VSXXX-AB digitizer");
        sprintf (mouse->phys, "%s/input0", serio->phys);
        mouse->dev.name = mouse->name;
        mouse->dev.phys = mouse->phys;
        mouse->dev.id.bustype = BUS_RS232;
+       mouse->dev.dev = &serio->dev;
        mouse->serio = serio;
 
        if (serio_open (serio, drv)) {