Hi Guys,
here is the respin of the 2 patches sent before on the list.
The first one is a rework of the last_field_index, and the second actually adds PenMount devices.
Cheers,
Benjamin
the current implementation requires the devices to report
HID_DG_CONTACTCOUNT to set the last_field_index value.
However, devices reporting in serial mode (DWAV and PenMount)
do not send this field.
Other devices (3M) add other fields in the reports descriptor
that are not multitouch related at the end, thus the need to
add a special case in the default case when handling events.
A first work around has been set up but with PenMount devices,
we have reached the limit.
The idea is to calculate the last_field_index by relying only on
multitouch fields the device send. This allows us to remove
the handling of non-multitouch events in hid-multitouch, and
guarantee that the function mt_emit_event is always called.
Signed-off-by: Benjamin Tissoires <[email protected]>
---
drivers/hid/hid-multitouch.c | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 0175f85..6005e78 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -210,6 +210,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
/* touchscreen emulation */
set_abs(hi->input, ABS_X, field, cls->sn_move);
td->last_slot_field = usage->hid;
+ td->last_field_index = field->index;
return 1;
case HID_GD_Y:
if (quirks & MT_QUIRK_EGALAX_XYZ_FIXUP)
@@ -221,6 +222,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
/* touchscreen emulation */
set_abs(hi->input, ABS_Y, field, cls->sn_move);
td->last_slot_field = usage->hid;
+ td->last_field_index = field->index;
return 1;
}
return 0;
@@ -229,18 +231,22 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
switch (usage->hid) {
case HID_DG_INRANGE:
td->last_slot_field = usage->hid;
+ td->last_field_index = field->index;
return 1;
case HID_DG_CONFIDENCE:
td->last_slot_field = usage->hid;
+ td->last_field_index = field->index;
return 1;
case HID_DG_TIPSWITCH:
hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);
input_set_capability(hi->input, EV_KEY, BTN_TOUCH);
td->last_slot_field = usage->hid;
+ td->last_field_index = field->index;
return 1;
case HID_DG_CONTACTID:
input_mt_init_slots(hi->input, td->maxcontacts);
td->last_slot_field = usage->hid;
+ td->last_field_index = field->index;
return 1;
case HID_DG_WIDTH:
hid_map_usage(hi, usage, bit, max,
@@ -248,6 +254,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
set_abs(hi->input, ABS_MT_TOUCH_MAJOR, field,
cls->sn_width);
td->last_slot_field = usage->hid;
+ td->last_field_index = field->index;
return 1;
case HID_DG_HEIGHT:
hid_map_usage(hi, usage, bit, max,
@@ -257,6 +264,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
input_set_abs_params(hi->input,
ABS_MT_ORIENTATION, 0, 1, 0, 0);
td->last_slot_field = usage->hid;
+ td->last_field_index = field->index;
return 1;
case HID_DG_TIPPRESSURE:
if (quirks & MT_QUIRK_EGALAX_XYZ_FIXUP)
@@ -269,13 +277,15 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
set_abs(hi->input, ABS_PRESSURE, field,
cls->sn_pressure);
td->last_slot_field = usage->hid;
+ td->last_field_index = field->index;
return 1;
case HID_DG_CONTACTCOUNT:
- td->last_field_index = field->report->maxfield - 1;
+ td->last_field_index = field->index;
return 1;
case HID_DG_CONTACTMAX:
/* we don't set td->last_slot_field as contactcount and
* contact max are global to the report */
+ td->last_field_index = field->index;
return -1;
}
/* let hid-input decide for the others */
@@ -424,23 +434,12 @@ static int mt_event(struct hid_device *hid, struct hid_field *field,
break;
default:
- if (td->last_field_index
- && field->index == td->last_field_index)
- /* we reach here when the last field in the
- * report is not related to multitouch.
- * This is not good. As a temporary solution,
- * we trigger our mt event completion and
- * ignore the field.
- */
- break;
/* fallback to the generic hidinput handling */
return 0;
}
if (usage->hid == td->last_slot_field) {
mt_complete_slot(td);
- if (!td->last_field_index)
- mt_emit_event(td, field->hidinput->input);
}
if (field->index == td->last_field_index
--
1.7.4.2
Signed-off-by: John Sung <[email protected]>
Signed-off-by: Benjamin Tissoires <[email protected]>
---
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-ids.h | 3 +++
drivers/hid/hid-multitouch.c | 8 ++++++++
3 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index c3d6626..6e31b9f 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1438,6 +1438,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ 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_PKB1700) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_PCI) },
{ 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) },
{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index d485894..252aeba 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -484,6 +484,9 @@
#define USB_VENDOR_ID_PANTHERLORD 0x0810
#define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK 0x0001
+#define USB_VENDOR_ID_PENMOUNT 0x14e1
+#define USB_DEVICE_ID_PENMOUNT_PCI 0x3500
+
#define USB_VENDOR_ID_PETALYNX 0x18b1
#define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE 0x0037
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 6005e78..51b5d27 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -89,6 +89,7 @@ struct mt_class {
#define MT_CLS_EGALAX 5
#define MT_CLS_STANTUM 6
#define MT_CLS_3M 7
+#define MT_CLS_CONFIDENCE 8
#define MT_DEFAULT_MAXCONTACT 10
@@ -156,6 +157,8 @@ struct mt_class mt_classes[] = {
.sn_move = 2048,
.sn_width = 128,
.sn_height = 128 },
+ { .name = MT_CLS_CONFIDENCE,
+ .quirks = MT_QUIRK_VALID_IS_CONFIDENCE },
{ }
};
@@ -584,6 +587,11 @@ static const struct hid_device_id mt_devices[] = {
HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
+ /* PenMount panels */
+ { .driver_data = MT_CLS_CONFIDENCE,
+ HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT,
+ USB_DEVICE_ID_PENMOUNT_PCI) },
+
/* PixCir-based panels */
{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,
HID_USB_DEVICE(USB_VENDOR_ID_HANVON,
--
1.7.4.2
On Thu, 21 Apr 2011, Benjamin Tissoires wrote:
> Signed-off-by: John Sung <[email protected]>
> Signed-off-by: Benjamin Tissoires <[email protected]>
Hi Benjamin,
thanks for respinning the pathes.
This one is though missing
- changelog
- From: line (I believe we'd like to keep John's authorship)
Thanks.
> ---
> drivers/hid/hid-core.c | 1 +
> drivers/hid/hid-ids.h | 3 +++
> drivers/hid/hid-multitouch.c | 8 ++++++++
> 3 files changed, 12 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index c3d6626..6e31b9f 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -1438,6 +1438,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
> { 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_PKB1700) },
> { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_PCI) },
> { 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) },
> { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index d485894..252aeba 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -484,6 +484,9 @@
> #define USB_VENDOR_ID_PANTHERLORD 0x0810
> #define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK 0x0001
>
> +#define USB_VENDOR_ID_PENMOUNT 0x14e1
> +#define USB_DEVICE_ID_PENMOUNT_PCI 0x3500
> +
> #define USB_VENDOR_ID_PETALYNX 0x18b1
> #define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE 0x0037
>
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index 6005e78..51b5d27 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -89,6 +89,7 @@ struct mt_class {
> #define MT_CLS_EGALAX 5
> #define MT_CLS_STANTUM 6
> #define MT_CLS_3M 7
> +#define MT_CLS_CONFIDENCE 8
>
> #define MT_DEFAULT_MAXCONTACT 10
>
> @@ -156,6 +157,8 @@ struct mt_class mt_classes[] = {
> .sn_move = 2048,
> .sn_width = 128,
> .sn_height = 128 },
> + { .name = MT_CLS_CONFIDENCE,
> + .quirks = MT_QUIRK_VALID_IS_CONFIDENCE },
>
> { }
> };
> @@ -584,6 +587,11 @@ static const struct hid_device_id mt_devices[] = {
> HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
> USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
>
> + /* PenMount panels */
> + { .driver_data = MT_CLS_CONFIDENCE,
> + HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT,
> + USB_DEVICE_ID_PENMOUNT_PCI) },
> +
> /* PixCir-based panels */
> { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,
> HID_USB_DEVICE(USB_VENDOR_ID_HANVON,
> --
> 1.7.4.2
>
--
Jiri Kosina
SUSE Labs, Novell Inc.
On Thu, Apr 21, 2011 at 14:18, Jiri Kosina <[email protected]> wrote:
> On Thu, 21 Apr 2011, Benjamin Tissoires wrote:
>
>> Signed-off-by: John Sung <[email protected]>
>> Signed-off-by: Benjamin Tissoires <[email protected]>
>
> Hi Benjamin,
>
> thanks for respinning the pathes.
>
> This one is though missing
>
> - changelog
> - From: line (I believe we'd like to keep John's authorship)
Yep, sorry for that, I just seen it in my triple check after sending
it (grrr...). Do you want me to resend it, or we wait for John to do
it?
Cheers,
Benjamin
>
> Thanks.
>
>> ---
>> ?drivers/hid/hid-core.c ? ? ? | ? ?1 +
>> ?drivers/hid/hid-ids.h ? ? ? ?| ? ?3 +++
>> ?drivers/hid/hid-multitouch.c | ? ?8 ++++++++
>> ?3 files changed, 12 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
>> index c3d6626..6e31b9f 100644
>> --- a/drivers/hid/hid-core.c
>> +++ b/drivers/hid/hid-core.c
>> @@ -1438,6 +1438,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
>> ? ? ? { 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_PKB1700) },
>> ? ? ? { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
>> + ? ? { HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_PCI) },
>> ? ? ? { 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) },
>> ? ? ? { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
>> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
>> index d485894..252aeba 100644
>> --- a/drivers/hid/hid-ids.h
>> +++ b/drivers/hid/hid-ids.h
>> @@ -484,6 +484,9 @@
>> ?#define USB_VENDOR_ID_PANTHERLORD ? ?0x0810
>> ?#define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK ?0x0001
>>
>> +#define USB_VENDOR_ID_PENMOUNT ? ? ? ? ? ? ? 0x14e1
>> +#define USB_DEVICE_ID_PENMOUNT_PCI ? 0x3500
>> +
>> ?#define USB_VENDOR_ID_PETALYNX ? ? ? ? ? ? ? 0x18b1
>> ?#define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE 0x0037
>>
>> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
>> index 6005e78..51b5d27 100644
>> --- a/drivers/hid/hid-multitouch.c
>> +++ b/drivers/hid/hid-multitouch.c
>> @@ -89,6 +89,7 @@ struct mt_class {
>> ?#define MT_CLS_EGALAX ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?5
>> ?#define MT_CLS_STANTUM ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? 6
>> ?#define MT_CLS_3M ? ? ? ? ? ? ? ? ? ? ? ? ? ?7
>> +#define MT_CLS_CONFIDENCE ? ? ? ? ? ? ? ? ? ?8
>>
>> ?#define MT_DEFAULT_MAXCONTACT ? ? ? ?10
>>
>> @@ -156,6 +157,8 @@ struct mt_class mt_classes[] = {
>> ? ? ? ? ? ? ? .sn_move = 2048,
>> ? ? ? ? ? ? ? .sn_width = 128,
>> ? ? ? ? ? ? ? .sn_height = 128 },
>> + ? ? { .name = MT_CLS_CONFIDENCE,
>> + ? ? ? ? ? ? .quirks = MT_QUIRK_VALID_IS_CONFIDENCE },
>>
>> ? ? ? { }
>> ?};
>> @@ -584,6 +587,11 @@ static const struct hid_device_id mt_devices[] = {
>> ? ? ? ? ? ? ? HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
>> ? ? ? ? ? ? ? ? ? ? ? USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
>>
>> + ? ? /* PenMount panels */
>> + ? ? { .driver_data = MT_CLS_CONFIDENCE,
>> + ? ? ? ? ? ? HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT,
>> + ? ? ? ? ? ? ? ? ? ? USB_DEVICE_ID_PENMOUNT_PCI) },
>> +
>> ? ? ? /* PixCir-based panels */
>> ? ? ? { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,
>> ? ? ? ? ? ? ? HID_USB_DEVICE(USB_VENDOR_ID_HANVON,
>> --
>> 1.7.4.2
>>
>
> --
> Jiri Kosina
> SUSE Labs, Novell Inc.
> --
> 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 Thu, Apr 21, 2011 at 02:15:59PM +0200, Benjamin Tissoires wrote:
> the current implementation requires the devices to report
> HID_DG_CONTACTCOUNT to set the last_field_index value.
> However, devices reporting in serial mode (DWAV and PenMount)
> do not send this field.
> Other devices (3M) add other fields in the reports descriptor
> that are not multitouch related at the end, thus the need to
> add a special case in the default case when handling events.
>
> A first work around has been set up but with PenMount devices,
> we have reached the limit.
>
> The idea is to calculate the last_field_index by relying only on
> multitouch fields the device send. This allows us to remove
> the handling of non-multitouch events in hid-multitouch, and
> guarantee that the function mt_emit_event is always called.
>
> Signed-off-by: Benjamin Tissoires <[email protected]>
> ---
Reviewed-and-tested-by: Henrik Rydberg <[email protected]>
Thanks,
Henrik
On Thu, Apr 21, 2011 at 02:16:00PM +0200, Benjamin Tissoires wrote:
> Signed-off-by: John Sung <[email protected]>
> Signed-off-by: Benjamin Tissoires <[email protected]>
> ---
Acked-by: Henrik Rydberg <[email protected]>
Thanks,
Henrik
From: John Sung <[email protected]>
This patch adds PenMount support to hid-multitouch.
A new class MT_CLS_CONFIDENCE is defined for PenMount,
since it uses HID_DG_CONFIDENCE as the valid flag.
Signed-off-by: John Sung <[email protected]>
Signed-off-by: Benjamin Tissoires <[email protected]>
Acked-by: Henrik Rydberg <[email protected]>
---
Hi Guys,
this is the final version (I hope so).
I changed the from, restored back the Kconfig part and reintroduced the commit message.
John, I hope it's good for you.
Cheers,
Benjamin
drivers/hid/Kconfig | 1 +
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-ids.h | 3 +++
drivers/hid/hid-multitouch.c | 8 ++++++++
4 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 996ae3a..8058cf1 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -313,6 +313,7 @@ config HID_MULTITOUCH
- Cypress TrueTouch panels
- Hanvon dual touch panels
- IrTouch Infrared USB panels
+ - PenMount dual touch panels
- Pixcir dual touch panels
- 'Sensing Win7-TwoFinger' panel by GeneralTouch
- eGalax dual-touch panels, including the
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index c3d6626..6e31b9f 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1438,6 +1438,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ 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_PKB1700) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_PCI) },
{ 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) },
{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index d485894..252aeba 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -484,6 +484,9 @@
#define USB_VENDOR_ID_PANTHERLORD 0x0810
#define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK 0x0001
+#define USB_VENDOR_ID_PENMOUNT 0x14e1
+#define USB_DEVICE_ID_PENMOUNT_PCI 0x3500
+
#define USB_VENDOR_ID_PETALYNX 0x18b1
#define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE 0x0037
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 6005e78..51b5d27 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -89,6 +89,7 @@ struct mt_class {
#define MT_CLS_EGALAX 5
#define MT_CLS_STANTUM 6
#define MT_CLS_3M 7
+#define MT_CLS_CONFIDENCE 8
#define MT_DEFAULT_MAXCONTACT 10
@@ -156,6 +157,8 @@ struct mt_class mt_classes[] = {
.sn_move = 2048,
.sn_width = 128,
.sn_height = 128 },
+ { .name = MT_CLS_CONFIDENCE,
+ .quirks = MT_QUIRK_VALID_IS_CONFIDENCE },
{ }
};
@@ -584,6 +587,11 @@ static const struct hid_device_id mt_devices[] = {
HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
+ /* PenMount panels */
+ { .driver_data = MT_CLS_CONFIDENCE,
+ HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT,
+ USB_DEVICE_ID_PENMOUNT_PCI) },
+
/* PixCir-based panels */
{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,
HID_USB_DEVICE(USB_VENDOR_ID_HANVON,
--
1.7.4.2
On Thu, 21 Apr 2011, Henrik Rydberg wrote:
> > the current implementation requires the devices to report
> > HID_DG_CONTACTCOUNT to set the last_field_index value.
> > However, devices reporting in serial mode (DWAV and PenMount)
> > do not send this field.
> > Other devices (3M) add other fields in the reports descriptor
> > that are not multitouch related at the end, thus the need to
> > add a special case in the default case when handling events.
> >
> > A first work around has been set up but with PenMount devices,
> > we have reached the limit.
> >
> > The idea is to calculate the last_field_index by relying only on
> > multitouch fields the device send. This allows us to remove
> > the handling of non-multitouch events in hid-multitouch, and
> > guarantee that the function mt_emit_event is always called.
> >
> > Signed-off-by: Benjamin Tissoires <[email protected]>
> > ---
>
> Reviewed-and-tested-by: Henrik Rydberg <[email protected]>
Applied, thanks guys.
--
Jiri Kosina
SUSE Labs, Novell Inc.
On Thu, 21 Apr 2011, Benjamin Tissoires wrote:
> From: John Sung <[email protected]>
>
> This patch adds PenMount support to hid-multitouch.
> A new class MT_CLS_CONFIDENCE is defined for PenMount,
> since it uses HID_DG_CONFIDENCE as the valid flag.
>
> Signed-off-by: John Sung <[email protected]>
> Signed-off-by: Benjamin Tissoires <[email protected]>
> Acked-by: Henrik Rydberg <[email protected]>
>
> ---
>
> Hi Guys,
>
> this is the final version (I hope so).
> I changed the from, restored back the Kconfig part and reintroduced the commit message.
> John, I hope it's good for you.
>
> Cheers,
> Benjamin
>
> drivers/hid/Kconfig | 1 +
> drivers/hid/hid-core.c | 1 +
> drivers/hid/hid-ids.h | 3 +++
> drivers/hid/hid-multitouch.c | 8 ++++++++
> 4 files changed, 13 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
> index 996ae3a..8058cf1 100644
> --- a/drivers/hid/Kconfig
> +++ b/drivers/hid/Kconfig
> @@ -313,6 +313,7 @@ config HID_MULTITOUCH
> - Cypress TrueTouch panels
> - Hanvon dual touch panels
> - IrTouch Infrared USB panels
> + - PenMount dual touch panels
> - Pixcir dual touch panels
> - 'Sensing Win7-TwoFinger' panel by GeneralTouch
> - eGalax dual-touch panels, including the
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index c3d6626..6e31b9f 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -1438,6 +1438,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
> { 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_PKB1700) },
> { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_PCI) },
> { 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) },
> { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index d485894..252aeba 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -484,6 +484,9 @@
> #define USB_VENDOR_ID_PANTHERLORD 0x0810
> #define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK 0x0001
>
> +#define USB_VENDOR_ID_PENMOUNT 0x14e1
> +#define USB_DEVICE_ID_PENMOUNT_PCI 0x3500
> +
> #define USB_VENDOR_ID_PETALYNX 0x18b1
> #define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE 0x0037
>
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index 6005e78..51b5d27 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -89,6 +89,7 @@ struct mt_class {
> #define MT_CLS_EGALAX 5
> #define MT_CLS_STANTUM 6
> #define MT_CLS_3M 7
> +#define MT_CLS_CONFIDENCE 8
>
> #define MT_DEFAULT_MAXCONTACT 10
>
> @@ -156,6 +157,8 @@ struct mt_class mt_classes[] = {
> .sn_move = 2048,
> .sn_width = 128,
> .sn_height = 128 },
> + { .name = MT_CLS_CONFIDENCE,
> + .quirks = MT_QUIRK_VALID_IS_CONFIDENCE },
>
> { }
> };
> @@ -584,6 +587,11 @@ static const struct hid_device_id mt_devices[] = {
> HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
> USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
>
> + /* PenMount panels */
> + { .driver_data = MT_CLS_CONFIDENCE,
> + HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT,
> + USB_DEVICE_ID_PENMOUNT_PCI) },
> +
> /* PixCir-based panels */
> { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,
> HID_USB_DEVICE(USB_VENDOR_ID_HANVON,
I have modified the commit message slightly, to reflect that Benjamin has
rebased John's original patch on top of last_index_field changes, and
applied.
Thanks a lot everybody.
--
Jiri Kosina
SUSE Labs, Novell Inc.
On Fri, Apr 22, 2011 at 11:57, Jiri Kosina <[email protected]> wrote:
> On Thu, 21 Apr 2011, Benjamin Tissoires wrote:
>
>> From: John Sung <[email protected]>
>>
>> This patch adds PenMount support to hid-multitouch.
>> A new class MT_CLS_CONFIDENCE is defined for PenMount,
>> since it uses HID_DG_CONFIDENCE as the valid flag.
>>
>> Signed-off-by: John Sung <[email protected]>
>> Signed-off-by: Benjamin Tissoires <[email protected]>
>> Acked-by: Henrik Rydberg <[email protected]>
>>
>> ---
>>
>> Hi Guys,
>>
>> this is the final version (I hope so).
>> I changed the from, restored back the Kconfig part and reintroduced the commit message.
>> John, I hope it's good for you.
>>
>> Cheers,
>> Benjamin
>>
>> ?drivers/hid/Kconfig ? ? ? ? ?| ? ?1 +
>> ?drivers/hid/hid-core.c ? ? ? | ? ?1 +
>> ?drivers/hid/hid-ids.h ? ? ? ?| ? ?3 +++
>> ?drivers/hid/hid-multitouch.c | ? ?8 ++++++++
>> ?4 files changed, 13 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
>> index 996ae3a..8058cf1 100644
>> --- a/drivers/hid/Kconfig
>> +++ b/drivers/hid/Kconfig
>> @@ -313,6 +313,7 @@ config HID_MULTITOUCH
>> ? ? ? ? - Cypress TrueTouch panels
>> ? ? ? ? - Hanvon dual touch panels
>> ? ? ? ? - IrTouch Infrared USB panels
>> + ? ? ? - PenMount dual touch panels
>> ? ? ? ? - Pixcir dual touch panels
>> ? ? ? ? - 'Sensing Win7-TwoFinger' panel by GeneralTouch
>> ? ? ? ? ? ?- eGalax dual-touch panels, including the
>> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
>> index c3d6626..6e31b9f 100644
>> --- a/drivers/hid/hid-core.c
>> +++ b/drivers/hid/hid-core.c
>> @@ -1438,6 +1438,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
>> ? ? ? { 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_PKB1700) },
>> ? ? ? { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
>> + ? ? { HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_PCI) },
>> ? ? ? { 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) },
>> ? ? ? { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
>> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
>> index d485894..252aeba 100644
>> --- a/drivers/hid/hid-ids.h
>> +++ b/drivers/hid/hid-ids.h
>> @@ -484,6 +484,9 @@
>> ?#define USB_VENDOR_ID_PANTHERLORD ? ?0x0810
>> ?#define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK ?0x0001
>>
>> +#define USB_VENDOR_ID_PENMOUNT ? ? ? ? ? ? ? 0x14e1
>> +#define USB_DEVICE_ID_PENMOUNT_PCI ? 0x3500
>> +
>> ?#define USB_VENDOR_ID_PETALYNX ? ? ? ? ? ? ? 0x18b1
>> ?#define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE 0x0037
>>
>> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
>> index 6005e78..51b5d27 100644
>> --- a/drivers/hid/hid-multitouch.c
>> +++ b/drivers/hid/hid-multitouch.c
>> @@ -89,6 +89,7 @@ struct mt_class {
>> ?#define MT_CLS_EGALAX ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?5
>> ?#define MT_CLS_STANTUM ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? 6
>> ?#define MT_CLS_3M ? ? ? ? ? ? ? ? ? ? ? ? ? ?7
>> +#define MT_CLS_CONFIDENCE ? ? ? ? ? ? ? ? ? ?8
>>
>> ?#define MT_DEFAULT_MAXCONTACT ? ? ? ?10
>>
>> @@ -156,6 +157,8 @@ struct mt_class mt_classes[] = {
>> ? ? ? ? ? ? ? .sn_move = 2048,
>> ? ? ? ? ? ? ? .sn_width = 128,
>> ? ? ? ? ? ? ? .sn_height = 128 },
>> + ? ? { .name = MT_CLS_CONFIDENCE,
>> + ? ? ? ? ? ? .quirks = MT_QUIRK_VALID_IS_CONFIDENCE },
>>
>> ? ? ? { }
>> ?};
>> @@ -584,6 +587,11 @@ static const struct hid_device_id mt_devices[] = {
>> ? ? ? ? ? ? ? HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
>> ? ? ? ? ? ? ? ? ? ? ? USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
>>
>> + ? ? /* PenMount panels */
>> + ? ? { .driver_data = MT_CLS_CONFIDENCE,
>> + ? ? ? ? ? ? HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT,
>> + ? ? ? ? ? ? ? ? ? ? USB_DEVICE_ID_PENMOUNT_PCI) },
>> +
>> ? ? ? /* PixCir-based panels */
>> ? ? ? { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,
>> ? ? ? ? ? ? ? HID_USB_DEVICE(USB_VENDOR_ID_HANVON,
>
> I have modified the commit message slightly, to reflect that Benjamin has
> rebased John's original patch on top of last_index_field changes, and
> applied.
>
That's good for me ;-)
Thanks a lot Jiri,
Benjamin
> Thanks a lot everybody.
>
> --
> Jiri Kosina
> SUSE Labs, Novell Inc.
>