From patchwork Thu Dec 3 05:08:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hutterer X-Patchwork-Id: 64411 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nB35LCE6015097 for ; Thu, 3 Dec 2009 05:21:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751281AbZLCFUj (ORCPT ); Thu, 3 Dec 2009 00:20:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751238AbZLCFUj (ORCPT ); Thu, 3 Dec 2009 00:20:39 -0500 Received: from leo.clearchain.com ([199.73.29.74]:18996 "EHLO mail.clearchain.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750931AbZLCFUi (ORCPT ); Thu, 3 Dec 2009 00:20:38 -0500 X-Greylist: delayed 680 seconds by postgrey-1.27 at vger.kernel.org; Thu, 03 Dec 2009 00:20:37 EST Received: from leo.clearchain.com (localhost [127.0.0.1]) by mail.clearchain.com (8.14.3/8.14.3) with ESMTP id nB359Jcq024321 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 3 Dec 2009 15:39:19 +1030 (CST) (envelope-from peter.hutterer@redhat.com) Received: (from whot@localhost) by leo.clearchain.com (8.14.3/8.14.3/Submit) id nB359JnH024320; Thu, 3 Dec 2009 15:39:19 +1030 (CST) (envelope-from peter.hutterer@redhat.com) X-Authentication-Warning: leo.clearchain.com: whot set sender to peter.hutterer@redhat.com using -f Date: Thu, 3 Dec 2009 15:08:10 +1000 From: Peter Hutterer To: Jiri Kosina Cc: linux-input@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] HID: add multi-input quirk for NextWindow Touchscreen. Message-ID: <20091203050810.GA26595@barra.bne.redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-08-17) X-Greylist: Sender is SPF-compliant, not delayed by milter-greylist-4.0.1 (mail.clearchain.com [127.0.0.1]); Thu, 03 Dec 2009 15:39:20 +1030 (CST) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index adbef5d..f5144b8 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -346,6 +346,9 @@ #define USB_VENDOR_ID_NEC 0x073e #define USB_DEVICE_ID_NEC_USB_GAME_PAD 0x0301 +#define USB_VENDOR_ID_NEXTWINDOW 0x1926 +#define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN 0x0003 + #define USB_VENDOR_ID_NTRIG 0x1b96 #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001 diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 0d9045a..e987562 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -37,6 +37,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_NATSU, USB_DEVICE_ID_NATSU_GAMEPAD, HID_QUIRK_BADPAD }, { USB_VENDOR_ID_NEC, USB_DEVICE_ID_NEC_USB_GAME_PAD, HID_QUIRK_BADPAD }, + { USB_VENDOR_ID_NEXTWINDOW, USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN, HID_QUIRK_MULTI_INPUT}, { USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD, HID_QUIRK_BADPAD }, { USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD },