From mboxrd@z Thu Jan 1 00:00:00 1970 From: mickib1@gmail.com Subject: [PATCH 2/7] HID: N-trig MTM Driver fix and cleanup patch 2 Date: Mon, 8 Mar 2010 23:13:42 +0200 Message-ID: <1268082827-2680-2-git-send-email-micki@n-trig.com> References: <1268082827-2680-1-git-send-email-micki@n-trig.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1268082827-2680-1-git-send-email-micki@n-trig.com> Sender: linux-kernel-owner@vger.kernel.org To: jkosina@suse.cz, rafi@seas.upenn.edu, chatty@enac.fr, peterhuewe@gmx.de, micki@n-trig.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-input@vger.kernel.org =46rom: micki Change ntrig_input_mapping function N-trig is changing the way people interact with computers by providing = a dual-mode pen and true multi-touch input device, specifically designe= d for today's advanced computing world. N-trig DuoSense=C2=AE solution provides a real Hands-on computing=C2=AE= experience, and sets the stage for OEMs and ISVs to introduce innovati= ve computer products and applications for an intuitive, Hands-on=C2=AE = experience directly onscreen. DuoSense digitizers are easily integrated into existing technologies, s= upport all LCDs, keep devices slim and light, and can be implemented in= a broad range of products, ranging from small notebooks to large LCDs. N-trig has offices in Israel, the US, Taiwan and Japan. Signed-off-by: Micki Balanga --- drivers/hid/hid-ntrig.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index e99342d..3602cd0 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c @@ -15,6 +15,7 @@ * do not have full multi touch support. * 1.1 - N-trig - Add Change Log and defines of MTM firmware. * Add debug Paramater change Driver name in hid_driver structure + * 1.2 - N-trig - Change ntrig_input_mapping */ =20 /* @@ -118,21 +119,12 @@ struct ntrig_data { __u8 mt_foot_count; }; =20 -/* - * this driver is aimed at two firmware versions in circulation: - * - dual pen/finger single touch - * - finger multitouch, pen not working - */ - static int ntrig_input_mapping(struct hid_device *hdev, struct hid_inp= ut *hi, struct hid_field *field, struct hid_usage *usage, unsigned long **bit, int *max) { - /* No special mappings needed for the pen and single touch */ - if (field->physical) - return 0; - switch (usage->hid & HID_USAGE_PAGE) { + case HID_UP_GENDESK: switch (usage->hid) { case HID_GD_X: @@ -155,12 +147,15 @@ static int ntrig_input_mapping(struct hid_device = *hdev, struct hid_input *hi, case HID_UP_DIGITIZER: switch (usage->hid) { /* we do not want to map these for now */ - case HID_DG_CONTACTID: /* Not trustworthy, squelch for now */ + case HID_DG_INVERT: /* value is always 0 */ + case HID_DG_ERASER: /* value is always 0 */ + case HID_DG_CONTACTID: /* value is useless */ + case HID_DG_BARRELSWITCH: /* doubtful */ case HID_DG_INPUTMODE: case HID_DG_DEVICEINDEX: + case HID_DG_CONTACTCOUNT: case HID_DG_CONTACTMAX: return -1; - /* width/height mapped on TouchMajor/TouchMinor/Orientation */ case HID_DG_WIDTH: hid_map_usage(hi, usage, bit, max, @@ -169,8 +164,8 @@ static int ntrig_input_mapping(struct hid_device *h= dev, struct hid_input *hi, case HID_DG_HEIGHT: hid_map_usage(hi, usage, bit, max, EV_ABS, ABS_MT_TOUCH_MINOR); - input_set_abs_params(hi->input, ABS_MT_ORIENTATION, - 0, 1, 0, 0); + hid_map_usage(hi, usage, bit, max, + EV_ABS, ABS_MT_TRACKING_ID); return 1; } return 0; --=20 1.6.3.3