* [PATCH] HID: add Add Cando touch screen 10.1-inch product id
@ 2011-01-08 11:15 Benjamin Tissoires
2011-01-08 11:15 ` [PATCH] HID: Switch turbox/mosart touchscreen to hid-mosart Benjamin Tissoires
2011-01-08 15:28 ` [PATCH] HID: add Add Cando touch screen 10.1-inch product id Jiri Kosina
0 siblings, 2 replies; 5+ messages in thread
From: Benjamin Tissoires @ 2011-01-08 11:15 UTC (permalink / raw)
To: Stephane Chatty, Henrik Rydberg, Dmitry Torokhov, Jiri Kosina,
linux-input
Cc: Benjamin Tissoires
This device has been reported to be an hid-cando one.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
---
Hi Jiri,
This one can go into stable branch.
Cheers,
Benjamin
drivers/hid/hid-cando.c | 2 ++
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-ids.h | 1 +
3 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/hid-cando.c b/drivers/hid/hid-cando.c
index 375b509..1ea066c 100644
--- a/drivers/hid/hid-cando.c
+++ b/drivers/hid/hid-cando.c
@@ -236,6 +236,8 @@ static const struct hid_device_id cando_devices[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
+ USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) },
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 04b7eb0..a397010 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1313,6 +1313,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },
{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) },
{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1) },
{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) },
{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index a945d79..9038ed3 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -141,6 +141,7 @@
#define USB_VENDOR_ID_CANDO 0x2087
#define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01
+#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1 0x0a02
#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03
#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6 0x0f01
--
1.7.3.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] HID: Switch turbox/mosart touchscreen to hid-mosart
2011-01-08 11:15 [PATCH] HID: add Add Cando touch screen 10.1-inch product id Benjamin Tissoires
@ 2011-01-08 11:15 ` Benjamin Tissoires
2011-01-08 15:28 ` Jiri Kosina
2011-01-09 13:46 ` Henrik Rydberg
2011-01-08 15:28 ` [PATCH] HID: add Add Cando touch screen 10.1-inch product id Jiri Kosina
1 sibling, 2 replies; 5+ messages in thread
From: Benjamin Tissoires @ 2011-01-08 11:15 UTC (permalink / raw)
To: Stephane Chatty, Henrik Rydberg, Dmitry Torokhov, Jiri Kosina,
linux-input
Cc: Benjamin Tissoires
This device used the MULTI_INPUT quirk whereas it could be used
with hid-mosart instead to support the multitouch part.
Reference: https://bugs.launchpad.net/ubuntu/+bug/620609/
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
---
Hi Jiri,
This one is in the utouch ppa since Novembre.
The guy that sent the multi_input quirk was not able to
test it, but others reported it is ok.
I think it also can go to stable.
Cheers,
Benjamin
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-mosart.c | 1 +
drivers/hid/usbhid/hid-quirks.c | 1 -
3 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index a397010..9303632 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1420,6 +1420,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },
{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },
{ HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART) },
{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_PF1209) },
{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP4030U) },
{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP5540U) },
diff --git a/drivers/hid/hid-mosart.c b/drivers/hid/hid-mosart.c
index 9fb050c..aed7ffe 100644
--- a/drivers/hid/hid-mosart.c
+++ b/drivers/hid/hid-mosart.c
@@ -257,6 +257,7 @@ static void mosart_remove(struct hid_device *hdev)
static const struct hid_device_id mosart_devices[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUSTEK_MULTITOUCH_YFO) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART) },
{ }
};
MODULE_DEVICE_TABLE(hid, mosart_devices);
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 76b9a14..9a94b64 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -35,7 +35,6 @@ static const struct hid_blacklist {
{ USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD },
{ USB_VENDOR_ID_DWAV, USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER, HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET },
{ USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER, HID_QUIRK_MULTI_INPUT },
- { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART, HID_QUIRK_MULTI_INPUT },
{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
--
1.7.3.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] HID: Switch turbox/mosart touchscreen to hid-mosart
2011-01-08 11:15 ` [PATCH] HID: Switch turbox/mosart touchscreen to hid-mosart Benjamin Tissoires
@ 2011-01-08 15:28 ` Jiri Kosina
2011-01-09 13:46 ` Henrik Rydberg
1 sibling, 0 replies; 5+ messages in thread
From: Jiri Kosina @ 2011-01-08 15:28 UTC (permalink / raw)
To: Benjamin Tissoires
Cc: Stephane Chatty, Henrik Rydberg, Dmitry Torokhov, linux-input,
linux-kernel
On Sat, 8 Jan 2011, Benjamin Tissoires wrote:
> This device used the MULTI_INPUT quirk whereas it could be used
> with hid-mosart instead to support the multitouch part.
>
> Reference: https://bugs.launchpad.net/ubuntu/+bug/620609/
>
> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Applied to 'multitouch' part, and will be pushing it to Linus together
with the hid-multitouch bits in the second merge round. Thanks,
Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] HID: add Add Cando touch screen 10.1-inch product id
2011-01-08 11:15 [PATCH] HID: add Add Cando touch screen 10.1-inch product id Benjamin Tissoires
2011-01-08 11:15 ` [PATCH] HID: Switch turbox/mosart touchscreen to hid-mosart Benjamin Tissoires
@ 2011-01-08 15:28 ` Jiri Kosina
1 sibling, 0 replies; 5+ messages in thread
From: Jiri Kosina @ 2011-01-08 15:28 UTC (permalink / raw)
To: Benjamin Tissoires
Cc: Stephane Chatty, Henrik Rydberg, Dmitry Torokhov, linux-input,
linux-kernel
On Sat, 8 Jan 2011, Benjamin Tissoires wrote:
> This device has been reported to be an hid-cando one.
>
> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Applied altogether with the turbox patch. Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] HID: Switch turbox/mosart touchscreen to hid-mosart
2011-01-08 11:15 ` [PATCH] HID: Switch turbox/mosart touchscreen to hid-mosart Benjamin Tissoires
2011-01-08 15:28 ` Jiri Kosina
@ 2011-01-09 13:46 ` Henrik Rydberg
1 sibling, 0 replies; 5+ messages in thread
From: Henrik Rydberg @ 2011-01-09 13:46 UTC (permalink / raw)
To: Benjamin Tissoires
Cc: Stephane Chatty, Dmitry Torokhov, Jiri Kosina, linux-input,
linux-kernel
On Sat, Jan 08, 2011 at 12:15:42PM +0100, Benjamin Tissoires wrote:
> This device used the MULTI_INPUT quirk whereas it could be used
> with hid-mosart instead to support the multitouch part.
>
> Reference: https://bugs.launchpad.net/ubuntu/+bug/620609/
>
> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
> ---
> Hi Jiri,
>
> This one is in the utouch ppa since Novembre.
> The guy that sent the multi_input quirk was not able to
> test it, but others reported it is ok.
>
> I think it also can go to stable.
Acked-by: Henrik Rydberg <rydberg@euromail.se>
Thanks,
Henrik
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-01-09 13:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-08 11:15 [PATCH] HID: add Add Cando touch screen 10.1-inch product id Benjamin Tissoires
2011-01-08 11:15 ` [PATCH] HID: Switch turbox/mosart touchscreen to hid-mosart Benjamin Tissoires
2011-01-08 15:28 ` Jiri Kosina
2011-01-09 13:46 ` Henrik Rydberg
2011-01-08 15:28 ` [PATCH] HID: add Add Cando touch screen 10.1-inch product id Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).