Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754607Ab1DVJ57 (ORCPT ); Fri, 22 Apr 2011 05:57:59 -0400 Received: from cantor.suse.de ([195.135.220.2]:53426 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754075Ab1DVJ55 (ORCPT ); Fri, 22 Apr 2011 05:57:57 -0400 Date: Fri, 22 Apr 2011 11:57:55 +0200 (CEST) From: Jiri Kosina To: Benjamin Tissoires Cc: Dmitry Torokhov , Henrik Rydberg , Stephane Chatty , John Sung , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] HID: add support for PenMount dual-touch panel In-Reply-To: <1303395712-4572-1-git-send-email-benjamin.tissoires@enac.fr> Message-ID: References: <1303388160-2814-3-git-send-email-benjamin.tissoires@enac.fr> <1303395712-4572-1-git-send-email-benjamin.tissoires@enac.fr> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4163 Lines: 115 On Thu, 21 Apr 2011, Benjamin Tissoires wrote: > From: John Sung > > This patch adds PenMount support to hid-multitouch. > A new class MT_CLS_CONFIDENCE is defined for PenMount, > since it uses HID_DG_CONFIDENCE as the valid flag. > > Signed-off-by: John Sung > Signed-off-by: Benjamin Tissoires > Acked-by: Henrik Rydberg > > --- > > Hi Guys, > > this is the final version (I hope so). > I changed the from, restored back the Kconfig part and reintroduced the commit message. > John, I hope it's good for you. > > Cheers, > Benjamin > > drivers/hid/Kconfig | 1 + > drivers/hid/hid-core.c | 1 + > drivers/hid/hid-ids.h | 3 +++ > drivers/hid/hid-multitouch.c | 8 ++++++++ > 4 files changed, 13 insertions(+), 0 deletions(-) > > diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig > index 996ae3a..8058cf1 100644 > --- a/drivers/hid/Kconfig > +++ b/drivers/hid/Kconfig > @@ -313,6 +313,7 @@ config HID_MULTITOUCH > - Cypress TrueTouch panels > - Hanvon dual touch panels > - IrTouch Infrared USB panels > + - PenMount dual touch panels > - Pixcir dual touch panels > - 'Sensing Win7-TwoFinger' panel by GeneralTouch > - eGalax dual-touch panels, including the > diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c > index c3d6626..6e31b9f 100644 > --- a/drivers/hid/hid-core.c > +++ b/drivers/hid/hid-core.c > @@ -1438,6 +1438,7 @@ static const struct hid_device_id hid_have_special_driver[] = { > { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) }, > { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) }, > { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, > + { HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_PCI) }, > { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) }, > { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) }, > { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) }, > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h > index d485894..252aeba 100644 > --- a/drivers/hid/hid-ids.h > +++ b/drivers/hid/hid-ids.h > @@ -484,6 +484,9 @@ > #define USB_VENDOR_ID_PANTHERLORD 0x0810 > #define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK 0x0001 > > +#define USB_VENDOR_ID_PENMOUNT 0x14e1 > +#define USB_DEVICE_ID_PENMOUNT_PCI 0x3500 > + > #define USB_VENDOR_ID_PETALYNX 0x18b1 > #define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE 0x0037 > > diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c > index 6005e78..51b5d27 100644 > --- a/drivers/hid/hid-multitouch.c > +++ b/drivers/hid/hid-multitouch.c > @@ -89,6 +89,7 @@ struct mt_class { > #define MT_CLS_EGALAX 5 > #define MT_CLS_STANTUM 6 > #define MT_CLS_3M 7 > +#define MT_CLS_CONFIDENCE 8 > > #define MT_DEFAULT_MAXCONTACT 10 > > @@ -156,6 +157,8 @@ struct mt_class mt_classes[] = { > .sn_move = 2048, > .sn_width = 128, > .sn_height = 128 }, > + { .name = MT_CLS_CONFIDENCE, > + .quirks = MT_QUIRK_VALID_IS_CONFIDENCE }, > > { } > }; > @@ -584,6 +587,11 @@ static const struct hid_device_id mt_devices[] = { > HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, > USB_DEVICE_ID_IRTOUCH_INFRARED_USB) }, > > + /* PenMount panels */ > + { .driver_data = MT_CLS_CONFIDENCE, > + HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, > + USB_DEVICE_ID_PENMOUNT_PCI) }, > + > /* PixCir-based panels */ > { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID, > HID_USB_DEVICE(USB_VENDOR_ID_HANVON, I have modified the commit message slightly, to reflect that Benjamin has rebased John's original patch on top of last_index_field changes, and applied. Thanks a lot everybody. -- Jiri Kosina SUSE Labs, Novell Inc. -- 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/