|
@@ -51,6 +51,7 @@ MODULE_LICENSE("GPL");
|
|
|
#define MT_QUIRK_VALID_IS_INRANGE (1 << 5)
|
|
|
#define MT_QUIRK_VALID_IS_CONFIDENCE (1 << 6)
|
|
|
#define MT_QUIRK_SLOT_IS_CONTACTID_MINUS_ONE (1 << 8)
|
|
|
+#define MT_QUIRK_NO_AREA (1 << 9)
|
|
|
|
|
|
struct mt_slot {
|
|
|
__s32 x, y, p, w, h;
|
|
@@ -115,6 +116,7 @@ struct mt_device {
|
|
|
#define MT_CLS_EGALAX_SERIAL 0x0104
|
|
|
#define MT_CLS_TOPSEED 0x0105
|
|
|
#define MT_CLS_PANASONIC 0x0106
|
|
|
+#define MT_CLS_FLATFROG 0x0107
|
|
|
|
|
|
#define MT_DEFAULT_MAXCONTACT 10
|
|
|
|
|
@@ -199,6 +201,12 @@ static struct mt_class mt_classes[] = {
|
|
|
.quirks = MT_QUIRK_NOT_SEEN_MEANS_UP,
|
|
|
.maxcontacts = 4 },
|
|
|
|
|
|
+ { .name = MT_CLS_FLATFROG,
|
|
|
+ .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP |
|
|
|
+ MT_QUIRK_NO_AREA,
|
|
|
+ .sn_move = 2048,
|
|
|
+ .maxcontacts = 40,
|
|
|
+ },
|
|
|
{ }
|
|
|
};
|
|
|
|
|
@@ -366,18 +374,21 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
|
|
|
case HID_DG_WIDTH:
|
|
|
hid_map_usage(hi, usage, bit, max,
|
|
|
EV_ABS, ABS_MT_TOUCH_MAJOR);
|
|
|
- set_abs(hi->input, ABS_MT_TOUCH_MAJOR, field,
|
|
|
- cls->sn_width);
|
|
|
+ if (!(cls->quirks & MT_QUIRK_NO_AREA))
|
|
|
+ set_abs(hi->input, ABS_MT_TOUCH_MAJOR, field,
|
|
|
+ cls->sn_width);
|
|
|
mt_store_field(usage, td, hi);
|
|
|
td->last_field_index = field->index;
|
|
|
return 1;
|
|
|
case HID_DG_HEIGHT:
|
|
|
hid_map_usage(hi, usage, bit, max,
|
|
|
EV_ABS, ABS_MT_TOUCH_MINOR);
|
|
|
- set_abs(hi->input, ABS_MT_TOUCH_MINOR, field,
|
|
|
- cls->sn_height);
|
|
|
- input_set_abs_params(hi->input,
|
|
|
+ if (!(cls->quirks & MT_QUIRK_NO_AREA)) {
|
|
|
+ set_abs(hi->input, ABS_MT_TOUCH_MINOR, field,
|
|
|
+ cls->sn_height);
|
|
|
+ input_set_abs_params(hi->input,
|
|
|
ABS_MT_ORIENTATION, 0, 1, 0, 0);
|
|
|
+ }
|
|
|
mt_store_field(usage, td, hi);
|
|
|
td->last_field_index = field->index;
|
|
|
return 1;
|
|
@@ -860,6 +871,11 @@ static const struct hid_device_id mt_devices[] = {
|
|
|
MT_USB_DEVICE(USB_VENDOR_ID_ELO,
|
|
|
USB_DEVICE_ID_ELO_TS2515) },
|
|
|
|
|
|
+ /* Flatfrog Panels */
|
|
|
+ { .driver_data = MT_CLS_FLATFROG,
|
|
|
+ MT_USB_DEVICE(USB_VENDOR_ID_FLATFROG,
|
|
|
+ USB_DEVICE_ID_MULTITOUCH_3200) },
|
|
|
+
|
|
|
/* GeneralTouch panel */
|
|
|
{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
|
|
|
MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,
|