]> err.no Git - linux-2.6/commitdiff
[PARISC] Update parisc specific input code from parisc tree
authorMatthew Wilcox <willy@parisc-linux.org>
Sat, 22 Oct 2005 02:58:51 +0000 (22:58 -0400)
committerKyle McMartin <kyle@parisc-linux.org>
Sat, 22 Oct 2005 02:58:51 +0000 (22:58 -0400)
Update drivers to new input layer changes.

Signed-off-by: Helge Deller <deller@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Reorder code in gscps2_interrupt() and only enable ports when opened.
This fixes issues with hangs booting an SMP kernel on my C360.
Previously serio_interrupt() could be called before the lock in
struct serio was initialised.

Signed-off-by: Richard Hirst <rhirst@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
drivers/input/keyboard/hil_kbd.c
drivers/input/keyboard/hilkbd.c
drivers/input/mouse/hil_ptr.c
drivers/input/serio/gscps2.c
drivers/input/serio/hil_mlc.c
include/linux/hil.h [new file with mode: 0644]
include/linux/hil_mlc.h [new file with mode: 0644]
include/linux/hp_sdc.h [new file with mode: 0644]
include/linux/input.h

index ef78bffed5e7bd643ac2dfd16c65e9f14c203f64..0a90962c38e7ef43ca9a1b8eed924fa859929445 100644 (file)
@@ -204,7 +204,7 @@ static irqreturn_t hil_kbd_interrupt(struct serio *serio,
        hil_packet packet;
        int idx;
 
-       kbd = (struct hil_kbd *)serio->private;
+       kbd = serio_get_drvdata(serio);
        if (kbd == NULL) {
                BUG();
                return IRQ_HANDLED;
@@ -234,7 +234,7 @@ static void hil_kbd_disconnect(struct serio *serio)
 {
        struct hil_kbd *kbd;
 
-       kbd = (struct hil_kbd *)serio->private;
+       kbd = serio_get_drvdata(serio);
        if (kbd == NULL) {
                BUG();
                return;
@@ -245,20 +245,20 @@ static void hil_kbd_disconnect(struct serio *serio)
        kfree(kbd);
 }
 
-static void hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
+static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
 {
        struct hil_kbd  *kbd;
        uint8_t         did, *idd;
        int             i;
        
-       if (serio->type != (SERIO_HIL_MLC | SERIO_HIL)) return;
-
-       if (!(kbd = kmalloc(sizeof(struct hil_kbd), GFP_KERNEL))) return;
+       kbd = kmalloc(sizeof(*kbd), GFP_KERNEL);
+       if (!kbd)
+               return -ENOMEM;
        memset(kbd, 0, sizeof(struct hil_kbd));
 
        if (serio_open(serio, drv)) goto bail0;
 
-       serio->private = kbd;
+       serio_set_drvdata(serio, kbd);
        kbd->serio = serio;
        kbd->dev.private = kbd;
 
@@ -342,19 +342,31 @@ static void hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
        down(&(kbd->sem));
        up(&(kbd->sem));
 
-       return;
+       return 0;
  bail1:
        serio_close(serio);
  bail0:
        kfree(kbd);
+       serio_set_drvdata(serio, NULL);
+       return -EIO;
 }
 
+static struct serio_device_id hil_kbd_ids[] = {
+       {
+               .type = SERIO_HIL_MLC,
+               .proto = SERIO_HIL,
+               .id = SERIO_ANY,
+               .extra = SERIO_ANY,
+       },
+       { 0 }
+};
 
 struct serio_driver hil_kbd_serio_drv = {
        .driver         = {
                .name   = "hil_kbd",
        },
        .description    = "HP HIL keyboard driver",
+       .id_table       = hil_kbd_ids,
        .connect        = hil_kbd_connect,
        .disconnect     = hil_kbd_disconnect,
        .interrupt      = hil_kbd_interrupt
index e7a1e14f8b0cc3eb093a95cf4db26ef3c1e1ea62..e95bc052e32a3ec6ab406ed74c90be0cfc811606 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/errno.h>
 #include <linux/input.h>
 #include <linux/init.h>
-#include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <linux/hil.h>
 #include <linux/spinlock.h>
 
index bc22849c6c79ef12de27efee7e50229881cef0df..c2bf2ed07dc6937aa8cbb98171d6b9021e4a577a 100644 (file)
@@ -196,7 +196,7 @@ static irqreturn_t hil_ptr_interrupt(struct serio *serio,
        hil_packet packet;
        int idx;
 
-       ptr = (struct hil_ptr *)serio->private;
+       ptr = serio_get_drvdata(serio);
        if (ptr == NULL) {
                BUG();
                return IRQ_HANDLED;
@@ -227,7 +227,7 @@ static void hil_ptr_disconnect(struct serio *serio)
 {
        struct hil_ptr *ptr;
 
-       ptr = (struct hil_ptr *)serio->private;
+       ptr = serio_get_drvdata(serio);
        if (ptr == NULL) {
                BUG();
                return;
@@ -238,21 +238,19 @@ static void hil_ptr_disconnect(struct serio *serio)
        kfree(ptr);
 }
 
-static void hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
+static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
 {
        struct hil_ptr  *ptr;
        char            *txt;
        unsigned int    i, naxsets, btntype;
        uint8_t         did, *idd;
 
-       if (serio->type != (SERIO_HIL_MLC | SERIO_HIL)) return;
-
-       if (!(ptr = kmalloc(sizeof(struct hil_ptr), GFP_KERNEL))) return;
+       if (!(ptr = kmalloc(sizeof(struct hil_ptr), GFP_KERNEL))) return -ENOMEM;
        memset(ptr, 0, sizeof(struct hil_ptr));
 
        if (serio_open(serio, driver)) goto bail0;
 
-       serio->private = ptr;
+       serio_set_drvdata(serio, ptr);
        ptr->serio = serio;
        ptr->dev.private = ptr;
 
@@ -380,23 +378,34 @@ static void hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
                (btntype == BTN_MOUSE) ? "HIL mouse":"HIL tablet or touchpad",
                did);
 
-       return;
+       return 0;
  bail1:
        serio_close(serio);
  bail0:
        kfree(ptr);
-       return;
+       serio_set_drvdata(serio, NULL);
+       return -ENODEV;
 }
 
+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",
-       .connect =      hil_ptr_connect,
-       .disconnect =   hil_ptr_disconnect,
-       .interrupt =    hil_ptr_interrupt
+       .id_table       = hil_ptr_ids,
+       .connect        = hil_ptr_connect,
+       .disconnect     = hil_ptr_disconnect,
+       .interrupt      = hil_ptr_interrupt
 };
 
 static int __init hil_ptr_init(void)
index 9790d7169a533d664d349bb61a456eeb0ce63caf..a7b0de0f92b2ab416cd44b62ae03dc6eda988ba0 100644 (file)
@@ -211,9 +211,6 @@ static void gscps2_reset(struct gscps2port *ps2port)
        writeb(0xff, addr+GSC_RESET);
        gscps2_flush(ps2port);
        spin_unlock_irqrestore(&ps2port->lock, flags);
-
-       /* enable it */
-       gscps2_enable(ps2port, ENABLE);
 }
 
 static LIST_HEAD(ps2port_list);
@@ -307,6 +304,9 @@ static int gscps2_open(struct serio *port)
 
        gscps2_reset(ps2port);
 
+       /* enable it */
+       gscps2_enable(ps2port, ENABLE);
+
        gscps2_interrupt(0, NULL, NULL);
 
        return 0;
@@ -370,8 +370,6 @@ static int __init gscps2_probe(struct parisc_device *dev)
        serio->port_data        = ps2port;
        serio->dev.parent       = &dev->dev;
 
-       list_add_tail(&ps2port->node, &ps2port_list);
-
        ret = -EBUSY;
        if (request_irq(dev->irq, gscps2_interrupt, SA_SHIRQ, ps2port->port->name, ps2port))
                goto fail_miserably;
@@ -396,15 +394,16 @@ static int __init gscps2_probe(struct parisc_device *dev)
 
        serio_register_port(ps2port->port);
 
+       list_add_tail(&ps2port->node, &ps2port_list);
+
        return 0;
 
 fail:
        free_irq(dev->irq, ps2port);
 
 fail_miserably:
-       list_del(&ps2port->node);
        iounmap(ps2port->addr);
-       release_mem_region(dev->hpa, GSC_STATUS + 4);
+       release_mem_region(dev->hpa.start, GSC_STATUS + 4);
 
 fail_nomem:
        kfree(ps2port);
index c243cb6fdfc4a72f56d188b5e59a62314cede3af..5704204964a3545caac7c19bdc46999218ea139a 100644 (file)
@@ -801,7 +801,8 @@ static int hil_mlc_serio_open(struct serio *serio) {
        struct hil_mlc_serio_map *map;
        struct hil_mlc *mlc;
 
-       if (serio->private != NULL) return -EBUSY;
+       if (serio_get_drvdata(serio) != NULL)
+               return -EBUSY;
 
        map = serio->port_data;
        if (map == NULL) {
@@ -832,11 +833,18 @@ static void hil_mlc_serio_close(struct serio *serio) {
                return;
        }
 
-       serio->private = NULL;
+       serio_set_drvdata(serio, NULL);
        serio->drv = NULL;
        /* TODO wake up interruptable */
 }
 
+static struct serio_device_id hil_mlc_serio_id = {
+       .type = SERIO_HIL_MLC,
+       .proto = SERIO_HIL,
+       .extra = SERIO_ANY,
+       .id = SERIO_ANY,
+};
+
 int hil_mlc_register(hil_mlc *mlc) {
        int i;
         unsigned long flags;
@@ -867,7 +875,7 @@ int hil_mlc_register(hil_mlc *mlc) {
                mlc_serio = kmalloc(sizeof(*mlc_serio), GFP_KERNEL);
                mlc->serio[i] = mlc_serio;
                memset(mlc_serio, 0, sizeof(*mlc_serio));
-               mlc_serio->type                 = SERIO_HIL | SERIO_HIL_MLC;
+               mlc_serio->id                   = hil_mlc_serio_id;
                mlc_serio->write                = hil_mlc_serio_write;
                mlc_serio->open                 = hil_mlc_serio_open;
                mlc_serio->close                = hil_mlc_serio_close;
diff --git a/include/linux/hil.h b/include/linux/hil.h
new file mode 100644 (file)
index 0000000..13352d7
--- /dev/null
@@ -0,0 +1,483 @@
+#ifndef _HIL_H_
+#define _HIL_H_
+
+/*
+ * Hewlett Packard Human Interface Loop (HP-HIL) Protocol -- header.
+ *
+ * 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
+ *
+ * A note of thanks to HP for providing and shipping reference materials
+ * free of charge to help in the development of HIL support for Linux.
+ *
+ */
+
+#include <asm/types.h>
+
+/* Physical constants relevant to raw loop/device timing. 
+ */ 
+
+#define HIL_CLOCK              8MHZ
+#define HIL_EK1_CLOCK          30HZ
+#define HIL_EK2_CLOCK          60HZ
+
+#define HIL_TIMEOUT_DEV         5      /* ms */
+#define HIL_TIMEOUT_DEVS       10      /* ms */
+#define HIL_TIMEOUT_NORESP     10      /* ms */
+#define HIL_TIMEOUT_DEVS_DATA  16      /* ms */
+#define HIL_TIMEOUT_SELFTEST   200     /* ms */
+
+
+/* Actual wire line coding.  These will only be useful if someone is 
+ * implementing a software MLC to run HIL devices on a non-parisc machine.
+ */
+
+#define HIL_WIRE_PACKET_LEN    15
+enum hil_wire_bitpos {
+       HIL_WIRE_START          = 0,
+       HIL_WIRE_ADDR2,
+       HIL_WIRE_ADDR1,
+       HIL_WIRE_ADDR0,
+       HIL_WIRE_COMMAND,
+       HIL_WIRE_DATA7,
+       HIL_WIRE_DATA6,
+       HIL_WIRE_DATA5,
+       HIL_WIRE_DATA4,
+       HIL_WIRE_DATA3,
+       HIL_WIRE_DATA2,
+       HIL_WIRE_DATA1,
+       HIL_WIRE_DATA0,
+       HIL_WIRE_PARITY,
+       HIL_WIRE_STOP
+};
+
+/* HP documentation uses these bit positions to refer to commands;
+ * we will call these "packets".
+ */
+enum hil_pkt_bitpos {
+       HIL_PKT_CMD             = 0x00000800,
+       HIL_PKT_ADDR2           = 0x00000400,
+       HIL_PKT_ADDR1           = 0x00000200,
+       HIL_PKT_ADDR0           = 0x00000100,
+       HIL_PKT_ADDR_MASK       = 0x00000700,
+       HIL_PKT_ADDR_SHIFT      = 8,
+       HIL_PKT_DATA7           = 0x00000080,
+       HIL_PKT_DATA6           = 0x00000040,
+       HIL_PKT_DATA5           = 0x00000020,
+       HIL_PKT_DATA4           = 0x00000010,
+       HIL_PKT_DATA3           = 0x00000008,
+       HIL_PKT_DATA2           = 0x00000004,
+       HIL_PKT_DATA1           = 0x00000002,
+       HIL_PKT_DATA0           = 0x00000001,
+       HIL_PKT_DATA_MASK       = 0x000000FF,
+       HIL_PKT_DATA_SHIFT      = 0
+};
+
+/* The HIL MLC also has several error/status/control bits.  We extend the 
+ * "packet" to include these when direct access to the MLC is available,
+ * or emulate them in cases where they are not available. 
+ *
+ * This way the device driver knows that the underlying MLC driver
+ * has had to deal with loop errors.
+ */
+enum hil_error_bitpos {
+       HIL_ERR_OB      = 0x00000800, /* MLC is busy sending an auto-poll, 
+                                        or we have filled up the output 
+                                        buffer and must wait. */
+       HIL_ERR_INT     = 0x00010000, /* A normal interrupt has occurred. */
+       HIL_ERR_NMI     = 0x00020000, /* An NMI has occurred. */
+       HIL_ERR_LERR    = 0x00040000, /* A poll didn't come back. */
+       HIL_ERR_PERR    = 0x01000000, /* There was a Parity Error. */
+       HIL_ERR_FERR    = 0x02000000, /* There was a Framing Error. */
+       HIL_ERR_FOF     = 0x04000000  /* Input FIFO Overflowed. */
+};
+
+enum hil_control_bitpos {
+       HIL_CTRL_TEST   = 0x00010000,
+       HIL_CTRL_IPF    = 0x00040000,
+       HIL_CTRL_APE    = 0x02000000
+};
+
+/* Bits 30,31 are unused, we use them to control write behavior. */
+#define HIL_DO_ALTER_CTRL  0x40000000 /* Write MSW of packet to control 
+                                          before writing LSW to loop */
+#define HIL_CTRL_ONLY      0xc0000000 /* *Only* alter the control registers */
+
+/* This gives us a 32-bit "packet" 
+ */
+typedef u32 hil_packet;
+
+
+/* HIL Loop commands 
+ */
+enum hil_command {
+       HIL_CMD_IFC     = 0x00, /* Interface Clear */
+       HIL_CMD_EPT     = 0x01, /* Enter Pass-Thru Mode */
+       HIL_CMD_ELB     = 0x02, /* Enter Loop-Back Mode */
+       HIL_CMD_IDD     = 0x03, /* Identify and Describe */
+       HIL_CMD_DSR     = 0x04, /* Device Soft Reset */
+       HIL_CMD_PST     = 0x05, /* Perform Self Test */
+       HIL_CMD_RRG     = 0x06, /* Read Register */
+       HIL_CMD_WRG     = 0x07, /* Write Register */
+       HIL_CMD_ACF     = 0x08, /* Auto Configure */
+       HIL_CMDID_ACF   = 0x07, /* Auto Configure bits with incremented ID */
+       HIL_CMD_POL     = 0x10, /* Poll */
+       HIL_CMDCT_POL   = 0x0f, /* Poll command bits with item count  */
+       HIL_CMD_RPL     = 0x20, /* RePoll */
+       HIL_CMDCT_RPL   = 0x0f, /* RePoll command bits with item count */
+       HIL_CMD_RNM     = 0x30, /* Report Name */
+       HIL_CMD_RST     = 0x31, /* Report Status */
+       HIL_CMD_EXD     = 0x32, /* Extended Describe */
+       HIL_CMD_RSC     = 0x33, /* Report Security Code */
+
+       /* 0x34 to 0x3c reserved for future use  */
+
+       HIL_CMD_DKA     = 0x3d, /* Disable Keyswitch Autorepeat */
+       HIL_CMD_EK1     = 0x3e, /* Enable Keyswitch Autorepeat 1 */
+       HIL_CMD_EK2     = 0x3f, /* Enable Keyswitch Autorepeat 2 */
+       HIL_CMD_PR1     = 0x40, /* Prompt1 */  
+       HIL_CMD_PR2     = 0x41, /* Prompt2 */
+       HIL_CMD_PR3     = 0x42, /* Prompt3 */
+       HIL_CMD_PR4     = 0x43, /* Prompt4 */
+       HIL_CMD_PR5     = 0x44, /* Prompt5 */
+       HIL_CMD_PR6     = 0x45, /* Prompt6 */
+       HIL_CMD_PR7     = 0x46, /* Prompt7 */
+       HIL_CMD_PRM     = 0x47, /* Prompt (General Purpose) */
+       HIL_CMD_AK1     = 0x48, /* Acknowlege1 */  
+       HIL_CMD_AK2     = 0x49, /* Acknowlege2 */
+       HIL_CMD_AK3     = 0x4a, /* Acknowlege3 */
+       HIL_CMD_AK4     = 0x4b, /* Acknowlege4 */
+       HIL_CMD_AK5     = 0x4c, /* Acknowlege5 */
+       HIL_CMD_AK6     = 0x4d, /* Acknowlege6 */
+       HIL_CMD_AK7     = 0x4e, /* Acknowlege7 */
+       HIL_CMD_ACK     = 0x4f, /* Acknowlege (General Purpose) */
+
+       /* 0x50 to 0x78 reserved for future use  */
+       /* 0x80 to 0xEF device-specific commands */
+       /* 0xf0 to 0xf9 reserved for future use  */
+
+       HIL_CMD_RIO     = 0xfa, /* Register I/O Error */
+       HIL_CMD_SHR     = 0xfb, /* System Hard Reset */
+       HIL_CMD_TER     = 0xfc, /* Transmission Error */
+       HIL_CMD_CAE     = 0xfd, /* Configuration Address Error */
+       HIL_CMD_DHR     = 0xfe, /* Device Hard Reset */
+
+       /* 0xff is prohibited from use. */
+};
+
+
+/* 
+ * Response "records" to HIL commands
+ */
+
+/* Device ID byte 
+ */
+#define HIL_IDD_DID_TYPE_MASK          0xe0    /* Primary type bits */
+#define HIL_IDD_DID_TYPE_KB_INTEGRAL   0xa0    /* Integral keyboard */
+#define HIL_IDD_DID_TYPE_KB_ITF                0xc0    /* ITD keyboard */
+#define HIL_IDD_DID_TYPE_KB_RSVD       0xe0    /* Reserved keyboard type */
+#define HIL_IDD_DID_TYPE_KB_LANG_MASK  0x1f    /* Keyboard locale bits */
+#define HIL_IDD_DID_KBLANG_USE_ESD     0x00    /* Use ESD Locale instead */
+#define HIL_IDD_DID_TYPE_ABS           0x80    /* Absolute Positioners */
+#define HIL_IDD_DID_ABS_RSVD1_MASK     0xf8    /* Reserved */
+#define HIL_IDD_DID_ABS_RSVD1          0x98
+#define HIL_IDD_DID_ABS_TABLET_MASK    0xf8    /* Tablets and digitizers */
+#define HIL_IDD_DID_ABS_TABLET         0x90
+#define HIL_IDD_DID_ABS_TSCREEN_MASK   0xfc    /* Touch screens */
+#define HIL_IDD_DID_ABS_TSCREEN                0x8c
+#define HIL_IDD_DID_ABS_RSVD2_MASK     0xfc    /* Reserved */
+#define HIL_IDD_DID_ABS_RSVD2          0x88
+#define HIL_IDD_DID_ABS_RSVD3_MASK     0xfc    /* Reserved */
+#define HIL_IDD_DID_ABS_RSVD3          0x80
+#define HIL_IDD_DID_TYPE_REL           0x60    /* Relative Positioners */
+#define HIL_IDD_DID_REL_RSVD1_MASK     0xf0    /* Reserved */
+#define HIL_IDD_DID_REL_RSVD1          0x70
+#define HIL_IDD_DID_REL_RSVD2_MASK     0xfc    /* Reserved */
+#define HIL_IDD_DID_REL_RSVD2          0x6c
+#define HIL_IDD_DID_REL_MOUSE_MASK     0xfc    /* Mouse */
+#define HIL_IDD_DID_REL_MOUSE          0x68
+#define HIL_IDD_DID_REL_QUAD_MASK      0xf8    /* Other Quadrature Devices */
+#define HIL_IDD_DID_REL_QUAD           0x60
+#define HIL_IDD_DID_TYPE_CHAR          0x40    /* Character Entry */
+#define HIL_IDD_DID_CHAR_BARCODE_MASK  0xfc    /* Barcode Reader */
+#define HIL_IDD_DID_CHAR_BARCODE       0x5c
+#define HIL_IDD_DID_CHAR_RSVD1_MASK    0xfc    /* Reserved */
+#define HIL_IDD_DID_CHAR_RSVD1         0x58
+#define HIL_IDD_DID_CHAR_RSVD2_MASK    0xf8    /* Reserved */
+#define HIL_IDD_DID_CHAR_RSVD2         0x50
+#define HIL_IDD_DID_CHAR_RSVD3_MASK    0xf0    /* Reserved */
+#define HIL_IDD_DID_CHAR_RSVD3         0x40
+#define HIL_IDD_DID_TYPE_OTHER         0x20    /* Miscellaneous */
+#define HIL_IDD_DID_OTHER_RSVD1_MASK   0xf0    /* Reserved */
+#define HIL_IDD_DID_OTHER_RSVD1                0x30
+#define HIL_IDD_DID_OTHER_BARCODE_MASK 0xfc    /* Tone Generator */
+#define HIL_IDD_DID_OTHER_BARCODE      0x2c
+#define HIL_IDD_DID_OTHER_RSVD2_MASK   0xfc    /* Reserved */
+#define HIL_IDD_DID_OTHER_RSVD2                0x28
+#define HIL_IDD_DID_OTHER_RSVD3_MASK   0xf8    /* Reserved */
+#define HIL_IDD_DID_OTHER_RSVD3                0x20
+#define HIL_IDD_DID_TYPE_KEYPAD                0x00    /* Vectra Keyboard */
+
+/* IDD record header 
+ */
+#define HIL_IDD_HEADER_AXSET_MASK      0x03    /* Number of axis in a set */
+#define HIL_IDD_HEADER_RSC             0x04    /* Supports RSC command */
+#define HIL_IDD_HEADER_EXD             0x08    /* Supports EXD command */
+#define HIL_IDD_HEADER_IOD             0x10    /* IOD byte to follow */
+#define HIL_IDD_HEADER_16BIT           0x20    /* 16 (vs. 8) bit resolution */
+#define HIL_IDD_HEADER_ABS             0x40    /* Reports Absolute Position */
+#define HIL_IDD_HEADER_2X_AXIS         0x80    /* Two sets of 1-3 axis */
+
+/* I/O Descriptor
+ */
+#define HIL_IDD_IOD_NBUTTON_MASK       0x07    /* Number of buttons */
+#define HIL_IDD_IOD_PROXIMITY          0x08    /* Proximity in/out events */
+#define HIL_IDD_IOD_PROMPT_MASK                0x70    /* Number of prompts/acks */
+#define HIL_IDD_IOD_PROMPT_SHIFT       4
+#define HIL_IDD_IOD_PROMPT             0x80    /* Generic prompt/ack */
+
+#define HIL_IDD_NUM_AXES_PER_SET(header_packet) \
+((header_packet) & HIL_IDD_HEADER_AXSET_MASK)
+
+#define HIL_IDD_NUM_AXSETS(header_packet) \
+(2 - !((header_packet) & HIL_IDD_HEADER_2X_AXIS))
+
+#define HIL_IDD_LEN(header_packet) \
+((4 - !(header_packet & HIL_IDD_HEADER_IOD) -                  \
+  2 * !(HIL_IDD_NUM_AXES_PER_SET(header_packet))) +            \
+  2 * HIL_IDD_NUM_AXES_PER_SET(header_packet) *                        \
+ !!((header_packet) & HIL_IDD_HEADER_ABS))
+
+/* The following HIL_IDD_* macros assume you have an array of 
+ * packets and/or unpacked 8-bit data in the order that they 
+ * were received.
+ */
+
+#define HIL_IDD_AXIS_COUNTS_PER_M(header_ptr) \
+(!(HIL_IDD_NUM_AXSETS(*(header_ptr))) ? -1 :                   \
+(((*(header_ptr + 1) & HIL_PKT_DATA_MASK) +                    \
+  ((*(header_ptr + 2) & HIL_PKT_DATA_MASK)) << 8)              \
+* ((*(header_ptr) & HIL_IDD_HEADER_16BIT) ? 100 : 1)))
+
+#define HIL_IDD_AXIS_MAX(header_ptr, __axnum) \
+((!(*(header_ptr) & HIL_IDD_HEADER_ABS) ||                     \
+  (HIL_IDD_NUM_AXES_PER_SET(*(header_ptr)) <= __axnum)) ? 0 :  \
+ ((HIL_PKT_DATA_MASK & *((header_ptr) + 3 + 2 * __axnum)) +    \
+  ((HIL_PKT_DATA_MASK & *((header_ptr) + 4 + 2 * __axnum)) << 8)))
+
+#define HIL_IDD_IOD(header_ptr) \
+(*(header_ptr + HIL_IDD_LEN((*header_ptr)) - 1))
+
+#define HIL_IDD_HAS_GEN_PROMPT(header_ptr) \
+((*header_ptr & HIL_IDD_HEADER_IOD) &&                         \
+ (HIL_IDD_IOD(header_ptr) & HIL_IDD_IOD_PROMPT))
+
+#define HIL_IDD_HAS_GEN_PROXIMITY(header_ptr) \
+((*header_ptr & HIL_IDD_HEADER_IOD) &&                         \
+ (HIL_IDD_IOD(header_ptr) & HIL_IDD_IOD_PROXIMITY))
+
+#define HIL_IDD_NUM_BUTTONS(header_ptr) \
+((*header_ptr & HIL_IDD_HEADER_IOD) ?                          \
+ (HIL_IDD_IOD(header_ptr) & HIL_IDD_IOD_NBUTTON_MASK) : 0)
+
+#define HIL_IDD_NUM_PROMPTS(header_ptr) \
+((*header_ptr & HIL_IDD_HEADER_IOD) ?                          \
+ ((HIL_IDD_IOD(header_ptr) & HIL_IDD_IOD_NPROMPT_MASK)         \
+  >> HIL_IDD_IOD_PROMPT_SHIFT) : 0)
+
+/* The response to HIL EXD commands -- the "extended describe record" */
+#define        HIL_EXD_HEADER_WRG              0x03    /* Supports type2 WRG */
+#define HIL_EXD_HEADER_WRG_TYPE1       0x01    /* Supports type1 WRG */
+#define        HIL_EXD_HEADER_WRG_TYPE2        0x02    /* Supports type2 WRG */
+#define        HIL_EXD_HEADER_RRG              0x04    /* Supports RRG command */
+#define        HIL_EXD_HEADER_RNM              0x10    /* Supports RNM command */
+#define HIL_EXD_HEADER_RST             0x20    /* Supports RST command */
+#define HIL_EXD_HEADER_LOCALE          0x40    /* Contains locale code */
+
+#define HIL_EXD_NUM_RRG(header_ptr) \
+((*header_ptr & HIL_EXD_HEADER_RRG) ? \
+ (*(header_ptr + 1) & HIL_PKT_DATA_MASK) : 0)
+
+#define HIL_EXD_NUM_WWG(header_ptr) \
+((*header_ptr & HIL_EXD_HEADER_WRG) ?                          \
+ (*(header_ptr + 2 - !(*header_ptr & HIL_EXD_HEADER_RRG)) &    \
+    HIL_PKT_DATA_MASK) : 0)
+
+#define HIL_EXD_LEN(header_ptr) \
+(!!(*header_ptr & HIL_EXD_HEADER_RRG) +                                \
+ !!(*header_ptr & HIL_EXD_HEADER_WRG) +                                \
+ !!(*header_ptr & HIL_EXD_HEADER_LOCALE) +                     \
+ 2 * !!(*header_ptr & HIL_EXD_HEADER_WRG_TYPE2) + 1)
+
+#define HIL_EXD_LOCALE(header_ptr) \
+(!(*header_ptr & HIL_EXD_HEADER_LOCALE) ? -1 :                 \
+ (*(header_ptr + HIL_EXD_LEN(header_ptr) - 1) & HIL_PKT_DATA_MASK))
+
+#define HIL_EXD_WRG_TYPE2_LEN(header_ptr) \
+(!(*header_ptr & HIL_EXD_HEADER_WRG_TYPE2) ? -1        :                       \
+ (*(header_ptr + HIL_EXD_LEN(header_ptr) - 2 -                         \
+    !!(*header_ptr & HIL_EXD_HEADER_LOCALE)) & HIL_PKT_DATA_MASK) +    \
+ ((*(header_ptr + HIL_EXD_LEN(header_ptr) - 1 -                                \
+     !!(*header_ptr & HIL_EXD_HEADER_LOCALE)) & HIL_PKT_DATA_MASK) << 8))
+
+/* Device locale codes. */ 
+
+/* Last defined locale code.  Everything above this is "Reserved",
+   and note that this same table applies to the Device ID Byte where 
+   keyboards may have a nationality code which is only 5 bits. */
+#define HIL_LOCALE_MAX 0x1f
+
+/* Map to hopefully useful strings.  I was trying to make these look
+   like locale.aliases strings do; maybe that isn't the right table to
+   emulate.  In either case, I didn't have much to work on. */
+#define HIL_LOCALE_MAP \
+"",                    /* 0x00 Reserved */             \
+"",                    /* 0x01 Reserved */             \
+"",                    /* 0x02 Reserved */             \
+"swiss.french",                /* 0x03 Swiss/French */         \
+"portuguese",          /* 0x04 Portuguese */           \
+"arabic",              /* 0x05 Arabic */               \
+"hebrew",              /* 0x06 Hebrew */               \
+"english.canadian",    /* 0x07 Canadian English */     \
+"turkish",             /* 0x08 Turkish */              \
+"greek",               /* 0x09 Greek */                \
+"thai",                        /* 0x0a Thai (Thailand) */      \
+"italian",             /* 0x0b Italian */              \
+"korean",              /* 0x0c Hangul (Korea) */       \
+"dutch",               /* 0x0d Dutch */                \
+"swedish",             /* 0x0e Swedish */              \
+"german",              /* 0x0f German */               \
+"chinese",             /* 0x10 Chinese-PRC */          \
+"chinese",             /* 0x11 Chinese-ROC */          \
+"swiss.french",                /* 0x12 Swiss/French II */      \
+"spanish",             /* 0x13 Spanish */              \
+"swiss.german",                /* 0x14 Swiss/German II */      \
+"flemish",             /* 0x15 Belgian (Flemish) */    \
+"finnish",             /* 0x16 Finnish */              \
+"english.uk",          /* 0x17 United Kingdom */       \
+"french.canadian",     /* 0x18 French/Canadian */      \
+"swiss.german",                /* 0x19 Swiss/German */         \
+"norwegian",           /* 0x1a Norwegian */            \
+"french",              /* 0x1b French */               \
+"danish",              /* 0x1c Danish */               \
+"japanese",            /* 0x1d Katakana */             \
+"spanish",             /* 0x1e Latin American/Spanish*/\
+"english.us"           /* 0x1f United States */        \
+
+
+/* HIL keycodes */
+#define HIL_KEYCODES_SET1_TBLSIZE 128
+#define HIL_KEYCODES_SET1      \
+   KEY_5,              KEY_RESERVED,   KEY_RIGHTALT,   KEY_LEFTALT,    \
+   KEY_RIGHTSHIFT,     KEY_LEFTSHIFT,  KEY_LEFTCTRL,   KEY_SYSRQ,      \
+   KEY_KP4,            KEY_KP8,        KEY_KP5,        KEY_KP9,        \
+   KEY_KP6,            KEY_KP7,        KEY_KPCOMMA,    KEY_KPENTER,    \
+   KEY_KP1,            KEY_KPSLASH,    KEY_KP2,        KEY_KPPLUS,     \
+   KEY_KP3,            KEY_KPASTERISK, KEY_KP0,        KEY_KPMINUS,    \
+   KEY_B,              KEY_V,          KEY_C,          KEY_X,          \
+   KEY_Z,              KEY_RESERVED,   KEY_RESERVED,   KEY_ESC,        \
+   KEY_6,              KEY_F10,        KEY_3,          KEY_F11,        \
+   KEY_KPDOT,          KEY_F9,         KEY_TAB /*KP*/, KEY_F12,        \
+   KEY_H,              KEY_G,          KEY_F,          KEY_D,          \
+   KEY_S,              KEY_A,          KEY_RESERVED,   KEY_CAPSLOCK,   \
+   KEY_U,              KEY_Y,          KEY_T,          KEY_R,          \
+   KEY_E,              KEY_W,          KEY_Q,          KEY_TAB,        \
+   KEY_7,              KEY_6,          KEY_5,          KEY_4,          \
+   KEY_3,              KEY_2,          KEY_1,          KEY_GRAVE,      \
+   KEY_F13,            KEY_F14,        KEY_F15,        KEY_F16,        \
+   KEY_F17,            KEY_F18,        KEY_F19,        KEY_F20,        \
+   KEY_MENU,           KEY_F4,         KEY_F3,         KEY_F2,         \
+   KEY_F1,             KEY_VOLUMEUP,   KEY_STOP,       KEY_SENDFILE,   \
+   KEY_SYSRQ,          KEY_F5,         KEY_F6,         KEY_F7,         \
+   KEY_F8,             KEY_VOLUMEDOWN, KEY_DEL_EOL,    KEY_DEL_EOS,    \
+   KEY_8,              KEY_9,          KEY_0,          KEY_MINUS,      \
+   KEY_EQUAL,          KEY_BACKSPACE,  KEY_INS_LINE,   KEY_DEL_LINE,   \
+   KEY_I,              KEY_O,          KEY_P,          KEY_LEFTBRACE,  \
+   KEY_RIGHTBRACE,     KEY_BACKSLASH,  KEY_INSERT,     KEY_DELETE,     \
+   KEY_J,              KEY_K,          KEY_L,          KEY_SEMICOLON,  \
+   KEY_APOSTROPHE,     KEY_ENTER,      KEY_HOME,       KEY_PAGEUP,     \
+   KEY_M,              KEY_COMMA,      KEY_DOT,        KEY_SLASH,      \
+   KEY_BACKSLASH,      KEY_SELECT,     KEY_102ND,      KEY_PAGEDOWN,   \
+   KEY_N,              KEY_SPACE,      KEY_NEXT,       KEY_RESERVED,   \
+   KEY_LEFT,           KEY_DOWN,       KEY_UP,         KEY_RIGHT
+
+
+#define HIL_KEYCODES_SET3_TBLSIZE 128
+#define HIL_KEYCODES_SET3      \
+  KEY_RESERVED,        KEY_ESC,        KEY_1,          KEY_2,                  \
+  KEY_3,       KEY_4,          KEY_5,          KEY_6,                  \
+  KEY_7,       KEY_8,          KEY_9,          KEY_0,                  \
+  KEY_MINUS,   KEY_EQUAL,      KEY_BACKSPACE,  KEY_TAB,                \
+  KEY_Q,       KEY_W,          KEY_E,          KEY_R,                  \
+  KEY_T,       KEY_Y,          KEY_U,          KEY_I,                  \
+  KEY_O,       KEY_P,          KEY_LEFTBRACE,  KEY_RIGHTBRACE,         \
+  KEY_ENTER,   KEY_LEFTCTRL,   KEY_A,          KEY_S,                  \
+  KEY_D,       KEY_F,          KEY_G,          KEY_H,                  \
+  KEY_J,       KEY_K,          KEY_L,          KEY_SEMICOLON,          \
+  KEY_APOSTROPHE,KEY_GRAVE,    KEY_LEFTSHIFT,  KEY_BACKSLASH,          \
+  KEY_Z,       KEY_X,          KEY_C,          KEY_V,                  \
+  KEY_B,       KEY_N,          KEY_M,          KEY_COMMA,              \
+  KEY_DOT,     KEY_SLASH,      KEY_RIGHTSHIFT, KEY_KPASTERISK,         \
+  KEY_LEFTALT, KEY_SPACE,      KEY_CAPSLOCK,   KEY_F1,                 \
+  KEY_F2,      KEY_F3,         KEY_F4,         KEY_F5,                 \
+  KEY_F6,      KEY_F7,         KEY_F8,         KEY_F9,                 \
+  KEY_F10,     KEY_NUMLOCK,    KEY_SCROLLLOCK, KEY_KP7,                \
+  KEY_KP8,     KEY_KP9,        KEY_KPMINUS,    KEY_KP4,                \
+  KEY_KP5,     KEY_KP6,        KEY_KPPLUS,     KEY_KP1,                \
+  KEY_KP2,     KEY_KP3,        KEY_KP0,        KEY_KPDOT,              \
+  KEY_SYSRQ,   KEY_RESERVED,   KEY_RESERVED,   KEY_RESERVED,           \
+  KEY_RESERVED,        KEY_RESERVED,   KEY_RESERVED,   KEY_RESERVED,           \
+  KEY_RESERVED,        KEY_RESERVED,   KEY_RESERVED,   KEY_RESERVED,           \
+  KEY_UP,      KEY_LEFT,       KEY_DOWN,       KEY_RIGHT,              \
+  KEY_HOME,    KEY_PAGEUP,     KEY_END,        KEY_PAGEDOWN,           \
+  KEY_INSERT,  KEY_DELETE,     KEY_102ND,      KEY_RESERVED,           \
+  KEY_RESERVED,        KEY_RESERVED,   KEY_RESERVED,   KEY_RESERVED,           \
+  KEY_F1,      KEY_F2,         KEY_F3,         KEY_F4,                 \
+  KEY_F5,      KEY_F6,         KEY_F7,         KEY_F8,                 \
+  KEY_RESERVED,        KEY_RESERVED,   KEY_RESERVED,   KEY_RESERVED,           \
+  KEY_RESERVED,        KEY_RESERVED,   KEY_RESERVED,   KEY_RESERVED
+
+
+/* Response to POL command, the "poll record header" */
+
+#define HIL_POL_NUM_AXES_MASK  0x03    /* Number of axis reported */
+#define HIL_POL_CTS            0x04    /* Device ready to receive data */
+#define HIL_POL_STATUS_PENDING 0x08    /* Device has status to report */
+#define HIL_POL_CHARTYPE_MASK  0x70    /* Type of character data to follow */
+#define HIL_POL_CHARTYPE_NONE  0x00    /* No character data to follow */
+#define HIL_POL_CHARTYPE_RSVD1 0x10    /* Reserved Set 1 */
+#define HIL_POL_CHARTYPE_ASCII 0x20    /* U.S. ASCII */
+#define HIL_POL_CHARTYPE_BINARY        0x30    /* Binary data */
+#define HIL_POL_CHARTYPE_SET1  0x40    /* Keycode Set 1 */
+#define HIL_POL_CHARTYPE_RSVD2 0x50    /* Reserved Set 2 */
+#define HIL_POL_CHARTYPE_SET2  0x60    /* Keycode Set 2 */
+#define HIL_POL_CHARTYPE_SET3  0x70    /* Keycode Set 3 */
+#define HIL_POL_AXIS_ALT       0x80    /* Data is from axis set 2 */
+
+
+#endif /* _HIL_H_ */
diff --git a/include/linux/hil_mlc.h b/include/linux/hil_mlc.h
new file mode 100644 (file)
index 0000000..8df29ca
--- /dev/null
@@ -0,0 +1,168 @@
+/*
+ * HP Human Interface Loop Master Link Controller driver.
+ *
+ * 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/time.h>
+#include <linux/interrupt.h>
+#include <asm/semaphore.h>
+#include <linux/serio.h>
+#include <linux/list.h>
+
+typedef struct hil_mlc hil_mlc;
+
+/* The HIL has a complicated state engine.
+ * We define the structure of nodes in the state engine here.
+ */
+enum hilse_act {
+       /* HILSE_OUT prepares to receive input if the next node
+        * is an IN or EXPECT, and then sends the given packet.
+        */
+       HILSE_OUT = 0,
+
+       /* HILSE_CTS checks if the loop is busy. */
+       HILSE_CTS,
+
+       /* HILSE_OUT_LAST sends the given command packet to 
+        * the last configured/running device on the loop.
+        */
+       HILSE_OUT_LAST,
+
+       /* HILSE_OUT_DISC sends the given command packet to
+        * the next device past the last configured/running one.
+        */
+       HILSE_OUT_DISC,
+
+       /* HILSE_FUNC runs a callback function with given arguments.
+        * a positive return value causes the "ugly" branch to be taken.
+        */
+       HILSE_FUNC,
+
+       /* HILSE_IN simply expects any non-errored packet to arrive 
+        * within arg usecs.
+        */
+       HILSE_IN                = 0x100,
+
+       /* HILSE_EXPECT expects a particular packet to arrive 
+        * within arg usecs, any other packet is considered an error.
+        */
+       HILSE_EXPECT,
+
+       /* HILSE_EXPECT_LAST as above but dev field should be last 
+        * discovered/operational device.
+        */
+       HILSE_EXPECT_LAST,
+
+       /* HILSE_EXPECT_LAST as above but dev field should be first 
+        * undiscovered/inoperational device.
+        */
+       HILSE_EXPECT_DISC
+};
+
+typedef int    (hilse_func) (hil_mlc *mlc, int arg);
+struct hilse_node {
+       enum hilse_act          act;    /* How to process this node         */
+       union {
+               hilse_func      *func;  /* Function to call if HILSE_FUNC   */
+               hil_packet      packet; /* Packet to send or to compare     */
+       } object;
+       int                     arg;    /* Timeout in usec or parm for func */
+       int                     good;   /* Node to jump to on success       */
+       int                     bad;    /* Node to jump to on error         */
+       int                     ugly;   /* Node to jump to on timeout       */
+};
+
+/* Methods for back-end drivers, e.g. hp_sdc_mlc */
+typedef int    (hil_mlc_cts) (hil_mlc *mlc);
+typedef void   (hil_mlc_out) (hil_mlc *mlc);
+typedef int    (hil_mlc_in)  (hil_mlc *mlc, suseconds_t timeout);
+
+struct hil_mlc_devinfo {
+       uint8_t idd[16];        /* Device ID Byte and Describe Record */
+       uint8_t rsc[16];        /* Security Code Header and Record */
+       uint8_t exd[16];        /* Extended Describe Record */
+       uint8_t rnm[16];        /* Device name as returned by RNM command */
+};
+
+struct hil_mlc_serio_map {
+       hil_mlc *mlc;
+       int di_revmap;
+       int didx;
+};
+
+/* How many (possibly old/detached) devices the we try to keep track of */
+#define HIL_MLC_DEVMEM 16
+
+struct hil_mlc {
+       struct list_head        list;   /* hil_mlc is organized as linked list */
+
+       rwlock_t                lock;
+
+       void *priv; /* Data specific to a particular type of MLC */
+
+       int                     seidx;  /* Current node in state engine */
+       int                     istarted, ostarted;
+
+       hil_mlc_cts             *cts;
+       struct semaphore        csem;   /* Raised when loop idle */
+
+       hil_mlc_out             *out;
+       struct semaphore        osem;   /* Raised when outpacket dispatched */
+       hil_packet              opacket;
+
+       hil_mlc_in              *in;
+       struct semaphore        isem;   /* Raised when a packet arrives */
+       hil_packet              ipacket[16];
+       hil_packet              imatch;
+       int                     icount;
+       struct timeval          instart;
+       suseconds_t             intimeout;
+
+       int                     ddi;    /* Last operational device id */
+       int                     lcv;    /* LCV to throttle loops */
+       struct timeval          lcv_tv; /* Time loop was started */
+
+       int                     di_map[7]; /* Maps below items to live devs */
+       struct hil_mlc_devinfo  di[HIL_MLC_DEVMEM];
+       struct serio            *serio[HIL_MLC_DEVMEM];
+       struct hil_mlc_serio_map serio_map[HIL_MLC_DEVMEM];
+       hil_packet              serio_opacket[HIL_MLC_DEVMEM];
+       int                     serio_oidx[HIL_MLC_DEVMEM];
+       struct hil_mlc_devinfo  di_scratch; /* Temporary area */
+
+       int                     opercnt;
+
+       struct tasklet_struct   *tasklet;
+};
+
+int hil_mlc_register(hil_mlc *mlc);
+int hil_mlc_unregister(hil_mlc *mlc);
diff --git a/include/linux/hp_sdc.h b/include/linux/hp_sdc.h
new file mode 100644 (file)
index 0000000..debd715
--- /dev/null
@@ -0,0 +1,300 @@
+/*
+ * HP i8042 System Device Controller -- header
+ *
+ * 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
+ *
+ * System Device Controller Microprocessor Firmware Theory of Operation
+ *     for Part Number 1820-4784 Revision B.  Dwg No. A-1820-4784-2
+ *
+ */
+
+#ifndef _LINUX_HP_SDC_H
+#define _LINUX_HP_SDC_H
+
+#include <linux/interrupt.h>
+#include <linux/types.h>
+#include <linux/time.h>
+#include <linux/timer.h>
+#if defined(__hppa__)
+#include <asm/hardware.h>
+#endif
+
+
+/* No 4X status reads take longer than this (in usec).
+ */
+#define HP_SDC_MAX_REG_DELAY 20000
+
+typedef void (hp_sdc_irqhook) (int irq, void *dev_id, 
+                              uint8_t status, uint8_t data);
+
+int hp_sdc_request_timer_irq(hp_sdc_irqhook *callback);
+int hp_sdc_request_hil_irq(hp_sdc_irqhook *callback);
+int hp_sdc_request_cooked_irq(hp_sdc_irqhook *callback);
+int hp_sdc_release_timer_irq(hp_sdc_irqhook *callback);
+int hp_sdc_release_hil_irq(hp_sdc_irqhook *callback);
+int hp_sdc_release_cooked_irq(hp_sdc_irqhook *callback);
+
+typedef struct {
+       int actidx;     /* Start of act.  Acts are atomic WRT I/O to SDC */
+       int idx;        /* Index within the act */
+       int endidx;     /* transaction is over and done if idx == endidx */
+       uint8_t *seq;   /* commands/data for the transaction */
+       union {
+         hp_sdc_irqhook   *irqhook;    /* Callback, isr or tasklet context */
+         struct semaphore *semaphore;  /* Semaphore to sleep on. */
+       } act;
+} hp_sdc_transaction;
+int hp_sdc_enqueue_transaction(hp_sdc_transaction *this);
+int hp_sdc_dequeue_transaction(hp_sdc_transaction *this);
+
+/* The HP_SDC_ACT* values are peculiar to this driver.
+ * Nuance: never HP_SDC_ACT_DATAIN | HP_SDC_ACT_DEALLOC, use another
+ * act to perform the dealloc.
+ */
+#define HP_SDC_ACT_PRECMD      0x01            /* Send a command first */
+#define HP_SDC_ACT_DATAREG     0x02            /* Set data registers */
+#define HP_SDC_ACT_DATAOUT     0x04            /* Send data bytes */
+#define HP_SDC_ACT_POSTCMD      0x08            /* Send command after */
+#define HP_SDC_ACT_DATAIN      0x10            /* Collect data after */
+#define HP_SDC_ACT_DURING      0x1f
+#define HP_SDC_ACT_SEMAPHORE    0x20            /* Raise semaphore after */
+#define HP_SDC_ACT_CALLBACK    0x40            /* Pass data to IRQ handler */
+#define HP_SDC_ACT_DEALLOC     0x80            /* Destroy transaction after */
+#define HP_SDC_ACT_AFTER       0xe0
+#define HP_SDC_ACT_DEAD                0x60            /* Act timed out. */
+
+/* Rest of the flags are straightforward representation of the SDC interface */
+#define HP_SDC_STATUS_IBF      0x02    /* Input buffer full */
+
+#define HP_SDC_STATUS_IRQMASK  0xf0    /* Bits containing "level 1" irq */
+#define HP_SDC_STATUS_PERIODIC  0x10    /* Periodic 10ms timer */
+#define HP_SDC_STATUS_USERTIMER 0x20    /* "Special purpose" timer */
+#define HP_SDC_STATUS_TIMER     0x30    /* Both PERIODIC and USERTIMER */
+#define HP_SDC_STATUS_REG      0x40    /* Data from an i8042 register */
+#define HP_SDC_STATUS_HILCMD    0x50   /* Command from HIL MLC */
+#define HP_SDC_STATUS_HILDATA   0x60   /* Data from HIL MLC */
+#define HP_SDC_STATUS_PUP      0x70    /* Sucessful power-up self test */
+#define HP_SDC_STATUS_KCOOKED  0x80    /* Key from cooked kbd */
+#define HP_SDC_STATUS_KRPG     0xc0    /* Key from Repeat Gen */
+#define HP_SDC_STATUS_KMOD_SUP 0x10    /* Shift key is up */
+#define HP_SDC_STATUS_KMOD_CUP 0x20    /* Control key is up */
+
+#define HP_SDC_NMISTATUS_FHS   0x40    /* NMI is a fast handshake irq */
+
+/* Internal i8042 registers (there are more, but they are not too useful). */
+
+#define HP_SDC_USE             0x02    /* Resource usage (including OB bit) */
+#define HP_SDC_IM              0x04    /* Interrupt mask */
+#define HP_SDC_CFG             0x11    /* Configuration register */
+#define HP_SDC_KBLANGUAGE      0x12    /* Keyboard language */
+
+#define HP_SDC_D0              0x70    /* General purpose data buffer 0 */
+#define HP_SDC_D1              0x71    /* General purpose data buffer 1 */
+#define HP_SDC_D2              0x72    /* General purpose data buffer 2 */
+#define HP_SDC_D3              0x73    /* General purpose data buffer 3 */
+#define HP_SDC_VT1             0x74    /* Timer for voice 1 */
+#define HP_SDC_VT2             0x75    /* Timer for voice 2 */
+#define HP_SDC_VT3             0x76    /* Timer for voice 3 */
+#define HP_SDC_VT4             0x77    /* Timer for voice 4 */
+#define HP_SDC_KBN             0x78    /* Which HIL devs are Nimitz */
+#define HP_SDC_KBC             0x79    /* Which HIL devs are cooked kbds */
+#define HP_SDC_LPS             0x7a    /* i8042's view of HIL status */
+#define HP_SDC_LPC             0x7b    /* i8042's view of HIL "control" */
+#define HP_SDC_RSV             0x7c    /* Reserved "for testing" */
+#define HP_SDC_LPR             0x7d    /* i8042 count of HIL reconfigs */
+#define HP_SDC_XTD             0x7e    /* "Extended Configuration" register */
+#define HP_SDC_STR             0x7f    /* i8042 self-test result */
+
+/* Bitfields for above registers */
+#define HP_SDC_USE_LOOP                0x04    /* Command is currently on the loop. */
+
+#define HP_SDC_IM_MASK          0x1f    /* these bits not part of cmd/status */
+#define HP_SDC_IM_FH           0x10    /* Mask the fast handshake irq */
+#define HP_SDC_IM_PT           0x08    /* Mask the periodic timer irq */
+#define HP_SDC_IM_TIMERS       0x04    /* Mask the MT/DT/CT irq */
+#define HP_SDC_IM_RESET                0x02    /* Mask the reset key irq */
+#define HP_SDC_IM_HIL          0x01    /* Mask the HIL MLC irq */
+
+#define HP_SDC_CFG_ROLLOVER    0x08    /* WTF is "N-key rollover"? */
+#define HP_SDC_CFG_KBD         0x10    /* There is a keyboard */
+#define HP_SDC_CFG_NEW         0x20    /* Supports/uses HIL MLC */
+#define HP_SDC_CFG_KBD_OLD     0x03    /* keyboard code for non-HIL */
+#define HP_SDC_CFG_KBD_NEW     0x07    /* keyboard code from HIL autoconfig */
+#define HP_SDC_CFG_REV         0x40    /* Code revision bit */
+#define HP_SDC_CFG_IDPROM      0x80    /* IDPROM present in kbd (not HIL) */
+
+#define HP_SDC_LPS_NDEV                0x07    /* # devices autoconfigured on HIL */
+#define HP_SDC_LPS_ACSUCC      0x08    /* loop autoconfigured successfully */
+#define HP_SDC_LPS_ACFAIL      0x80    /* last loop autoconfigure failed */
+
+#define HP_SDC_LPC_APE_IPF     0x01    /* HIL MLC APE/IPF (autopoll) set */
+#define HP_SDC_LPC_ARCONERR    0x02    /* i8042 autoreconfigs loop on err */
+#define HP_SDC_LPC_ARCQUIET    0x03    /* i8042 doesn't report autoreconfigs*/
+#define HP_SDC_LPC_COOK                0x10    /* i8042 cooks devices in _KBN */
+#define HP_SDC_LPC_RC          0x80    /* causes autoreconfig */
+
+#define HP_SDC_XTD_REV         0x07    /* contains revision code */
+#define HP_SDC_XTD_REV_STRINGS(val, str) \
+switch (val) {                                         \
+       case 0x1: str = "1820-3712"; break;             \
+       case 0x2: str = "1820-4379"; break;             \
+       case 0x3: str = "1820-4784"; break;             \
+       default: str = "unknown";                       \
+};
+#define HP_SDC_XTD_BEEPER      0x08    /* TI SN76494 beeper available */
+#define HP_SDC_XTD_BBRTC       0x20    /* OKI MSM-58321 BBRTC present */
+
+#define HP_SDC_CMD_LOAD_RT     0x31    /* Load real time (from 8042) */
+#define HP_SDC_CMD_LOAD_FHS    0x36    /* Load the fast handshake timer */
+#define HP_SDC_CMD_LOAD_MT     0x38    /* Load the match timer */
+#define HP_SDC_CMD_LOAD_DT     0x3B    /* Load the delay timer */
+#define HP_SDC_CMD_LOAD_CT     0x3E    /* Load the cycle timer */
+
+#define HP_SDC_CMD_SET_IM      0x40    /* 010xxxxx == set irq mask */
+
+/* The documents provided do not explicitly state that all registers betweem 
+ * 0x01 and 0x1f inclusive can be read by sending their register index as a 
+ * command, but this is implied and appears to be the case.
+ */
+#define HP_SDC_CMD_READ_RAM    0x00    /* Load from i8042 RAM (autoinc) */
+#define HP_SDC_CMD_READ_USE    0x02    /* Undocumented! Load from usage reg */
+#define HP_SDC_CMD_READ_IM     0x04    /* Load current interrupt mask */
+#define HP_SDC_CMD_READ_KCC    0x11    /* Load primary kbd config code */
+#define HP_SDC_CMD_READ_KLC    0x12    /* Load primary kbd language code */
+#define HP_SDC_CMD_READ_T1     0x13    /* Load timer output buffer byte 1 */
+#define HP_SDC_CMD_READ_T2     0x14    /* Load timer output buffer byte 1 */
+#define HP_SDC_CMD_READ_T3     0x15    /* Load timer output buffer byte 1 */
+#define HP_SDC_CMD_READ_T4     0x16    /* Load timer output buffer byte 1 */
+#define HP_SDC_CMD_READ_T5     0x17    /* Load timer output buffer byte 1 */
+#define HP_SDC_CMD_READ_D0     0xf0    /* Load from i8042 RAM location 0x70 */
+#define HP_SDC_CMD_READ_D1     0xf1    /* Load from i8042 RAM location 0x71 */
+#define HP_SDC_CMD_READ_D2     0xf2    /* Load from i8042 RAM location 0x72 */
+#define HP_SDC_CMD_READ_D3     0xf3    /* Load from i8042 RAM location 0x73 */
+#define HP_SDC_CMD_READ_VT1    0xf4    /* Load from i8042 RAM location 0x74 */
+#define HP_SDC_CMD_READ_VT2    0xf5    /* Load from i8042 RAM location 0x75 */
+#define HP_SDC_CMD_READ_VT3    0xf6    /* Load from i8042 RAM location 0x76 */
+#define HP_SDC_CMD_READ_VT4    0xf7    /* Load from i8042 RAM location 0x77 */
+#define HP_SDC_CMD_READ_KBN    0xf8    /* Load from i8042 RAM location 0x78 */
+#define HP_SDC_CMD_READ_KBC    0xf9    /* Load from i8042 RAM location 0x79 */
+#define HP_SDC_CMD_READ_LPS    0xfa    /* Load from i8042 RAM location 0x7a */
+#define HP_SDC_CMD_READ_LPC    0xfb    /* Load from i8042 RAM location 0x7b */
+#define HP_SDC_CMD_READ_RSV    0xfc    /* Load from i8042 RAM location 0x7c */
+#define HP_SDC_CMD_READ_LPR    0xfd    /* Load from i8042 RAM location 0x7d */
+#define HP_SDC_CMD_READ_XTD    0xfe    /* Load from i8042 RAM location 0x7e */
+#define HP_SDC_CMD_READ_STR    0xff    /* Load from i8042 RAM location 0x7f */
+
+#define HP_SDC_CMD_SET_ARD     0xA0    /* Set emulated autorepeat delay */
+#define HP_SDC_CMD_SET_ARR     0xA2    /* Set emulated autorepeat rate */
+#define HP_SDC_CMD_SET_BELL    0xA3    /* Set voice 3 params for "beep" cmd */
+#define HP_SDC_CMD_SET_RPGR    0xA6    /* Set "RPG" irq rate (doesn't work) */
+#define HP_SDC_CMD_SET_RTMS    0xAD    /* Set the RTC time (milliseconds) */
+#define HP_SDC_CMD_SET_RTD     0xAF    /* Set the RTC time (days) */
+#define HP_SDC_CMD_SET_FHS     0xB2    /* Set fast handshake timer */
+#define HP_SDC_CMD_SET_MT      0xB4    /* Set match timer */
+#define HP_SDC_CMD_SET_DT      0xB7    /* Set delay timer */
+#define HP_SDC_CMD_SET_CT      0xBA    /* Set cycle timer */
+#define HP_SDC_CMD_SET_RAMP    0xC1    /* Reset READ_RAM autoinc counter */
+#define HP_SDC_CMD_SET_D0      0xe0    /* Load to i8042 RAM location 0x70 */
+#define HP_SDC_CMD_SET_D1      0xe1    /* Load to i8042 RAM location 0x71 */
+#define HP_SDC_CMD_SET_D2      0xe2    /* Load to i8042 RAM location 0x72 */
+#define HP_SDC_CMD_SET_D3      0xe3    /* Load to i8042 RAM location 0x73 */
+#define HP_SDC_CMD_SET_VT1     0xe4    /* Load to i8042 RAM location 0x74 */
+#define HP_SDC_CMD_SET_VT2     0xe5    /* Load to i8042 RAM location 0x75 */
+#define HP_SDC_CMD_SET_VT3     0xe6    /* Load to i8042 RAM location 0x76 */
+#define HP_SDC_CMD_SET_VT4     0xe7    /* Load to i8042 RAM location 0x77 */
+#define HP_SDC_CMD_SET_KBN     0xe8    /* Load to i8042 RAM location 0x78 */
+#define HP_SDC_CMD_SET_KBC     0xe9    /* Load to i8042 RAM location 0x79 */
+#define HP_SDC_CMD_SET_LPS     0xea    /* Load to i8042 RAM location 0x7a */
+#define HP_SDC_CMD_SET_LPC     0xeb    /* Load to i8042 RAM location 0x7b */
+#define HP_SDC_CMD_SET_RSV     0xec    /* Load to i8042 RAM location 0x7c */
+#define HP_SDC_CMD_SET_LPR     0xed    /* Load to i8042 RAM location 0x7d */
+#define HP_SDC_CMD_SET_XTD     0xee    /* Load to i8042 RAM location 0x7e */
+#define HP_SDC_CMD_SET_STR     0xef    /* Load to i8042 RAM location 0x7f */
+
+#define HP_SDC_CMD_DO_RTCW     0xc2    /* i8042 RAM 0x70 --> RTC */
+#define HP_SDC_CMD_DO_RTCR     0xc3    /* RTC[0x70 0:3] --> irq/status/data */
+#define HP_SDC_CMD_DO_BEEP     0xc4    /* i8042 RAM 0x70-74  --> beeper,VT3 */
+#define HP_SDC_CMD_DO_HIL      0xc5    /* i8042 RAM 0x70-73 --> 
+                                          HIL MLC R0,R1 i8042 HIL watchdog */
+
+/* Values used to (de)mangle input/output to/from the HIL MLC */
+#define HP_SDC_DATA            0x40    /* Data from an 8042 register */
+#define HP_SDC_HIL_CMD         0x50    /* Data from HIL MLC R1/8042 */
+#define HP_SDC_HIL_R1MASK      0x0f    /* Contents of HIL MLC R1 0:3 */
+#define HP_SDC_HIL_AUTO                0x10    /* Set if POL results from i8042 */   
+#define HP_SDC_HIL_ISERR       0x80    /* Has meaning as in next 4 values */
+#define HP_SDC_HIL_RC_DONE     0x80    /* i8042 auto-configured loop */
+#define HP_SDC_HIL_ERR         0x81    /* HIL MLC R2 had a bit set */
+#define HP_SDC_HIL_TO          0x82    /* i8042 HIL watchdog expired */
+#define HP_SDC_HIL_RC          0x84    /* i8042 is auto-configuring loop */
+#define HP_SDC_HIL_DAT         0x60    /* Data from HIL MLC R0 */
+
+
+typedef struct {
+       rwlock_t        ibf_lock;
+       rwlock_t        lock;           /* user/tasklet lock */
+       rwlock_t        rtq_lock;       /* isr/tasklet lock */
+       rwlock_t        hook_lock;      /* isr/user lock for handler add/del */
+
+       unsigned int    irq, nmi;       /* Our IRQ lines */
+       unsigned long   base_io, status_io, data_io; /* Our IO ports */
+
+       uint8_t         im;             /* Interrupt mask */
+       int             set_im;         /* Interrupt mask needs to be set. */
+
+       int             ibf;            /* Last known status of IBF flag */
+       uint8_t         wi;             /* current i8042 write index */
+       uint8_t         r7[4];          /* current i8042[0x70 - 0x74] values */
+       uint8_t         r11, r7e;       /* Values from version/revision regs */
+
+       hp_sdc_irqhook  *timer, *reg, *hil, *pup, *cooked;
+
+#define HP_SDC_QUEUE_LEN 16
+       hp_sdc_transaction *tq[HP_SDC_QUEUE_LEN]; /* All pending read/writes */
+
+       int             rcurr, rqty;    /* Current read transact in process */
+       struct timeval  rtv;            /* Time when current read started */
+       int             wcurr;          /* Current write transact in process */
+
+       int             dev_err;        /* carries status from registration */
+#if defined(__hppa__)
+       struct parisc_device    *dev;
+#elif defined(__mc68000__)
+       void            *dev;
+#else
+#error No support for device registration on this arch yet.
+#endif
+
+       struct timer_list kicker;       /* Keeps below task alive */
+       struct tasklet_struct   task;
+
+} hp_i8042_sdc;
+
+#endif /* _LINUX_HP_SDC_H */
index e8c296ff6257adeccdd9d60245f463d1ea0255a3..d7836311ada9dc4006961a57360b85a78ba6a6c5 100644 (file)
@@ -644,6 +644,7 @@ struct input_absinfo {
 #define BUS_ADB                        0x17
 #define BUS_I2C                        0x18
 #define BUS_HOST               0x19
+#define BUS_GSC                        0x1A
 
 /*
  * Values describing the status of an effect