From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Subject: Re: [PATCH v2] alps: Add support for v7 devices Date: Sat, 26 Jul 2014 23:59:22 +0200 Message-ID: <53D424BA.8060103@redhat.com> References: <1406376832-7135-1-git-send-email-hdegoede@redhat.com> <20140726210912.GA11800@core.coreip.homeip.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mx1.redhat.com ([209.132.183.28]:62585 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750818AbaGZV7c (ORCPT ); Sat, 26 Jul 2014 17:59:32 -0400 In-Reply-To: <20140726210912.GA11800@core.coreip.homeip.net> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, Yunkang Tang Hi, On 07/26/2014 11:09 PM, Dmitry Torokhov wrote: > Hi Hans, > > On Sat, Jul 26, 2014 at 02:13:52PM +0200, Hans de Goede wrote: >> From: Yunkang Tang >> >> Such as found on the new Toshiba Port=E9g=E9 Z30-A and Z40-A. >> >> Signed-off-by: Yunkang Tang >> [hdegoede@redhat.com: Remove softbutton handling, this is done in us= erspace] >> [hdegoede@redhat.com: Report INPUT_PROP_BUTTONPAD] >> [hdegoede@redhat.com: Do not report fake PRESSURE, reporting BTN_TOU= CH is >> enough] >> [hdegoede@redhat.com: Various cleanups / refactoring] >> Signed-off-by: Hans de Goede >> >> -- >> 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 =3D ((pkt[2] & 0x80) << 4); >> + mt[0].x |=3D ((pkt[2] & 0x3F) << 5); >> + mt[0].x |=3D ((pkt[3] & 0x30) >> 1); >> + mt[0].x |=3D (pkt[3] & 0x07); >> + mt[0].y =3D (pkt[1] << 3) | (pkt[0] & 0x07); >> + >> + mt[1].x =3D ((pkt[3] & 0x80) << 4); >> + mt[1].x |=3D ((pkt[4] & 0x80) << 3); >> + mt[1].x |=3D ((pkt[4] & 0x3F) << 4); >> + mt[1].y =3D ((pkt[5] & 0x80) << 3); >> + mt[1].y |=3D ((pkt[5] & 0x3F) << 4); >> + >> + if (pkt_id =3D=3D V7_PACKET_ID_TWO) { >> + mt[1].x &=3D ~0x000F; >> + mt[1].y |=3D 0x000F; >> + } else if (pkt_id =3D=3D V7_PACKET_ID_MULTI) { >> + mt[1].x &=3D ~0x003F; >> + mt[1].y &=3D ~0x0020; >> + mt[1].y |=3D ((pkt[4] & 0x02) << 4); >> + mt[1].y |=3D 0x001F; >> + } else if (pkt_id =3D=3D V7_PACKET_ID_NEW) { >> + mt[1].x &=3D ~0x003F; >> + mt[1].x |=3D (pkt[0] & 0x20); >> + mt[1].y |=3D 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] =3D=3D 0x73) >> + return true; >> + >> + if (id[0] =3D=3D 0x88 && >> + (id[1] =3D=3D 0x07 || id[1] =3D=3D 0x08 || >> + (id[1] & 0xf0) =3D=3D 0xb0 || (id[1] & 0xf0) =3D=3D 0xc0)) > > And split this condition into 1 line per id[1] check... > >> + return true; >> + >> + return false; >> +} >> + > > And applied and pushed out everything. Ok, thanks. Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-input" = in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html