mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
Input: alps - change alps_decode_rushmore to do all decoding itself
Change alps_decode_rushmore to do all decoding itself, rather then relying on alps_decode_pinnacle and then overriding some fields + or-ing in some bits. This is a preparation patch for modifying the decode functions to properly differentiate between position and bitmap packets. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
parent
4e3e4629e4
commit
aab9cf7b03
1 changed files with 17 additions and 5 deletions
|
@ -597,13 +597,25 @@ static int alps_decode_pinnacle(struct alps_fields *f, unsigned char *p,
|
|||
static int alps_decode_rushmore(struct alps_fields *f, unsigned char *p,
|
||||
struct psmouse *psmouse)
|
||||
{
|
||||
alps_decode_pinnacle(f, p, psmouse);
|
||||
|
||||
/* Rushmore's packet decode has a bit difference with Pinnacle's */
|
||||
f->first_mp = !!(p[4] & 0x40);
|
||||
f->is_mp = !!(p[5] & 0x40);
|
||||
|
||||
f->fingers = max((p[5] & 0x3), ((p[5] >> 2) & 0x3)) + 1;
|
||||
f->x_map |= (p[5] & 0x10) << 11;
|
||||
f->y_map |= (p[5] & 0x20) << 6;
|
||||
f->x_map = ((p[5] & 0x10) << 11) |
|
||||
((p[4] & 0x7e) << 8) |
|
||||
((p[1] & 0x7f) << 2) |
|
||||
((p[0] & 0x30) >> 4);
|
||||
f->y_map = ((p[5] & 0x20) << 6) |
|
||||
((p[3] & 0x70) << 4) |
|
||||
((p[2] & 0x7f) << 1) |
|
||||
(p[4] & 0x01);
|
||||
|
||||
f->st.x = ((p[1] & 0x7f) << 4) | ((p[4] & 0x30) >> 2) |
|
||||
((p[0] & 0x30) >> 4);
|
||||
f->st.y = ((p[2] & 0x7f) << 4) | (p[4] & 0x0f);
|
||||
f->pressure = p[5] & 0x7f;
|
||||
|
||||
alps_decode_buttons_v3(f, p);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue