On Tue, Mar 31, 2020 at 08:53:17AM +1000, Peter Hutterer wrote:
> On Mon, Mar 30, 2020 at 03:02:36PM +0800, Johnny Chuang wrote:
> > From: Johnny Chuang <johnny.chuang@xxxxxxxxxx>
> >
> > Elan define finger/palm detection on the least significant bit of byte 33.
> > The default value is 1 for all firmwares, which report as MT_TOOL_FINGER.
> > If firmware support palm detection, the bit will change to 0 and
> > report as MT_TOOL_PALM when firmware detecting palm.
> >
> > Signed-off-by: Johnny Chuang <johnny.chuang@xxxxxxxxxx>
>
> Reviewed-by: Peter Hutterer <peter.hutterer@xxxxxxxxx>
>
> Cheers,
> Peter
>
> > ---
> > Changes in v2:
> > - Modify MT_TOOL_MAX to MT_TOOL_PALM
> >
> > drivers/input/touchscreen/elants_i2c.c | 11 ++++++++++-
> > 1 file changed, 10 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
> > index 14c577c..93211fe 100644
> > --- a/drivers/input/touchscreen/elants_i2c.c
> > +++ b/drivers/input/touchscreen/elants_i2c.c
> > @@ -73,6 +73,7 @@
> > #define FW_POS_STATE 1
> > #define FW_POS_TOTAL 2
> > #define FW_POS_XY 3
> > +#define FW_POS_TOOL_TYPE 33
> > #define FW_POS_CHECKSUM 34
> > #define FW_POS_WIDTH 35
> > #define FW_POS_PRESSURE 45
> > @@ -842,6 +843,7 @@ static void elants_i2c_mt_event(struct elants_data *ts, u8 *buf)
> > {
> > struct input_dev *input = ts->input;
> > unsigned int n_fingers;
> > + unsigned int tool_type;
> > u16 finger_state;
> > int i;
> >
> > @@ -852,6 +854,12 @@ static void elants_i2c_mt_event(struct elants_data *ts, u8 *buf)
> > dev_dbg(&ts->client->dev,
> > "n_fingers: %u, state: %04x\n", n_fingers, finger_state);
> >
> > + /* Note: all fingers have the same tool type */
> > + if (buf[FW_POS_TOOL_TYPE] & 0x01)
> > + tool_type = MT_TOOL_FINGER;
> > + else
> > + tool_type = MT_TOOL_PALM;
I changed this to
tool_type = buf[FW_POS_TOOL_TYPE] & BIT(0) ?
MT_TOOL_FINGER : MT_TOOL_PALM;
to be a bit more compact, and applied.
Thanks.
--
Dmitry
