Skip to contentSkip to conversation

hid-multitouch: Add device id for another DWAV/eGalax variant

PATCH In review Gabriel M. Beddingfield 2 participants 3 messages Jun 23, 2011 – Nov 28, 2011 HID

lore
Share & tools
lore

Gabriel M. Beddingfield

author
#0 lore raw

PATCH 1/1 hid-multitouch: Add device id for another DWAV/eGalax variant

Add the device id for a DWAV eGalax touchscreen, found on the Dell Inspiron Duo.

Signed-off-by Gabriel M. Beddingfield <[email protected]>

---

drivers/hid/hid-core.c +1 -0
index f7440e8..594e9e4 100644
@@ -1374,6 +1374,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
drivers/hid/hid-ids.h +1 -0
index aecb5a4..8b0d757 100644
@@ -222,6 +222,7 @@
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2	0x72a1
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3	0x480e
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4	0x726b
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5	0x725e
 
 #define USB_VENDOR_ID_ELECOM		0x056e
 #define USB_DEVICE_ID_ELECOM_BM084	0x0061
drivers/hid/hid-multitouch.c +3 -0
index 0b2dcd0..06edd68 100644
@@ -647,6 +647,9 @@ static const struct hid_device_id mt_devices[] = {
 	{  .driver_data = MT_CLS_EGALAX,
 		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
 			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
+	{  .driver_data = MT_CLS_EGALAX,
+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
 
 	/* Elo TouchSystems IntelliTouch Plus panel */
 	{ .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,
Reviewed-by on v1 1/1
#1 lore raw
Reviewed-by Benjamin Tissoires <[email protected]>

Thanks,
Benjamin

Quoted 44 lines · Gabriel M. Beddingfield

Add the device id for a DWAV eGalax touchscreen, found on the Dell Inspiron Duo.

Signed-off-by Gabriel M. Beddingfield <[email protected]>

---

drivers/hid/hid-core.c +1 -0
index f7440e8..594e9e4 100644
@@ -1374,6 +1374,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },
        { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
drivers/hid/hid-ids.h +1 -0
index aecb5a4..8b0d757 100644
@@ -222,6 +222,7 @@
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2  0x72a1
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3  0x480e
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4  0x726b
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5  0x725e
 
  #define USB_VENDOR_ID_ELECOM           0x056e
  #define USB_DEVICE_ID_ELECOM_BM084     0x0061
drivers/hid/hid-multitouch.c +3 -1
index 0b2dcd0..06edd68 100644
@@ -647,6 +647,9 @@ static const struct hid_device_id mt_devices[] = {
        {  .driver_data = MT_CLS_EGALAX,
                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
+       {  .driver_data = MT_CLS_EGALAX,
+               HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
 
        /* Elo TouchSystems IntelliTouch Plus panel */
        { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,
--
Quoted 4 lines

To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw

Hi Gabriel,

by rewinding old patches in my local git tree, I realized that this patch was never picked by Jiri.

So, can you resend it against the for-next branch of Jiri's tree? Please also change the #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5 by USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E

Thanks,
Benjamin

Quoted 48 lines · Benjamin Tissoires
Reviewed-by Benjamin Tissoires <[email protected]>

Thanks,
Benjamin

Quoted 41 lines · Gabriel M. Beddingfield

Add the device id for a DWAV eGalax touchscreen, found on the Dell Inspiron Duo.

Signed-off-by Gabriel M. Beddingfield <[email protected]>

---

drivers/hid/hid-core.c +1 -0
index f7440e8..594e9e4 100644
@@ -1374,6 +1374,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },
        { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
drivers/hid/hid-ids.h +1 -0
index aecb5a4..8b0d757 100644
@@ -222,6 +222,7 @@
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2  0x72a1
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3  0x480e
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4  0x726b
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5  0x725e
 
  #define USB_VENDOR_ID_ELECOM           0x056e
  #define USB_DEVICE_ID_ELECOM_BM084     0x0061
drivers/hid/hid-multitouch.c +3 -0
index 0b2dcd0..06edd68 100644
@@ -647,6 +647,9 @@ static const struct hid_device_id mt_devices[] = {
        {  .driver_data = MT_CLS_EGALAX,
                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
+       {  .driver_data = MT_CLS_EGALAX,
+               HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
Quoted 8 lines
Quoted 7 lines
drivers/hid/hid-multitouch.c +0 -1
        /* Elo TouchSystems IntelliTouch Plus panel */
        { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,
--

To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html