Input: combine hil_kbd and hil_ptr drivers
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 8 Aug 2009 06:17:47 +0000 (23:17 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 9 Aug 2009 20:27:27 +0000 (13:27 -0700)
hil_kbd and hil_ptr look like twins so it makes sense to combine them
into a single driver.

[deller@gmx.de: add MODULE_ALIAS() entry for mouse]
Tested-by: Helge Deller <deller@gmx.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/keyboard/Kconfig
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/Kconfig
drivers/input/mouse/Makefile
drivers/input/mouse/hil_ptr.c [deleted file]

index a6b989a..5239e25 100644 (file)
@@ -187,7 +187,7 @@ config KEYBOARD_HIL_OLD
          submenu.
 
 config KEYBOARD_HIL
-       tristate "HP HIL keyboard support"
+       tristate "HP HIL keyboard/pointer support"
        depends on GSC || HP300
        default y
        select HP_SDC
@@ -196,7 +196,8 @@ config KEYBOARD_HIL
        help
          The "Human Interface Loop" is a older, 8-channel USB-like
          controller used in several Hewlett Packard models.
-         This driver implements support for HIL-keyboards attached
+         This driver implements support for HIL-keyboards and pointing
+         devices (mice, tablets, touchscreens) attached
          to your machine, so normally you should say Y here.
 
 config KEYBOARD_HP6XX
index 235a669..c83f4b2 100644 (file)
 #include <linux/slab.h>
 #include <linux/pci_ids.h>
 
-#define PREFIX "HIL KEYB: "
-#define HIL_GENERIC_NAME "HIL keyboard"
+#define PREFIX "HIL: "
 
 MODULE_AUTHOR("Brian S. Julin <bri@calyx.com>");
-MODULE_DESCRIPTION(HIL_GENERIC_NAME " driver");
+MODULE_DESCRIPTION("HIL keyboard/mouse driver");
 MODULE_LICENSE("Dual BSD/GPL");
-MODULE_ALIAS("serio:ty03pr25id00ex*");
+MODULE_ALIAS("serio:ty03pr25id00ex*"); /* HIL keyboard */
+MODULE_ALIAS("serio:ty03pr25id0Fex*"); /* HIL mouse */
 
 #define HIL_PACKET_MAX_LENGTH 16
 
@@ -82,6 +82,11 @@ struct hil_dev {
        char    rnm[HIL_PACKET_MAX_LENGTH + 1]; /* RNM record + NULL term. */
 
        struct completion cmd_done;
+
+       bool is_pointer;
+       /* Extra device details needed for pointing devices. */
+       unsigned int nbtn, naxes;
+       unsigned int btnmap[7];
 };
 
 static bool hil_dev_is_command_response(hil_packet p)
@@ -139,7 +144,7 @@ static void hil_dev_handle_command_response(struct hil_dev *dev)
        complete(&dev->cmd_done);
 }
 
-static void hil_dev_handle_key_events(struct hil_dev *kbd)
+static void hil_dev_handle_kbd_events(struct hil_dev *kbd)
 {
        struct input_dev *dev = kbd->dev;
        int idx = kbd->idx4 / 4;
@@ -198,6 +203,67 @@ static void hil_dev_handle_key_events(struct hil_dev *kbd)
        input_sync(dev);
 }
 
+static void hil_dev_handle_ptr_events(struct hil_dev *ptr)
+{
+       struct input_dev *dev = ptr->dev;
+       int idx = ptr->idx4 / 4;
+       hil_packet p = ptr->data[idx - 1];
+       int i, cnt, laxis;
+       bool absdev, ax16;
+
+       if ((p & HIL_CMDCT_POL) != idx - 1) {
+               printk(KERN_WARNING PREFIX
+                       "Malformed poll packet %x (idx = %i)\n", p, idx);
+               return;
+       }
+
+       i = (p & HIL_POL_AXIS_ALT) ? 3 : 0;
+       laxis = (p & HIL_POL_NUM_AXES_MASK) + i;
+
+       ax16 = ptr->idd[1] & HIL_IDD_HEADER_16BIT; /* 8 or 16bit resolution */
+       absdev = ptr->idd[1] & HIL_IDD_HEADER_ABS;
+
+       for (cnt = 1; i < laxis; i++) {
+               unsigned int lo, hi, val;
+
+               lo = ptr->data[cnt++] & HIL_PKT_DATA_MASK;
+               hi = ax16 ? (ptr->data[cnt++] & HIL_PKT_DATA_MASK) : 0;
+
+               if (absdev) {
+                       val = lo + (hi << 8);
+#ifdef TABLET_AUTOADJUST
+                       if (val < dev->absmin[ABS_X + i])
+                               dev->absmin[ABS_X + i] = val;
+                       if (val > dev->absmax[ABS_X + i])
+                               dev->absmax[ABS_X + i] = val;
+#endif
+                       if (i%3) val = dev->absmax[ABS_X + i] - val;
+                       input_report_abs(dev, ABS_X + i, val);
+               } else {
+                       val = (int) (((int8_t)lo) | ((int8_t)hi << 8));
+                       if (i % 3)
+                               val *= -1;
+                       input_report_rel(dev, REL_X + i, val);
+               }
+       }
+
+       while (cnt < idx - 1) {
+               unsigned int btn = ptr->data[cnt++];
+               int up = btn & 1;
+
+               btn &= 0xfe;
+               if (btn == 0x8e)
+                       continue; /* TODO: proximity == touch? */
+               if (btn > 0x8c || btn < 0x80)
+                       continue;
+               btn = (btn - 0x80) >> 1;
+               btn = ptr->btnmap[btn];
+               input_report_key(dev, btn, !up);
+       }
+
+       input_sync(dev);
+}
+
 static void hil_dev_process_err(struct hil_dev *dev)
 {
        printk(KERN_WARNING PREFIX "errored HIL packet\n");
@@ -234,8 +300,10 @@ static irqreturn_t hil_dev_interrupt(struct serio *serio,
                } else if (packet & HIL_PKT_CMD) {
                        if (hil_dev_is_command_response(packet))
                                hil_dev_handle_command_response(dev);
+                       else if (dev->is_pointer)
+                               hil_dev_handle_ptr_events(dev);
                        else
-                               hil_dev_handle_key_events(dev);
+                               hil_dev_handle_kbd_events(dev);
                        dev->idx4 = 0;
                }
        }
@@ -251,15 +319,130 @@ static void hil_dev_disconnect(struct serio *serio)
 
        serio_close(serio);
        input_unregister_device(dev->dev);
+       serio_set_drvdata(serio, NULL);
        kfree(dev);
 }
 
+static void hil_dev_keyboard_setup(struct hil_dev *kbd)
+{
+       struct input_dev *input_dev = kbd->dev;
+       uint8_t did = kbd->idd[0];
+       int i;
+
+       input_dev->evbit[0]     = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
+       input_dev->ledbit[0]    = BIT_MASK(LED_NUML) | BIT_MASK(LED_CAPSL) |
+                                 BIT_MASK(LED_SCROLLL);
+
+       for (i = 0; i < 128; i++) {
+               __set_bit(hil_kbd_set1[i], input_dev->keybit);
+               __set_bit(hil_kbd_set3[i], input_dev->keybit);
+       }
+       __clear_bit(KEY_RESERVED, input_dev->keybit);
+
+       input_dev->keycodemax   = HIL_KEYCODES_SET1_TBLSIZE;
+       input_dev->keycodesize  = sizeof(hil_kbd_set1[0]);
+       input_dev->keycode      = hil_kbd_set1;
+
+       input_dev->name = strlen(kbd->rnm) ? kbd->rnm : "HIL keyboard";
+       input_dev->phys = "hpkbd/input0";
+
+       printk(KERN_INFO PREFIX "HIL keyboard found (did = 0x%02x, lang = %s)\n",
+               did, hil_language[did & HIL_IDD_DID_TYPE_KB_LANG_MASK]);
+}
+
+static void hil_dev_pointer_setup(struct hil_dev *ptr)
+{
+       struct input_dev *input_dev = ptr->dev;
+       uint8_t did = ptr->idd[0];
+       uint8_t *idd = ptr->idd + 1;
+       unsigned int naxsets = HIL_IDD_NUM_AXSETS(*idd);
+       unsigned int i, btntype;
+       const char *txt;
+
+       ptr->naxes = HIL_IDD_NUM_AXES_PER_SET(*idd);
+
+       switch (did & HIL_IDD_DID_TYPE_MASK) {
+       case HIL_IDD_DID_TYPE_REL:
+               input_dev->evbit[0] = BIT_MASK(EV_REL);
+
+               for (i = 0; i < ptr->naxes; i++)
+                       __set_bit(REL_X + i, input_dev->relbit);
+
+               for (i = 3; naxsets > 1 && i < ptr->naxes + 3; i++)
+                       __set_bit(REL_X + i, input_dev->relbit);
+
+               txt = "relative";
+               break;
+
+       case HIL_IDD_DID_TYPE_ABS:
+               input_dev->evbit[0] = BIT_MASK(EV_ABS);
+
+               for (i = 0; i < ptr->naxes; i++)
+                       input_set_abs_params(input_dev, ABS_X + i,
+                                       0, HIL_IDD_AXIS_MAX(idd, i), 0, 0);
+
+               for (i = 3; naxsets > 1 && i < ptr->naxes + 3; i++)
+                       input_set_abs_params(input_dev, ABS_X + i,
+                                       0, HIL_IDD_AXIS_MAX(idd, i - 3), 0, 0);
+
+#ifdef TABLET_AUTOADJUST
+               for (i = 0; i < ABS_MAX; i++) {
+                       int diff = input_dev->absmax[ABS_X + i] / 10;
+                       input_dev->absmin[ABS_X + i] += diff;
+                       input_dev->absmax[ABS_X + i] -= diff;
+               }
+#endif
+
+               txt = "absolute";
+               break;
+
+       default:
+               BUG();
+       }
+
+       ptr->nbtn = HIL_IDD_NUM_BUTTONS(idd);
+       if (ptr->nbtn)
+               input_dev->evbit[0] |= BIT_MASK(EV_KEY);
+
+       btntype = BTN_MISC;
+       if ((did & HIL_IDD_DID_ABS_TABLET_MASK) == HIL_IDD_DID_ABS_TABLET)
+#ifdef TABLET_SIMULATES_MOUSE
+               btntype = BTN_TOUCH;
+#else
+               btntype = BTN_DIGI;
+#endif
+       if ((did & HIL_IDD_DID_ABS_TSCREEN_MASK) == HIL_IDD_DID_ABS_TSCREEN)
+               btntype = BTN_TOUCH;
+
+       if ((did & HIL_IDD_DID_REL_MOUSE_MASK) == HIL_IDD_DID_REL_MOUSE)
+               btntype = BTN_MOUSE;
+
+       for (i = 0; i < ptr->nbtn; i++) {
+               __set_bit(btntype | i, input_dev->keybit);
+               ptr->btnmap[i] = btntype | i;
+       }
+
+       if (btntype == BTN_MOUSE) {
+               /* Swap buttons 2 and 3 */
+               ptr->btnmap[1] = BTN_MIDDLE;
+               ptr->btnmap[2] = BTN_RIGHT;
+       }
+
+       input_dev->name = strlen(ptr->rnm) ? ptr->rnm : "HIL pointer device";
+
+       printk(KERN_INFO PREFIX
+               "HIL pointer device found (did: 0x%02x, axis: %s)\n",
+               did, txt);
+       printk(KERN_INFO PREFIX
+               "HIL pointer has %i buttons and %i sets of %i axes\n",
+               ptr->nbtn, naxsets, ptr->naxes);
+}
+
 static int hil_dev_connect(struct serio *serio, struct serio_driver *drv)
 {
        struct hil_dev *dev;
        struct input_dev *input_dev;
        uint8_t did, *idd;
-       int i;
        int error;
 
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
@@ -317,49 +500,47 @@ static int hil_dev_connect(struct serio *serio, struct serio_driver *drv)
 
        did = dev->idd[0];
        idd = dev->idd + 1;
+
        switch (did & HIL_IDD_DID_TYPE_MASK) {
        case HIL_IDD_DID_TYPE_KB_INTEGRAL:
        case HIL_IDD_DID_TYPE_KB_ITF:
        case HIL_IDD_DID_TYPE_KB_RSVD:
        case HIL_IDD_DID_TYPE_CHAR:
-               printk(KERN_INFO PREFIX "HIL keyboard found (did = 0x%02x, lang = %s)\n",
-                       did, hil_language[did & HIL_IDD_DID_TYPE_KB_LANG_MASK]);
+               if (HIL_IDD_NUM_BUTTONS(idd) ||
+                   HIL_IDD_NUM_AXES_PER_SET(*idd)) {
+                       printk(KERN_INFO PREFIX
+                               "combo devices are not supported.\n");
+                       goto bail1;
+               }
+
+               dev->is_pointer = false;
+               hil_dev_keyboard_setup(dev);
                break;
-       default:
-               goto bail1;
-       }
 
-       if (HIL_IDD_NUM_BUTTONS(idd) || HIL_IDD_NUM_AXES_PER_SET(*idd)) {
-               printk(KERN_INFO PREFIX "keyboards only, no combo devices supported.\n");
+       case HIL_IDD_DID_TYPE_REL:
+       case HIL_IDD_DID_TYPE_ABS:
+               dev->is_pointer = true;
+               hil_dev_pointer_setup(dev);
+               break;
+
+       default:
                goto bail1;
        }
 
-       input_dev->evbit[0]     = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
-       input_dev->ledbit[0]    = BIT_MASK(LED_NUML) | BIT_MASK(LED_CAPSL) |
-                                 BIT_MASK(LED_SCROLLL);
-       input_dev->keycodemax   = HIL_KEYCODES_SET1_TBLSIZE;
-       input_dev->keycodesize  = sizeof(hil_kbd_set1[0]);
-       input_dev->keycode      = hil_kbd_set1;
-       input_dev->name         = strlen(dev->rnm) ? dev->rnm : HIL_GENERIC_NAME;
-       input_dev->phys         = "hpkbd/input0";       /* XXX */
-
        input_dev->id.bustype   = BUS_HIL;
        input_dev->id.vendor    = PCI_VENDOR_ID_HP;
        input_dev->id.product   = 0x0001; /* TODO: get from kbd->rsc */
        input_dev->id.version   = 0x0100; /* TODO: get from kbd->rsc */
        input_dev->dev.parent   = &serio->dev;
 
-       for (i = 0; i < 128; i++) {
-               __set_bit(hil_kbd_set1[i], input_dev->keybit);
-               __set_bit(hil_kbd_set3[i], input_dev->keybit);
+       if (!dev->is_pointer) {
+               serio_write(serio, 0);
+               serio_write(serio, 0);
+               serio_write(serio, HIL_PKT_CMD >> 8);
+               /* Enable Keyswitch Autorepeat 1 */
+               serio_write(serio, HIL_CMD_EK1);
+               /* No need to wait for completion */
        }
-       __clear_bit(KEY_RESERVED, input_dev->keybit);
-
-       serio_write(serio, 0);
-       serio_write(serio, 0);
-       serio_write(serio, HIL_PKT_CMD >> 8);
-       serio_write(serio, HIL_CMD_EK1); /* Enable Keyswitch Autorepeat 1 */
-       /* No need to wait for completion */
 
        error = input_register_device(input_dev);
        if (error)
@@ -388,9 +569,9 @@ static struct serio_device_id hil_dev_ids[] = {
 
 static struct serio_driver hil_serio_drv = {
        .driver         = {
-               .name   = "hil_kbd",
+               .name   = "hil_dev",
        },
-       .description    = "HP HIL keyboard driver",
+       .description    = "HP HIL keyboard/mouse/tablet driver",
        .id_table       = hil_dev_ids,
        .connect        = hil_dev_connect,
        .disconnect     = hil_dev_disconnect,
index 8a2c5b1..90bef5d 100644 (file)
@@ -262,14 +262,6 @@ config MOUSE_VSXXXAA
          described in the source file). This driver also works with the
          digitizer (VSXXX-AB) DEC produced.
 
-config MOUSE_HIL
-       tristate "HIL pointers (mice etc)."
-       depends on GSC || HP300
-       select HP_SDC
-       select HIL_MLC
-       help
-         Say Y here to support HIL pointers.
-
 config MOUSE_GPIO
        tristate "GPIO mouse"
        depends on GENERIC_GPIO
index 010f265..ea58c9a 100644 (file)
@@ -9,7 +9,6 @@ obj-$(CONFIG_MOUSE_APPLETOUCH)          += appletouch.o
 obj-$(CONFIG_MOUSE_ATARI)              += atarimouse.o
 obj-$(CONFIG_MOUSE_BCM5974)            += bcm5974.o
 obj-$(CONFIG_MOUSE_GPIO)               += gpio_mouse.o
-obj-$(CONFIG_MOUSE_HIL)                        += hil_ptr.o
 obj-$(CONFIG_MOUSE_INPORT)             += inport.o
 obj-$(CONFIG_MOUSE_LOGIBM)             += logibm.o
 obj-$(CONFIG_MOUSE_MAPLE)              += maplemouse.o
diff --git a/drivers/input/mouse/hil_ptr.c b/drivers/input/mouse/hil_ptr.c
deleted file mode 100644 (file)
index cd12c2d..0000000
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * Generic linux-input device driver for axis-bearing devices
- *
- * Copyright (c) 2001 Brian S. Julin
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL").
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- *
- * References:
- * HP-HIL Technical Reference Manual.  Hewlett Packard Product No. 45918A
- *
- */
-
-#include <linux/hil.h>
-#include <linux/input.h>
-#include <linux/serio.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/pci_ids.h>
-
-#define PREFIX "HIL PTR: "
-#define HIL_GENERIC_NAME "HIL pointer device"
-
-MODULE_AUTHOR("Brian S. Julin <bri@calyx.com>");
-MODULE_DESCRIPTION(HIL_GENERIC_NAME " driver");
-MODULE_LICENSE("Dual BSD/GPL");
-MODULE_ALIAS("serio:ty03pr25id0Fex*");
-
-#define TABLET_SIMULATES_MOUSE /* allow tablet to be used as mouse */
-#undef  TABLET_AUTOADJUST      /* auto-adjust valid tablet ranges */
-
-
-#define HIL_PTR_MAX_LENGTH 16
-
-struct hil_ptr {
-       struct input_dev *dev;
-       struct serio *serio;
-
-       /* Input buffer and index for packets from HIL bus. */
-       hil_packet data[HIL_PTR_MAX_LENGTH];
-       int idx4; /* four counts per packet */
-
-       /* Raw device info records from HIL bus, see hil.h for fields. */
-       char    idd[HIL_PTR_MAX_LENGTH];        /* DID byte and IDD record */
-       char    rsc[HIL_PTR_MAX_LENGTH];        /* RSC record */
-       char    exd[HIL_PTR_MAX_LENGTH];        /* EXD record */
-       char    rnm[HIL_PTR_MAX_LENGTH + 1];    /* RNM record + NULL term. */
-
-       /* Extra device details not contained in struct input_dev. */
-       unsigned int nbtn, naxes;
-       unsigned int btnmap[7];
-
-       /* Something to sleep around with. */
-       struct semaphore sem;
-};
-
-/* Process a complete packet after transfer from the HIL */
-static void hil_ptr_process_record(struct hil_ptr *ptr)
-{
-       struct input_dev *dev = ptr->dev;
-       hil_packet *data = ptr->data;
-       hil_packet p;
-       int idx, i, cnt, laxis;
-       int ax16, absdev;
-
-       idx = ptr->idx4/4;
-       p = data[idx - 1];
-
-       if ((p & ~HIL_CMDCT_POL) ==
-           (HIL_ERR_INT | HIL_PKT_CMD | HIL_CMD_POL))
-               goto report;
-       if ((p & ~HIL_CMDCT_RPL) ==
-           (HIL_ERR_INT | HIL_PKT_CMD | HIL_CMD_RPL))
-               goto report;
-
-       /* Not a poll response.  See if we are loading config records. */
-       switch (p & HIL_PKT_DATA_MASK) {
-       case HIL_CMD_IDD:
-               for (i = 0; i < idx; i++)
-                       ptr->idd[i] = ptr->data[i] & HIL_PKT_DATA_MASK;
-               for (; i < HIL_PTR_MAX_LENGTH; i++)
-                       ptr->idd[i] = 0;
-               break;
-
-       case HIL_CMD_RSC:
-               for (i = 0; i < idx; i++)
-                       ptr->rsc[i] = ptr->data[i] & HIL_PKT_DATA_MASK;
-               for (; i < HIL_PTR_MAX_LENGTH; i++)
-                       ptr->rsc[i] = 0;
-               break;
-
-       case HIL_CMD_EXD:
-               for (i = 0; i < idx; i++)
-                       ptr->exd[i] = ptr->data[i] & HIL_PKT_DATA_MASK;
-               for (; i < HIL_PTR_MAX_LENGTH; i++)
-                       ptr->exd[i] = 0;
-               break;
-
-       case HIL_CMD_RNM:
-               for (i = 0; i < idx; i++)
-                       ptr->rnm[i] = ptr->data[i] & HIL_PKT_DATA_MASK;
-               for (; i < HIL_PTR_MAX_LENGTH + 1; i++)
-                       ptr->rnm[i] = 0;
-               break;
-
-       default:
-               /* These occur when device isn't present */
-               if (p == (HIL_ERR_INT | HIL_PKT_CMD))
-                       break;
-               /* Anything else we'd like to know about. */
-               printk(KERN_WARNING PREFIX "Device sent unknown record %x\n", p);
-               break;
-       }
-       goto out;
-
- report:
-       if ((p & HIL_CMDCT_POL) != idx - 1) {
-               printk(KERN_WARNING PREFIX
-                       "Malformed poll packet %x (idx = %i)\n", p, idx);
-               goto out;
-       }
-
-       i = (ptr->data[0] & HIL_POL_AXIS_ALT) ? 3 : 0;
-       laxis = ptr->data[0] & HIL_POL_NUM_AXES_MASK;
-       laxis += i;
-
-       ax16 = ptr->idd[1] & HIL_IDD_HEADER_16BIT; /* 8 or 16bit resolution */
-       absdev = ptr->idd[1] & HIL_IDD_HEADER_ABS;
-
-       for (cnt = 1; i < laxis; i++) {
-               unsigned int lo,hi,val;
-               lo = ptr->data[cnt++] & HIL_PKT_DATA_MASK;
-               hi = ax16 ? (ptr->data[cnt++] & HIL_PKT_DATA_MASK) : 0;
-               if (absdev) {
-                       val = lo + (hi<<8);
-#ifdef TABLET_AUTOADJUST
-                       if (val < dev->absmin[ABS_X + i])
-                               dev->absmin[ABS_X + i] = val;
-                       if (val > dev->absmax[ABS_X + i])
-                               dev->absmax[ABS_X + i] = val;
-#endif
-                       if (i%3) val = dev->absmax[ABS_X + i] - val;
-                       input_report_abs(dev, ABS_X + i, val);
-               } else {
-                       val = (int) (((int8_t)lo) | ((int8_t)hi<<8));
-                       if (i%3)
-                               val *= -1;
-                       input_report_rel(dev, REL_X + i, val);
-               }
-       }
-
-       while (cnt < idx - 1) {
-               unsigned int btn;
-               int up;
-               btn = ptr->data[cnt++];
-               up = btn & 1;
-               btn &= 0xfe;
-               if (btn == 0x8e)
-                       continue; /* TODO: proximity == touch? */
-               else
-                       if ((btn > 0x8c) || (btn < 0x80))
-                               continue;
-               btn = (btn - 0x80) >> 1;
-               btn = ptr->btnmap[btn];
-               input_report_key(dev, btn, !up);
-       }
-       input_sync(dev);
- out:
-       ptr->idx4 = 0;
-       up(&ptr->sem);
-}
-
-static void hil_ptr_process_err(struct hil_ptr *ptr)
-{
-       printk(KERN_WARNING PREFIX "errored HIL packet\n");
-       ptr->idx4 = 0;
-       up(&ptr->sem);
-}
-
-static irqreturn_t hil_ptr_interrupt(struct serio *serio,
-        unsigned char data, unsigned int flags)
-{
-       struct hil_ptr *ptr;
-       hil_packet packet;
-       int idx;
-
-       ptr = serio_get_drvdata(serio);
-       BUG_ON(ptr == NULL);
-
-       if (ptr->idx4 >= (HIL_PTR_MAX_LENGTH * sizeof(hil_packet))) {
-               hil_ptr_process_err(ptr);
-               return IRQ_HANDLED;
-       }
-       idx = ptr->idx4/4;
-       if (!(ptr->idx4 % 4))
-               ptr->data[idx] = 0;
-       packet = ptr->data[idx];
-       packet |= ((hil_packet)data) << ((3 - (ptr->idx4 % 4)) * 8);
-       ptr->data[idx] = packet;
-
-       /* Records of N 4-byte hil_packets must terminate with a command. */
-       if ((++(ptr->idx4)) % 4)
-               return IRQ_HANDLED;
-       if ((packet & 0xffff0000) != HIL_ERR_INT) {
-               hil_ptr_process_err(ptr);
-               return IRQ_HANDLED;
-       }
-       if (packet & HIL_PKT_CMD)
-               hil_ptr_process_record(ptr);
-
-       return IRQ_HANDLED;
-}
-
-static void hil_ptr_disconnect(struct serio *serio)
-{
-       struct hil_ptr *ptr;
-
-       ptr = serio_get_drvdata(serio);
-       BUG_ON(ptr == NULL);
-
-       serio_close(serio);
-       input_unregister_device(ptr->dev);
-       kfree(ptr);
-}
-
-static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
-{
-       struct hil_ptr  *ptr;
-       const char      *txt;
-       unsigned int    i, naxsets, btntype;
-       uint8_t         did, *idd;
-       int             error;
-
-       ptr = kzalloc(sizeof(struct hil_ptr), GFP_KERNEL);
-       if (!ptr)
-               return -ENOMEM;
-
-       ptr->dev = input_allocate_device();
-       if (!ptr->dev) {
-               error = -ENOMEM;
-               goto bail0;
-       }
-
-       error = serio_open(serio, driver);
-       if (error)
-               goto bail1;
-
-       serio_set_drvdata(serio, ptr);
-       ptr->serio = serio;
-
-       init_MUTEX_LOCKED(&ptr->sem);
-
-       /* Get device info.  MLC driver supplies devid/status/etc. */
-       serio_write(serio, 0);
-       serio_write(serio, 0);
-       serio_write(serio, HIL_PKT_CMD >> 8);
-       serio_write(serio, HIL_CMD_IDD);
-       down(&ptr->sem);
-
-       serio_write(serio, 0);
-       serio_write(serio, 0);
-       serio_write(serio, HIL_PKT_CMD >> 8);
-       serio_write(serio, HIL_CMD_RSC);
-       down(&ptr->sem);
-
-       serio_write(serio, 0);
-       serio_write(serio, 0);
-       serio_write(serio, HIL_PKT_CMD >> 8);
-       serio_write(serio, HIL_CMD_RNM);
-       down(&ptr->sem);
-
-       serio_write(serio, 0);
-       serio_write(serio, 0);
-       serio_write(serio, HIL_PKT_CMD >> 8);
-       serio_write(serio, HIL_CMD_EXD);
-       down(&ptr->sem);
-
-       up(&ptr->sem);
-
-       did = ptr->idd[0];
-       idd = ptr->idd + 1;
-       txt = "unknown";
-
-       if ((did & HIL_IDD_DID_TYPE_MASK) == HIL_IDD_DID_TYPE_REL) {
-               ptr->dev->evbit[0] = BIT_MASK(EV_REL);
-               txt = "relative";
-       }
-
-       if ((did & HIL_IDD_DID_TYPE_MASK) == HIL_IDD_DID_TYPE_ABS) {
-               ptr->dev->evbit[0] = BIT_MASK(EV_ABS);
-               txt = "absolute";
-       }
-
-       if (!ptr->dev->evbit[0]) {
-               error = -ENODEV;
-               goto bail2;
-       }
-
-       ptr->nbtn = HIL_IDD_NUM_BUTTONS(idd);
-       if (ptr->nbtn)
-               ptr->dev->evbit[0] |= BIT_MASK(EV_KEY);
-
-       naxsets = HIL_IDD_NUM_AXSETS(*idd);
-       ptr->naxes = HIL_IDD_NUM_AXES_PER_SET(*idd);
-
-       printk(KERN_INFO PREFIX "HIL pointer device found (did: 0x%02x, axis: %s)\n",
-                       did, txt);
-       printk(KERN_INFO PREFIX "HIL pointer has %i buttons and %i sets of %i axes\n",
-                       ptr->nbtn, naxsets, ptr->naxes);
-
-       btntype = BTN_MISC;
-       if ((did & HIL_IDD_DID_ABS_TABLET_MASK) == HIL_IDD_DID_ABS_TABLET)
-#ifdef TABLET_SIMULATES_MOUSE
-               btntype = BTN_TOUCH;
-#else
-               btntype = BTN_DIGI;
-#endif
-       if ((did & HIL_IDD_DID_ABS_TSCREEN_MASK) == HIL_IDD_DID_ABS_TSCREEN)
-               btntype = BTN_TOUCH;
-
-       if ((did & HIL_IDD_DID_REL_MOUSE_MASK) == HIL_IDD_DID_REL_MOUSE)
-               btntype = BTN_MOUSE;
-
-       for (i = 0; i < ptr->nbtn; i++) {
-               set_bit(btntype | i, ptr->dev->keybit);
-               ptr->btnmap[i] = btntype | i;
-       }
-
-       if (btntype == BTN_MOUSE) {
-               /* Swap buttons 2 and 3 */
-               ptr->btnmap[1] = BTN_MIDDLE;
-               ptr->btnmap[2] = BTN_RIGHT;
-       }
-
-       if ((did & HIL_IDD_DID_TYPE_MASK) == HIL_IDD_DID_TYPE_REL) {
-               for (i = 0; i < ptr->naxes; i++)
-                       set_bit(REL_X + i, ptr->dev->relbit);
-               for (i = 3; (i < ptr->naxes + 3) && (naxsets > 1); i++)
-                       set_bit(REL_X + i, ptr->dev->relbit);
-       } else {
-               for (i = 0; i < ptr->naxes; i++) {
-                       set_bit(ABS_X + i, ptr->dev->absbit);
-                       ptr->dev->absmin[ABS_X + i] = 0;
-                       ptr->dev->absmax[ABS_X + i] =
-                               HIL_IDD_AXIS_MAX((ptr->idd + 1), i);
-               }
-               for (i = 3; (i < ptr->naxes + 3) && (naxsets > 1); i++) {
-                       set_bit(ABS_X + i, ptr->dev->absbit);
-                       ptr->dev->absmin[ABS_X + i] = 0;
-                       ptr->dev->absmax[ABS_X + i] =
-                               HIL_IDD_AXIS_MAX((ptr->idd + 1), (i - 3));
-               }
-#ifdef TABLET_AUTOADJUST
-               for (i = 0; i < ABS_MAX; i++) {
-                       int diff = ptr->dev->absmax[ABS_X + i] / 10;
-                       ptr->dev->absmin[ABS_X + i] += diff;
-                       ptr->dev->absmax[ABS_X + i] -= diff;
-               }
-#endif
-       }
-
-       ptr->dev->name = strlen(ptr->rnm) ? ptr->rnm : HIL_GENERIC_NAME;
-
-       ptr->dev->id.bustype    = BUS_HIL;
-       ptr->dev->id.vendor     = PCI_VENDOR_ID_HP;
-       ptr->dev->id.product    = 0x0001; /* TODO: get from ptr->rsc */
-       ptr->dev->id.version    = 0x0100; /* TODO: get from ptr->rsc */
-       ptr->dev->dev.parent    = &serio->dev;
-
-       error = input_register_device(ptr->dev);
-       if (error) {
-               printk(KERN_INFO PREFIX "Unable to register input device\n");
-               goto bail2;
-       }
-
-       printk(KERN_INFO "input: %s (%s), ID: %d\n",
-               ptr->dev->name,
-               (btntype == BTN_MOUSE) ? "HIL mouse":"HIL tablet or touchpad",
-               did);
-
-       return 0;
-
- bail2:
-       serio_close(serio);
- bail1:
-       input_free_device(ptr->dev);
- bail0:
-       kfree(ptr);
-       serio_set_drvdata(serio, NULL);
-       return error;
-}
-
-static struct serio_device_id hil_ptr_ids[] = {
-       {
-               .type = SERIO_HIL_MLC,
-               .proto = SERIO_HIL,
-               .id = SERIO_ANY,
-               .extra = SERIO_ANY,
-       },
-       { 0 }
-};
-
-static struct serio_driver hil_ptr_serio_driver = {
-       .driver         = {
-               .name   = "hil_ptr",
-       },
-       .description    = "HP HIL mouse/tablet driver",
-       .id_table       = hil_ptr_ids,
-       .connect        = hil_ptr_connect,
-       .disconnect     = hil_ptr_disconnect,
-       .interrupt      = hil_ptr_interrupt
-};
-
-static int __init hil_ptr_init(void)
-{
-       return serio_register_driver(&hil_ptr_serio_driver);
-}
-
-static void __exit hil_ptr_exit(void)
-{
-       serio_unregister_driver(&hil_ptr_serio_driver);
-}
-
-module_init(hil_ptr_init);
-module_exit(hil_ptr_exit);