Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755360Ab0FDKBq (ORCPT ); Fri, 4 Jun 2010 06:01:46 -0400 Received: from LION.seas.upenn.edu ([158.130.12.194]:57872 "EHLO lion.seas.upenn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754014Ab0FDKBo (ORCPT ); Fri, 4 Jun 2010 06:01:44 -0400 Message-ID: <4C08CDF3.1020704@seas.upenn.edu> Date: Fri, 04 Jun 2010 05:57:07 -0400 From: Rafi Rubin User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: Jiri Kosina CC: Micki Balanga , 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 References: <48A28051AC6D7A48B64F28272458190333674B@Exchange-IL.n-trig.com> In-Reply-To: X-Enigmail-Version: 1.0.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3973 Lines: 108 -----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 >> --- >> --- >> 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----- -- 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/