From patchwork Mon Mar 8 21:13:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mickib1@gmail.com X-Patchwork-Id: 84153 X-Patchwork-Delegate: jikos@jikos.cz Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o28LFKXI031566 for ; Mon, 8 Mar 2010 21:15:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755929Ab0CHVOJ (ORCPT ); Mon, 8 Mar 2010 16:14:09 -0500 Received: from mail-fx0-f219.google.com ([209.85.220.219]:62249 "EHLO mail-fx0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755775Ab0CHVOG (ORCPT ); Mon, 8 Mar 2010 16:14:06 -0500 Received: by mail-fx0-f219.google.com with SMTP id 19so6803589fxm.21 for ; Mon, 08 Mar 2010 13:14:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=NvkZcrxElzcHi+y32FCjoVZpBM1SV4MbOopLIcXC9rE=; b=uNqITQ9ak4E3m/FUR899xtOb1BC7yRgdBQRawPgpqJeVfZq/o+7Szhlr7pcX3jlyLM q6SaPfQVsCNYmcbfWu8sxSgIYAOexYypvHRiE/5VE8Y+Iclg21zEmItbHuBg4c9U3Nvn jRbQoniFLI5du5HqLLeKe6NdiFg383iRl22+A= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=FuqcwRqQruiHghyQOUbUmWKmExB1Bn+2+8KDhwjvwujgVClHK9dT131J5gh+e8svI6 AmX9Z8LRISbTZBvOYQJDuLGnlMPY4AwBcMhzrPNgoX0zAyOnIr8Sh1uJ5jhICY6gshEY kD47sW+p6NyYO3c0EnZiuqzM3AGdugPIp6DOg= Received: by 10.102.211.3 with SMTP id j3mr3797765mug.117.1268082845150; Mon, 08 Mar 2010 13:14:05 -0800 (PST) Received: from localhost.localdomain (bzq-84-108-117-55.cablep.bezeqint.net [84.108.117.55]) by mx.google.com with ESMTPS id y37sm9818207mug.52.2010.03.08.13.14.03 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 08 Mar 2010 13:14:04 -0800 (PST) From: mickib1@gmail.com 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 Subject: [PATCH 3/7] HID: N-trig MTM Driver fix And cleanup patch 3 Date: Mon, 8 Mar 2010 23:13:43 +0200 Message-Id: <1268082827-2680-3-git-send-email-micki@n-trig.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1268082827-2680-2-git-send-email-micki@n-trig.com> References: <1268082827-2680-1-git-send-email-micki@n-trig.com> <1268082827-2680-2-git-send-email-micki@n-trig.com> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 08 Mar 2010 21:15:20 +0000 (UTC) diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index 3602cd0..8130c3c 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c @@ -16,6 +16,7 @@ * 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 + * 1.3 - N-trig - Change ntrig_input_mapped */ /* @@ -182,14 +183,23 @@ static int ntrig_input_mapped(struct hid_device *hdev, struct hid_input *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; - - if (usage->type == EV_KEY || usage->type == EV_REL - || usage->type == EV_ABS) - clear_bit(usage->code, *bit); - + /* + * Maps Key For Pen And Touch events + * MSC events used to transfer information about finger status + * In cureent Frame + * todo: Maybe later transfer to mt proctol + * if there will be relevant events + */ + struct input_dev *input = hi->input; + set_bit(BTN_LEFT, input->keybit); + set_bit(BTN_RIGHT, input->keybit); + set_bit(EV_MSC, input->evbit); + set_bit(MSC_PULSELED, input->mscbit); + set_bit(MSC_SERIAL, input->mscbit); + set_bit(MSC_SCAN, input->mscbit); + + input_set_abs_params(hi->input, ABS_PRESSURE, + 0/*Min*/, 255 /*Max*/, 0, 0); return 0; }