Add hid-egalax driver to the unified hid-multitouch framework.

This patch merges the egalax devices to hid-multitouch and therefore adds an MT_QUIRK_EGALAX to work around the broken hid report. It also fixes suspend/resume issues with the old driver.

Signed-off-by Richard Nauber <[email protected]>

---
 drivers/hid/Kconfig          |    9 +-
 drivers/hid/Makefile         |    1 -
 drivers/hid/hid-egalax.c     |  279 ------------------------------------------ drivers/hid/hid-multitouch.c |   48 +++++++-

 4 files changed, 47 insertions(+), 290 deletions(-)

 delete mode 100644 drivers/hid/hid-egalax.c

drivers/hid/Kconfig +0 -0

index 2560f01..34959a2 100644
@@ -160,13 +160,6 @@ config HID_EMS_FF

       Currently the following devices are known to be supported:
        - Trio Linker Plus II

drivers/hid/Kconfig +0 -7

-config HID_EGALAX
-       tristate "eGalax multi-touch panel"
-       depends on USB_HID
-       ---help---
-       Support for the eGalax dual-touch panels, including the
-       Joojoo and Wetab tablets.
-

 config HID_ELECOM
       tristate "ELECOM BM084 bluetooth mouse"
       depends on BT_HIDP

drivers/hid/Kconfig +0 -0

@@ -306,6 +299,8 @@ config HID_MULTITOUCH

         - Hanvon dual touch panels
         - Pixcir dual touch panels
         - 'Sensing Win7-TwoFinger' panel by GeneralTouch
+          - eGalax dual-touch panels, including the
+           Joojoo and Wetab tablets

         If unsure, say N.

drivers/hid/Makefile +0 -0

index 6efc2a0..29e9898 100644
@@ -36,7 +36,6 @@ obj-$(CONFIG_HID_CHICONY)     += hid-chicony.o

 obj-$(CONFIG_HID_CYPRESS)      += hid-cypress.o obj-$(CONFIG_HID_DRAGONRISE)   += hid-drff.o obj-$(CONFIG_HID_EMS_FF)       += hid-emsff.o -obj-$(CONFIG_HID_EGALAX)       += hid-egalax.o obj-$(CONFIG_HID_ELECOM)       += hid-elecom.o obj-$(CONFIG_HID_EZKEY)                += hid-ezkey.o obj-$(CONFIG_HID_GYRATION)     += hid-gyration.o

drivers/hid/hid-egalax.c deleted +0 -279

deleted file mode 100644
index 03bee19..0000000
@@ -1,279 +0,0 @@
-/*
- *  HID driver for eGalax dual-touch panels
- *
- *  Copyright (c) 2010 Stephane Chatty <[email protected]>
- *  Copyright (c) 2010 Henrik Rydberg <[email protected]>
- *  Copyright (c) 2010 Canonical, Ltd.
- *
- */
-
-/*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#include <linux/device.h>
-#include <linux/hid.h>
-#include <linux/module.h>
-#include <linux/usb.h>
-#include <linux/input/mt.h>
-#include <linux/slab.h>
-#include "usbhid/usbhid.h"
-
-MODULE_AUTHOR("Stephane Chatty <[email protected]>");
-MODULE_DESCRIPTION("eGalax dual-touch panel");
-MODULE_LICENSE("GPL");
-
-#include "hid-ids.h"
-
-#define MAX_SLOTS              2
-
-/* estimated signal-to-noise ratios */
-#define SN_MOVE                        4096
-#define SN_PRESSURE            32
-
-struct egalax_data {
-       int valid;
-       int slot;
-       int touch;
-       int x, y, z;
-};
-
-static void set_abs(struct input_dev *input, unsigned int code,
-                   struct hid_field *field, int snratio)
-{
-       int fmin = field->logical_minimum;
-       int fmax = field->logical_maximum;
-       int fuzz = snratio ? (fmax - fmin) / snratio : 0;
-       input_set_abs_params(input, code, fmin, fmax, fuzz, 0);
-}
-
-static int egalax_input_mapping(struct hid_device *hdev, struct hid_input *hi,
-               struct hid_field *field, struct hid_usage *usage,
-               unsigned long **bit, int *max)
-{
-       struct input_dev *input = hi->input;
-
-       switch (usage->hid & HID_USAGE_PAGE) {
-
-       case HID_UP_GENDESK:
-               switch (usage->hid) {
-               case HID_GD_X:
-                       field->logical_maximum = 32760;
-                       hid_map_usage(hi, usage, bit, max,
-                                       EV_ABS, ABS_MT_POSITION_X);
-                       set_abs(input, ABS_MT_POSITION_X, field, SN_MOVE);
-                       /* touchscreen emulation */
-                       set_abs(input, ABS_X, field, SN_MOVE);
-                       return 1;
-               case HID_GD_Y:
-                       field->logical_maximum = 32760;
-                       hid_map_usage(hi, usage, bit, max,
-                                       EV_ABS, ABS_MT_POSITION_Y);
-                       set_abs(input, ABS_MT_POSITION_Y, field, SN_MOVE);
-                       /* touchscreen emulation */
-                       set_abs(input, ABS_Y, field, SN_MOVE);
-                       return 1;
-               }
-               return 0;
-
-       case HID_UP_DIGITIZER:
-               switch (usage->hid) {
-               case HID_DG_TIPSWITCH:
-                       /* touchscreen emulation */
-                       hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);
-                       input_set_capability(input, EV_KEY, BTN_TOUCH);
-                       return 1;
-               case HID_DG_INRANGE:
-               case HID_DG_CONFIDENCE:
-               case HID_DG_CONTACTCOUNT:
-               case HID_DG_CONTACTMAX:
-                       return -1;
-               case HID_DG_CONTACTID:
-                       input_mt_init_slots(input, MAX_SLOTS);
-                       return 1;
-               case HID_DG_TIPPRESSURE:
-                       field->logical_minimum = 0;
-                       hid_map_usage(hi, usage, bit, max,
-                                       EV_ABS, ABS_MT_PRESSURE);
-                       set_abs(input, ABS_MT_PRESSURE, field, SN_PRESSURE);
-                       /* touchscreen emulation */
-                       set_abs(input, ABS_PRESSURE, field, SN_PRESSURE);
-                       return 1;
-               }
-               return 0;
-       }
-
-       /* ignore others (from other reports we won't get anyway) */
-       return -1;
-}
-
-static int egalax_input_mapped(struct hid_device *hdev, struct hid_input *hi,
-               struct hid_field *field, struct hid_usage *usage,
-               unsigned long **bit, int *max)
-{
-       /* tell hid-input to skip setup of these event types */
-       if (usage->type == EV_KEY || usage->type == EV_ABS)
-               set_bit(usage->type, hi->input->evbit);
-       return -1;
-}
-
-/*
- * this function is called when a whole finger has been parsed,
- * so that it can decide what to send to the input layer.
- */
-static void egalax_filter_event(struct egalax_data *td, struct input_dev *input)
-{
-       input_mt_slot(input, td->slot);
-       input_mt_report_slot_state(input, MT_TOOL_FINGER, td->touch);
-       if (td->touch) {
-               input_event(input, EV_ABS, ABS_MT_POSITION_X, td->x);
-               input_event(input, EV_ABS, ABS_MT_POSITION_Y, td->y);
-               input_event(input, EV_ABS, ABS_MT_PRESSURE, td->z);
-       }
-       input_mt_report_pointer_emulation(input, true);
-}
-
-static int egalax_event(struct hid_device *hid, struct hid_field *field,
-                               struct hid_usage *usage, __s32 value)
-{
-       struct egalax_data *td = hid_get_drvdata(hid);
-
-       /* Note, eGalax has two product lines: the first is resistive and
-        * uses a standard parallel multitouch protocol (product ID ==
-        * 48xx).  The second is capacitive and uses an unusual "serial"
-        * protocol with a different message for each multitouch finger
-        * (product ID == 72xx).
-        */
-       if (hid->claimed & HID_CLAIMED_INPUT) {
-               struct input_dev *input = field->hidinput->input;
-
-               switch (usage->hid) {
-               case HID_DG_INRANGE:
-                       td->valid = value;
-                       break;
-               case HID_DG_CONFIDENCE:
-                       /* avoid interference from generic hidinput handling */
-                       break;
-               case HID_DG_TIPSWITCH:
-                       td->touch = value;
-                       break;
-               case HID_DG_TIPPRESSURE:
-                       td->z = value;
-                       break;
-               case HID_DG_CONTACTID:
-                       td->slot = clamp_val(value, 0, MAX_SLOTS - 1);
-                       break;
-               case HID_GD_X:
-                       td->x = value;
-                       break;
-               case HID_GD_Y:
-                       td->y = value;
-                       /* this is the last field in a finger */
-                       if (td->valid)
-                               egalax_filter_event(td, input);
-                       break;
-               case HID_DG_CONTACTCOUNT:
-                       /* touch emulation: this is the last field in a frame */
-                       break;
-
-               default:
-                       /* fallback to the generic hidinput handling */
-                       return 0;
-               }
-       }
-
-       /* we have handled the hidinput part, now remains hiddev */
-       if (hid->claimed & HID_CLAIMED_HIDDEV && hid->hiddev_hid_event)
-               hid->hiddev_hid_event(hid, field, usage, value);
-
-       return 1;
-}
-
-static int egalax_probe(struct hid_device *hdev, const struct hid_device_id *id)
-{
-       int ret;
-       struct egalax_data *td;
-       struct hid_report *report;
-
-       td = kzalloc(sizeof(struct egalax_data), GFP_KERNEL);
-       if (!td) {
-               hid_err(hdev, "cannot allocate eGalax data\n");
-               return -ENOMEM;
-       }
-       hid_set_drvdata(hdev, td);
-
-       ret = hid_parse(hdev);
-       if (ret)
-               goto end;
-
-       ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
-       if (ret)
-               goto end;
-
-       report = hdev->report_enum[HID_FEATURE_REPORT].report_id_hash[5];
-       if (report) {
-               report->field[0]->value[0] = 2;
-               usbhid_submit_report(hdev, report, USB_DIR_OUT);
-       }
-
-end:
-       if (ret)
-               kfree(td);
-
-       return ret;
-}
-
-static void egalax_remove(struct hid_device *hdev)
-{
-       hid_hw_stop(hdev);
-       kfree(hid_get_drvdata(hdev));
-       hid_set_drvdata(hdev, NULL);
-}
-
-static const struct hid_device_id egalax_devices[] = {
-       { HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
-       { 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) },
-       { }
-};
-MODULE_DEVICE_TABLE(hid, egalax_devices);
-
-static const struct hid_usage_id egalax_grabbed_usages[] = {
-       { HID_ANY_ID, HID_ANY_ID, HID_ANY_ID },
-       { HID_ANY_ID - 1, HID_ANY_ID - 1, HID_ANY_ID - 1}
-};
-
-static struct hid_driver egalax_driver = {
-       .name = "egalax-touch",
-       .id_table = egalax_devices,
-       .probe = egalax_probe,
-       .remove = egalax_remove,
-       .input_mapping = egalax_input_mapping,
-       .input_mapped = egalax_input_mapped,
-       .usage_table = egalax_grabbed_usages,
-       .event = egalax_event,
-};
-
-static int __init egalax_init(void)
-{
-       return hid_register_driver(&egalax_driver);
-}
-
-static void __exit egalax_exit(void)
-{
-       hid_unregister_driver(&egalax_driver);
-}
-
-module_init(egalax_init);
-module_exit(egalax_exit);
-

drivers/hid/hid-multitouch.c +0 -0

index 07d3183..58df924 100644

drivers/hid/hid-multitouch.c +0 -0

  /*
  * these device-dependent functions determine what slot corresponds

@@ -118,7 +121,13 @@ struct mt_class mt_classes[] = {

               .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP | MT_QUIRK_CYPRESS, .maxcontacts = 10 },

-
+       { .name = MT_CLS_EGALAX,
+               .quirks =  MT_QUIRK_SLOT_IS_CONTACTID |
+                       MT_QUIRK_VALID_IS_INRANGE |
+                       MT_QUIRK_EGALAX,
+               .maxcontacts = 2 ,
+               .sn_move = 4096,
+               .sn_pressure = 32},

       { }
 };

drivers/hid/hid-multitouch.c +1 -0

@@ -146,9 +155,16 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
  {
        struct mt_device *td = hid_get_drvdata(hdev);
        struct mt_class *cls = td->mtclass;
+
        switch (usage->hid & HID_USAGE_PAGE) {
 

       case HID_UP_GENDESK:

               switch (usage->hid) {
               case HID_GD_X:
                       hid_map_usage(hi, usage, bit, max,

drivers/hid/hid-multitouch.c +0 -0

@@ -203,6 +219,10 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                        td->last_slot_field = usage->hid;
                        return 1;

               case HID_DG_TIPPRESSURE:
+                       /* fix up the pressure range for egalax devices*/
+                       if (cls->quirks & MT_QUIRK_EGALAX)
+                               field->logical_minimum = 0;
+

drivers/hid/hid-multitouch.c +0 -0

  }
 
 

drivers/hid/hid-multitouch.c +7 -0

        /* we have handled the hidinput part, now remains hiddev */
        if (hid->claimed & HID_CLAIMED_HIDDEV && hid->hiddev_hid_event)
                hid->hiddev_hid_event(hid, field, usage, value);

@@ -478,6 +503,23 @@ static const struct hid_device_id mt_devices[] = {
                HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
                        USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH) },
 
+       /* eGalax devices */
+       {  .driver_data = MT_CLS_EGALAX,
+               HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
+       {  .driver_data = MT_CLS_EGALAX,
+               HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },

drivers/hid/hid-multitouch.c +0 -1

        { }
  };
  MODULE_DEVICE_TABLE(hid, mt_devices);
--

1.7.1

--
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

Hi Benjamin, Hendrick, Jiri and Stéphan,

I would like to give this patch another shot, after Benjamin reviewed it (thanks for that!). As he pointed out, testing for the capacitive kind of egalax devices is needed. Maybe Stéphan, has the hardware and would be so kind to test it? I have tried it with my Samsung MB30 display and it worked:
Bus 002 Device 002: ID 0eef:480e D-WAV Scientific Co., Ltd
(thats USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3)

I am looking forward to your comments,
Richard

PS: The patch should apply to 2fa403e8b49 of Jiris for-next branch, although I had to cheat a little and rebase his tree to 2.6.38-rc7 because of some unrelated breakage (ecryptfs).

[PATCH] [input-hid] Add hid-egalax driver to the unified hid-multitouch framework.

This patch merges the hid-egalax driver into hid-multitouch and therefore adds two device classes (MT_CLS_EGALAX_CAPACITIVE/RESISTIVE). It also gains the capability to work around broken hid reports by overriding X/Y limits and emitting events for each finger (MT_QUIRK_SEND_AT_EACH_REPORT). As a side effect, this patch fixes the broken suspend/resume behavior with the old driver.

Signed-off-by Richard Nauber <[email protected]>

---
 drivers/hid/Kconfig          |    9 +-
 drivers/hid/Makefile         |    1 -
 drivers/hid/hid-egalax.c     |  279 ------------------------------------------
 drivers/hid/hid-multitouch.c |   68 ++++++++++-
 4 files changed, 68 insertions(+), 289 deletions(-)
 delete mode 100644 drivers/hid/hid-egalax.c

drivers/hid/hid-multitouch.c +1 -0

index 65e7f20..a00f3d8 100644
@@ -37,6 +37,7 @@ MODULE_LICENSE("GPL");
 #define MT_QUIRK_SLOT_IS_CONTACTNUMBER	(1 << 3)
 #define MT_QUIRK_VALID_IS_INRANGE	(1 << 4)
 #define MT_QUIRK_VALID_IS_CONFIDENCE	(1 << 5)
+#define MT_QUIRK_SEND_AT_EACH_REPORT	(1 << 6)
 
 struct mt_slot {
 	__s32 x, y, p, w, h;

drivers/hid/hid-multitouch.c +21 -1

 };
 
 /* classes of device behavior */

@@ -70,6 +74,8 @@ struct mt_class {
 #define MT_CLS_DUAL_INRANGE_CONTACTID		2
 #define MT_CLS_DUAL_INRANGE_CONTACTNUMBER	3
 #define MT_CLS_CYPRESS				4
+#define MT_CLS_EGALAX_CAPACITIVE		5
+#define MT_CLS_EGALAX_RESISTIVE			6
 
 /*
  * these device-dependent functions determine what slot corresponds

@@ -119,7 +125,25 @@ struct mt_class mt_classes[] = {
 		.quirks = MT_QUIRK_NOT_SEEN_MEANS_UP |
 			MT_QUIRK_CYPRESS,
 		.maxcontacts = 10 },
-
+	{ .name = MT_CLS_EGALAX_CAPACITIVE,
+		.quirks =  MT_QUIRK_SLOT_IS_CONTACTID |
+			MT_QUIRK_VALID_IS_INRANGE,
+		.maxcontacts = 2,
+		.sn_move = 4096,
+		.sn_pressure = 32,
+		.override_logical_limits = 1,
+		.logical_min = { 0, 0 },
+		.logical_max = { 32760, 32760 } },
+	{ .name = MT_CLS_EGALAX_RESISTIVE,
+		.quirks =  MT_QUIRK_SLOT_IS_CONTACTID |
+			MT_QUIRK_VALID_IS_INRANGE |
+			MT_QUIRK_SEND_AT_EACH_REPORT,
+		.maxcontacts = 2,
+		.sn_move = 4096,
+		.sn_pressure = 32,
+		.override_logical_limits = 1,
+		.logical_min = { 0, 0 },
+		.logical_max = { 32760, 32760 } },
 	{ }
 };
 

drivers/hid/hid-multitouch.c +28 -1

 			hid_map_usage(hi, usage, bit, max,
 					EV_ABS, ABS_MT_POSITION_Y);
 			set_abs(hi->input, ABS_MT_POSITION_Y, field,

@@ -204,6 +241,10 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 			td->last_slot_field = usage->hid;
 			return 1;
 		case HID_DG_TIPPRESSURE:
+			/* fix up the pressure range for some devices
+			with broken report */
+			field->logical_minimum = 0;
+
 			hid_map_usage(hi, usage, bit, max,
 					EV_ABS, ABS_MT_PRESSURE);
 			set_abs(hi->input, ABS_MT_PRESSURE, field,

@@ -367,8 +408,12 @@ static int mt_event(struct hid_device *hid, struct hid_field *field,
 		if (usage->hid == td->last_slot_field)
 			mt_complete_slot(td);
 
-		if (field->index == td->last_field_index
+		if ((field->index == td->last_field_index
 			&& td->num_received >= td->num_expected)
+			|| ((quirks & MT_QUIRK_SEND_AT_EACH_REPORT)
+				&& (usage->hid == td->last_slot_field)))
+			/* emit an event for every finger to work around
+			a corrupt last_field_index in the hid report*/
 			mt_emit_event(td, field->hidinput->input);
 
 	}

@@ -484,6 +529,25 @@ static const struct hid_device_id mt_devices[] = {
 		HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
 			USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH) },
 
+	/* Resistive eGalax devices */
+	{  .driver_data = MT_CLS_EGALAX_RESISTIVE,
+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
+	{  .driver_data = MT_CLS_EGALAX_RESISTIVE,
+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
+
+	/* Capacitive eGalax devices */
+	{  .driver_data = MT_CLS_EGALAX_CAPACITIVE,
+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
+	{  .driver_data = MT_CLS_EGALAX_CAPACITIVE,
+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
+	{  .driver_data = MT_CLS_EGALAX_CAPACITIVE,
+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
+
 	{ }
 };
 MODULE_DEVICE_TABLE(hid, mt_devices);

Signature · 1 line

1.7.1

Hi Richard,

Quoted 1 line

Hi Benjamin, Hendrick, Jiri and Stéphan,

The name is Henrik.

Quoted 7 lines

I would like to give this patch another shot, after Benjamin reviewed it (thanks for that!). As he pointed out, testing for the capacitive kind of egalax devices is needed. Maybe Stéphan, has the hardware and would be so kind to test it? I have tried it with my Samsung MB30 display and it worked:
Bus 002 Device 002: ID 0eef:480e D-WAV Scientific Co., Ltd
(thats USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3)

Quoted 6 lines

I am looking forward to your comments,
Richard

PS: The patch should apply to 2fa403e8b49 of Jiris for-next branch, although I had to cheat a little and rebase his tree to 2.6.38-rc7 because of some unrelated breakage (ecryptfs).

Thanks for making this patch. Please find some comments inline. Also, since you are removing copyright from something that was largely copied into this driver, perhaps something should be done about that.

Quoted 18 lines

[PATCH] [input-hid] Add hid-egalax driver to the unified hid-multitouch framework.

This patch merges the hid-egalax driver into hid-multitouch and therefore adds two device classes (MT_CLS_EGALAX_CAPACITIVE/RESISTIVE). It also gains the capability to work around broken hid reports by overriding X/Y limits and emitting events for each finger (MT_QUIRK_SEND_AT_EACH_REPORT). As a side effect, this patch fixes the broken suspend/resume behavior with the old driver.

Signed-off-by Richard Nauber <[email protected]>

---
 drivers/hid/Kconfig          |    9 +-
 drivers/hid/Makefile         |    1 -
 drivers/hid/hid-egalax.c     |  279 ------------------------------------------ drivers/hid/hid-multitouch.c |   68 ++++++++++-

 4 files changed, 68 insertions(+), 289 deletions(-)

 delete mode 100644 drivers/hid/hid-egalax.c

[...]

Quoted 10 lines

drivers/hid/hid-multitouch.c +1 -0

index 65e7f20..a00f3d8 100644
@@ -37,6 +37,7 @@ MODULE_LICENSE("GPL");
  #define MT_QUIRK_SLOT_IS_CONTACTNUMBER       (1 << 3)
  #define MT_QUIRK_VALID_IS_INRANGE    (1 << 4)
  #define MT_QUIRK_VALID_IS_CONFIDENCE (1 << 5)
+#define MT_QUIRK_SEND_AT_EACH_REPORT (1 << 6)
 

Quoted 9 lines

drivers/hid/hid-multitouch.c +0 -0

  struct mt_slot {
       __s32 x, y, p, w, h;

@@ -63,6 +64,9 @@ struct mt_class {

      __s32 sn_move;  /* Signal/noise ratio for move events */ __s32 sn_pressure;      /* Signal/noise ratio for pressure events */ __u8 maxcontacts;
+     __u8 override_logical_limits;  /* correct the reported X/Y range */
+     __u32 logical_min[2];
+     __u32 logical_max[2];

Please think about byte alignment here, keeping elements of the same size together. Also, the override needs a specific name, given that it applies to the whole class, not just the x and y positions. Perhaps the override should be triggered with a quirk instead?

Quoted 41 lines

 };

 /* classes of device behavior */

drivers/hid/hid-multitouch.c +2 -0

@@ -70,6 +74,8 @@ struct mt_class {
  #define MT_CLS_DUAL_INRANGE_CONTACTID                2
  #define MT_CLS_DUAL_INRANGE_CONTACTNUMBER    3
  #define MT_CLS_CYPRESS                               4
+#define MT_CLS_EGALAX_CAPACITIVE             5
+#define MT_CLS_EGALAX_RESISTIVE                      6
 
  /*
   * these device-dependent functions determine what slot corresponds

@@ -119,7 +125,25 @@ struct mt_class mt_classes[] = {

              .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP | MT_QUIRK_CYPRESS, .maxcontacts = 10 },
-
+     { .name = MT_CLS_EGALAX_CAPACITIVE,
+             .quirks =  MT_QUIRK_SLOT_IS_CONTACTID |
+                     MT_QUIRK_VALID_IS_INRANGE,
+             .maxcontacts = 2,
+             .sn_move = 4096,
+             .sn_pressure = 32,
+             .override_logical_limits = 1,
+             .logical_min = { 0, 0 },
+             .logical_max = { 32760, 32760 } },
+     { .name = MT_CLS_EGALAX_RESISTIVE,
+             .quirks =  MT_QUIRK_SLOT_IS_CONTACTID |
+                     MT_QUIRK_VALID_IS_INRANGE |
+                     MT_QUIRK_SEND_AT_EACH_REPORT,
+             .maxcontacts = 2,
+             .sn_move = 4096,
+             .sn_pressure = 32,
+             .override_logical_limits = 1,
+             .logical_min = { 0, 0 },
+             .logical_max = { 32760, 32760 } }, { }
 };

drivers/hid/hid-multitouch.c static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi, · line 174

Quoted 4 lines

drivers/hid/hid-multitouch.c +1 -0

@@ -147,11 +171,19 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
  {
       struct mt_device *td = hid_get_drvdata(hdev);
       struct mt_class *cls = td->mtclass;
+

Please check for patch for unrelated changes like this.

Quoted 2 lines

drivers/hid/hid-multitouch.c +0 -0

       switch (usage->hid & HID_USAGE_PAGE) {
 

Quoted 10 lines

      case HID_UP_GENDESK:
+
              switch (usage->hid) {
              case HID_GD_X:
+                     /* fix up the reported X limits if necessary*/
+                     if (cls->override_logical_limits) {
+                             field->logical_minimum = cls->logical_min[0];
+                             field->logical_maximum = cls->logical_max[0];
+                     }
+

Something like "if (quirks & MT_QUIRK_FIX_X)", and then on next line "field->logical_maximum = cls->max_x".

Quoted 7 lines

                      hid_map_usage(hi, usage, bit, max, EV_ABS, ABS_MT_POSITION_X); set_abs(hi->input, ABS_MT_POSITION_X, field,

drivers/hid/hid-multitouch.c +0 -0

@@ -161,6 +193,11 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                       td->last_slot_field = usage->hid;
                       return 1;

Quoted 6 lines

              case HID_GD_Y:
+                     /* fix up the reported Y limits if nessecary*/
+                     if (cls->override_logical_limits) {
+                             field->logical_minimum = cls->logical_min[1];
+                             field->logical_maximum = cls->logical_max[1];
+                     }

Ditto.

Quoted 52 lines

                      hid_map_usage(hi, usage, bit, max, EV_ABS, ABS_MT_POSITION_Y); set_abs(hi->input, ABS_MT_POSITION_Y, field,

drivers/hid/hid-multitouch.c +0 -0

@@ -204,6 +241,10 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                       td->last_slot_field = usage->hid;
                       return 1;

              case HID_DG_TIPPRESSURE:
+                     /* fix up the pressure range for some devices
+                     with broken report */
+                     field->logical_minimum = 0;
+
                      hid_map_usage(hi, usage, bit, max, EV_ABS, ABS_MT_PRESSURE); set_abs(hi->input, ABS_MT_PRESSURE, field,

drivers/hid/hid-multitouch.c +24 -1

@@ -367,8 +408,12 @@ static int mt_event(struct hid_device *hid, struct hid_field *field,
               if (usage->hid == td->last_slot_field)
                       mt_complete_slot(td);
 
-             if (field->index == td->last_field_index
+             if ((field->index == td->last_field_index
                       && td->num_received >= td->num_expected)
+                     || ((quirks & MT_QUIRK_SEND_AT_EACH_REPORT)
+                             && (usage->hid == td->last_slot_field)))
+                     /* emit an event for every finger to work around
+                     a corrupt last_field_index in the hid report*/
                       mt_emit_event(td, field->hidinput->input);
 
       }

@@ -484,6 +529,25 @@ static const struct hid_device_id mt_devices[] = {
               HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
                       USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH) },
 
+     /* Resistive eGalax devices */
+     {  .driver_data = MT_CLS_EGALAX_RESISTIVE,
+             HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                     USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
+     {  .driver_data = MT_CLS_EGALAX_RESISTIVE,
+             HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                     USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
+
+     /* Capacitive eGalax devices */
+     {  .driver_data = MT_CLS_EGALAX_CAPACITIVE,
+             HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                     USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
+     {  .driver_data = MT_CLS_EGALAX_CAPACITIVE,
+             HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                     USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
+     {  .driver_data = MT_CLS_EGALAX_CAPACITIVE,
+             HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                     USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
+
       { }

Quoted 5 lines

drivers/hid/hid-multitouch.c +0 -1

  };
  MODULE_DEVICE_TABLE(hid, mt_devices);
--

1.7.1

Thanks,
Henrik

Quoted 6 lines

Quoted 6 lines

 struct mt_slot {
      __s32 x, y, p, w, h;

(quoted diff) +0 -0

@@ -63,6 +64,9 @@ struct mt_class {

      __s32 sn_move;  /* Signal/noise ratio for move events */ __s32 sn_pressure;      /* Signal/noise ratio for pressure events */ __u8 maxcontacts;

Quoted 8 lines

Quoted 3 lines

+     __u8 override_logical_limits;  /* correct the reported X/Y range */
+     __u32 logical_min[2];
+     __u32 logical_max[2];

Please think about byte alignment here, keeping elements of the same size together. Also, the override needs a specific name, given that it applies to the whole class, not just the x and y positions. Perhaps the override should be triggered with a quirk instead?

I'm not in favor of a quirk in this particular case: the information is already here: max > 0.

Quoted 15 lines

Quoted 14 lines

Quoted 9 lines

 struct mt_slot {
      __s32 x, y, p, w, h;

(quoted diff) +0 -0

@@ -63,6 +64,9 @@ struct mt_class {

      __s32 sn_move;  /* Signal/noise ratio for move events */ __s32 sn_pressure;      /* Signal/noise ratio for pressure events */ __u8 maxcontacts;
+     __u8 override_logical_limits;  /* correct the reported X/Y range */
+     __u32 logical_min[2];
+     __u32 logical_max[2];

Please think about byte alignment here, keeping elements of the same size together. Also, the override needs a specific name, given that it applies to the whole class, not just the x and y positions. Perhaps the override should be triggered with a quirk instead?

Quoted 2 lines

I'm not in favor of a quirk in this particular case: the information is already here: max > 0.

Only if min == 0, which is far from always the case. And setting a special value for a special hardware does what a quirk does, so maybe it is a quirk after all.

Quoted 7 lines

Quoted 2 lines

I'm not in favor of a quirk in this particular case: the information is already here: max > 0.

Only if min == 0, which is far from always the case. And setting a special value for a special hardware does what a quirk does, so maybe it is a quirk after all.

I think there is a misunderstanding:
if the class provides max_x (so > 0), or min_x, that means that the person in charge of adding the driver wants to replace the two values min/max.

No need for a quirk that will be redundant with the hand-provided values.

What I meant is that (min_x < max_x) is the proper test.

Quoted 1 line

No need for a quirk that will be redundant with the hand-provided values.

Yes, but I think we might be better off using a quirk than a generic way to replace the values provided by the hardware.

here is the third version of this patch, improved according to your suggestions.

Quoted 6 lines

What I meant is that (min_x < max_x) is the proper test.

Quoted 1 line

No need for a quirk that will be redundant with the hand-provided values.

Yes, but I think we might be better off using a quirk than a generic way to replace the values provided by the hardware.

My personal opinion is that the override should be triggered by your (min_x < max_x) test, which is safe, because the (min_x == max_x) case makes no sense for a device and we are allowed to attach a special meaning to it. Additionally this enables us to conveniently extend the mechanism to more axis, whose could be individually enabled without a bloat of quirk defines.

So tell me what you think of this...

From 67fd1e768341a8f67cd882b7603de62b5f250970 Mon Sep 17 00:00:00 2001

From cd625e954a7f9774ae8f84a9eb2315c6da8b387c Mon Sep 17 00:00:00 2001

Hi Richard,

Quoted 9 lines

here is the third version of this patch, improved according to your suggestions.

Quoted 6 lines

What I meant is that (min_x < max_x) is the proper test.

Quoted 1 line

No need for a quirk that will be redundant with the hand-provided values.

Yes, but I think we might be better off using a quirk than a generic way to replace the values provided by the hardware.

Quoted 8 lines

My personal opinion is that the override should be triggered by your (min_x < max_x) test, which is safe, because the (min_x == max_x) case makes no sense for a device and we are allowed to attach a special meaning to it. Additionally this enables us to conveniently extend the mechanism to more axis, whose could be individually enabled without a bloat of quirk defines.

So tell me what you think of this...

Having a mechanism to override device limits suggests this is generally needed, which is not the case. Adding a specific quirk for this specific hardware seems more appropriate. Also, it seems the special behavior of the newer firmwares can be autodetected, so there is no need for more than one class. I have added two patches below, tested on a joojoo. Do you concur with the changes, and do they still work for you?

From 67fd1e768341a8f67cd882b7603de62b5f250970 Mon Sep 17 00:00:00 2001
From: Henrik Rydberg <[email protected]>
Date: Wed, 9 Mar 2011 06:35:25 +0100
Subject: [PATCH 1/2] HID: hid-multitouch: Send events per slot if CONTACTCOUNT is missing

The recent capacitive DWAV firmwares do not use the CONTACTCOUNT field, and the touch frame boundary can therefore not be determined. This patch makes the driver report the touch frame at each completed slot instead.

Signed-off-by Henrik Rydberg <[email protected]>

---
 drivers/hid/hid-multitouch.c |    5 ++++-

 1 files changed, 4 insertions(+), 1 deletions(-)

drivers/hid/hid-multitouch.c +0 -0

index 69f8744..4518006 100644

               if (field->index == td->last_field_index && td->num_received >= td->num_expected) --
1.7.4.1

From cd625e954a7f9774ae8f84a9eb2315c6da8b387c Mon Sep 17 00:00:00 2001
From: Richard Nauber <[email protected]>
Date: Wed, 9 Mar 2011 06:20:57 +0100
Subject: [PATCH 2/2] HID: merge hid-egalax into hid-multitouch

This patch merges the hid-egalax driver into hid-multitouch.  There are two types of devices support by the hid-egalax driver: resistive and capacitive. Here, they are implicitly distinguished by the absence of a HID_DG_CONTACTCOUNT field in the latter, so no special code path needs to be introduced.

As a side effect, this patch fixes the broken suspend/resume behavior in the old driver.

[[email protected]: minor fixups]

Not-yet-Signed-off-by Richard Nauber <[email protected]>

Signed-off-by Henrik Rydberg <[email protected]>

---
 drivers/hid/Kconfig          |    9 +-
 drivers/hid/Makefile         |    1 -
 drivers/hid/hid-egalax.c     |  279 ------------------------------------------ drivers/hid/hid-multitouch.c |   43 +++++++

 4 files changed, 45 insertions(+), 287 deletions(-)

 delete mode 100644 drivers/hid/hid-egalax.c

drivers/hid/Kconfig +0 -0

index a0b117d..b4b8b21 100644
@@ -160,13 +160,6 @@ config HID_EMS_FF

       Currently the following devices are known to be supported:
        - Trio Linker Plus II

drivers/hid/Kconfig +0 -7

-config HID_EGALAX
-       tristate "eGalax multi-touch panel"
-       depends on USB_HID
-       ---help---
-       Support for the eGalax dual-touch panels, including the
-       Joojoo and Wetab tablets.
-

 config HID_ELECOM
       tristate "ELECOM BM084 bluetooth mouse"
       depends on BT_HIDP

drivers/hid/Kconfig +0 -0

@@ -307,6 +300,8 @@ config HID_MULTITOUCH

         - IrTouch Infrared USB panels
         - Pixcir dual touch panels
         - 'Sensing Win7-TwoFinger' panel by GeneralTouch
+          - eGalax dual-touch panels, including the
+           Joojoo and Wetab tablets

         If unsure, say N.

drivers/hid/Makefile +0 -0

index 6efc2a0..29e9898 100644
@@ -36,7 +36,6 @@ obj-$(CONFIG_HID_CHICONY)     += hid-chicony.o

 obj-$(CONFIG_HID_CYPRESS)      += hid-cypress.o obj-$(CONFIG_HID_DRAGONRISE)   += hid-drff.o obj-$(CONFIG_HID_EMS_FF)       += hid-emsff.o -obj-$(CONFIG_HID_EGALAX)       += hid-egalax.o obj-$(CONFIG_HID_ELECOM)       += hid-elecom.o obj-$(CONFIG_HID_EZKEY)                += hid-ezkey.o obj-$(CONFIG_HID_GYRATION)     += hid-gyration.o

drivers/hid/hid-egalax.c deleted +0 -279

deleted file mode 100644
index 03bee19..0000000
@@ -1,279 +0,0 @@
-/*
- *  HID driver for eGalax dual-touch panels
- *
- *  Copyright (c) 2010 Stephane Chatty <[email protected]>
- *  Copyright (c) 2010 Henrik Rydberg <[email protected]>
- *  Copyright (c) 2010 Canonical, Ltd.
- *
- */
-
-/*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#include <linux/device.h>
-#include <linux/hid.h>
-#include <linux/module.h>
-#include <linux/usb.h>
-#include <linux/input/mt.h>
-#include <linux/slab.h>
-#include "usbhid/usbhid.h"
-
-MODULE_AUTHOR("Stephane Chatty <[email protected]>");
-MODULE_DESCRIPTION("eGalax dual-touch panel");
-MODULE_LICENSE("GPL");
-
-#include "hid-ids.h"
-
-#define MAX_SLOTS              2
-
-/* estimated signal-to-noise ratios */
-#define SN_MOVE                        4096
-#define SN_PRESSURE            32
-
-struct egalax_data {
-       int valid;
-       int slot;
-       int touch;
-       int x, y, z;
-};
-
-static void set_abs(struct input_dev *input, unsigned int code,
-                   struct hid_field *field, int snratio)
-{
-       int fmin = field->logical_minimum;
-       int fmax = field->logical_maximum;
-       int fuzz = snratio ? (fmax - fmin) / snratio : 0;
-       input_set_abs_params(input, code, fmin, fmax, fuzz, 0);
-}
-
-static int egalax_input_mapping(struct hid_device *hdev, struct hid_input *hi,
-               struct hid_field *field, struct hid_usage *usage,
-               unsigned long **bit, int *max)
-{
-       struct input_dev *input = hi->input;
-
-       switch (usage->hid & HID_USAGE_PAGE) {
-
-       case HID_UP_GENDESK:
-               switch (usage->hid) {
-               case HID_GD_X:
-                       field->logical_maximum = 32760;
-                       hid_map_usage(hi, usage, bit, max,
-                                       EV_ABS, ABS_MT_POSITION_X);
-                       set_abs(input, ABS_MT_POSITION_X, field, SN_MOVE);
-                       /* touchscreen emulation */
-                       set_abs(input, ABS_X, field, SN_MOVE);
-                       return 1;
-               case HID_GD_Y:
-                       field->logical_maximum = 32760;
-                       hid_map_usage(hi, usage, bit, max,
-                                       EV_ABS, ABS_MT_POSITION_Y);
-                       set_abs(input, ABS_MT_POSITION_Y, field, SN_MOVE);
-                       /* touchscreen emulation */
-                       set_abs(input, ABS_Y, field, SN_MOVE);
-                       return 1;
-               }
-               return 0;
-
-       case HID_UP_DIGITIZER:
-               switch (usage->hid) {
-               case HID_DG_TIPSWITCH:
-                       /* touchscreen emulation */
-                       hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);
-                       input_set_capability(input, EV_KEY, BTN_TOUCH);
-                       return 1;
-               case HID_DG_INRANGE:
-               case HID_DG_CONFIDENCE:
-               case HID_DG_CONTACTCOUNT:
-               case HID_DG_CONTACTMAX:
-                       return -1;
-               case HID_DG_CONTACTID:
-                       input_mt_init_slots(input, MAX_SLOTS);
-                       return 1;
-               case HID_DG_TIPPRESSURE:
-                       field->logical_minimum = 0;
-                       hid_map_usage(hi, usage, bit, max,
-                                       EV_ABS, ABS_MT_PRESSURE);
-                       set_abs(input, ABS_MT_PRESSURE, field, SN_PRESSURE);
-                       /* touchscreen emulation */
-                       set_abs(input, ABS_PRESSURE, field, SN_PRESSURE);
-                       return 1;
-               }
-               return 0;
-       }
-
-       /* ignore others (from other reports we won't get anyway) */
-       return -1;
-}
-
-static int egalax_input_mapped(struct hid_device *hdev, struct hid_input *hi,
-               struct hid_field *field, struct hid_usage *usage,
-               unsigned long **bit, int *max)
-{
-       /* tell hid-input to skip setup of these event types */
-       if (usage->type == EV_KEY || usage->type == EV_ABS)
-               set_bit(usage->type, hi->input->evbit);
-       return -1;
-}
-
-/*
- * this function is called when a whole finger has been parsed,
- * so that it can decide what to send to the input layer.
- */
-static void egalax_filter_event(struct egalax_data *td, struct input_dev *input)
-{
-       input_mt_slot(input, td->slot);
-       input_mt_report_slot_state(input, MT_TOOL_FINGER, td->touch);
-       if (td->touch) {
-               input_event(input, EV_ABS, ABS_MT_POSITION_X, td->x);
-               input_event(input, EV_ABS, ABS_MT_POSITION_Y, td->y);
-               input_event(input, EV_ABS, ABS_MT_PRESSURE, td->z);
-       }
-       input_mt_report_pointer_emulation(input, true);
-}
-
-static int egalax_event(struct hid_device *hid, struct hid_field *field,
-                               struct hid_usage *usage, __s32 value)
-{
-       struct egalax_data *td = hid_get_drvdata(hid);
-
-       /* Note, eGalax has two product lines: the first is resistive and
-        * uses a standard parallel multitouch protocol (product ID ==
-        * 48xx).  The second is capacitive and uses an unusual "serial"
-        * protocol with a different message for each multitouch finger
-        * (product ID == 72xx).
-        */
-       if (hid->claimed & HID_CLAIMED_INPUT) {
-               struct input_dev *input = field->hidinput->input;
-
-               switch (usage->hid) {
-               case HID_DG_INRANGE:
-                       td->valid = value;
-                       break;
-               case HID_DG_CONFIDENCE:
-                       /* avoid interference from generic hidinput handling */
-                       break;
-               case HID_DG_TIPSWITCH:
-                       td->touch = value;
-                       break;
-               case HID_DG_TIPPRESSURE:
-                       td->z = value;
-                       break;
-               case HID_DG_CONTACTID:
-                       td->slot = clamp_val(value, 0, MAX_SLOTS - 1);
-                       break;
-               case HID_GD_X:
-                       td->x = value;
-                       break;
-               case HID_GD_Y:
-                       td->y = value;
-                       /* this is the last field in a finger */
-                       if (td->valid)
-                               egalax_filter_event(td, input);
-                       break;
-               case HID_DG_CONTACTCOUNT:
-                       /* touch emulation: this is the last field in a frame */
-                       break;
-
-               default:
-                       /* fallback to the generic hidinput handling */
-                       return 0;
-               }
-       }
-
-       /* we have handled the hidinput part, now remains hiddev */
-       if (hid->claimed & HID_CLAIMED_HIDDEV && hid->hiddev_hid_event)
-               hid->hiddev_hid_event(hid, field, usage, value);
-
-       return 1;
-}
-
-static int egalax_probe(struct hid_device *hdev, const struct hid_device_id *id)
-{
-       int ret;
-       struct egalax_data *td;
-       struct hid_report *report;
-
-       td = kzalloc(sizeof(struct egalax_data), GFP_KERNEL);
-       if (!td) {
-               hid_err(hdev, "cannot allocate eGalax data\n");
-               return -ENOMEM;
-       }
-       hid_set_drvdata(hdev, td);
-
-       ret = hid_parse(hdev);
-       if (ret)
-               goto end;
-
-       ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
-       if (ret)
-               goto end;
-
-       report = hdev->report_enum[HID_FEATURE_REPORT].report_id_hash[5];
-       if (report) {
-               report->field[0]->value[0] = 2;
-               usbhid_submit_report(hdev, report, USB_DIR_OUT);
-       }
-
-end:
-       if (ret)
-               kfree(td);
-
-       return ret;
-}
-
-static void egalax_remove(struct hid_device *hdev)
-{
-       hid_hw_stop(hdev);
-       kfree(hid_get_drvdata(hdev));
-       hid_set_drvdata(hdev, NULL);
-}
-
-static const struct hid_device_id egalax_devices[] = {
-       { HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
-       { 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) },
-       { }
-};
-MODULE_DEVICE_TABLE(hid, egalax_devices);
-
-static const struct hid_usage_id egalax_grabbed_usages[] = {
-       { HID_ANY_ID, HID_ANY_ID, HID_ANY_ID },
-       { HID_ANY_ID - 1, HID_ANY_ID - 1, HID_ANY_ID - 1}
-};
-
-static struct hid_driver egalax_driver = {
-       .name = "egalax-touch",
-       .id_table = egalax_devices,
-       .probe = egalax_probe,
-       .remove = egalax_remove,
-       .input_mapping = egalax_input_mapping,
-       .input_mapped = egalax_input_mapped,
-       .usage_table = egalax_grabbed_usages,
-       .event = egalax_event,
-};
-
-static int __init egalax_init(void)
-{
-       return hid_register_driver(&egalax_driver);
-}
-
-static void __exit egalax_exit(void)
-{
-       hid_unregister_driver(&egalax_driver);
-}
-
-module_init(egalax_init);
-module_exit(egalax_exit);
-

drivers/hid/hid-multitouch.c +18 -0

index 4518006..c2e79dc 100644
@@ -5,6 +5,12 @@
  *  Copyright (c) 2010-2011 Benjamin Tissoires <[email protected]>
  *  Copyright (c) 2010-2011 Ecole Nationale de l'Aviation Civile, France
  *
+ *  This code is partly based on hid-egalax.c:
+ *
+ *  Copyright (c) 2010 Stephane Chatty <[email protected]>
+ *  Copyright (c) 2010 Henrik Rydberg <[email protected]>
+ *  Copyright (c) 2010 Canonical, Ltd.
+ *
  */
 
  /*

@@ -37,6 +43,7 @@ MODULE_LICENSE("GPL");
  #define MT_QUIRK_SLOT_IS_CONTACTNUMBER (1 << 3)
  #define MT_QUIRK_VALID_IS_INRANGE      (1 << 4)
  #define MT_QUIRK_VALID_IS_CONFIDENCE   (1 << 5)
+#define MT_QUIRK_EGALAX_XYZ_FIXUP      (1 << 6)
 
  struct mt_slot {
        __s32 x, y, p, w, h;

@@ -70,6 +77,7 @@ struct mt_class {
  #define MT_CLS_DUAL_INRANGE_CONTACTID          2
  #define MT_CLS_DUAL_INRANGE_CONTACTNUMBER      3
  #define MT_CLS_CYPRESS                         4
+#define MT_CLS_EGALAX                          5
 
  /*
  * these device-dependent functions determine what slot corresponds

@@ -120,6 +128,14 @@ struct mt_class mt_classes[] = {
                        MT_QUIRK_CYPRESS,
                .maxcontacts = 10 },
 
+       { .name = MT_CLS_EGALAX,
+               .quirks =  MT_QUIRK_SLOT_IS_CONTACTID |
+                       MT_QUIRK_VALID_IS_INRANGE |
+                       MT_QUIRK_EGALAX_XYZ_FIXUP
+               .maxcontacts = 2,
+               .sn_move = 4096,
+               .sn_pressure = 32,
+       },
        { }
  };
 

@@ -147,11 +163,15 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
  {
        struct mt_device *td = hid_get_drvdata(hdev);
        struct mt_class *cls = td->mtclass;
+       __s32 quirks = cls->quirks;
+
        switch (usage->hid & HID_USAGE_PAGE) {
 

       case HID_UP_GENDESK:
               switch (usage->hid) {
               case HID_GD_X:
+                       if (quirks & MT_QUIRK_EGALAX_XYZ_FIXUP)
+                               field->logical_maximum = 32760;

                       hid_map_usage(hi, usage, bit, max, EV_ABS, ABS_MT_POSITION_X); set_abs(hi->input, ABS_MT_POSITION_X, field,

drivers/hid/hid-multitouch.c +0 -0

@@ -161,6 +181,8 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                        td->last_slot_field = usage->hid;
                        return 1;

               case HID_GD_Y:
+                       if (quirks & MT_QUIRK_EGALAX_XYZ_FIXUP)
+                               field->logical_maximum = 32760;

                       hid_map_usage(hi, usage, bit, max, EV_ABS, ABS_MT_POSITION_Y); set_abs(hi->input, ABS_MT_POSITION_Y, field,

drivers/hid/hid-multitouch.c +0 -0

@@ -204,6 +226,8 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                        td->last_slot_field = usage->hid;
                        return 1;

               case HID_DG_TIPPRESSURE:
+                       if (quirks & MT_QUIRK_EGALAX_XYZ_FIXUP)
+                               field->logical_minimum = 0;

                       hid_map_usage(hi, usage, bit, max, EV_ABS, ABS_MT_PRESSURE); set_abs(hi->input, ABS_MT_PRESSURE, field,

drivers/hid/hid-multitouch.c +19 -1

@@ -487,6 +511,25 @@ static const struct hid_device_id mt_devices[] = {
                HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
                        USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH) },
 
+       /* Resistive eGalax devices */
+       {  .driver_data = MT_CLS_EGALAX,
+               HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
+       {  .driver_data = MT_CLS_EGALAX,
+               HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
+
+       /* Capacitive eGalax devices */
+       {  .driver_data = MT_CLS_EGALAX,
+               HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
+       {  .driver_data = MT_CLS_EGALAX,
+               HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
+       {  .driver_data = MT_CLS_EGALAX,
+               HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
+
        { }
  };
  MODULE_DEVICE_TABLE(hid, mt_devices);
--

1.7.4.1

Quoted 8 lines

drivers/hid/hid-multitouch.c +2 -0

@@ -147,11 +163,15 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
  {
        struct mt_device *td = hid_get_drvdata(hdev);
        struct mt_class *cls = td->mtclass;
+       __s32 quirks = cls->quirks;
+
        switch (usage->hid & HID_USAGE_PAGE) {
 

Quoted 5 lines

       case HID_UP_GENDESK:
               switch (usage->hid) {
               case HID_GD_X:
+                       if (quirks & MT_QUIRK_EGALAX_XYZ_FIXUP)
+                               field->logical_maximum = 32760;

Please do not add numerical constants in a generic code. If I want to override the values for another device, I'll have to rename your quirk to MT_QUIRK_EGALAX_XYZ_FIXUP_WITH_0_32760_0_32760_0_x and add mine. These values have to be moved in the MT_CLS.

Quoted 3 lines

               case HID_DG_TIPPRESSURE:
+                       if (quirks & MT_QUIRK_EGALAX_XYZ_FIXUP)
+                               field->logical_minimum = 0;

No really need for the test and the quirk. In addition, here you do not override logical_max. This shows that the quirk is not MT_QUIRK_EGALAX_XYZ_FIXUP but the combination of MT_QUIRK_EGALAX_XY_FIXUP and MT_QUIRK_EGALAX_Z_MIN_FIXUP. Just drop it here.

Quoted 8 lines

Quoted 8 lines

drivers/hid/hid-multitouch.c +2 -0

@@ -147,11 +163,15 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
  {
        struct mt_device *td = hid_get_drvdata(hdev);
        struct mt_class *cls = td->mtclass;
+       __s32 quirks = cls->quirks;
+
        switch (usage->hid & HID_USAGE_PAGE) {
 

Quoted 10 lines

Quoted 5 lines

       case HID_UP_GENDESK:
               switch (usage->hid) {
               case HID_GD_X:
+                       if (quirks & MT_QUIRK_EGALAX_XYZ_FIXUP)
+                               field->logical_maximum = 32760;

Please do not add numerical constants in a generic code. If I want to override the values for another device, I'll have to rename your quirk to MT_QUIRK_EGALAX_XYZ_FIXUP_WITH_0_32760_0_32760_0_x and add mine. These values have to be moved in the MT_CLS.

It is a specific value used for a specific code path, no need to over-generalize.  The quirk name could be specialized even more, i suppose, but the point is that it makes the hid-multitouch driver do exactly what is done in the hid-egalax driver, and it is easy to prove that there are no side effects for other devices.

Quoted 10 lines

Quoted 4 lines

               case HID_DG_TIPPRESSURE:
+                       if (quirks & MT_QUIRK_EGALAX_XYZ_FIXUP)
+                               field->logical_minimum = 0;

No really need for the test and the quirk. In addition, here you do not override logical_max. This shows that the quirk is not MT_QUIRK_EGALAX_XYZ_FIXUP but the combination of MT_QUIRK_EGALAX_XY_FIXUP and  MT_QUIRK_EGALAX_Z_MIN_FIXUP. Just drop it here.

The added code path simply reflects what is in the hid-egalax driver. It is true that the statement _probably_ works for other devices as well, but it cannot be proven just by looking at the code. Also, we have no known additional case where it is needed.

I am trying to think of a better name for the quirk, but frankly, I think it already says what it needs to say.

Quoted 10 lines

Quoted 4 lines

Please do not add numerical constants in a generic code. If I want to override the values for another device, I'll have to rename your quirk to MT_QUIRK_EGALAX_XYZ_FIXUP_WITH_0_32760_0_32760_0_x and add mine. These values have to be moved in the MT_CLS.

It is a specific value used for a specific code path, no need to over-generalize.  The quirk name could be specialized even more, i suppose, but the point is that it makes the hid-multitouch driver do exactly what is done in the hid-egalax driver, and it is easy to prove that there are no side effects for other devices.

Or it's a generic code path for generic devices: if someone want to do the same thing that have been done in hid-egalax (correct the logical min/max reported by the device), this could be done.

Concerning the prove, I'm pretty sure we can manage to prove that both solutions are equivalent as the current code already relies on the fact that static struct are null initialized.

Quoted 10 lines

Quoted 9 lines

Quoted 3 lines

               case HID_DG_TIPPRESSURE:
+                       if (quirks & MT_QUIRK_EGALAX_XYZ_FIXUP)
+                               field->logical_minimum = 0;

No really need for the test and the quirk. In addition, here you do not override logical_max. This shows that the quirk is not MT_QUIRK_EGALAX_XYZ_FIXUP but the combination of MT_QUIRK_EGALAX_XY_FIXUP and  MT_QUIRK_EGALAX_Z_MIN_FIXUP. Just drop it here.

Quoted 4 lines

The added code path simply reflects what is in the hid-egalax driver. It is true that the statement _probably_ works for other devices as well, but it cannot be proven just by looking at the code. Also, we have no known additional case where it is needed.

I didn't told to remove the test just by looking at the code. I'm taking in account all the devices that have been reported to us:
http://lii-enac.fr/en/architecture/linux-input/multitouch-devices.html
Among all of them, only asus, egalax (capacitive and resistive), mosart (the same as asus), and stantum reports pressure. Asus and mosart set only the logical maximum -> logical minimum is therefore at 0.
Stantum does not set the min/max -> logical minimum is at 0 too. EGalax set the minimum at 1 -> in your patch, you explained that was a bug for the upper layers.

Quoted 2 lines

I am trying to think of a better name for the quirk, but frankly, I think it already says what it needs to say.

What about MT_QUIRK_XYZ_CORRECTIONS_FOR_SPECIAL_EGALAX_DEVICES?

Hi,

Except for a missing comma, Henriks patch works fine for me and I would be glad to have it submitted. So feel free to add my SIGNED-OFF-BY. (Or should I repost the patch?)

Greetings and thanks to all,
Richard

--- snip ---

drivers/hid/hid-multitouch.c +0 -0

index 57575ff..ee01e65 100644
@@ -131,7 +131,7 @@ struct mt_class mt_classes[] = {
        { .name = MT_CLS_EGALAX,

               .quirks =  MT_QUIRK_SLOT_IS_CONTACTID | MT_QUIRK_VALID_IS_INRANGE |
-                       MT_QUIRK_EGALAX_XYZ_FIXUP
+                       MT_QUIRK_EGALAX_XYZ_FIXUP, .maxcontacts = 2,
               .sn_move = 4096,
               .sn_pressure = 32,

--
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

On Fri, Mar 11, 2011 at 7:53 AM, Benjamin Tissoires <[email protected]> wrote:
Hi Richard,

I'm really sorry, but it's a NACK for me:
what ever Henrik said, I do not want to have numerical constants throughout the code. It would be the open door to many others. The reason we have "mt_class" is to regroup each per-device parameters in it. So there is no need to introduce those constants everywhere.

Quoted 9 lines

On Fri, Mar 11, 2011 at 7:53 AM, Benjamin Tissoires <[email protected]> wrote:
Hi Richard,

I'm really sorry, but it's a NACK for me:
what ever Henrik said, I do not want to have numerical constants throughout the code. It would be the open door to many others. The reason we have "mt_class" is to regroup each per-device parameters in it. So there is no need to introduce those constants everywhere.

Hm, so should I make a patch that applies on top of Henriks "Send events per slot if CONTACTCOUNT is missing"  and uses the generic XY fixup of my v3 patch?

Hi Richard,

Quoted 10 lines · Richard Nauber

Quoted 9 lines

On Fri, Mar 11, 2011 at 7:53 AM, Benjamin Tissoires <[email protected]> wrote:
Hi Richard,

I'm really sorry, but it's a NACK for me:
what ever Henrik said, I do not want to have numerical constants throughout the code. It would be the open door to many others. The reason we have "mt_class" is to regroup each per-device parameters in it. So there is no need to introduce those constants everywhere.

Quoted 4 lines

Hm, so should I make a patch that applies on top of Henriks "Send events per slot if CONTACTCOUNT is missing"  and uses the generic XY fixup of my v3 patch?

I would say so. Please just change the name of the field .axis by a better name.

Hi,

Except for a missing comma, Henriks patch works fine for me and I would be glad to have it submitted. So feel free to add my SIGNED-OFF-BY. (Or should I repost the patch?)

drivers/hid/hid-egalax.c deleted +0 -273

- *
- */
-
-/*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#include <linux/device.h>
-#include <linux/hid.h>
-#include <linux/module.h>
-#include <linux/usb.h>
-#include <linux/input/mt.h>
-#include <linux/slab.h>
-#include "usbhid/usbhid.h"
-
-MODULE_AUTHOR("Stephane Chatty <[email protected]>");
-MODULE_DESCRIPTION("eGalax dual-touch panel");
-MODULE_LICENSE("GPL");
-
-#include "hid-ids.h"
-
-#define MAX_SLOTS		2
-
-/* estimated signal-to-noise ratios */
-#define SN_MOVE			4096
-#define SN_PRESSURE		32
-
-struct egalax_data {
-	int valid;
-	int slot;
-	int touch;
-	int x, y, z;
-};
-
-static void set_abs(struct input_dev *input, unsigned int code,
-		    struct hid_field *field, int snratio)
-{
-	int fmin = field->logical_minimum;
-	int fmax = field->logical_maximum;
-	int fuzz = snratio ? (fmax - fmin) / snratio : 0;
-	input_set_abs_params(input, code, fmin, fmax, fuzz, 0);
-}
-
-static int egalax_input_mapping(struct hid_device *hdev, struct hid_input *hi,
-		struct hid_field *field, struct hid_usage *usage,
-		unsigned long **bit, int *max)
-{
-	struct input_dev *input = hi->input;
-
-	switch (usage->hid & HID_USAGE_PAGE) {
-
-	case HID_UP_GENDESK:
-		switch (usage->hid) {
-		case HID_GD_X:
-			field->logical_maximum = 32760;
-			hid_map_usage(hi, usage, bit, max,
-					EV_ABS, ABS_MT_POSITION_X);
-			set_abs(input, ABS_MT_POSITION_X, field, SN_MOVE);
-			/* touchscreen emulation */
-			set_abs(input, ABS_X, field, SN_MOVE);
-			return 1;
-		case HID_GD_Y:
-			field->logical_maximum = 32760;
-			hid_map_usage(hi, usage, bit, max,
-					EV_ABS, ABS_MT_POSITION_Y);
-			set_abs(input, ABS_MT_POSITION_Y, field, SN_MOVE);
-			/* touchscreen emulation */
-			set_abs(input, ABS_Y, field, SN_MOVE);
-			return 1;
-		}
-		return 0;
-
-	case HID_UP_DIGITIZER:
-		switch (usage->hid) {
-		case HID_DG_TIPSWITCH:
-			/* touchscreen emulation */
-			hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);
-			input_set_capability(input, EV_KEY, BTN_TOUCH);
-			return 1;
-		case HID_DG_INRANGE:
-		case HID_DG_CONFIDENCE:
-		case HID_DG_CONTACTCOUNT:
-		case HID_DG_CONTACTMAX:
-			return -1;
-		case HID_DG_CONTACTID:
-			input_mt_init_slots(input, MAX_SLOTS);
-			return 1;
-		case HID_DG_TIPPRESSURE:
-			field->logical_minimum = 0;
-			hid_map_usage(hi, usage, bit, max,
-					EV_ABS, ABS_MT_PRESSURE);
-			set_abs(input, ABS_MT_PRESSURE, field, SN_PRESSURE);
-			/* touchscreen emulation */
-			set_abs(input, ABS_PRESSURE, field, SN_PRESSURE);
-			return 1;
-		}
-		return 0;
-	}
-
-	/* ignore others (from other reports we won't get anyway) */
-	return -1;
-}
-
-static int egalax_input_mapped(struct hid_device *hdev, struct hid_input *hi,
-		struct hid_field *field, struct hid_usage *usage,
-		unsigned long **bit, int *max)
-{
-	/* tell hid-input to skip setup of these event types */
-	if (usage->type == EV_KEY || usage->type == EV_ABS)
-		set_bit(usage->type, hi->input->evbit);
-	return -1;
-}
-
-/*
- * this function is called when a whole finger has been parsed,
- * so that it can decide what to send to the input layer.
- */
-static void egalax_filter_event(struct egalax_data *td, struct input_dev *input)
-{
-	input_mt_slot(input, td->slot);
-	input_mt_report_slot_state(input, MT_TOOL_FINGER, td->touch);
-	if (td->touch) {
-		input_event(input, EV_ABS, ABS_MT_POSITION_X, td->x);
-		input_event(input, EV_ABS, ABS_MT_POSITION_Y, td->y);
-		input_event(input, EV_ABS, ABS_MT_PRESSURE, td->z);
-	}
-	input_mt_report_pointer_emulation(input, true);
-}
-
-static int egalax_event(struct hid_device *hid, struct hid_field *field,
-				struct hid_usage *usage, __s32 value)
-{
-	struct egalax_data *td = hid_get_drvdata(hid);
-
-	/* Note, eGalax has two product lines: the first is resistive and
-	 * uses a standard parallel multitouch protocol (product ID ==
-	 * 48xx).  The second is capacitive and uses an unusual "serial"
-	 * protocol with a different message for each multitouch finger
-	 * (product ID == 72xx).
-	 */
-	if (hid->claimed & HID_CLAIMED_INPUT) {
-		struct input_dev *input = field->hidinput->input;
-
-		switch (usage->hid) {
-		case HID_DG_INRANGE:
-			td->valid = value;
-			break;
-		case HID_DG_CONFIDENCE:
-			/* avoid interference from generic hidinput handling */
-			break;
-		case HID_DG_TIPSWITCH:
-			td->touch = value;
-			break;
-		case HID_DG_TIPPRESSURE:
-			td->z = value;
-			break;
-		case HID_DG_CONTACTID:
-			td->slot = clamp_val(value, 0, MAX_SLOTS - 1);
-			break;
-		case HID_GD_X:
-			td->x = value;
-			break;
-		case HID_GD_Y:
-			td->y = value;
-			/* this is the last field in a finger */
-			if (td->valid)
-				egalax_filter_event(td, input);
-			break;
-		case HID_DG_CONTACTCOUNT:
-			/* touch emulation: this is the last field in a frame */
-			break;
-
-		default:
-			/* fallback to the generic hidinput handling */
-			return 0;
-		}
-	}
-
-	/* we have handled the hidinput part, now remains hiddev */
-	if (hid->claimed & HID_CLAIMED_HIDDEV && hid->hiddev_hid_event)
-		hid->hiddev_hid_event(hid, field, usage, value);
-
-	return 1;
-}
-
-static int egalax_probe(struct hid_device *hdev, const struct hid_device_id *id)
-{
-	int ret;
-	struct egalax_data *td;
-	struct hid_report *report;
-
-	td = kzalloc(sizeof(struct egalax_data), GFP_KERNEL);
-	if (!td) {
-		hid_err(hdev, "cannot allocate eGalax data\n");
-		return -ENOMEM;
-	}
-	hid_set_drvdata(hdev, td);
-
-	ret = hid_parse(hdev);
-	if (ret)
-		goto end;
-
-	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
-	if (ret)
-		goto end;
-
-	report = hdev->report_enum[HID_FEATURE_REPORT].report_id_hash[5]; 
-	if (report) {
-		report->field[0]->value[0] = 2;
-		usbhid_submit_report(hdev, report, USB_DIR_OUT);
-	}
-
-end:
-	if (ret)
-		kfree(td);
-
-	return ret;
-}
-
-static void egalax_remove(struct hid_device *hdev)
-{
-	hid_hw_stop(hdev);
-	kfree(hid_get_drvdata(hdev));
-	hid_set_drvdata(hdev, NULL);
-}
-
-static const struct hid_device_id egalax_devices[] = {
-	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
-	{ 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) },
-	{ }
-};
-MODULE_DEVICE_TABLE(hid, egalax_devices);
-
-static const struct hid_usage_id egalax_grabbed_usages[] = {
-	{ HID_ANY_ID, HID_ANY_ID, HID_ANY_ID },
-	{ HID_ANY_ID - 1, HID_ANY_ID - 1, HID_ANY_ID - 1}
-};
-
-static struct hid_driver egalax_driver = {
-	.name = "egalax-touch",
-	.id_table = egalax_devices,
-	.probe = egalax_probe,
-	.remove = egalax_remove,
-	.input_mapping = egalax_input_mapping,
-	.input_mapped = egalax_input_mapped,
-	.usage_table = egalax_grabbed_usages,
-	.event = egalax_event,
-};
-
-static int __init egalax_init(void)
-{
-	return hid_register_driver(&egalax_driver);
-}
-
-static void __exit egalax_exit(void)
-{
-	hid_unregister_driver(&egalax_driver);
-}
-
-module_init(egalax_init);
-module_exit(egalax_exit);
-

drivers/hid/hid-multitouch.c +45 -3

index 07d3183..58df924 100644
@@ -36,6 +36,8 @@ MODULE_LICENSE("GPL");
 #define MT_QUIRK_SLOT_IS_CONTACTNUMBER	(1 << 3)
 #define MT_QUIRK_VALID_IS_INRANGE	(1 << 4)
 #define MT_QUIRK_VALID_IS_CONFIDENCE	(1 << 5)
+#define MT_QUIRK_EGALAX			(1 << 6)
+
 
 struct mt_slot {
 	__s32 x, y, p, w, h;

@@ -69,6 +71,7 @@ struct mt_class {
 #define MT_CLS_DUAL1	2
 #define MT_CLS_DUAL2	3
 #define MT_CLS_CYPRESS	4
+#define MT_CLS_EGALAX	5
 
 /*
  * these device-dependent functions determine what slot corresponds

@@ -118,7 +121,13 @@ struct mt_class mt_classes[] = {
 		.quirks = MT_QUIRK_NOT_SEEN_MEANS_UP |
 			MT_QUIRK_CYPRESS,
 		.maxcontacts = 10 },
-
+	{ .name = MT_CLS_EGALAX,
+		.quirks =  MT_QUIRK_SLOT_IS_CONTACTID |
+			MT_QUIRK_VALID_IS_INRANGE |
+			MT_QUIRK_EGALAX,
+		.maxcontacts = 2 ,
+		.sn_move = 4096,
+		.sn_pressure = 32},
 	{ }
 };
 

@@ -146,9 +155,16 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 {
 	struct mt_device *td = hid_get_drvdata(hdev);
 	struct mt_class *cls = td->mtclass;
+
 	switch (usage->hid & HID_USAGE_PAGE) {
 
 	case HID_UP_GENDESK:
+
+	/* fix up the X/Y limits for egalax devices*/
+	if ((cls->quirks & MT_QUIRK_EGALAX)
+		&& ((usage->hid == HID_GD_X) || (usage->hid == HID_GD_Y)))
+			field->logical_maximum = 32760;
+
 		switch (usage->hid) {
 		case HID_GD_X:
 			hid_map_usage(hi, usage, bit, max,

@@ -203,6 +219,10 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 			td->last_slot_field = usage->hid;
 			return 1;
 		case HID_DG_TIPPRESSURE:
+			/* fix up the pressure range for egalax devices*/
+			if (cls->quirks & MT_QUIRK_EGALAX)
+				field->logical_minimum = 0;
+
 			hid_map_usage(hi, usage, bit, max,
 					EV_ABS, ABS_MT_PRESSURE);
 			set_abs(hi->input, ABS_MT_PRESSURE, field,

@@ -269,8 +289,10 @@ static void mt_complete_slot(struct mt_device *td)
 
 		if (slotnum >= 0 && slotnum < td->mtclass->maxcontacts)
 			td->slots[slotnum] = td->curdata;
+
 	}
 	td->num_received++;
+
 }
 
 

@@ -366,12 +388,15 @@ static int mt_event(struct hid_device *hid, struct hid_field *field,
 		if (usage->hid == td->last_slot_field)
 			mt_complete_slot(td);
 
-		if (field->index == td->last_field_index
+		if ((field->index == td->last_field_index
 			&& td->num_received >= td->num_expected)
+			|| ((quirks & MT_QUIRK_EGALAX)
+				&& (usage->hid == td->last_slot_field)))
+			/* for egalax devices: emit an event for every finger
+			to work around the wrong last_field_index in the report*/
 			mt_emit_event(td, field->hidinput->input);
 
 	}
-
 	/* we have handled the hidinput part, now remains hiddev */
 	if (hid->claimed & HID_CLAIMED_HIDDEV && hid->hiddev_hid_event)
 		hid->hiddev_hid_event(hid, field, usage, value);

@@ -478,6 +503,23 @@ static const struct hid_device_id mt_devices[] = {
 		HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
 			USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH) },
 
+	/* eGalax devices */
+	{  .driver_data = MT_CLS_EGALAX,
+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
+	{  .driver_data = MT_CLS_EGALAX,
+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
+	{  .driver_data = MT_CLS_EGALAX,
+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
+	{  .driver_data = MT_CLS_EGALAX,
+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
+	{  .driver_data = MT_CLS_EGALAX,
+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
+
 	{ }
 };
 MODULE_DEVICE_TABLE(hid, mt_devices);

Signature · 1 line

1.7.1