From be5aff099b351a0dde6365c200662a5152be3648 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Thu, 26 Aug 2010 20:28:02 +0200 Subject: reworked driver now using MT slots Supports 20 fingers Signed-off-by: Henrik Rydberg --- usr/src/dkms_source_tree/hid-3m-pct.c | 174 +++++++++++++++++++--------------- 1 file changed, 99 insertions(+), 75 deletions(-) diff --git a/usr/src/dkms_source_tree/hid-3m-pct.c b/usr/src/dkms_source_tree/hid-3m-pct.c index fc57c0c..1a6b02b 100644 --- a/usr/src/dkms_source_tree/hid-3m-pct.c +++ b/usr/src/dkms_source_tree/hid-3m-pct.c @@ -24,22 +24,30 @@ MODULE_LICENSE("GPL"); #include "hid-ids.h" +#define MAX_SLOTS 20 +#define MAX_TRACKING_ID 0xfff +#define SN_MOVE 2048 +#define SN_WIDTH 512 + struct mmm_finger { __s32 x, y, w, h; - __u8 rank; - bool touch, valid; + int touch, valid; + int last_touch, id; }; struct mmm_data { - struct mmm_finger f[10]; - __u8 curid, num; - bool touch, valid; + struct mmm_finger f[MAX_SLOTS]; + int touch, valid; + int slot; }; static int mmm_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; + int delta = field->logical_maximum - field->logical_minimum; + switch (usage->hid & HID_USAGE_PAGE) { case HID_UP_BUTTON: @@ -49,19 +57,27 @@ static int mmm_input_mapping(struct hid_device *hdev, struct hid_input *hi, switch (usage->hid) { case HID_GD_X: hid_map_usage(hi, usage, bit, max, - EV_ABS, ABS_MT_POSITION_X); - /* touchscreen emulation */ - input_set_abs_params(hi->input, ABS_X, - field->logical_minimum, - field->logical_maximum, 0, 0); + EV_ABS, ABS_MT_POSITION_X); + input_set_abs_params(input, ABS_MT_POSITION_X, + field->logical_minimum, + field->logical_maximum, + delta / SN_MOVE, 0); + input_set_abs_params(input, ABS_X, + field->logical_minimum, + field->logical_maximum, + delta / SN_MOVE, 0); return 1; case HID_GD_Y: hid_map_usage(hi, usage, bit, max, - EV_ABS, ABS_MT_POSITION_Y); - /* touchscreen emulation */ - input_set_abs_params(hi->input, ABS_Y, - field->logical_minimum, - field->logical_maximum, 0, 0); + EV_ABS, ABS_MT_POSITION_Y); + input_set_abs_params(input, ABS_MT_POSITION_Y, + field->logical_minimum, + field->logical_maximum, + delta / SN_MOVE, 0); + input_set_abs_params(input, ABS_Y, + field->logical_minimum, + field->logical_maximum, + delta / SN_MOVE, 0); return 1; } return 0; @@ -79,23 +95,37 @@ static int mmm_input_mapping(struct hid_device *hdev, struct hid_input *hi, case HID_DG_CONFIDENCE: return -1; 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_WIDTH: hid_map_usage(hi, usage, bit, max, - EV_ABS, ABS_MT_TOUCH_MAJOR); + EV_ABS, ABS_MT_TOUCH_MAJOR); + input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, + field->logical_minimum, + field->logical_maximum, + delta / SN_WIDTH, 0); return 1; case HID_DG_HEIGHT: hid_map_usage(hi, usage, bit, max, - EV_ABS, ABS_MT_TOUCH_MINOR); - input_set_abs_params(hi->input, ABS_MT_ORIENTATION, - 1, 1, 0, 0); + EV_ABS, ABS_MT_TOUCH_MINOR); + input_set_abs_params(input, ABS_MT_TOUCH_MINOR, + field->logical_minimum, + field->logical_maximum, + delta / SN_WIDTH, 0); + input_set_abs_params(input, ABS_MT_ORIENTATION, + 1, 1, 0, 0); return 1; case HID_DG_CONTACTID: - field->logical_maximum = 59; + field->logical_maximum = MAX_TRACKING_ID; hid_map_usage(hi, usage, bit, max, - EV_ABS, ABS_MT_TRACKING_ID); + EV_ABS, ABS_MT_TRACKING_ID); + input_set_abs_params(input, ABS_MT_TRACKING_ID, + 0, MAX_TRACKING_ID, 0, 0); + if (!input->mt) { + input_mt_create_slots(input, MAX_SLOTS); + input_set_events_per_packet(input, 150); + } return 1; } /* let hid-input decide for the others */ @@ -114,9 +144,8 @@ static int mmm_input_mapped(struct hid_device *hdev, struct hid_input *hi, unsigned long **bit, int *max) { if (usage->type == EV_KEY || usage->type == EV_ABS) - clear_bit(usage->code, *bit); - - return 0; + set_bit(usage->type, hi->input->evbit); + return -1; } /* @@ -125,44 +154,42 @@ static int mmm_input_mapped(struct hid_device *hdev, struct hid_input *hi, */ static void mmm_filter_event(struct mmm_data *md, struct input_dev *input) { - int i, index = -1; - - /* - * we need to iterate on all fingers to decide if we have a press - * or a release event in our touchscreen emulation. - */ - for (i = 0; i < 10; ++i) { + static int trkid; + int i, sx = 0, sy = 0, count = 0; + for (i = 0; i < MAX_SLOTS; ++i) { struct mmm_finger *f = &md->f[i]; - if (!f->valid) { - /* this finger is just placeholder data, ignore */ - } else if (f->touch) { - /* this finger is on the screen */ - int wide = (f->w > f->h); - input_event(input, EV_ABS, ABS_MT_TRACKING_ID, i); + if (!f->valid) + continue; + input_mt_slot(input, i); + if (f->touch) { + int wide = f->w > f->h; + int major = wide ? f->w : f->h; + int minor = wide ? f->h : f->w; input_event(input, EV_ABS, ABS_MT_POSITION_X, f->x); input_event(input, EV_ABS, ABS_MT_POSITION_Y, f->y); input_event(input, EV_ABS, ABS_MT_ORIENTATION, wide); - input_event(input, EV_ABS, ABS_MT_TOUCH_MAJOR, - wide ? f->w : f->h); - input_event(input, EV_ABS, ABS_MT_TOUCH_MINOR, - wide ? f->h : f->w); - input_mt_sync(input); - - if (index < 0) - index = i; + input_event(input, EV_ABS, ABS_MT_TOUCH_MAJOR, major); + input_event(input, EV_ABS, ABS_MT_TOUCH_MINOR, minor); + if (!f->last_touch) + f->id = trkid++ & MAX_TRACKING_ID; + if (!count++) + sx = f->x, sy = f->y; + } else { + f->id = -1; } - f->valid = 0; + input_event(input, EV_ABS, ABS_MT_TRACKING_ID, f->id); + f->last_touch = f->touch; } - - /* touchscreen emulation */ - if (index >= 0) { - struct mmm_finger *f = &md->f[index]; - input_event(input, EV_KEY, BTN_TOUCH, 1); - input_event(input, EV_ABS, ABS_X, f->x); - input_event(input, EV_ABS, ABS_Y, f->y); - } else { - input_event(input, EV_KEY, BTN_TOUCH, 0); + for (i = 0; i < MAX_SLOTS; ++i) { + struct mmm_finger *f = &md->f[i]; + f->valid = f->touch = 0; + } + input_report_key(input, BTN_TOUCH, count > 0); + if (count > 0) { + input_report_abs(input, ABS_X, sx); + input_report_abs(input, ABS_Y, sy); } + input_sync(input); } /* @@ -181,37 +208,32 @@ static int mmm_event(struct hid_device *hid, struct hid_field *field, if (hid->claimed & HID_CLAIMED_INPUT) { struct input_dev *input = field->hidinput->input; switch (usage->hid) { + case HID_DG_CONTACTCOUNT: + break; case HID_DG_TIPSWITCH: md->touch = value; break; case HID_DG_CONFIDENCE: + if (md->valid && !value) + mmm_filter_event(md, input); md->valid = value; break; - case HID_DG_WIDTH: - if (md->valid) - md->f[md->curid].w = value; - break; - case HID_DG_HEIGHT: - if (md->valid) - md->f[md->curid].h = value; - break; case HID_DG_CONTACTID: - if (md->valid) { - md->curid = value; - md->f[value].touch = md->touch; - md->f[value].valid = 1; - } + md->slot = value < MAX_SLOTS ? value : 0; + md->f[md->slot].touch = md->touch; + md->f[md->slot].valid = md->valid; break; case HID_GD_X: - if (md->valid) - md->f[md->curid].x = value; + md->f[md->slot].x = value; break; case HID_GD_Y: - if (md->valid) - md->f[md->curid].y = value; + md->f[md->slot].y = value; break; - case HID_DG_CONTACTCOUNT: - mmm_filter_event(md, input); + case HID_DG_WIDTH: + md->f[md->slot].w = value; + break; + case HID_DG_HEIGHT: + md->f[md->slot].h = value; break; } } @@ -228,6 +250,8 @@ static int mmm_probe(struct hid_device *hdev, const struct hid_device_id *id) int ret; struct mmm_data *md; + hdev->quirks |= HID_QUIRK_NO_INPUT_SYNC; + md = kzalloc(sizeof(struct mmm_data), GFP_KERNEL); if (!md) { dev_err(&hdev->dev, "cannot allocate 3M data\n"); -- cgit v1.2.3