diff --git a/Documentation/input/elantech.txt b/Documentation/input/elantech.txt index 679e74b..a9a81a7 100644 --- a/Documentation/input/elantech.txt +++ b/Documentation/input/elantech.txt @@ -1,27 +1,46 @@ Elantech Touchpad Driver ======================== - Copyright (C) 2007 Arjan Opmeer + + Copyright (C) 2007-2008 Arjan Opmeer Extra information found and provided by Steve Havelka -Configuration of the touchpad is performed by writing values to registers -found under sysfs entries /sys/bus/serio/drivers/psmouse/serio?/reg_*. -E.g. to disable tapping while leaving the other settings to the default -Windows driver value one would: +Introduction +~~~~~~~~~~~~ + +Like most touchpads the Elantech touchpad can be in two modes. One is called +relative mode in which the touchpad uses its internal controller to +translate touching the pad and moving your finger into mouse movement +updates. In this mode the touchpad acts just like a normal wired mouse. + +The other is called absolute mode in which the touchpad merely acts as an XY +grid and as long as there is a finger on the pad continuously sends the +coordinates of the finger to the driver. Think of it like a tablet where +your finger is the stylus. + +The Linux Elantech touchpad driver always puts the touchpad into absolute +mode to be compatible with the Xorg Synaptics touchpad driver. - echo -n 0x32 > reg_10 +The operation of the touchpad can be altered by adjusting the contents of +some of its internal registers. These registers are represented by the +driver as sysfs entries under /sys/bus/serio/drivers/psmouse/serio? that can +be read from and written to. + +However some register settings have effect only when the touchpad is in +relative mode and not in absolute mode. In absence of any Elantech +documentation they are mentioned here for completeness sake. Registers ~~~~~~~~~ -* reg_10 (Windows driver default value 0x12) +* reg_10 bit 7 6 5 4 3 2 1 0 B C T D L A S E - E: 1 = enable smart edges in other cases + E: 1 = enable smart edges unconditionally S: 1 = enable smart edges only when dragging A: 1 = absolute mode (needs 4 byte packets, see reg_11) L: 1 = enable drag lock (see reg_22) @@ -30,7 +49,7 @@ Registers C: 1 = enable corner tap B: 1 = swap left and right button -* reg_11 (Windows driver default value 0x8f) +* reg_11 bit 7 6 5 4 3 2 1 0 1 0 0 H V 1 F P @@ -38,51 +57,39 @@ Registers P: 1 = enable parity checking for relative mode F: 1 = enable native 4 byte packet mode V: 1 = enable vertical scroll area - H: 1 = enable horizonal scroll area - + H: 1 = enable horizontal scroll area -* reg_20 (Windows driver default value 0x0a) +* reg_20 single finger width? -* reg_21 (Windows driver default value 0x60) +* reg_21 scroll area width (small: 0x40 ... wide: 0xff) -* reg_22 (Windows driver default value 0xff) +* reg_22 drag lock time out (short: 0x14 ... long: 0xfe; 0xff =never) -* reg_23 (Windows driver default value 0x10) +* reg_23 tap make timeout? - Note: the Windows driver does not write this register - -* reg_24 (Windows driver default value 0x10) +* reg_24 tap release timeout? - Note: the Windows driver does not write this register - -* reg_25 (Windows driver default value 0x03) +* reg_25 smart edge cursor speed (0x02 = slow, 0x03 = medium, 0x04 = fast) -* reg_26 (Windows driver default value 0x00 ?? ) +* reg_26 smart edge activation area width? - Note: the Windows driver does not write this register - Note: the Windows driver default value of 0x00 disables smart edges - when it would get written - Note: the Windows driver sets bit 0 of the registry value to disable - tapping when typing, but never actually writes the register. - Only used as an internal driver flag? - -Initially the Elantouch Touchpad is in emulation mode and reports 3 byte +Initially the Elantech touchpad is in emulation mode and reports 3 byte standard PS/2 packets and hence works with a standard mouse driver. However, it can be configured to talk its native 4 byte relative mode and 4 byte absolute mode both for which a dedicated driver is needed. @@ -96,10 +103,9 @@ byte 0: c c p2 p1 1 M R L L, R, M = 1 when Left, Right, Middle mouse button pressed - some models have M as byte 3 odd parity - when parity checking is enabled (P = 1): - p1 = byte 1 odd parity - p2 = byte 2 odd parity + some models have M as byte 3 odd parity bit + when parity checking is enabled (reg_11, P = 1): + p1..p2 = byte 1 and 2 odd parity bit c = 1 when corner tap detected byte 1: @@ -116,48 +122,73 @@ byte 2: dy7..dy0 = y movement; positive = up, negative = down byte 3: - bit 7 6 5 4 3 2 1 0 - w h n1 n0 d3 d2 d1 d0 + parity checking enabled (reg_11, P = 1): + + bit 7 6 5 4 3 2 1 0 + w h n1 n0 ds3 ds2 ds1 ds0 - when parity checking is enabled (P = 1): normally: - d3..d0 = scroll wheel amount and direction - positive = down or left - negative = up or right + ds3..ds0 = scroll wheel amount and direction + positive = down or left + negative = up or right when corner tap detected: - d0 = 1 when top right corner tapped - d1 = 1 when bottom right corner tapped - d2 = 1 when bottom left corner tapped - d3 = 1 when top left corner tapped + ds0 = 1 when top right corner tapped + ds1 = 1 when bottom right corner tapped + ds2 = 1 when bottom left corner tapped + ds3 = 1 when top left corner tapped n1..n0 = number of fingers on touchpad - not all models report this but map one, two and three - finger taps directly to L, M and R mouse buttons - w = 1 when wide finger touch? + only models with firmware 2.x report this, models with + firmware 1.x seem to map one, two and three finger taps + directly to L, M and R mouse buttons h = 1 when horizontal scroll action - otherwise (P = 0): - all of byte 3 is vertical scroll amount and direction - negative = up - positive = down + w = 1 when wide finger touch? + + otherwise (reg_11, P = 0): + + bit 7 6 5 4 3 2 1 0 + ds7 ds6 ds5 ds4 ds3 ds2 ds1 ds0 + + ds7..ds0 = vertical scroll amount and direction + negative = up + positive = down Native 4 byte absolute mode packet format ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ byte 0: - bit 7 6 5 4 3 2 1 0 - D U p1 p2 1 p3 R L + firmware version 1.x: + + bit 7 6 5 4 3 2 1 0 + D U p1 p2 1 p3 R L + + L, R = 1 when Left, Right mouse button pressed + p1..p3 = byte 1..3 odd parity bit + D, U = 1 when rocker switch pressed Up, Down + + firmware version 2.x: - L, R = 1 when Left, Right mouse button pressed - p1..p3 = parity bit of bytes 1..3 - D, U = 1 when rocker switch pressed Up, Down + bit 7 6 5 4 3 2 1 0 + n1 n0 p2 p1 1 p3 R L + + L, R = 1 when Left, Right mouse button pressed + p1..p3 = byte 1..3 odd parity bit + n1..n0 = number of fingers on touchpad byte 1: - bit 7 6 5 4 3 2 1 0 - f 0 th tw x9 x8 y9 y8 + firmware version 1.x: + + bit 7 6 5 4 3 2 1 0 + f 0 th tw x9 x8 y9 y8 + + tw = 1 when two finger touch + th = 1 when three finger touch + f = 1 when finger touch + + firmware version 2.x: - tw = 1 when two finger touch - th = 1 when three finger touch - f = 1 when finger touch + bit 7 6 5 4 3 2 1 0 + 0 0 0 0 x9 x8 y9 y8 byte 2: bit 7 6 5 4 3 2 1 0 diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index ea3701b..5e45f24 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1,7 +1,7 @@ /* - * Elantech Touchpad driver + * Elantech Touchpad driver (v4) * - * Copyright (C) 2007 Arjan Opmeer + * Copyright (C) 2007-2008 Arjan Opmeer * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published @@ -10,53 +10,54 @@ * Trademarks are the property of their respective owners. */ +#include #include #include #include #include #include "psmouse.h" -#include "synaptics.h" #include "elantech.h" /* - * Native absolute mode reporting has odd parity check on the last 3 bytes. - * Native relative mode can have odd parity checking on second and third byte, - * or last 3 bytes depending on model. + * Send a Synaptics style special command */ -static unsigned char parity[256]; - -/* - * Send a synaptics style special commands - */ -static int synaptics_send_cmd(struct psmouse *psmouse, unsigned char c, unsigned char *param) +static int synaptics_send_cmd(struct psmouse *psmouse, unsigned char c, + unsigned char *param) { if (psmouse_sliced_command(psmouse, c)) return -1; if (ps2_command(&psmouse->ps2dev, param, PSMOUSE_CMD_GETINFO)) return -1; + return 0; } /* * Send an Elantech style special command to write a register with a value */ -static int elantech_write_reg(struct psmouse *psmouse, unsigned char reg, unsigned char val) +static int elantech_write_reg(struct psmouse *psmouse, unsigned char reg, + unsigned char val) { + struct ps2dev *ps2dev = &psmouse->ps2dev; + if ((reg < 0x10) || (reg > 0x26)) return -1; if ((reg > 0x11) && (reg < 0x20)) return -1; - if (psmouse_sliced_command(psmouse, ELANTECH_COMMAND_START) || + if (psmouse_sliced_command(psmouse, ETP_REGISTER_WRITE) || psmouse_sliced_command(psmouse, reg) || psmouse_sliced_command(psmouse, val) || - ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_SETSCALE11)) { + ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11)) { return -1; } return 0; } +/* + * Dump a complete mouse movement packet to the syslog + */ static void elantech_packet_dump(unsigned char *packet, int size) { int i; @@ -68,22 +69,30 @@ static void elantech_packet_dump(unsigned char *packet, int size) } /* - * Report absolute mode input events + * Interpret complete data packets and report absolute mode input events */ static void elantech_report_absolute(struct psmouse *psmouse) { - struct elantech_data *etd = psmouse->private; + struct elantech_data *etd = psmouse->private; struct input_dev *dev = psmouse->dev; unsigned char *packet = psmouse->packet; int fingers; - /* byte 0: D U p1 p2 1 p3 R L - * byte 1: f 0 th tw x9 x8 y9 y8 - * byte 2: x7 x6 x5 x4 x3 x2 x1 x0 - * byte 3: y7 y6 y5 y4 y3 y2 y1 y0 */ - fingers = ((packet[1] & 0x80) >> 7) + ((packet[1] & 0x30) >> 4); + if (etd->fw_version_maj == 0x01) { + /* byte 0: D U p1 p2 1 p3 R L + byte 1: f 0 th tw x9 x8 y9 y8 */ + fingers = ((packet[1] & 0x80) >> 7) + + ((packet[1] & 0x30) >> 4); + } else { + /* byte 0: n1 n0 p2 p1 1 p3 R L + byte 1: 0 0 0 0 x9 x8 y9 y8 */ + fingers = (packet[0] & 0xc0) >> 6; + } + input_report_key(dev, BTN_TOUCH, fingers != 0); - if (fingers == 1) { + /* byte 2: x7 x6 x5 x4 x3 x2 x1 x0 + byte 3: y7 y6 y5 y4 y3 y2 y1 y0 */ + if (fingers) { input_report_abs(dev, ABS_X, ((packet[1] & 0x0c) << 6) | packet[2]); input_report_abs(dev, ABS_Y, ETP_YMAX - @@ -95,86 +104,24 @@ static void elantech_report_absolute(struct psmouse *psmouse) input_report_key(dev, BTN_TOOL_TRIPLETAP, fingers == 3); input_report_key(dev, BTN_LEFT, packet[0] & 0x01); input_report_key(dev, BTN_RIGHT, packet[0] & 0x02); - if (etd->capabilities & ETP_CAP_HAS_ROCKER) { - input_report_key(dev, BTN_FORWARD, packet[0] & 0x40); /* rocker up */ - input_report_key(dev, BTN_BACK, packet[0] & 0x80); /* rocker down */ - } -} - -/* - * Report relative mode input events - */ -static void elantech_report_relative(struct psmouse *psmouse) -{ - struct elantech_data *etd = psmouse->private; - struct input_dev *dev = psmouse->dev; - unsigned char *packet = psmouse->packet; - int fingers, cornertap; - - /* byte 0: c c p2 p1 1 M R L - * byte 1: dx7 dx6 dx5 dx4 dx3 dx2 dx1 dx0 - * byte 2: dy7 dy6 dy5 dy4 dy3 dy2 dy1 dy0 - * byte 3: w h n1 n0 d3 d2 d1 d0 */ - input_report_key(dev, BTN_LEFT, packet[0] & 0x01); - input_report_key(dev, BTN_RIGHT, packet[0] & 0x02); - - if (etd->capabilities & ETP_CAP_REPORTS_MIDDLE_BUTTON) - input_report_key(dev, BTN_MIDDLE, packet[0] & 0x04); - - if (etd->capabilities & ETP_CAP_ALTERNATE_TAP_BITS) { - fingers = (packet[3] & 0x30) >> 4; - input_report_key(dev, BTN_LEFT, fingers == 1); - input_report_key(dev, BTN_MIDDLE, fingers == 2); - input_report_key(dev, BTN_RIGHT, fingers == 3); - } - - cornertap = (((packet[0] & 0xc0) == 0xc0) && ((packet[1] & 0xf0) == 0xf0)); - if (!cornertap) { - input_report_rel(dev, REL_X, (int) (packet[1] & 0x7f) - - (int) (packet[1] & 0x80)); - input_report_rel(dev, REL_Y, (int) (packet[2] & 0x80) - - (int) (packet[2] & 0x7f)); - } - - /* No more information in 3 bytes */ - if (!(etd->reg_11 & ETP_R11_4_BYTE_MODE)) - return; - - if (cornertap) { - input_report_key(dev, BTN_0, packet[3] & 0x01); /* top right */ - input_report_key(dev, BTN_1, packet[3] & 0x02); /* bottom right */ - input_report_key(dev, BTN_2, packet[3] & 0x04); /* bottom left */ - input_report_key(dev, BTN_3, packet[3] & 0x08); /* top left */ - } - - if (etd->reg_11 & ETP_R11_PARITY_CHECKING) { - if (packet[3] & 0x0f) { - if (packet[3] & 0x40) { - input_report_rel(dev, REL_HWHEEL, - (int) (packet[3] & 0x08) - - (int) (packet[3] & 0x07)); - } else { - input_report_rel(dev, REL_WHEEL, - (int) (packet[3] & 0x08) - - (int) (packet[3] & 0x07)); - } - } - } else { - if (packet[3]) - input_report_rel(dev, REL_WHEEL, - (int) (packet[3] & 0x80) - - (int) (packet[3] & 0x7f)); + if ((etd->fw_version_maj == 0x01) && + (etd->capabilities & ETP_CAP_HAS_ROCKER)) { + /* rocker up */ + input_report_key(dev, BTN_FORWARD, packet[0] & 0x40); + /* rocker down */ + input_report_key(dev, BTN_BACK, packet[0] & 0x80); } } /* - * Process byte stream from mouse and interpret complete data packets + * Process byte stream from mouse and handle complete packets */ static psmouse_ret_t elantech_process_byte(struct psmouse *psmouse) { - struct elantech_data *etd = psmouse->private; + struct elantech_data *etd = psmouse->private; struct input_dev *dev = psmouse->dev; unsigned char *packet = psmouse->packet; + unsigned char p1, p2, p3; if (psmouse->pktcnt < psmouse->pktsize) return PSMOUSE_GOOD_DATA; @@ -182,29 +129,22 @@ static psmouse_ret_t elantech_process_byte(struct psmouse *psmouse) if (etd->debug) elantech_packet_dump(packet, psmouse->pktsize); - if (etd->reg_10 & ETP_R10_ABSOLUTE_MODE) { + /* Parity bits are placed differently */ + if (etd->fw_version_maj == 0x01) { /* byte 0: D U p1 p2 1 p3 R L */ - if ((parity[packet[1]] != ((packet[0] & 0x20) >> 5)) || - (parity[packet[2]] != ((packet[0] & 0x10) >> 4)) || - (parity[packet[3]] != ((packet[0] & 0x04) >> 2))) - return PSMOUSE_BAD_DATA; - } else if (etd->reg_11 & ETP_R11_PARITY_CHECKING) { - /* byte 0: c c p2 p1 1 M R L */ - if ((parity[packet[1]] != ((packet[0] & 0x10) >> 4)) || - (parity[packet[2]] != ((packet[0] & 0x20) >> 5))) - return PSMOUSE_BAD_DATA; - /* Parity bit has not been sacrificed as middle mouse button bit */ - if (!(etd->capabilities & ETP_CAP_REPORTS_MIDDLE_BUTTON)) { - if (parity[packet[3]] != ((packet[0] & 0x04) >> 2)) - return PSMOUSE_BAD_DATA; - } - } - - if (etd->reg_10 & ETP_R10_ABSOLUTE_MODE) { - elantech_report_absolute(psmouse); + p1 = (packet[0] & 0x20) >> 5; + p2 = (packet[0] & 0x10) >> 4; } else { - elantech_report_relative(psmouse); + /* byte 0: n1 n0 p2 p1 1 p3 R L */ + p1 = (packet[0] & 0x10) >> 4; + p2 = (packet[0] & 0x20) >> 5; } + p3 = (packet[0] & 0x04) >> 2; + if ((etd->parity[packet[1]] != p1) || (etd->parity[packet[2]] != p2) || + (etd->parity[packet[3]] != p3)) + return PSMOUSE_BAD_DATA; + + elantech_report_absolute(psmouse); input_sync(dev); @@ -212,54 +152,34 @@ static psmouse_ret_t elantech_process_byte(struct psmouse *psmouse) } /* - * Initialise the touchpad to a default state. Because we don't know (yet) - * how to read registers we need to write some default values so we can - * report their contents when asked to. + * Put the touchpad into absolute mode */ -static void elantech_set_defaults(struct psmouse *psmouse) +static int elantech_set_absolute_mode(struct psmouse *psmouse) { - struct elantech_data *etd = psmouse->private; - struct input_dev *dev = psmouse->dev; + struct elantech_data *etd = psmouse->private; - /* - * For now, use the Elantech Windows driver default values - */ - etd->reg_10 = 0x12; - elantech_write_reg(psmouse, 0x10, etd->reg_10); + etd->reg_10 = 0x16; etd->reg_11 = 0x8f; - elantech_write_reg(psmouse, 0x11, etd->reg_11); - etd->reg_20 = 0x0a; - elantech_write_reg(psmouse, 0x20, etd->reg_20); - etd->reg_21 = 0x60; - elantech_write_reg(psmouse, 0x21, etd->reg_21); - etd->reg_22 = 0xff; - elantech_write_reg(psmouse, 0x22, etd->reg_22); - /* - * However, the Windows driver mentions registers 23, 24 and 26 - * but seems to never actually write them - */ - etd->reg_23 = 0x10; - /* - * elantech_write_reg(psmouse, 0x23, etd->reg_23); - */ - etd->reg_24 = 0x10; - /* - * elantech_write_reg(psmouse, 0x24, etd->reg_24); - */ - etd->reg_25 = 0x03; - elantech_write_reg(psmouse, 0x25, etd->reg_25); - /* - * The Windows driver default value of 0x00 seems wrong as it - * disables smart edge cursor movement - */ - etd->reg_26 = 0x00; - /* - * elantech_write_reg(psmouse, 0x26, etd->reg_26); - */ + if (elantech_write_reg(psmouse, 0x10, etd->reg_10) || + elantech_write_reg(psmouse, 0x11, etd->reg_11)) { + return -1; + } + + return 0; +} + +/* + * Set the appropriate event bits for the input subsystem + */ +static void elantech_set_input_params(struct psmouse *psmouse) +{ + struct elantech_data *etd = psmouse->private; + struct input_dev *dev = psmouse->dev; set_bit(EV_KEY, dev->evbit); + set_bit(EV_ABS, dev->evbit); + set_bit(BTN_LEFT, dev->keybit); - set_bit(BTN_MIDDLE, dev->keybit); set_bit(BTN_RIGHT, dev->keybit); set_bit(BTN_TOUCH, dev->keybit); @@ -268,24 +188,12 @@ static void elantech_set_defaults(struct psmouse *psmouse) set_bit(BTN_TOOL_TRIPLETAP, dev->keybit); /* Rocker button */ - if (etd->capabilities & ETP_CAP_HAS_ROCKER) { + if ((etd->fw_version_maj == 0x01) && + (etd->capabilities & ETP_CAP_HAS_ROCKER)) { set_bit(BTN_FORWARD, dev->keybit); set_bit(BTN_BACK, dev->keybit); } - /* Corner taps */ - set_bit(BTN_0, dev->keybit); - set_bit(BTN_1, dev->keybit); - set_bit(BTN_2, dev->keybit); - set_bit(BTN_3, dev->keybit); - - set_bit(EV_REL, dev->evbit); - set_bit(REL_X, dev->relbit); - set_bit(REL_Y, dev->relbit); - set_bit(REL_WHEEL, dev->relbit); - set_bit(REL_HWHEEL, dev->relbit); - - set_bit(EV_ABS, dev->evbit); input_set_abs_params(dev, ABS_X, ETP_XMIN, ETP_XMAX, 0, 0); input_set_abs_params(dev, ABS_Y, ETP_YMIN, ETP_YMAX, 0, 0); input_set_abs_params(dev, ABS_PRESSURE, 0, ETP_MAX_PRESSURE, 0, 0); @@ -299,7 +207,8 @@ struct elantech_attr_data { /* * Display a register value by reading a sysfs entry */ -static ssize_t elantech_show_int_attr(struct psmouse *psmouse, void *data, char *buf) +static ssize_t elantech_show_int_attr(struct psmouse *psmouse, void *data, + char *buf) { struct elantech_data *etd = psmouse->private; struct elantech_attr_data *attr = data; @@ -315,40 +224,29 @@ static ssize_t elantech_show_int_attr(struct psmouse *psmouse, void *data, char static ssize_t elantech_set_int_attr(struct psmouse *psmouse, void *data, const char *buf, size_t count) { - struct elantech_data *etd = psmouse->private; - struct elantech_attr_data *attr = data; + struct elantech_data *etd = psmouse->private; + struct elantech_attr_data *attr = data; unsigned char *reg = (unsigned char *) etd + attr->field_offset; unsigned long value; - char *rest; + int err; - value = simple_strtoul(buf, &rest, 16); - if (*rest || value > 255) + err = strict_strtoul(buf, 16, &value); + if (err) + return err; + if (value > 0xff) return -EINVAL; - if (attr->reg == 0x10) { - /* Force on 4 byte mode when absolute mode gets selected */ - if ((value & ETP_R10_ABSOLUTE_MODE) && - !(etd->reg_11 & ETP_R11_4_BYTE_MODE)) { - etd->reg_11 |= ETP_R11_4_BYTE_MODE; - elantech_write_reg(psmouse, 0x11, etd->reg_11); - psmouse->pktsize = 4; - } - } else if (attr->reg == 0x11) { - if (value & ETP_R11_4_BYTE_MODE) - psmouse->pktsize = 4; - else { - /* Force off absolute mode when 4 byte mode is no longer selected */ - if (etd->reg_10 & ETP_R10_ABSOLUTE_MODE) { - etd->reg_10 ^= ETP_R10_ABSOLUTE_MODE; - elantech_write_reg(psmouse, 0x10, etd->reg_10); - } - psmouse->pktsize = 3; - } - } + if (attr->reg == 0x10) + /* Force absolute mode always on */ + value |= ETP_R10_ABSOLUTE_MODE; + else if (attr->reg == 0x11) + /* Force 4 byte mode always on */ + value |= ETP_R11_4_BYTE_MODE; *reg = value; - elantech_write_reg(psmouse, attr->reg, value); + if (attr->reg) + elantech_write_reg(psmouse, attr->reg, value); return count; } @@ -393,17 +291,6 @@ static struct attribute_group elantech_attr_group = { }; /* - * Clean up sysfs entries when disconnecting - */ -static void elantech_disconnect(struct psmouse *psmouse) -{ - sysfs_remove_group(&psmouse->ps2dev.serio->dev.kobj, - &elantech_attr_group); - kfree(psmouse->private); - psmouse->private = NULL; -} - -/* * Use magic knock to detect Elantech touchpad */ int elantech_detect(struct psmouse *psmouse, int set_properties) @@ -417,6 +304,10 @@ int elantech_detect(struct psmouse *psmouse, int set_properties) ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11); ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO); + /* + * Report this in case there are Elantech models that use a different + * set of magic numbers + */ if ((param[0] != 0x3c) || (param[1] != 0x03) || (param[2] != 0xc8)) { pr_info("elantech.c: unexpected magic knock result 0x%02x, 0x%02x, 0x%02x.\n", param[0], param[1], param[2]); @@ -432,11 +323,38 @@ int elantech_detect(struct psmouse *psmouse, int set_properties) } /* + * Clean up sysfs entries when disconnecting + */ +static void elantech_disconnect(struct psmouse *psmouse) +{ + sysfs_remove_group(&psmouse->ps2dev.serio->dev.kobj, + &elantech_attr_group); + kfree(psmouse->private); + psmouse->private = NULL; +} + +/* + * Put the touchpad back into absolute mode when reconnecting + */ +static int elantech_reconnect(struct psmouse *psmouse) +{ + if (elantech_detect(psmouse, 0)) + return -1; + + if (elantech_set_absolute_mode(psmouse)) { + pr_err("elantech.c: failed to put touchpad back into absolute mode.\n"); + return -1; + } + + return 0; +} + +/* * Initialize the touchpad and create sysfs entries */ int elantech_init(struct psmouse *psmouse) { - struct elantech_data *etd; + struct elantech_data *etd; int i, error; unsigned char param[3]; @@ -445,41 +363,48 @@ int elantech_init(struct psmouse *psmouse) if (!etd) return -1; - parity[0] = 1; + etd->parity[0] = 1; for (i = 1; i < 256; i++) - parity[i] = (parity[i & (i - 1)] ^ 1); + etd->parity[i] = (etd->parity[i & (i - 1)] ^ 1); /* - * Why does the Elantech Windows driver try this? - * For now just report it and see if it makes sense - * when more people use this driver + * Find out what version hardware this is */ - if (!synaptics_send_cmd(psmouse, SYN_QUE_IDENTIFY, param)) - pr_info("elantech.c: Synaptics identify query result 0x%02x, 0x%02x, 0x%02x.\n", - param[0], param[1], param[2]); - if (!synaptics_send_cmd(psmouse, SYN_QUE_MODES, param)) - pr_info("elantech.c: Synaptics modes query result 0x%02x, 0x%02x, 0x%02x.\n", - param[0], param[1], param[2]); - if (!synaptics_send_cmd(psmouse, SYN_QUE_CAPABILITIES, param)) { - pr_info("elantech.c: Synaptics capabilities query result 0x%02x, 0x%02x, 0x%02x.\n", - param[0], param[1], param[2]); - etd->capabilities = param[0]; + if (synaptics_send_cmd(psmouse, ETP_FW_VERSION_QUERY, param)) + goto init_fail; + pr_info("elantech.c: Elantech version query result 0x%02x, 0x%02x, 0x%02x.\n", + param[0], param[1], param[2]); + etd->fw_version_maj = param[0]; + etd->fw_version_min = param[2]; + + if (synaptics_send_cmd(psmouse, ETP_CAPABILITIES_QUERY, param)) + goto init_fail; + pr_info("elantech.c: Synaptics capabilities query result 0x%02x, 0x%02x, 0x%02x.\n", + param[0], param[1], param[2]); + etd->capabilities = param[0]; + + if (elantech_set_absolute_mode(psmouse)) { + pr_err("elantech.c: failed to put touchpad into absolute mode.\n"); + goto init_fail; } - - elantech_set_defaults(psmouse); - - psmouse->protocol_handler = elantech_process_byte; - psmouse->disconnect = elantech_disconnect; - psmouse->pktsize = 4; + elantech_set_input_params(psmouse); error = sysfs_create_group(&psmouse->ps2dev.serio->dev.kobj, &elantech_attr_group); if (error) { - printk(KERN_ERR "elantech.c: failed to create sysfs attributes, error: %d\n", + pr_err("elantech.c: failed to create sysfs attributes, error: %d.\n", error); - kfree(etd); - return -1; + goto init_fail; } + psmouse->protocol_handler = elantech_process_byte; + psmouse->disconnect = elantech_disconnect; + psmouse->reconnect = elantech_reconnect; + psmouse->pktsize = 4; + return 0; + +init_fail: + kfree(etd); + return -1; } diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h index e5a6157..1c0452d 100644 --- a/drivers/input/mouse/elantech.h +++ b/drivers/input/mouse/elantech.h @@ -1,7 +1,7 @@ /* - * Elantech Touchpad driver + * Elantech Touchpad driver (v4) * - * Copyright (C) 2007 Arjan Opmeer + * Copyright (C) 2007-2008 Arjan Opmeer * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published @@ -14,28 +14,31 @@ #define _ELANTECH_H /* + * Command values for Synaptics style queries + */ +#define ETP_FW_VERSION_QUERY 0x01 +#define ETP_CAPABILITIES_QUERY 0x02 + +/* * Commands start with this value */ -#define ELANTECH_COMMAND_START 0x11 +#define ETP_REGISTER_WRITE 0x11 /* * Register bitmasks */ #define ETP_R10_ABSOLUTE_MODE 0x04 -#define ETP_R11_PARITY_CHECKING 0x01 #define ETP_R11_4_BYTE_MODE 0x02 /* * Capability bitmasks */ -#define ETP_CAP_REPORTS_MIDDLE_BUTTON 0x02 #define ETP_CAP_HAS_ROCKER 0x04 -#define ETP_CAP_ALTERNATE_TAP_BITS 0x10 /* * One hard to find application note states that X axis range is 0 to 576 * and Y axis range is 0 to 384. - * Edge fuzz might be necessary because of bezel around the touchpad. + * Edge fuzz might be necessary because of bezel around the touchpad */ #define ETP_EDGE_FUZZ 32 @@ -48,8 +51,8 @@ * It seems the touchpad does not report pressure. * Just choose some values for compatibility with X Synaptics driver */ -#define ETP_MAX_PRESSURE 127 -#define ETP_DEF_PRESSURE 64 +#define ETP_MAX_PRESSURE 255 +#define ETP_DEF_PRESSURE 128 struct elantech_data { unsigned char reg_10; @@ -63,6 +66,9 @@ struct elantech_data { unsigned char reg_26; unsigned char debug; unsigned char capabilities; + unsigned char fw_version_maj; + unsigned char fw_version_min; + unsigned char parity[256]; }; #ifdef CONFIG_MOUSE_PS2_ELANTECH diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index d42ff6f..300d960 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -770,6 +770,12 @@ static const struct psmouse_protocol psmouse_protocols[] = { .detect = touchkit_ps2_detect, }, #endif + { + .type = PSMOUSE_CORTRON, + .name = "CortronPS/2", + .alias = "cortps", + .detect = cortron_detect, + }, #ifdef CONFIG_MOUSE_PS2_ELANTECH { .type = PSMOUSE_ELANTECH, @@ -780,12 +786,6 @@ static const struct psmouse_protocol psmouse_protocols[] = { }, #endif { - .type = PSMOUSE_CORTRON, - .name = "CortronPS/2", - .alias = "cortps", - .detect = cortron_detect, - }, - { .type = PSMOUSE_AUTO, .name = "auto", .alias = "any",