TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: ALPS - clean up TrackStick handling for SS5 hardware

Browse Source 
For consistency and clarity, the input_report_*() functions should be
called by alps_process_packet_ss4_v2() instead of by alps_decode_ss4_v2().

Reviewed-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Paul Donohue <linux-kernel@PaulSD.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Paul Donohue
2016-11-28 20:13:47 -08:00
committed by Dmitry Torokhov
parent 864db9295b
commit 7229c58c09
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/input/mouse/alps.c
+22 -14
View File
@@ -1267,18 +1267,12 @@ static int alps_decode_ss4_v2(struct alps_fields *f,
break; break;
case SS4_PACKET_ID_STICK: case SS4_PACKET_ID_STICK:
if (!(priv->flags & ALPS_DUALPOINT)) { /*
psmouse_warn(psmouse, * x, y, and pressure are decoded in
"Rejected trackstick packet from non DualPoint device"); * alps_process_packet_ss4_v2()
} else { */
int x = (s8)(((p[0] & 1) << 7) | (p[1] & 0x7f)); f->first_mp = 0;
int y = (s8)(((p[3] & 1) << 7) | (p[2] & 0x7f)); f->is_mp = 0;
int pressure = (s8)(p[4] & 0x7f);
input_report_rel(priv->dev2, REL_X, x);
input_report_rel(priv->dev2, REL_Y, -y);
input_report_abs(priv->dev2, ABS_PRESSURE, pressure);
}
break; break;
case SS4_PACKET_ID_IDLE: case SS4_PACKET_ID_IDLE:
@@ -1312,6 +1306,7 @@ static void alps_process_packet_ss4_v2(struct psmouse *psmouse)
struct input_dev *dev = psmouse->dev; struct input_dev *dev = psmouse->dev;
struct input_dev *dev2 = priv->dev2; struct input_dev *dev2 = priv->dev2;
struct alps_fields *f = &priv->f; struct alps_fields *f = &priv->f;
int x, y, pressure;
memset(f, 0, sizeof(struct alps_fields)); memset(f, 0, sizeof(struct alps_fields));
priv->decode_fields(f, packet, psmouse); priv->decode_fields(f, packet, psmouse);
@@ -1348,12 +1343,25 @@ static void alps_process_packet_ss4_v2(struct psmouse *psmouse)
/* Report trackstick */ /* Report trackstick */
if (alps_get_pkt_id_ss4_v2(packet) == SS4_PACKET_ID_STICK) { if (alps_get_pkt_id_ss4_v2(packet) == SS4_PACKET_ID_STICK) {
if (priv->flags & ALPS_DUALPOINT) { if (!(priv->flags & ALPS_DUALPOINT)) {
psmouse_warn(psmouse,
"Rejected trackstick packet from non DualPoint device");
return;
}
x = (s8)(((packet[0] & 1) << 7) | (packet[1] & 0x7f));
y = (s8)(((packet[3] & 1) << 7) | (packet[2] & 0x7f));
pressure = (s8)(packet[4] & 0x7f);
input_report_rel(dev2, REL_X, x);
input_report_rel(dev2, REL_Y, -y);
input_report_abs(dev2, ABS_PRESSURE, pressure);
input_report_key(dev2, BTN_LEFT, f->ts_left); input_report_key(dev2, BTN_LEFT, f->ts_left);
input_report_key(dev2, BTN_RIGHT, f->ts_right); input_report_key(dev2, BTN_RIGHT, f->ts_right);
input_report_key(dev2, BTN_MIDDLE, f->ts_middle); input_report_key(dev2, BTN_MIDDLE, f->ts_middle);
input_sync(dev2); input_sync(dev2);
}
return; return;
} }