rpms/kernel/F-12 linux-2.6-input-hid-quirk-egalax.patch, NONE, 1.1 linux-2.6-input-hid-quirk-hp-touchsmart.patch, NONE, 1.1 kernel.spec, 1.1998, 1.1999
Dave Airlie
airlied at fedoraproject.org
Mon Feb 1 00:05:38 UTC 2010
Author: airlied
Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14439
Modified Files:
kernel.spec
Added Files:
linux-2.6-input-hid-quirk-egalax.patch
linux-2.6-input-hid-quirk-hp-touchsmart.patch
Log Message:
* Mon Feb 01 2010 Dave Airlie <airlied at redhat.com> 2.6.32.7-39
- Add two input quirks for HP and eGalax touchscreens. (from whot)
linux-2.6-input-hid-quirk-egalax.patch:
hid-ids.h | 3 +++
usbhid/hid-quirks.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
--- NEW FILE linux-2.6-input-hid-quirk-egalax.patch ---
Date: Mon, 1 Feb 2010 12:53:47 +1300
From: Peter Hutterer <peter.hutterer at redhat.com>
To: Dave Airlie <airlied at redhat.com>
Subject: [PATCH] HID: add multi-input quirk for eGalax Touchcontroller
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Tested-by: Alfred Broda <guaranga at wp.pl>
---
drivers/hid/hid-ids.h | 3 +++
drivers/hid/usbhid/hid-quirks.c | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index f5144b8..2e698a2 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -158,6 +158,9 @@
#define USB_VENDOR_ID_DRAGONRISE 0x0079
+#define USB_VENDOR_ID_EGALAX 0x0EEF
+#define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001
+
#define USB_VENDOR_ID_ELO 0x04E7
#define USB_DEVICE_ID_ELO_TS2700 0x0020
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index e987562..dc27d74 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -32,6 +32,7 @@ static const struct hid_blacklist {
{ USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD },
{ USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD },
{ USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD },
+ { USB_VENDOR_ID_EGALAX, USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER, 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.6.5.2
linux-2.6-input-hid-quirk-hp-touchsmart.patch:
hid-ids.h | 3 +++
usbhid/hid-quirks.c | 1 +
2 files changed, 4 insertions(+)
--- NEW FILE linux-2.6-input-hid-quirk-hp-touchsmart.patch ---
commit 9db630b48a99adb4156e205b812fba8959644280
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date: Thu Dec 3 15:08:10 2009 +1000
HID: add multi-input quirk for NextWindow Touchscreen.
These touchscreens are mounted onto HP TouchSmart and the Dell Studio One
19. Without a quirk they report a wrong button set and the x/y coordinates
through ABS_Z/ABS_RX, confusing the higher levels (most notably X.Org's
evdev driver).
Device id 0x003 covers models 1900, 2150, and 2700 [1] though testing could
only be performed on a model 1900.
[1] http://www.nextwindow.com/nextwindow_support/latest_tech_info.html
Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 656c015..0ceabbb 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -347,6 +347,9 @@
#define USB_VENDOR_ID_NEC 0x073e
#define USB_DEVICE_ID_NEC_USB_GAME_PAD 0x0301
+#define USB_VENDOR_ID_NEXTWINDOW 0x1926
+#define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN 0x0003
+
#define USB_VENDOR_ID_NTRIG 0x1b96
#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 0d9045a..e987562 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -37,6 +37,7 @@ static const struct hid_blacklist {
{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
{ USB_VENDOR_ID_NATSU, USB_DEVICE_ID_NATSU_GAMEPAD, HID_QUIRK_BADPAD },
{ USB_VENDOR_ID_NEC, USB_DEVICE_ID_NEC_USB_GAME_PAD, HID_QUIRK_BADPAD },
+ { USB_VENDOR_ID_NEXTWINDOW, USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN, HID_QUIRK_MULTI_INPUT},
{ USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD, HID_QUIRK_BADPAD },
{ USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD },
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1998
retrieving revision 1.1999
diff -u -p -r1.1998 -r1.1999
--- kernel.spec 30 Jan 2010 21:07:31 -0000 1.1998
+++ kernel.spec 1 Feb 2010 00:05:38 -0000 1.1999
@@ -651,6 +651,8 @@ Patch391: linux-2.6-acpi-video-dos.patch
Patch450: linux-2.6-input-kill-stupid-messages.patch
Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch
Patch452: linux-2.6.30-no-pcspkr-modalias.patch
+Patch453: linux-2.6-input-hid-quirk-hp-touchsmart.patch
+Patch454: linux-2.6-input-hid-quirk-egalax.patch
Patch460: linux-2.6-serial-460800.patch
@@ -1283,6 +1285,9 @@ ApplyPatch die-floppy-die.patch
ApplyPatch linux-2.6.30-no-pcspkr-modalias.patch
+ApplyPatch linux-2.6-input-hid-quirk-hp-touchsmart.patch
+ApplyPatch linux-2.6-input-hid-quirk-egalax.patch
+
# Allow to use 480600 baud on 16C950 UARTs
ApplyPatch linux-2.6-serial-460800.patch
@@ -2035,6 +2040,9 @@ fi
# and build.
%changelog
+* Mon Feb 01 2010 Dave Airlie <airlied at redhat.com> 2.6.32.7-39
+- Add two input quirks for HP and eGalax touchscreens.
+
* Sat Jan 30 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.32.7-38
- Fix possible oops in bio-integrity code.
More information about the scm-commits
mailing list