Hi Hans,
On Sat, Jul 26, 2014 at 02:13:52PM +0200, Hans de Goede wrote:
> From: Yunkang Tang <yunkang.tang@xxxxxxxxxxx>
>
> Such as found on the new Toshiba Portégé Z30-A and Z40-A.
>
> Signed-off-by: Yunkang Tang <yunkang.tang@xxxxxxxxxxx>
> [hdegoede@xxxxxxxxxx: Remove softbutton handling, this is done in userspace]
> [hdegoede@xxxxxxxxxx: Report INPUT_PROP_BUTTONPAD]
> [hdegoede@xxxxxxxxxx: Do not report fake PRESSURE, reporting BTN_TOUCH is
> enough]
> [hdegoede@xxxxxxxxxx: Various cleanups / refactoring]
> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
>
> --
> Changes in v2:
> -alps_is_valid_package_v7: switch to using a switch-case
> -alps_check_valid_firmware_id: fix to not always return true
Thank you for whipping the update so quickly.
> +
> +static void alps_get_finger_coordinate_v7(struct input_mt_pos *mt,
> + unsigned char *pkt,
> + unsigned char pkt_id)
> +{
> + mt[0].x = ((pkt[2] & 0x80) << 4);
> + mt[0].x |= ((pkt[2] & 0x3F) << 5);
> + mt[0].x |= ((pkt[3] & 0x30) >> 1);
> + mt[0].x |= (pkt[3] & 0x07);
> + mt[0].y = (pkt[1] << 3) | (pkt[0] & 0x07);
> +
> + mt[1].x = ((pkt[3] & 0x80) << 4);
> + mt[1].x |= ((pkt[4] & 0x80) << 3);
> + mt[1].x |= ((pkt[4] & 0x3F) << 4);
> + mt[1].y = ((pkt[5] & 0x80) << 3);
> + mt[1].y |= ((pkt[5] & 0x3F) << 4);
> +
> + if (pkt_id == V7_PACKET_ID_TWO) {
> + mt[1].x &= ~0x000F;
> + mt[1].y |= 0x000F;
> + } else if (pkt_id == V7_PACKET_ID_MULTI) {
> + mt[1].x &= ~0x003F;
> + mt[1].y &= ~0x0020;
> + mt[1].y |= ((pkt[4] & 0x02) << 4);
> + mt[1].y |= 0x001F;
> + } else if (pkt_id == V7_PACKET_ID_NEW) {
> + mt[1].x &= ~0x003F;
> + mt[1].x |= (pkt[0] & 0x20);
> + mt[1].y |= 0x000F;
> + }
I took the liberty of changing the above to another switch/case...
>
> +static bool alps_check_valid_firmware_id(unsigned char id[])
> +{
> + if (id[0] == 0x73)
> + return true;
> +
> + if (id[0] == 0x88 &&
> + (id[1] == 0x07 || id[1] == 0x08 ||
> + (id[1] & 0xf0) == 0xb0 || (id[1] & 0xf0) == 0xc0))
And split this condition into 1 line per id[1] check...
> + return true;
> +
> + return false;
> +}
> +
And applied and pushed out everything.
Thanks.
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
