From f822982515378982dc8d8e6058579288d0ee3cff Mon Sep 17 00:00:00 2001

From: Kevin Cernekee <cernekee@gmail.com>

Date: Wed, 13 Feb 2013 20:55:19 -0800

Subject: [PATCH 01/15] Input: ALPS - document the alps.h data structures

Add kernel-doc markup.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>

Tested-by: Dave Turvene <dturvene@dahetral.com>

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

---

 drivers/input/mouse/alps.h | 74 ++++++++++++++++++++++++++++++++++++++--------

 1 file changed, 61 insertions(+), 13 deletions(-)

diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h

index ae1ac35..67be4e5 100644

--- a/drivers/input/mouse/alps.h

+++ b/drivers/input/mouse/alps.h

@@ -17,30 +17,78 @@

 #define ALPS_PROTO_V3	2

 #define ALPS_PROTO_V4	3

+/**

+ * struct alps_model_info - touchpad ID table

+ * @signature: E7 response string to match.

+ * @command_mode_resp: For V3/V4 touchpads, the final byte of the EC response

+ *   (aka command mode response) identifies the firmware minor version.  This

+ *   can be used to distinguish different hardware models which are not

+ *   uniquely identifiable through their E7 responses.

+ * @proto_version: Indicates V1/V2/V3/...

+ * @byte0: Helps figure out whether a position report packet matches the

+ *   known format for this model.  The first byte of the report, ANDed with

+ *   mask0, should match byte0.

+ * @mask0: The mask used to check the first byte of the report.

+ * @flags: Additional device capabilities (passthrough port, trackstick, etc.).

+ *

+ * Many (but not all) ALPS touchpads can be identified by looking at the

+ * values returned in the "E7 report" and/or the "EC report."  This table

+ * lists a number of such touchpads.

+ */

 struct alps_model_info {

-        unsigned char signature[3];

-	unsigned char command_mode_resp; /* v3/v4 only */

+	unsigned char signature[3];

+	unsigned char command_mode_resp;

 	unsigned char proto_version;

-        unsigned char byte0, mask0;

-        unsigned char flags;

+	unsigned char byte0, mask0;

+	unsigned char flags;

 };

+/**

+ * struct alps_nibble_commands - encodings for register accesses

+ * @command: PS/2 command used for the nibble

+ * @data: Data supplied as an argument to the PS/2 command, if applicable

+ *

+ * The ALPS protocol uses magic sequences to transmit binary data to the

+ * touchpad, as it is generally not OK to send arbitrary bytes out the

+ * PS/2 port.  Each of the sequences in this table sends one nibble of the

+ * register address or (write) data.  Different versions of the ALPS protocol

+ * use slightly different encodings.

+ */

 struct alps_nibble_commands {

 	int command;

 	unsigned char data;

 };

+/**

+ * struct alps_data - private data structure for the ALPS driver

+ * @dev2: "Relative" device used to report trackstick or mouse activity.

+ * @phys: Physical path for the relative device.

+ * @i: Information on the detected touchpad model.

+ * @nibble_commands: Command mapping used for touchpad register accesses.

+ * @addr_command: Command used to tell the touchpad that a register address

+ *   follows.

+ * @prev_fin: Finger bit from previous packet.

+ * @multi_packet: Multi-packet data in progress.

+ * @multi_data: Saved multi-packet data.

+ * @x1: First X coordinate from last MT report.

+ * @x2: Second X coordinate from last MT report.

+ * @y1: First Y coordinate from last MT report.

+ * @y2: Second Y coordinate from last MT report.

+ * @fingers: Number of fingers from last MT report.

+ * @quirks: Bitmap of ALPS_QUIRK_*.

+ * @timer: Timer for flushing out the final report packet in the stream.

+ */

 struct alps_data {

-	struct input_dev *dev2;		/* Relative device */

-	char phys[32];			/* Phys */

-	const struct alps_model_info *i;/* Info */

+	struct input_dev *dev2;

+	char phys[32];

+	const struct alps_model_info *i;

 	const struct alps_nibble_commands *nibble_commands;

-	int addr_command;		/* Command to set register address */

-	int prev_fin;			/* Finger bit from previous packet */

-	int multi_packet;		/* Multi-packet data in progress */

-	unsigned char multi_data[6];	/* Saved multi-packet data */

-	int x1, x2, y1, y2;		/* Coordinates from last MT report */

-	int fingers;			/* Number of fingers from MT report */

+	int addr_command;

+	int prev_fin;

+	int multi_packet;

+	unsigned char multi_data[6];

+	int x1, x2, y1, y2;

+	int fingers;

 	u8 quirks;

 	struct timer_list timer;

 };

-- 

1.8.1.2

From 196069863604cb55061a02ad5f046c5e4054ba54 Mon Sep 17 00:00:00 2001

From: Kevin Cernekee <cernekee@gmail.com>

Date: Wed, 13 Feb 2013 20:56:33 -0800

Subject: [PATCH 02/15] Input: ALPS - copy "model" info into alps_data struct

Not every type of ALPS touchpad is well-suited to table-based detection.

Start moving the various alps_model_data attributes into the alps_data

struct so that we don't need a unique table entry for every possible

permutation of protocol version, flags, byte0/mask0, etc.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>

Tested-by: Dave Turvene <dturvene@dahetral.com>

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

---

 drivers/input/mouse/alps.c | 63 +++++++++++++++++++++++-----------------------

 drivers/input/mouse/alps.h | 14 +++++++++--

 2 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c

index e229fa3..33ee6e0 100644

--- a/drivers/input/mouse/alps.c

+++ b/drivers/input/mouse/alps.c

@@ -122,10 +122,10 @@ static const struct alps_model_info alps_model_data[] = {

 /* Packet formats are described in Documentation/input/alps.txt */

-static bool alps_is_valid_first_byte(const struct alps_model_info *model,

+static bool alps_is_valid_first_byte(struct alps_data *priv,

 				     unsigned char data)

 {

-	return (data & model->mask0) == model->byte0;

+	return (data & priv->mask0) == priv->byte0;

 }

 static void alps_report_buttons(struct psmouse *psmouse,

@@ -158,14 +158,13 @@ static void alps_report_buttons(struct psmouse *psmouse,

 static void alps_process_packet_v1_v2(struct psmouse *psmouse)

 {

 	struct alps_data *priv = psmouse->private;

-	const struct alps_model_info *model = priv->i;

 	unsigned char *packet = psmouse->packet;

 	struct input_dev *dev = psmouse->dev;

 	struct input_dev *dev2 = priv->dev2;

 	int x, y, z, ges, fin, left, right, middle;

 	int back = 0, forward = 0;

-	if (model->proto_version == ALPS_PROTO_V1) {

+	if (priv->proto_version == ALPS_PROTO_V1) {

 		left = packet[2] & 0x10;

 		right = packet[2] & 0x08;

 		middle = 0;

@@ -181,12 +180,12 @@ static void alps_process_packet_v1_v2(struct psmouse *psmouse)

 		z = packet[5];

 	}

-	if (model->flags & ALPS_FW_BK_1) {

+	if (priv->flags & ALPS_FW_BK_1) {

 		back = packet[0] & 0x10;

 		forward = packet[2] & 4;

 	}

-	if (model->flags & ALPS_FW_BK_2) {

+	if (priv->flags & ALPS_FW_BK_2) {

 		back = packet[3] & 4;

 		forward = packet[2] & 4;

 		if ((middle = forward && back))

@@ -196,7 +195,7 @@ static void alps_process_packet_v1_v2(struct psmouse *psmouse)

 	ges = packet[2] & 1;

 	fin = packet[2] & 2;

-	if ((model->flags & ALPS_DUALPOINT) && z == 127) {

+	if ((priv->flags & ALPS_DUALPOINT) && z == 127) {

 		input_report_rel(dev2, REL_X,  (x > 383 ? (x - 768) : x));

 		input_report_rel(dev2, REL_Y, -(y > 255 ? (y - 512) : y));

@@ -239,15 +238,15 @@ static void alps_process_packet_v1_v2(struct psmouse *psmouse)

 	input_report_abs(dev, ABS_PRESSURE, z);

 	input_report_key(dev, BTN_TOOL_FINGER, z > 0);

-	if (model->flags & ALPS_WHEEL)

+	if (priv->flags & ALPS_WHEEL)

 		input_report_rel(dev, REL_WHEEL, ((packet[2] << 1) & 0x08) - ((packet[0] >> 4) & 0x07));

-	if (model->flags & (ALPS_FW_BK_1 | ALPS_FW_BK_2)) {

+	if (priv->flags & (ALPS_FW_BK_1 | ALPS_FW_BK_2)) {

 		input_report_key(dev, BTN_FORWARD, forward);

 		input_report_key(dev, BTN_BACK, back);

 	}

-	if (model->flags & ALPS_FOUR_BUTTONS) {

+	if (priv->flags & ALPS_FOUR_BUTTONS) {

 		input_report_key(dev, BTN_0, packet[2] & 4);

 		input_report_key(dev, BTN_1, packet[0] & 0x10);

 		input_report_key(dev, BTN_2, packet[3] & 4);

@@ -699,9 +698,8 @@ static void alps_process_packet_v4(struct psmouse *psmouse)

 static void alps_process_packet(struct psmouse *psmouse)

 {

 	struct alps_data *priv = psmouse->private;

-	const struct alps_model_info *model = priv->i;

-	switch (model->proto_version) {

+	switch (priv->proto_version) {

 	case ALPS_PROTO_V1:

 	case ALPS_PROTO_V2:

 		alps_process_packet_v1_v2(psmouse);

@@ -765,7 +763,7 @@ static psmouse_ret_t alps_handle_interleaved_ps2(struct psmouse *psmouse)

 		if (((psmouse->packet[3] |

 		      psmouse->packet[4] |

 		      psmouse->packet[5]) & 0x80) ||

-		    (!alps_is_valid_first_byte(priv->i, psmouse->packet[6]))) {

+		    (!alps_is_valid_first_byte(priv, psmouse->packet[6]))) {

 			psmouse_dbg(psmouse,

 				    "refusing packet %4ph (suspected interleaved ps/2)\n",

 				    psmouse->packet + 3);

@@ -844,7 +842,6 @@ static void alps_flush_packet(unsigned long data)

 static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)

 {

 	struct alps_data *priv = psmouse->private;

-	const struct alps_model_info *model = priv->i;

 	if ((psmouse->packet[0] & 0xc8) == 0x08) { /* PS/2 packet */

 		if (psmouse->pktcnt == 3) {

@@ -857,15 +854,15 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)

 	/* Check for PS/2 packet stuffed in the middle of ALPS packet. */

-	if ((model->flags & ALPS_PS2_INTERLEAVED) &&

+	if ((priv->flags & ALPS_PS2_INTERLEAVED) &&

 	    psmouse->pktcnt >= 4 && (psmouse->packet[3] & 0x0f) == 0x0f) {

 		return alps_handle_interleaved_ps2(psmouse);

 	}

-	if (!alps_is_valid_first_byte(model, psmouse->packet[0])) {

+	if (!alps_is_valid_first_byte(priv, psmouse->packet[0])) {

 		psmouse_dbg(psmouse,

 			    "refusing packet[0] = %x (mask0 = %x, byte0 = %x)\n",

-			    psmouse->packet[0], model->mask0, model->byte0);

+			    psmouse->packet[0], priv->mask0, priv->byte0);

 		return PSMOUSE_BAD_DATA;

 	}

@@ -1190,16 +1187,16 @@ static int alps_poll(struct psmouse *psmouse)

 	unsigned char buf[sizeof(psmouse->packet)];

 	bool poll_failed;

-	if (priv->i->flags & ALPS_PASS)

+	if (priv->flags & ALPS_PASS)

 		alps_passthrough_mode_v2(psmouse, true);

 	poll_failed = ps2_command(&psmouse->ps2dev, buf,

 				  PSMOUSE_CMD_POLL | (psmouse->pktsize << 8)) < 0;

-	if (priv->i->flags & ALPS_PASS)

+	if (priv->flags & ALPS_PASS)

 		alps_passthrough_mode_v2(psmouse, false);

-	if (poll_failed || (buf[0] & priv->i->mask0) != priv->i->byte0)

+	if (poll_failed || (buf[0] & priv->mask0) != priv->byte0)

 		return -1;

 	if ((psmouse->badbyte & 0xc8) == 0x08) {

@@ -1217,9 +1214,8 @@ static int alps_poll(struct psmouse *psmouse)

 static int alps_hw_init_v1_v2(struct psmouse *psmouse)

 {

 	struct alps_data *priv = psmouse->private;

-	const struct alps_model_info *model = priv->i;

-	if ((model->flags & ALPS_PASS) &&

+	if ((priv->flags & ALPS_PASS) &&

 	    alps_passthrough_mode_v2(psmouse, true)) {

 		return -1;

 	}

@@ -1234,7 +1230,7 @@ static int alps_hw_init_v1_v2(struct psmouse *psmouse)

 		return -1;

 	}

-	if ((model->flags & ALPS_PASS) &&

+	if ((priv->flags & ALPS_PASS) &&

 	    alps_passthrough_mode_v2(psmouse, false)) {

 		return -1;

 	}

@@ -1520,10 +1516,9 @@ error:

 static int alps_hw_init(struct psmouse *psmouse)

 {

 	struct alps_data *priv = psmouse->private;

-	const struct alps_model_info *model = priv->i;

 	int ret = -1;

-	switch (model->proto_version) {

+	switch (priv->proto_version) {

 	case ALPS_PROTO_V1:

 	case ALPS_PROTO_V2:

 		ret = alps_hw_init_v1_v2(psmouse);

@@ -1585,7 +1580,10 @@ int alps_init(struct psmouse *psmouse)

 	if (!model)

 		goto init_fail;

-	priv->i = model;

+	priv->proto_version = model->proto_version;

+	priv->byte0 = model->byte0;

+	priv->mask0 = model->mask0;

+	priv->flags = model->flags;

 	if (alps_hw_init(psmouse))

 		goto init_fail;

@@ -1609,7 +1607,7 @@ int alps_init(struct psmouse *psmouse)

 	dev1->evbit[BIT_WORD(EV_ABS)] |= BIT_MASK(EV_ABS);

-	switch (model->proto_version) {

+	switch (priv->proto_version) {

 	case ALPS_PROTO_V1:

 	case ALPS_PROTO_V2:

 		input_set_abs_params(dev1, ABS_X, 0, 1023, 0, 0);

@@ -1633,17 +1631,17 @@ int alps_init(struct psmouse *psmouse)

 	input_set_abs_params(dev1, ABS_PRESSURE, 0, 127, 0, 0);

-	if (model->flags & ALPS_WHEEL) {

+	if (priv->flags & ALPS_WHEEL) {

 		dev1->evbit[BIT_WORD(EV_REL)] |= BIT_MASK(EV_REL);

 		dev1->relbit[BIT_WORD(REL_WHEEL)] |= BIT_MASK(REL_WHEEL);

 	}

-	if (model->flags & (ALPS_FW_BK_1 | ALPS_FW_BK_2)) {

+	if (priv->flags & (ALPS_FW_BK_1 | ALPS_FW_BK_2)) {

 		dev1->keybit[BIT_WORD(BTN_FORWARD)] |= BIT_MASK(BTN_FORWARD);

 		dev1->keybit[BIT_WORD(BTN_BACK)] |= BIT_MASK(BTN_BACK);

 	}

-	if (model->flags & ALPS_FOUR_BUTTONS) {

+	if (priv->flags & ALPS_FOUR_BUTTONS) {

 		dev1->keybit[BIT_WORD(BTN_0)] |= BIT_MASK(BTN_0);

 		dev1->keybit[BIT_WORD(BTN_1)] |= BIT_MASK(BTN_1);

 		dev1->keybit[BIT_WORD(BTN_2)] |= BIT_MASK(BTN_2);

@@ -1654,7 +1652,8 @@ int alps_init(struct psmouse *psmouse)

 	snprintf(priv->phys, sizeof(priv->phys), "%s/input1", psmouse->ps2dev.serio->phys);

 	dev2->phys = priv->phys;

-	dev2->name = (model->flags & ALPS_DUALPOINT) ? "DualPoint Stick" : "PS/2 Mouse";

+	dev2->name = (priv->flags & ALPS_DUALPOINT) ?

+		     "DualPoint Stick" : "PS/2 Mouse";

 	dev2->id.bustype = BUS_I8042;

 	dev2->id.vendor  = 0x0002;

 	dev2->id.product = PSMOUSE_ALPS;

@@ -1673,7 +1672,7 @@ int alps_init(struct psmouse *psmouse)

 	psmouse->poll = alps_poll;

 	psmouse->disconnect = alps_disconnect;

 	psmouse->reconnect = alps_reconnect;

-	psmouse->pktsize = model->proto_version == ALPS_PROTO_V4 ? 8 : 6;

+	psmouse->pktsize = priv->proto_version == ALPS_PROTO_V4 ? 8 : 6;

 	/* We are having trouble resyncing ALPS touchpads so disable it for now */

 	psmouse->resync_time = 0;

diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h

index 67be4e5..efd0eea 100644

--- a/drivers/input/mouse/alps.h

+++ b/drivers/input/mouse/alps.h

@@ -63,10 +63,15 @@ struct alps_nibble_commands {

  * struct alps_data - private data structure for the ALPS driver

  * @dev2: "Relative" device used to report trackstick or mouse activity.

  * @phys: Physical path for the relative device.

- * @i: Information on the detected touchpad model.

  * @nibble_commands: Command mapping used for touchpad register accesses.

  * @addr_command: Command used to tell the touchpad that a register address

  *   follows.

+ * @proto_version: Indicates V1/V2/V3/...

+ * @byte0: Helps figure out whether a position report packet matches the

+ *   known format for this model.  The first byte of the report, ANDed with

+ *   mask0, should match byte0.

+ * @mask0: The mask used to check the first byte of the report.

+ * @flags: Additional device capabilities (passthrough port, trackstick, etc.).

  * @prev_fin: Finger bit from previous packet.

  * @multi_packet: Multi-packet data in progress.

  * @multi_data: Saved multi-packet data.

@@ -81,9 +86,14 @@ struct alps_nibble_commands {

 struct alps_data {

 	struct input_dev *dev2;

 	char phys[32];

-	const struct alps_model_info *i;

+

+	/* these are autodetected when the device is identified */

 	const struct alps_nibble_commands *nibble_commands;

 	int addr_command;

+	unsigned char proto_version;

+	unsigned char byte0, mask0;

+	unsigned char flags;

+

 	int prev_fin;

 	int multi_packet;

 	unsigned char multi_data[6];

-- 

1.8.1.2

From b856c913996a38ced60bdf41aeae4da00882bf1f Mon Sep 17 00:00:00 2001

From: Kevin Cernekee <cernekee@gmail.com>

Date: Wed, 13 Feb 2013 20:57:04 -0800

Subject: [PATCH 03/15] Input: ALPS - move alps_get_model() down below hw_init

 code

This will minimize the number of forward declarations needed when

alps_get_model() starts assigning function pointers.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>

Tested-by: Dave Turvene <dturvene@dahetral.com>

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

---

 drivers/input/mouse/alps.c | 186 ++++++++++++++++++++++-----------------------

 1 file changed, 93 insertions(+), 93 deletions(-)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c

index 33ee6e0..c473549 100644

--- a/drivers/input/mouse/alps.c

+++ b/drivers/input/mouse/alps.c

@@ -998,99 +998,6 @@ static inline int alps_exit_command_mode(struct psmouse *psmouse)

 	return 0;

 }

-static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int *version)

-{

-	struct ps2dev *ps2dev = &psmouse->ps2dev;

-	static const unsigned char rates[] = { 0, 10, 20, 40, 60, 80, 100, 200 };

-	unsigned char param[4];

-	const struct alps_model_info *model = NULL;

-	int i;

-

-	/*

-	 * First try "E6 report".

-	 * ALPS should return 0,0,10 or 0,0,100 if no buttons are pressed.

-	 * The bits 0-2 of the first byte will be 1s if some buttons are

-	 * pressed.

-	 */

-	param[0] = 0;

-	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11))

-		return NULL;

-

-	param[0] = param[1] = param[2] = 0xff;

-	if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO))

-		return NULL;

-

-	psmouse_dbg(psmouse, "E6 report: %2.2x %2.2x %2.2x",

-		    param[0], param[1], param[2]);

-

-	if ((param[0] & 0xf8) != 0 || param[1] != 0 ||

-	    (param[2] != 10 && param[2] != 100))

-		return NULL;

-

-	/*

-	 * Now try "E7 report". Allowed responses are in

-	 * alps_model_data[].signature

-	 */

-	param[0] = 0;

-	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21))

-		return NULL;

-

-	param[0] = param[1] = param[2] = 0xff;

-	if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO))

-		return NULL;

-

-	psmouse_dbg(psmouse, "E7 report: %2.2x %2.2x %2.2x",

-		    param[0], param[1], param[2]);

-

-	if (version) {

-		for (i = 0; i < ARRAY_SIZE(rates) && param[2] != rates[i]; i++)

-			/* empty */;

-		*version = (param[0] << 8) | (param[1] << 4) | i;

-	}

-

-	for (i = 0; i < ARRAY_SIZE(alps_model_data); i++) {

-		if (!memcmp(param, alps_model_data[i].signature,

-			    sizeof(alps_model_data[i].signature))) {

-			model = alps_model_data + i;

-			break;

-		}

-	}

-

-	if (model && model->proto_version > ALPS_PROTO_V2) {

-		/*

-		 * Need to check command mode response to identify

-		 * model

-		 */

-		model = NULL;

-		if (alps_enter_command_mode(psmouse, param)) {

-			psmouse_warn(psmouse,

-				     "touchpad failed to enter command mode\n");

-		} else {

-			for (i = 0; i < ARRAY_SIZE(alps_model_data); i++) {

-				if (alps_model_data[i].proto_version > ALPS_PROTO_V2 &&

-				    alps_model_data[i].command_mode_resp == param[0]) {

-					model = alps_model_data + i;

-					break;

-				}

-			}

-			alps_exit_command_mode(psmouse);

-

-			if (!model)

-				psmouse_dbg(psmouse,

-					    "Unknown command mode response %2.2x\n",

-					    param[0]);

-		}

-	}

-

-	return model;

-}

-

 /*

  * For DualPoint devices select the device that should respond to

  * subsequent commands. It looks like glidepad is behind stickpointer,

@@ -1534,6 +1441,99 @@ static int alps_hw_init(struct psmouse *psmouse)

 	return ret;

 }

+static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int *version)

+{

+	struct ps2dev *ps2dev = &psmouse->ps2dev;

+	static const unsigned char rates[] = { 0, 10, 20, 40, 60, 80, 100, 200 };

+	unsigned char param[4];

+	const struct alps_model_info *model = NULL;

+	int i;

+

+	/*

+	 * First try "E6 report".

+	 * ALPS should return 0,0,10 or 0,0,100 if no buttons are pressed.

+	 * The bits 0-2 of the first byte will be 1s if some buttons are

+	 * pressed.

+	 */

+	param[0] = 0;

+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES) ||

+	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11) ||

+	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11) ||

+	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11))

+		return NULL;

+

+	param[0] = param[1] = param[2] = 0xff;

+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO))

+		return NULL;

+

+	psmouse_dbg(psmouse, "E6 report: %2.2x %2.2x %2.2x",

+		    param[0], param[1], param[2]);

+

+	if ((param[0] & 0xf8) != 0 || param[1] != 0 ||

+	    (param[2] != 10 && param[2] != 100))

+		return NULL;

+

+	/*

+	 * Now try "E7 report". Allowed responses are in

+	 * alps_model_data[].signature

+	 */

+	param[0] = 0;

+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES) ||

+	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21) ||

+	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21) ||

+	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21))

+		return NULL;

+

+	param[0] = param[1] = param[2] = 0xff;

+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO))

+		return NULL;

+

+	psmouse_dbg(psmouse, "E7 report: %2.2x %2.2x %2.2x",

+		    param[0], param[1], param[2]);

+

+	if (version) {

+		for (i = 0; i < ARRAY_SIZE(rates) && param[2] != rates[i]; i++)

+			/* empty */;

+		*version = (param[0] << 8) | (param[1] << 4) | i;

+	}

+

+	for (i = 0; i < ARRAY_SIZE(alps_model_data); i++) {

+		if (!memcmp(param, alps_model_data[i].signature,

+			    sizeof(alps_model_data[i].signature))) {

+			model = alps_model_data + i;

+			break;

+		}

+	}

+

+	if (model && model->proto_version > ALPS_PROTO_V2) {

+		/*

+		 * Need to check command mode response to identify

+		 * model

+		 */

+		model = NULL;

+		if (alps_enter_command_mode(psmouse, param)) {

+			psmouse_warn(psmouse,

+				     "touchpad failed to enter command mode\n");

+		} else {

+			for (i = 0; i < ARRAY_SIZE(alps_model_data); i++) {

+				if (alps_model_data[i].proto_version > ALPS_PROTO_V2 &&

+				    alps_model_data[i].command_mode_resp == param[0]) {

+					model = alps_model_data + i;

+					break;

+				}

+			}

+			alps_exit_command_mode(psmouse);

+

+			if (!model)

+				psmouse_dbg(psmouse,

+					    "Unknown command mode response %2.2x\n",

+					    param[0]);

+		}

+	}

+

+	return model;

+}

+

 static int alps_reconnect(struct psmouse *psmouse)

 {

 	const struct alps_model_info *model;

-- 

1.8.1.2

From b719d56d5743e2c338568f4edb6eab17ea9c9eec Mon Sep 17 00:00:00 2001

From: Kevin Cernekee <cernekee@gmail.com>

Date: Wed, 13 Feb 2013 22:19:01 -0800

Subject: [PATCH 04/15] Input: ALPS - introduce helper function for repeated

 commands

Several ALPS driver init sequences repeat a command three times, then

issue PSMOUSE_CMD_GETINFO to read the result.  Move this into a helper

function to simplify the code.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>

Tested-by: Dave Turvene <dturvene@dahetral.com>

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

---

 drivers/input/mouse/alps.c | 71 ++++++++++++++++++++--------------------------

 1 file changed, 30 insertions(+), 41 deletions(-)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c

index c473549..1ca854b 100644

--- a/drivers/input/mouse/alps.c

+++ b/drivers/input/mouse/alps.c

@@ -964,24 +964,42 @@ static int alps_command_mode_write_reg(struct psmouse *psmouse, int addr,

 	return __alps_command_mode_write_reg(psmouse, value);

 }

+static int alps_rpt_cmd(struct psmouse *psmouse, int init_command,

+			int repeated_command, unsigned char *param)

+{

+	struct ps2dev *ps2dev = &psmouse->ps2dev;

+

+	param[0] = 0;

+	if (init_command && ps2_command(ps2dev, param, init_command))

+		return -EIO;

+

+	if (ps2_command(ps2dev,  NULL, repeated_command) ||

+	    ps2_command(ps2dev,  NULL, repeated_command) ||

+	    ps2_command(ps2dev,  NULL, repeated_command))

+		return -EIO;

+

+	param[0] = param[1] = param[2] = 0xff;

+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO))

+		return -EIO;

+

+	psmouse_dbg(psmouse, "%2.2X report: %2.2x %2.2x %2.2x\n",

+		    repeated_command, param[0], param[1], param[2]);

+	return 0;

+}

+

 static int alps_enter_command_mode(struct psmouse *psmouse,

 				   unsigned char *resp)

 {

 	unsigned char param[4];

-	struct ps2dev *ps2dev = &psmouse->ps2dev;

-	if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_WRAP) ||

-	    ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_WRAP) ||

-	    ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_WRAP) ||

-	    ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO)) {

+	if (alps_rpt_cmd(psmouse, 0, PSMOUSE_CMD_RESET_WRAP, param)) {

 		psmouse_err(psmouse, "failed to enter command mode\n");

 		return -1;

 	}

 	if (param[0] != 0x88 && param[1] != 0x07) {

 		psmouse_dbg(psmouse,

-			    "unknown response while entering command mode: %2.2x %2.2x %2.2x\n",

-			    param[0], param[1], param[2]);

+			    "unknown response while entering command mode\n");

 		return -1;

 	}

@@ -1041,18 +1059,10 @@ static int alps_absolute_mode_v1_v2(struct psmouse *psmouse)

 static int alps_get_status(struct psmouse *psmouse, char *param)

 {

-	struct ps2dev *ps2dev = &psmouse->ps2dev;

-

 	/* Get status: 0xF5 0xF5 0xF5 0xE9 */

-	if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE) ||

-	    ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE) ||

-	    ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE) ||

-	    ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO))

+	if (alps_rpt_cmd(psmouse, 0, PSMOUSE_CMD_DISABLE, param))

 		return -1;

-	psmouse_dbg(psmouse, "Status: %2.2x %2.2x %2.2x",

-		    param[0], param[1], param[2]);

-

 	return 0;

 }

@@ -1443,7 +1453,6 @@ static int alps_hw_init(struct psmouse *psmouse)

 static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int *version)

 {

-	struct ps2dev *ps2dev = &psmouse->ps2dev;

 	static const unsigned char rates[] = { 0, 10, 20, 40, 60, 80, 100, 200 };

 	unsigned char param[4];

 	const struct alps_model_info *model = NULL;

@@ -1455,20 +1464,10 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int

 	 * The bits 0-2 of the first byte will be 1s if some buttons are

 	 * pressed.

 	 */

-	param[0] = 0;

-	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11))

-		return NULL;

-

-	param[0] = param[1] = param[2] = 0xff;

-	if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO))

+	if (alps_rpt_cmd(psmouse, PSMOUSE_CMD_SETRES, PSMOUSE_CMD_SETSCALE11,

+			 param))

 		return NULL;

-	psmouse_dbg(psmouse, "E6 report: %2.2x %2.2x %2.2x",

-		    param[0], param[1], param[2]);

-

 	if ((param[0] & 0xf8) != 0 || param[1] != 0 ||

 	    (param[2] != 10 && param[2] != 100))

 		return NULL;

@@ -1477,20 +1476,10 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int

 	 * Now try "E7 report". Allowed responses are in

 	 * alps_model_data[].signature

 	 */

-	param[0] = 0;

-	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21))

-		return NULL;

-

-	param[0] = param[1] = param[2] = 0xff;

-	if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO))

+	if (alps_rpt_cmd(psmouse, PSMOUSE_CMD_SETRES, PSMOUSE_CMD_SETSCALE21,

+			 param))

 		return NULL;

-	psmouse_dbg(psmouse, "E7 report: %2.2x %2.2x %2.2x",

-		    param[0], param[1], param[2]);

-

 	if (version) {

 		for (i = 0; i < ARRAY_SIZE(rates) && param[2] != rates[i]; i++)

 			/* empty */;

-- 

1.8.1.2

From c7fd5d0e90f577072ece70651aeecb37f62f5fdb Mon Sep 17 00:00:00 2001

From: Kevin Cernekee <cernekee@gmail.com>

Date: Wed, 13 Feb 2013 22:19:59 -0800

Subject: [PATCH 05/15] Input: ALPS - rework detection sequence

If the E6 report test passes, get the E7 and EC reports right away and

then try to match an entry in the table.

Pass in the alps_data struct, so that the detection code will be able to

set operating parameters based on information found during detection.

Change the version (psmouse->model) to report the protocol version only,

in preparation for supporting models that do not show up in the ID table.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>

Tested-by: Dave Turvene <dturvene@dahetral.com>

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

---

 drivers/input/mouse/alps.c | 124 +++++++++++++++++++--------------------------

 drivers/input/mouse/alps.h |   8 +--

 2 files changed, 56 insertions(+), 76 deletions(-)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c

index 1ca854b..e6a27a5 100644

--- a/drivers/input/mouse/alps.c

+++ b/drivers/input/mouse/alps.c

@@ -1451,86 +1451,76 @@ static int alps_hw_init(struct psmouse *psmouse)

 	return ret;

 }

-static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int *version)

+static int alps_match_table(struct psmouse *psmouse, struct alps_data *priv,

+			    unsigned char *e7, unsigned char *ec)

 {

-	static const unsigned char rates[] = { 0, 10, 20, 40, 60, 80, 100, 200 };

-	unsigned char param[4];

-	const struct alps_model_info *model = NULL;

+	const struct alps_model_info *model;

 	int i;

+	for (i = 0; i < ARRAY_SIZE(alps_model_data); i++) {

+		model = &alps_model_data[i];

+

+		if (!memcmp(e7, model->signature, sizeof(model->signature)) &&

+		    (!model->command_mode_resp ||

+		     model->command_mode_resp == ec[2])) {

+

+			priv->proto_version = model->proto_version;

+			priv->flags = model->flags;

+			priv->byte0 = model->byte0;

+			priv->mask0 = model->mask0;

+

+			return 0;

+		}

+	}

+

+	return -EINVAL;

+}

+

+static int alps_identify(struct psmouse *psmouse, struct alps_data *priv)

+{

+	unsigned char e6[4], e7[4], ec[4];

+

 	/*

 	 * First try "E6 report".

 	 * ALPS should return 0,0,10 or 0,0,100 if no buttons are pressed.

 	 * The bits 0-2 of the first byte will be 1s if some buttons are

 	 * pressed.

 	 */

-	if (alps_rpt_cmd(psmouse, PSMOUSE_CMD_SETRES, PSMOUSE_CMD_SETSCALE11,

-			 param))

-		return NULL;

+	if (alps_rpt_cmd(psmouse, PSMOUSE_CMD_SETRES,

+			 PSMOUSE_CMD_SETSCALE11, e6))

+		return -EIO;

-	if ((param[0] & 0xf8) != 0 || param[1] != 0 ||

-	    (param[2] != 10 && param[2] != 100))

-		return NULL;

+	if ((e6[0] & 0xf8) != 0 || e6[1] != 0 || (e6[2] != 10 && e6[2] != 100))

+		return -EINVAL;

 	/*

-	 * Now try "E7 report". Allowed responses are in

-	 * alps_model_data[].signature

+	 * Now get the "E7" and "EC" reports.  These will uniquely identify

+	 * most ALPS touchpads.

 	 */

-	if (alps_rpt_cmd(psmouse, PSMOUSE_CMD_SETRES, PSMOUSE_CMD_SETSCALE21,

-			 param))

-		return NULL;

-