* [PATCH] HID: Add support to new N-trig firwmare
@ 2010-06-03 5:11 Micki Balanga
2010-06-04 9:17 ` Jiri Kosina
0 siblings, 1 reply; 13+ messages in thread
From: Micki Balanga @ 2010-06-03 5:11 UTC (permalink / raw)
To: jkosina, chatty, dhprince-devel; +Cc: linux-input, linux-kernel
Update hid-ids.h to support new N-trig firmware.
Product id 0x02 - 0x0A
Signed-off-by: Micki Balanga <micki@n-trig.com>
---
---
drivers/hid/hid-core.c | 9 +++++++++
drivers/hid/hid-ids.h | 10 ++++++++++
2 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index aa0f7dc..19f627a 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1337,6 +1337,15 @@ static const struct hid_device_id hid_blacklist[]
= {
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY,
USB_DEVICE_ID_GENIUS_KB29E) },
{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK,
USB_DEVICE_ID_ORTEK_WKB2000) },
{ 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) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 6af77ed..55fbfd6 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -391,6 +391,16 @@
#define USB_VENDOR_ID_NTRIG 0x1b96
#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1 0x0002
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2 0x0003
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3 0x0004
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4 0x0005
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5 0x0006
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6 0x0007
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7 0x0008
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8 0x0009
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9 0x000A
+
#define USB_VENDOR_ID_ONTRAK 0x0a07
#define USB_DEVICE_ID_ONTRAK_ADU100 0x0064
--
1.6.3.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH] HID: Add support to new N-trig firwmare
2010-06-03 5:11 [PATCH] HID: Add support to new N-trig firwmare Micki Balanga
@ 2010-06-04 9:17 ` Jiri Kosina
2010-06-04 9:57 ` Rafi Rubin
[not found] ` <48A28051AC6D7A48B64F28272458190326E03E@Exchange-IL.n-trig.com>
0 siblings, 2 replies; 13+ messages in thread
From: Jiri Kosina @ 2010-06-04 9:17 UTC (permalink / raw)
To: Micki Balanga
Cc: chatty, dhprince-devel, linux-input, linux-kernel, Rafi Rubin
On Thu, 3 Jun 2010, Micki Balanga wrote:
> Update hid-ids.h to support new N-trig firmware.
> Product id 0x02 - 0x0A
[ adding Rafi Rubin to CC ]
Hi Micki,
thanks a lot for the update. Your mail client line-wrapped the patch
though, so I couldn't apply it without having to fix all the wrapped lines
manually. Could you please fix it and resend? (or send it as attachment if
your mail client can't be configured not to damage the patch if put
in-line)?
Thanks.
> Signed-off-by: Micki Balanga <micki@n-trig.com>
> ---
> ---
> drivers/hid/hid-core.c | 9 +++++++++
> drivers/hid/hid-ids.h | 10 ++++++++++
> 2 files changed, 19 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index aa0f7dc..19f627a 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -1337,6 +1337,15 @@ static const struct hid_device_id hid_blacklist[]
> = {
> { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
> USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
> { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY,
> USB_DEVICE_ID_GENIUS_KB29E) },
> { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9) },
> { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK,
> USB_DEVICE_ID_ORTEK_WKB2000) },
> { 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) },
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 6af77ed..55fbfd6 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -391,6 +391,16 @@
>
> #define USB_VENDOR_ID_NTRIG 0x1b96
> #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001
> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1 0x0002
> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2 0x0003
> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3 0x0004
> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4 0x0005
> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5 0x0006
> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6 0x0007
> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7 0x0008
> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8 0x0009
> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9 0x000A
> +
>
> #define USB_VENDOR_ID_ONTRAK 0x0a07
> #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064
> --
> 1.6.3.3
>
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] HID: Add support to new N-trig firwmare
2010-06-04 9:17 ` Jiri Kosina
@ 2010-06-04 9:57 ` Rafi Rubin
[not found] ` <48A28051AC6D7A48B64F28272458190326E03E@Exchange-IL.n-trig.com>
1 sibling, 0 replies; 13+ messages in thread
From: Rafi Rubin @ 2010-06-04 9:57 UTC (permalink / raw)
To: Jiri Kosina
Cc: Micki Balanga, chatty, dhprince-devel, linux-input, linux-kernel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 06/04/10 05:17, Jiri Kosina wrote:
> On Thu, 3 Jun 2010, Micki Balanga wrote:
>
>> Update hid-ids.h to support new N-trig firmware.
>> Product id 0x02 - 0x0A
>
> [ adding Rafi Rubin to CC ]
>
> Hi Micki,
>
> thanks a lot for the update. Your mail client line-wrapped the patch
> though, so I couldn't apply it without having to fix all the wrapped lines
> manually. Could you please fix it and resend? (or send it as attachment if
> your mail client can't be configured not to damage the patch if put
> in-line)?
>
> Thanks.
Micki: thanks for the heads up. Should we expect the behavior of the new
devices to remain consistent, or will they require adjustments?
Rafi
>> Signed-off-by: Micki Balanga <micki@n-trig.com>
>> ---
>> ---
>> drivers/hid/hid-core.c | 9 +++++++++
>> drivers/hid/hid-ids.h | 10 ++++++++++
>> 2 files changed, 19 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
>> index aa0f7dc..19f627a 100644
>> --- a/drivers/hid/hid-core.c
>> +++ b/drivers/hid/hid-core.c
>> @@ -1337,6 +1337,15 @@ static const struct hid_device_id hid_blacklist[]
>> = {
>> { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
>> USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
>> { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY,
>> USB_DEVICE_ID_GENIUS_KB29E) },
>> { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
>> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
>> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
>> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
>> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
>> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
>> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
>> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
>> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
>> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG,
>> USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9) },
>> { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK,
>> USB_DEVICE_ID_ORTEK_WKB2000) },
>> { 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) },
>> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
>> index 6af77ed..55fbfd6 100644
>> --- a/drivers/hid/hid-ids.h
>> +++ b/drivers/hid/hid-ids.h
>> @@ -391,6 +391,16 @@
>>
>> #define USB_VENDOR_ID_NTRIG 0x1b96
>> #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001
>> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1 0x0002
>> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2 0x0003
>> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3 0x0004
>> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4 0x0005
>> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5 0x0006
>> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6 0x0007
>> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7 0x0008
>> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8 0x0009
>> +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9 0x000A
>> +
>>
>> #define USB_VENDOR_ID_ONTRAK 0x0a07
>> #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064
>> --
>> 1.6.3.3
>>
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAkwIzfMACgkQwuRiAT9o608fcQCg95rLIvR4hyKP+r6XRE/nJaY6
hKMAnRjmRUGXT32en4UVC1lb2hv6xlAp
=Tax4
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: [PATCH] HID: Add support to new N-trig firwmare
[not found] ` <48A28051AC6D7A48B64F28272458190326E03E@Exchange-IL.n-trig.com>
@ 2010-06-05 15:42 ` Jiri Kosina
2010-06-21 5:06 ` Micki Balanga
0 siblings, 1 reply; 13+ messages in thread
From: Jiri Kosina @ 2010-06-05 15:42 UTC (permalink / raw)
To: Micki Balanga
Cc: chatty, dhprince-devel, linux-input, linux-kernel, Rafi Rubin
On Fri, 4 Jun 2010, Micki Balanga wrote:
> Hi Jiri,
> Attach the patch via file.
> (Also fix 3 warning: please , no space before tabs)
Thanks Micki, I have applied the patch.
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: [PATCH] HID: Add support to new N-trig firwmare
2010-06-05 15:42 ` Jiri Kosina
@ 2010-06-21 5:06 ` Micki Balanga
2010-06-21 6:14 ` Rafi Rubin
2010-06-21 9:48 ` Jiri Kosina
0 siblings, 2 replies; 13+ messages in thread
From: Micki Balanga @ 2010-06-21 5:06 UTC (permalink / raw)
To: Jiri Kosina; +Cc: chatty, dhprince-devel, linux-input, linux-kernel, Rafi Rubin
[-- Attachment #1: Type: text/plain, Size: 786 bytes --]
Hi Jiri
We have some new product so I have to update the patch,
When I update my git branch I didn't see the changes regarding N-trig
Product id. If you can insert this patch, if there a problem with the
patch
Let me know and hi will update it
Thank you
Micki
-----Original Message-----
From: Jiri Kosina [mailto:jkosina@suse.cz]
Sent: Saturday, June 05, 2010 6:42 PM
To: Micki Balanga
Cc: chatty@enac.fr; dhprince-devel@yahoo.co.uk;
linux-input@vger.kernel.org; linux-kernel@vger.kernel.org; Rafi Rubin
Subject: RE: [PATCH] HID: Add support to new N-trig firwmare
On Fri, 4 Jun 2010, Micki Balanga wrote:
> Hi Jiri,
> Attach the patch via file.
> (Also fix 3 warning: please , no space before tabs)
Thanks Micki, I have applied the patch.
--
Jiri Kosina
SUSE Labs, Novell Inc.
[-- Attachment #2: 0001-HID-Add-support-to-new-N-trig-firwmare-part-2.patch --]
[-- Type: application/octet-stream, Size: 4447 bytes --]
From efc0539c78af9aaea46e0738a4f9d749e7368883 Mon Sep 17 00:00:00 2001
From: micki <micki@micki-laptop.(none)>
Date: Sat, 19 Jun 2010 11:37:29 +0300
Subject: [PATCH] HID: Add support to new N-trig firwmare part 2
Product id 0x03 - 0x14
Signed-off-by: Micki Balanga <micki@n-trig.com>
---
---
---
drivers/hid/hid-core.c | 18 ++++++++++++++++++
drivers/hid/hid-ids.h | 22 ++++++++++++++++++++--
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index aa0f7dc..887aefd 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1337,6 +1337,24 @@ static const struct hid_device_id hid_blacklist[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) },
+ { 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_WKB2000) },
{ 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) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 6af77ed..1d6194a 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -34,7 +34,7 @@
#define USB_DEVICE_ID_ACECAD_FLAIR 0x0004
#define USB_DEVICE_ID_ACECAD_302 0x0008
-#define USB_VENDOR_ID_ADS_TECH 0x06e1
+#define USB_VENDOR_ID_ADS_TECH 0x06e1
#define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X 0xa155
#define USB_VENDOR_ID_AFATECH 0x15a4
@@ -198,7 +198,7 @@
#define USB_VENDOR_ID_ETT 0x0664
#define USB_DEVICE_ID_TC5UH 0x0309
-#define USB_VENDOR_ID_EZKEY 0x0518
+#define USB_VENDOR_ID_EZKEY 0x0518
#define USB_DEVICE_ID_BTC_8193 0x0002
#define USB_VENDOR_ID_GAMERON 0x0810
@@ -391,6 +391,24 @@
#define USB_VENDOR_ID_NTRIG 0x1b96
#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1 0x0003
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2 0x0004
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3 0x0005
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4 0x0006
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5 0x0007
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6 0x0008
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7 0x0009
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8 0x000A
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9 0x000B
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10 0x000C
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11 0x000D
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12 0x000E
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13 0x000F
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14 0x0010
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15 0x0011
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16 0x0012
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17 0x0013
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18 0x0014
#define USB_VENDOR_ID_ONTRAK 0x0a07
#define USB_DEVICE_ID_ONTRAK_ADU100 0x0064
--
1.6.3.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH] HID: Add support to new N-trig firwmare
2010-06-21 5:06 ` Micki Balanga
@ 2010-06-21 6:14 ` Rafi Rubin
2010-06-21 6:39 ` Micki Balanga
2010-06-21 9:48 ` Jiri Kosina
1 sibling, 1 reply; 13+ messages in thread
From: Rafi Rubin @ 2010-06-21 6:14 UTC (permalink / raw)
To: Micki Balanga
Cc: Jiri Kosina, chatty, dhprince-devel, linux-input, linux-kernel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 06/21/10 01:06, Micki Balanga wrote:
> Hi Jiri
> We have some new product so I have to update the patch,
> When I update my git branch I didn't see the changes regarding N-trig
> Product id. If you can insert this patch, if there a problem with the
> patch
> Let me know and hi will update it
> Thank you
> Micki
>
>
> -----Original Message-----
> From: Jiri Kosina [mailto:jkosina@suse.cz]
> Sent: Saturday, June 05, 2010 6:42 PM
> To: Micki Balanga
> Cc: chatty@enac.fr; dhprince-devel@yahoo.co.uk;
> linux-input@vger.kernel.org; linux-kernel@vger.kernel.org; Rafi Rubin
> Subject: RE: [PATCH] HID: Add support to new N-trig firwmare
>
> On Fri, 4 Jun 2010, Micki Balanga wrote:
>
>> Hi Jiri,
>> Attach the patch via file.
>> (Also fix 3 warning: please , no space before tabs)
>
> Thanks Micki, I have applied the patch.
>
Micki, looks like there are a couple of accidental whitespace modifications:
- -#define USB_VENDOR_ID_ADS_TECH 0x06e1
+#define USB_VENDOR_ID_ADS_TECH 0x06e1
- -#define USB_VENDOR_ID_EZKEY 0x0518
+#define USB_VENDOR_ID_EZKEY 0x0518
Also, in the list of product ids, did you mean to skip 2?
Jiri, is there a better way than listing each device individually?
Rafi
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAkwfA0UACgkQwuRiAT9o60+M9QCfQJcJ7pMo9TOY5vYgfK6Yq16d
nD8AoK+l5sVJKAUEpyYEEANnCFCNm/zr
=IFqR
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: [PATCH] HID: Add support to new N-trig firwmare
2010-06-21 6:14 ` Rafi Rubin
@ 2010-06-21 6:39 ` Micki Balanga
2010-06-21 7:55 ` Rafi Rubin
0 siblings, 1 reply; 13+ messages in thread
From: Micki Balanga @ 2010-06-21 6:39 UTC (permalink / raw)
To: Rafi Rubin; +Cc: Jiri Kosina, chatty, dhprince-devel, linux-input, linux-kernel
Hi rafi
Thank for the remarks
Before submitting the patch I used checkpatch.pl script
And checked whitespace in the code I inserted.
Yes I aware there is no product id 0x002. (it's ok)
Micki
-----Original Message-----
From: Rafi Rubin [mailto:rafi@seas.upenn.edu]
Sent: Monday, June 21, 2010 9:15 AM
To: Micki Balanga
Cc: Jiri Kosina; chatty@enac.fr; dhprince-devel@yahoo.co.uk;
linux-input@vger.kernel.org; linux-kernel@vger.kernel.org
Subject: Re: [PATCH] HID: Add support to new N-trig firwmare
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 06/21/10 01:06, Micki Balanga wrote:
> Hi Jiri
> We have some new product so I have to update the patch,
> When I update my git branch I didn't see the changes regarding N-trig
> Product id. If you can insert this patch, if there a problem with the
> patch
> Let me know and hi will update it
> Thank you
> Micki
>
>
> -----Original Message-----
> From: Jiri Kosina [mailto:jkosina@suse.cz]
> Sent: Saturday, June 05, 2010 6:42 PM
> To: Micki Balanga
> Cc: chatty@enac.fr; dhprince-devel@yahoo.co.uk;
> linux-input@vger.kernel.org; linux-kernel@vger.kernel.org; Rafi Rubin
> Subject: RE: [PATCH] HID: Add support to new N-trig firwmare
>
> On Fri, 4 Jun 2010, Micki Balanga wrote:
>
>> Hi Jiri,
>> Attach the patch via file.
>> (Also fix 3 warning: please , no space before tabs)
>
> Thanks Micki, I have applied the patch.
>
Micki, looks like there are a couple of accidental whitespace
modifications:
- -#define USB_VENDOR_ID_ADS_TECH 0x06e1
+#define USB_VENDOR_ID_ADS_TECH 0x06e1
- -#define USB_VENDOR_ID_EZKEY 0x0518
+#define USB_VENDOR_ID_EZKEY 0x0518
Also, in the list of product ids, did you mean to skip 2?
Jiri, is there a better way than listing each device individually?
Rafi
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAkwfA0UACgkQwuRiAT9o60+M9QCfQJcJ7pMo9TOY5vYgfK6Yq16d
nD8AoK+l5sVJKAUEpyYEEANnCFCNm/zr
=IFqR
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] HID: Add support to new N-trig firwmare
2010-06-21 6:39 ` Micki Balanga
@ 2010-06-21 7:55 ` Rafi Rubin
0 siblings, 0 replies; 13+ messages in thread
From: Rafi Rubin @ 2010-06-21 7:55 UTC (permalink / raw)
To: Micki Balanga
Cc: Jiri Kosina, chatty, dhprince-devel, linux-input, linux-kernel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 06/21/10 02:39, Micki Balanga wrote:
> Hi rafi
> Thank for the remarks
> Before submitting the patch I used checkpatch.pl script
> And checked whitespace in the code I inserted.
I'm not saying anything in the patch is a style violation, just looks like you
changed two lines unintentionally.
Take a look at the patch itself, or try out "git difftool drivers/hid/hid-ids.h"
and look at the ADS_TECH and EZKEY lines.
> Yes I aware there is no product id 0x002. (it's ok)
Ok, just sanity checking.
> -----Original Message-----
> From: Rafi Rubin [mailto:rafi@seas.upenn.edu]
> Sent: Monday, June 21, 2010 9:15 AM
> To: Micki Balanga
> Cc: Jiri Kosina; chatty@enac.fr; dhprince-devel@yahoo.co.uk;
> linux-input@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH] HID: Add support to new N-trig firwmare
>
> On 06/21/10 01:06, Micki Balanga wrote:
>> Hi Jiri
>> We have some new product so I have to update the patch,
>> When I update my git branch I didn't see the changes regarding N-trig
>> Product id. If you can insert this patch, if there a problem with the
>> patch
>> Let me know and hi will update it
>> Thank you
>> Micki
>
>
>> -----Original Message-----
>> From: Jiri Kosina [mailto:jkosina@suse.cz]
>> Sent: Saturday, June 05, 2010 6:42 PM
>> To: Micki Balanga
>> Cc: chatty@enac.fr; dhprince-devel@yahoo.co.uk;
>> linux-input@vger.kernel.org; linux-kernel@vger.kernel.org; Rafi Rubin
>> Subject: RE: [PATCH] HID: Add support to new N-trig firwmare
>
>> On Fri, 4 Jun 2010, Micki Balanga wrote:
>
>>> Hi Jiri,
>>> Attach the patch via file.
>>> (Also fix 3 warning: please , no space before tabs)
>
>> Thanks Micki, I have applied the patch.
>
>
> Micki, looks like there are a couple of accidental whitespace
> modifications:
>
> -#define USB_VENDOR_ID_ADS_TECH 0x06e1
> +#define USB_VENDOR_ID_ADS_TECH 0x06e1
>
> -#define USB_VENDOR_ID_EZKEY 0x0518
> +#define USB_VENDOR_ID_EZKEY 0x0518
>
>
> Also, in the list of product ids, did you mean to skip 2?
>
>
> Jiri, is there a better way than listing each device individually?
>
>
> Rafi
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAkwfGvkACgkQwuRiAT9o608vqACfZgAPtUYpEJHZMPwjGR/0u2l/
I/UAoNUrl8V75kFOBVmMCNRKIfnYB7Pk
=55Y2
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: [PATCH] HID: Add support to new N-trig firwmare
2010-06-21 5:06 ` Micki Balanga
2010-06-21 6:14 ` Rafi Rubin
@ 2010-06-21 9:48 ` Jiri Kosina
2010-06-21 10:09 ` Micki Balanga
1 sibling, 1 reply; 13+ messages in thread
From: Jiri Kosina @ 2010-06-21 9:48 UTC (permalink / raw)
To: Micki Balanga
Cc: chatty, dhprince-devel, linux-input, linux-kernel, Rafi Rubin
On Mon, 21 Jun 2010, Micki Balanga wrote:
> We have some new product so I have to update the patch,
> When I update my git branch I didn't see the changes regarding N-trig
> Product id. If you can insert this patch, if there a problem with the
> patch
> Let me know and hi will update it
Hi Micki,
the patch seems incomplete -- it adds new entries to hid_blacklist[], but
doesn't update ntrig_devices[].
Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: [PATCH] HID: Add support to new N-trig firwmare
2010-06-21 9:48 ` Jiri Kosina
@ 2010-06-21 10:09 ` Micki Balanga
2010-06-21 11:43 ` Jiri Kosina
0 siblings, 1 reply; 13+ messages in thread
From: Micki Balanga @ 2010-06-21 10:09 UTC (permalink / raw)
To: Jiri Kosina; +Cc: chatty, dhprince-devel, linux-input, linux-kernel, Rafi Rubin
[-- Attachment #1: Type: text/plain, Size: 870 bytes --]
Hi Jiri,
Attach one file which update hid_blacklist.
Attach Second patch which update ntrig_devices.
Micki
-----Original Message-----
From: Jiri Kosina [mailto:jkosina@suse.cz]
Sent: Monday, June 21, 2010 12:49 PM
To: Micki Balanga
Cc: chatty@enac.fr; dhprince-devel@yahoo.co.uk;
linux-input@vger.kernel.org; linux-kernel@vger.kernel.org; Rafi Rubin
Subject: RE: [PATCH] HID: Add support to new N-trig firwmare
On Mon, 21 Jun 2010, Micki Balanga wrote:
> We have some new product so I have to update the patch,
> When I update my git branch I didn't see the changes regarding N-trig
> Product id. If you can insert this patch, if there a problem with the
> patch
> Let me know and hi will update it
Hi Micki,
the patch seems incomplete -- it adds new entries to hid_blacklist[],
but
doesn't update ntrig_devices[].
Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
[-- Attachment #2: 0001-HID-Add-support-to-new-N-trig-firwmare-part-2.patch --]
[-- Type: application/octet-stream, Size: 4447 bytes --]
From efc0539c78af9aaea46e0738a4f9d749e7368883 Mon Sep 17 00:00:00 2001
From: micki <micki@micki-laptop.(none)>
Date: Sat, 19 Jun 2010 11:37:29 +0300
Subject: [PATCH] HID: Add support to new N-trig firwmare part 2
Product id 0x03 - 0x14
Signed-off-by: Micki Balanga <micki@n-trig.com>
---
---
---
drivers/hid/hid-core.c | 18 ++++++++++++++++++
drivers/hid/hid-ids.h | 22 ++++++++++++++++++++--
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index aa0f7dc..887aefd 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1337,6 +1337,24 @@ static const struct hid_device_id hid_blacklist[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) },
+ { 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_WKB2000) },
{ 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) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 6af77ed..1d6194a 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -34,7 +34,7 @@
#define USB_DEVICE_ID_ACECAD_FLAIR 0x0004
#define USB_DEVICE_ID_ACECAD_302 0x0008
-#define USB_VENDOR_ID_ADS_TECH 0x06e1
+#define USB_VENDOR_ID_ADS_TECH 0x06e1
#define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X 0xa155
#define USB_VENDOR_ID_AFATECH 0x15a4
@@ -198,7 +198,7 @@
#define USB_VENDOR_ID_ETT 0x0664
#define USB_DEVICE_ID_TC5UH 0x0309
-#define USB_VENDOR_ID_EZKEY 0x0518
+#define USB_VENDOR_ID_EZKEY 0x0518
#define USB_DEVICE_ID_BTC_8193 0x0002
#define USB_VENDOR_ID_GAMERON 0x0810
@@ -391,6 +391,24 @@
#define USB_VENDOR_ID_NTRIG 0x1b96
#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1 0x0003
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2 0x0004
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3 0x0005
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4 0x0006
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5 0x0007
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6 0x0008
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7 0x0009
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8 0x000A
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9 0x000B
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10 0x000C
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11 0x000D
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12 0x000E
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13 0x000F
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14 0x0010
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15 0x0011
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16 0x0012
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17 0x0013
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18 0x0014
#define USB_VENDOR_ID_ONTRAK 0x0a07
#define USB_DEVICE_ID_ONTRAK_ADU100 0x0064
--
1.6.3.3
[-- Attachment #3: 0002-HID-Update-hid-ntrig-driver-with-new-product-id-supp.patch --]
[-- Type: application/octet-stream, Size: 3868 bytes --]
From f1338c4702cd95e8b00ba340fd0735891d294d47 Mon Sep 17 00:00:00 2001
From: micki <micki@micki@n-trig.com>
Date: Mon, 21 Jun 2010 13:00:42 +0300
Subject: [PATCH 2/2] [HID] Update hid-ntrig driver with new product id support
Product id 0x01 - 014
Signed-off-by: Micki Balanga <micki@n-trig.com>
---
---
---
drivers/hid/hid-ntrig.c | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c
index b6b0cae..43025b9 100644
--- a/drivers/hid/hid-ntrig.c
+++ b/drivers/hid/hid-ntrig.c
@@ -489,7 +489,7 @@ static int ntrig_input_mapped(struct hid_device *hdev, struct hid_input *hi,
* and call input_mt_sync after each point if necessary
*/
static int ntrig_event (struct hid_device *hid, struct hid_field *field,
- struct hid_usage *usage, __s32 value)
+ struct hid_usage *usage, __s32 value)
{
struct input_dev *input = field->hidinput->input;
struct ntrig_data *nd = hid_get_drvdata(hid);
@@ -498,7 +498,7 @@ static int ntrig_event (struct hid_device *hid, struct hid_field *field,
if (field->application == HID_DG_PEN)
return 0;
- if (hid->claimed & HID_CLAIMED_INPUT) {
+ if (hid->claimed & HID_CLAIMED_INPUT) {
switch (usage->hid) {
case 0xff000001:
/* Tag indicating the start of a multitouch group */
@@ -868,6 +868,42 @@ static void ntrig_remove(struct hid_device *hdev)
static const struct hid_device_id ntrig_devices[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN),
.driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18),
+ .driver_data = NTRIG_DUPLICATE_USAGES },
{ }
};
MODULE_DEVICE_TABLE(hid, ntrig_devices);
--
1.6.3.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* RE: [PATCH] HID: Add support to new N-trig firwmare
2010-06-21 10:09 ` Micki Balanga
@ 2010-06-21 11:43 ` Jiri Kosina
2010-06-21 12:24 ` Micki Balanga
0 siblings, 1 reply; 13+ messages in thread
From: Jiri Kosina @ 2010-06-21 11:43 UTC (permalink / raw)
To: Micki Balanga
Cc: chatty, dhprince-devel, linux-input, linux-kernel, Rafi Rubin
On Mon, 21 Jun 2010, Micki Balanga wrote:
> Attach one file which update hid_blacklist.
> Attach Second patch which update ntrig_devices.
I have folded the patches together, rebased them on top of the patch you
already sent me and I had in my tree (adding devices up od 0x0A), and
applied. Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: [PATCH] HID: Add support to new N-trig firwmare
2010-06-21 11:43 ` Jiri Kosina
@ 2010-06-21 12:24 ` Micki Balanga
2010-06-21 12:25 ` Jiri Kosina
0 siblings, 1 reply; 13+ messages in thread
From: Micki Balanga @ 2010-06-21 12:24 UTC (permalink / raw)
To: Jiri Kosina; +Cc: chatty, dhprince-devel, linux-input, linux-kernel, Rafi Rubin
Hi
Thank you very much but the product id runs from 0x01 - 0x14(Not 0x0A)
(hid_blacklist, ntrig_devices - were updated till 0x14)
Micki
-----Original Message-----
From: Jiri Kosina [mailto:jkosina@suse.cz]
Sent: Monday, June 21, 2010 2:44 PM
To: Micki Balanga
Cc: chatty@enac.fr; dhprince-devel@yahoo.co.uk;
linux-input@vger.kernel.org; linux-kernel@vger.kernel.org; Rafi Rubin
Subject: RE: [PATCH] HID: Add support to new N-trig firwmare
On Mon, 21 Jun 2010, Micki Balanga wrote:
> Attach one file which update hid_blacklist.
> Attach Second patch which update ntrig_devices.
I have folded the patches together, rebased them on top of the patch you
already sent me and I had in my tree (adding devices up od 0x0A), and
applied. Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: [PATCH] HID: Add support to new N-trig firwmare
2010-06-21 12:24 ` Micki Balanga
@ 2010-06-21 12:25 ` Jiri Kosina
0 siblings, 0 replies; 13+ messages in thread
From: Jiri Kosina @ 2010-06-21 12:25 UTC (permalink / raw)
To: Micki Balanga
Cc: chatty, dhprince-devel, linux-input, linux-kernel, Rafi Rubin
On Mon, 21 Jun 2010, Micki Balanga wrote:
> Thank you very much but the product id runs from 0x01 - 0x14(Not 0x0A)
> (hid_blacklist, ntrig_devices - were updated till 0x14)
Yes, but you already sent me patch adding device ids up to 0x0a, and that
has already been in my tree.
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2010-06-21 12:26 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-03 5:11 [PATCH] HID: Add support to new N-trig firwmare Micki Balanga
2010-06-04 9:17 ` Jiri Kosina
2010-06-04 9:57 ` Rafi Rubin
[not found] ` <48A28051AC6D7A48B64F28272458190326E03E@Exchange-IL.n-trig.com>
2010-06-05 15:42 ` Jiri Kosina
2010-06-21 5:06 ` Micki Balanga
2010-06-21 6:14 ` Rafi Rubin
2010-06-21 6:39 ` Micki Balanga
2010-06-21 7:55 ` Rafi Rubin
2010-06-21 9:48 ` Jiri Kosina
2010-06-21 10:09 ` Micki Balanga
2010-06-21 11:43 ` Jiri Kosina
2010-06-21 12:24 ` Micki Balanga
2010-06-21 12:25 ` 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).