Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753665Ab2J2V4Z (ORCPT ); Mon, 29 Oct 2012 17:56:25 -0400 Received: from smtprelay-b21.telenor.se ([195.54.99.212]:58847 "EHLO smtprelay-b21.telenor.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750983Ab2J2V4U (ORCPT ); Mon, 29 Oct 2012 17:56:20 -0400 X-SENDER-IP: [85.230.29.114] X-LISTENER: [smtp.bredband.net] X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AhWdAND6jlBV5h1yPGdsb2JhbABEilK3KAICgQgZAQEBATg0gh4BAQQBJxMcIwULCANGFA0YChoTh3QDCQqyJQ2JVBSKeoEdgSaCJ4F5YQOUH4FUgRuEXoU5h3MO X-IronPort-AV: E=Sophos;i="4.80,674,1344204000"; d="scan'208";a="219480540" From: "Henrik Rydberg" Date: Mon, 29 Oct 2012 23:00:58 +0100 To: Benjamin Tissoires Cc: Dmitry Torokhov , Jiri Kosina , Stephane Chatty , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 06/11] HID: hid-multitouch: support T and C for win8 devices Message-ID: <20121029220058.GB15413@polaris.bitmath.org> References: <1351241067-9521-1-git-send-email-benjamin.tissoires@gmail.com> <1351241067-9521-7-git-send-email-benjamin.tissoires@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1351241067-9521-7-git-send-email-benjamin.tissoires@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4715 Lines: 150 Hi Benjamin, > Win8 input specification clarifies the X and Y sent by devices. > It distincts the position where the user wants to Touch (T) from > the center of the ellipsoide (C). This patch enable supports for this > distinction in hid-multitouch. > > We recognize Win8 certified devices from their vendor feature 0xff0000c5 > where Microsoft put a signed blob in the report to check if the device > passed the certification. > > Signed-off-by: Benjamin Tissoires > --- > drivers/hid/hid-multitouch.c | 53 ++++++++++++++++++++++++++++++++++++-------- > 1 file changed, 44 insertions(+), 9 deletions(-) This is great, just a few comments below. > > diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c > index 41f2981..000c979 100644 > --- a/drivers/hid/hid-multitouch.c > +++ b/drivers/hid/hid-multitouch.c > @@ -52,9 +52,10 @@ MODULE_LICENSE("GPL"); > #define MT_QUIRK_VALID_IS_CONFIDENCE (1 << 6) > #define MT_QUIRK_SLOT_IS_CONTACTID_MINUS_ONE (1 << 8) > #define MT_QUIRK_NO_AREA (1 << 9) > +#define MT_QUIRK_WIN_8_CERTIFIED (1 << 10) > > struct mt_slot { > - __s32 x, y, p, w, h; > + __s32 x, y, cx, cy, p, w, h; > __s32 contactid; /* the device ContactID assigned to this slot */ > bool touch_state; /* is the touch valid? */ > }; > @@ -292,6 +293,10 @@ static void mt_feature_mapping(struct hid_device *hdev, > td->maxcontacts = td->mtclass.maxcontacts; > > break; > + case 0xff0000c5: > + if (field->report_count == 256 && field->report_size == 8) > + td->mtclass.quirks |= MT_QUIRK_WIN_8_CERTIFIED; > + break; > } > } > > @@ -350,18 +355,36 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi, > case HID_UP_GENDESK: > switch (usage->hid) { > case HID_GD_X: > - hid_map_usage(hi, usage, bit, max, > + if (cls->quirks & MT_QUIRK_WIN_8_CERTIFIED && Parenthesis, please. Precedence is not always enough. > + usage_index) { > + hid_map_usage(hi, usage, bit, max, > + EV_ABS, ABS_MT_TOOL_X); > + set_abs(hi->input, ABS_MT_TOOL_X, field, > + cls->sn_move); > + } else { > + hid_map_usage(hi, usage, bit, max, > EV_ABS, ABS_MT_POSITION_X); > - set_abs(hi->input, ABS_MT_POSITION_X, field, > - cls->sn_move); > + set_abs(hi->input, ABS_MT_POSITION_X, field, > + cls->sn_move); > + } > + Do we really want to do the latter several times, even if the device is not a win8 one? > mt_store_field(usage, td, hi); > td->last_field_index = field->index; > return 1; > case HID_GD_Y: > - hid_map_usage(hi, usage, bit, max, > + if (cls->quirks & MT_QUIRK_WIN_8_CERTIFIED && Ditto. > + usage_index) { > + hid_map_usage(hi, usage, bit, max, > + EV_ABS, ABS_MT_TOOL_Y); > + set_abs(hi->input, ABS_MT_TOOL_Y, field, > + cls->sn_move); > + } else { > + hid_map_usage(hi, usage, bit, max, > EV_ABS, ABS_MT_POSITION_Y); > - set_abs(hi->input, ABS_MT_POSITION_Y, field, > - cls->sn_move); > + set_abs(hi->input, ABS_MT_POSITION_Y, field, > + cls->sn_move); > + } > + Ditto. > mt_store_field(usage, td, hi); > td->last_field_index = field->index; > return 1; > @@ -502,6 +525,12 @@ static void mt_complete_slot(struct mt_device *td, struct input_dev *input) > > input_event(input, EV_ABS, ABS_MT_POSITION_X, s->x); > input_event(input, EV_ABS, ABS_MT_POSITION_Y, s->y); > + if (td->mtclass.quirks & MT_QUIRK_WIN_8_CERTIFIED) { > + input_event(input, EV_ABS, ABS_MT_TOOL_X, > + s->cx); Won't this fit on one line? > + input_event(input, EV_ABS, ABS_MT_TOOL_Y, > + s->cy); > + } > input_event(input, EV_ABS, ABS_MT_ORIENTATION, wide); > input_event(input, EV_ABS, ABS_MT_PRESSURE, s->p); > input_event(input, EV_ABS, ABS_MT_TOUCH_MAJOR, major); > @@ -553,10 +582,16 @@ static int mt_event(struct hid_device *hid, struct hid_field *field, > td->curdata.p = value; > break; > case HID_GD_X: > - td->curdata.x = value; > + if (usage->code == ABS_MT_POSITION_X) > + td->curdata.x = value; > + else > + td->curdata.cx = value; Since cx is the new value, reversing the logic would make sense here. > break; > case HID_GD_Y: > - td->curdata.y = value; > + if (usage->code == ABS_MT_POSITION_Y) > + td->curdata.y = value; > + else > + td->curdata.cy = value; > break; > case HID_DG_WIDTH: > td->curdata.w = value; > -- > 1.7.11.7 > Thanks, Henrik -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/