[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LNX.2.00.1104211417330.12035@pobox.suse.cz>
Date: Thu, 21 Apr 2011 14:18:11 +0200 (CEST)
From: Jiri Kosina <jkosina@...e.cz>
To: Benjamin Tissoires <benjamin.tissoires@...c.fr>
Cc: Dmitry Torokhov <dmitry.torokhov@...il.com>,
Henrik Rydberg <rydberg@...omail.se>,
Stephane Chatty <chatty@...-enac.fr>,
PenMount <penmount.touch@...il.com>, linux-input@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH 2/2] HID: add support for PenMount dual-touch panel
On Thu, 21 Apr 2011, Benjamin Tissoires wrote:
> Signed-off-by: John Sung <penmount.touch@...il.com>
> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@...c.fr>
Hi Benjamin,
thanks for respinning the pathes.
This one is though missing
- changelog
- From: line (I believe we'd like to keep John's authorship)
Thanks.
> ---
> drivers/hid/hid-core.c | 1 +
> drivers/hid/hid-ids.h | 3 +++
> drivers/hid/hid-multitouch.c | 8 ++++++++
> 3 files changed, 12 insertions(+), 0 deletions(-)
>
> 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,
> --
> 1.7.4.2
>
--
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists