lkml.org 
[lkml]   [2011]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: [PATCH v2 7/7] Input: elantech - add v3 hardware support
    Date
    Hi Dmitry,

    Much cleaner. Thank you.
    I will change it.

    jj

    On Thu, 25 Aug 2011 00:06:42 -0700, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
    > On Thu, Aug 25, 2011 at 09:09:02AM +0800, JJ Ding wrote:
    > > Hi Seth,
    > >
    > > Thank you. You are right.
    > > I think I somehow tested the worng touchpad for this patch.
    > >
    >
    > How about we change it thusly:
    >
    > Input: elamtech - fix V3 packet checking
    >
    > Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    > ---
    >
    > drivers/input/mouse/elantech.c | 18 ++++++------------
    > 1 files changed, 6 insertions(+), 12 deletions(-)
    >
    >
    > diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
    > index 1e2b9da..d814bf74 100644
    > --- a/drivers/input/mouse/elantech.c
    > +++ b/drivers/input/mouse/elantech.c
    > @@ -508,24 +508,18 @@ static int elantech_packet_check_v2(struct psmouse *psmouse)
    > */
    > static int elantech_packet_check_v3(struct psmouse *psmouse)
    > {
    > + const u8 debounce_packet[] = { 0xc4, 0xff, 0xff, 0x02, 0xff, 0xff };
    > unsigned char *packet = psmouse->packet;
    >
    > - if ((packet[0] & 0x0c) == 0x04 &&
    > - (packet[3] & 0xcf) == 0x02)
    > + if (!memcmp(packet, debounce_packet, sizeof(debounce_packet)))
    > + return PACKET_DEBOUNCE;
    > +
    > + if ((packet[0] & 0x0c) == 0x04 && (packet[3] & 0xcf) == 0x02)
    > return PACKET_V3_HEAD;
    >
    > - if ((packet[0] & 0x0c) == 0x0c &&
    > - (packet[3] & 0xce) == 0x0c)
    > + if ((packet[0] & 0x0c) == 0x0c && (packet[3] & 0xce) == 0x0c)
    > return PACKET_V3_TAIL;
    >
    > - if (packet[0] == 0xc4 &&
    > - packet[1] == 0xff &&
    > - packet[2] == 0xff &&
    > - packet[3] == 0x02 &&
    > - packet[4] == 0xff &&
    > - packet[5] == 0xff)
    > - return PACKET_DEBOUNCE;
    > -
    > return PACKET_UNKNOWN;
    > }
    >
    > Thanks.
    >
    > --
    > Dmitry


    \
     
     \ /
      Last update: 2011-08-25 10:23    [W:3.688 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site