From patchwork Tue Feb 8 14:47:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 540961 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p18Elf1x014319 for ; Tue, 8 Feb 2011 14:47:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752727Ab1BHOrj (ORCPT ); Tue, 8 Feb 2011 09:47:39 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:60683 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752645Ab1BHOri (ORCPT ); Tue, 8 Feb 2011 09:47:38 -0500 Received: by wyb28 with SMTP id 28so5778941wyb.19 for ; Tue, 08 Feb 2011 06:47:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=RmOJ7z369rX9O6uvZxlHWBCul72fohE4oCjZ0ni/+TU=; b=ImBIy/rHuG5NSxgnThToCgr1V/JEqg72QcPHoH8mVHtAYVcAATRADXAUF1vzi8NCEY 529eIy+cLu31NTHypnqbNchvF5urhQr4YHNjr7rt7OE3KxauPN27oTplr9EPcWrBoj5r UGEQtjBq1ZAYWD9DV00F7CFVOZoqtinTjLXPI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=HryBcm/oAgUs3AhW2QQplDN64Huj1eBMpXwHlv7ky0D5k/AEUeUJ6lZmgEvUSTOZhi eFNzgniSfdixvsRycN9lBq1eDFNOqJEuhegayQXu9z2RRL2UAnwy09lroGMAYHCxL+tf C42M4B4WmSRB3lVXUfkgT+GjSOs0em0ZV25IQ= MIME-Version: 1.0 Received: by 10.227.146.80 with SMTP id g16mr13797165wbv.77.1297176456964; Tue, 08 Feb 2011 06:47:36 -0800 (PST) Received: by 10.227.27.226 with HTTP; Tue, 8 Feb 2011 06:47:35 -0800 (PST) In-Reply-To: References: <1296485689.7756.9.camel@novo.hadess.net> <20110131212842.GB1603@polaris.bitmath.org> <1296561717.15349.5.camel@novo.hadess.net> <1296650569.2123.2.camel@novo.hadess.net> <1296922260.4223.4.camel@novo.hadess.net> <1297098262.29885.14.camel@novo.hadess.net> Date: Tue, 8 Feb 2011 15:47:35 +0100 Message-ID: Subject: Re: Elo TouchSystems touchscreen support? (04e7:0022) From: Benjamin Tissoires To: Bastien Nocera Cc: Henrik Rydberg , linux-input@vger.kernel.org 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.6 (demeter1.kernel.org [140.211.167.41]); Tue, 08 Feb 2011 14:47:42 +0000 (UTC) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index a721710..3b73c88 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -70,6 +70,7 @@ struct mt_class { #define MT_CLS_DUAL_INRANGE_CONTACTID 2 #define MT_CLS_DUAL_INRANGE_CONTACTNUMBER 3 #define MT_CLS_CYPRESS 4 +#define MT_CLS_DUAL_NSMU_CONTACTID 5 /* * these device-dependent functions determine what slot corresponds @@ -119,6 +120,10 @@ struct mt_class mt_classes[] = { .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP | MT_QUIRK_CYPRESS, .maxcontacts = 10 }, + { .name = MT_CLS_DUAL_NSMU_CONTACTID, + .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP | + MT_QUIRK_SLOT_IS_CONTACTID, + .maxcontacts = 2 }, { } }; @@ -467,7 +472,7 @@ static const struct hid_device_id mt_devices[] = { USB_DEVICE_ID_CYPRESS_TRUETOUCH) }, /* Elo TouchSystems IntelliTouch Plus panel */ - { .driver_data = MT_CLS_DEFAULT, + { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID, HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },