HID: hid-multitouch: fix input mode feature command
Zytronic panels shows a new way of setting the Input Mode feature. This feature is put in the second usage in the HID feature, instead of the first, as the majority of the multitouch devices. This patch adds a detection step when the feature is presented to know where the feature is located in the report. We can then trigger the right command to the device. This removes the magic number "0" in the function mt_set_input_mode. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
4380d81988
commit
4aceed37e3
|
@ -83,6 +83,7 @@ struct mt_device {
|
||||||
unsigned last_field_index; /* last field index of the report */
|
unsigned last_field_index; /* last field index of the report */
|
||||||
unsigned last_slot_field; /* the last field of a slot */
|
unsigned last_slot_field; /* the last field of a slot */
|
||||||
__s8 inputmode; /* InputMode HID feature, -1 if non-existent */
|
__s8 inputmode; /* InputMode HID feature, -1 if non-existent */
|
||||||
|
__s8 inputmode_index; /* InputMode HID feature index in the report */
|
||||||
__s8 maxcontact_report_id; /* Maximum Contact Number HID feature,
|
__s8 maxcontact_report_id; /* Maximum Contact Number HID feature,
|
||||||
-1 if non-existent */
|
-1 if non-existent */
|
||||||
__u8 num_received; /* how many contacts we received */
|
__u8 num_received; /* how many contacts we received */
|
||||||
|
@ -260,10 +261,20 @@ static void mt_feature_mapping(struct hid_device *hdev,
|
||||||
struct hid_field *field, struct hid_usage *usage)
|
struct hid_field *field, struct hid_usage *usage)
|
||||||
{
|
{
|
||||||
struct mt_device *td = hid_get_drvdata(hdev);
|
struct mt_device *td = hid_get_drvdata(hdev);
|
||||||
|
int i;
|
||||||
|
|
||||||
switch (usage->hid) {
|
switch (usage->hid) {
|
||||||
case HID_DG_INPUTMODE:
|
case HID_DG_INPUTMODE:
|
||||||
td->inputmode = field->report->id;
|
td->inputmode = field->report->id;
|
||||||
|
td->inputmode_index = 0; /* has to be updated below */
|
||||||
|
|
||||||
|
for (i=0; i < field->maxusage; i++) {
|
||||||
|
if (field->usage[i].hid == usage->hid) {
|
||||||
|
td->inputmode_index = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case HID_DG_CONTACTMAX:
|
case HID_DG_CONTACTMAX:
|
||||||
td->maxcontact_report_id = field->report->id;
|
td->maxcontact_report_id = field->report->id;
|
||||||
|
@ -618,7 +629,7 @@ static void mt_set_input_mode(struct hid_device *hdev)
|
||||||
re = &(hdev->report_enum[HID_FEATURE_REPORT]);
|
re = &(hdev->report_enum[HID_FEATURE_REPORT]);
|
||||||
r = re->report_id_hash[td->inputmode];
|
r = re->report_id_hash[td->inputmode];
|
||||||
if (r) {
|
if (r) {
|
||||||
r->field[0]->value[0] = 0x02;
|
r->field[0]->value[td->inputmode_index] = 0x02;
|
||||||
usbhid_submit_report(hdev, r, USB_DIR_OUT);
|
usbhid_submit_report(hdev, r, USB_DIR_OUT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue