From patchwork Wed Oct 13 22:30:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephane Chatty X-Patchwork-Id: 251471 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9DMeeOP019479 for ; Wed, 13 Oct 2010 22:40:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753297Ab0JMWke (ORCPT ); Wed, 13 Oct 2010 18:40:34 -0400 Received: from 89-230.252-81.static-ip.oleane.fr ([81.252.230.89]:41596 "EHLO smtp.lii-enac.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751523Ab0JMWke (ORCPT ); Wed, 13 Oct 2010 18:40:34 -0400 Received: by smtp.lii-enac.fr (DoorWays, from userid 2000) id 9B86E9522A; Thu, 14 Oct 2010 00:30:35 +0200 (CEST) Date: Thu, 14 Oct 2010 00:30:35 +0200 To: rydberg@euromail.se, dmitry.torokhov@gmail.com, jkosina@suse.cz, linux-input@vger.kernel.org Cc: chatty@enac.fr Subject: [PATCH 1/4] hid-multitouch: support for PixCir-based panels User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Message-Id: <20101013223035.9B86E9522A@smtp.lii-enac.fr> From: chatty@lii-enac.fr (Stephane Chatty) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 13 Oct 2010 22:40:40 +0000 (UTC) diff -rupN a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c --- a/drivers/hid/hid-core.c 2010-10-14 00:30:43.992936922 +0200 +++ b/drivers/hid/hid-core.c 2010-10-14 01:29:28.009936912 +0200 @@ -1290,6 +1290,7 @@ static const struct hid_device_id hid_bl { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) }, { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) }, + { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) }, @@ -1312,6 +1313,7 @@ static const struct hid_device_id hid_bl { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, + { HID_USB_DEVICE(USB_VENDOR_ID_HANVON, USB_DEVICE_ID_HANVON_MULTITOUCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) }, diff -rupN a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h --- a/drivers/hid/hid-ids.h 2010-10-14 00:27:48.288936922 +0200 +++ b/drivers/hid/hid-ids.h 2010-10-14 01:29:37.273937194 +0200 @@ -132,6 +132,7 @@ #define USB_DEVICE_ID_BTC_EMPREX_REMOTE_2 0x5577 #define USB_VENDOR_ID_CANDO 0x2087 +#define USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH 0x0703 #define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01 #define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03 @@ -295,6 +296,9 @@ #define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003 #define USB_DEVICE_ID_GYRATION_REMOTE_3 0x0008 +#define USB_VENDOR_ID_HANVON 0x20b3 +#define USB_DEVICE_ID_HANVON_MULTITOUCH 0x0a18 + #define USB_VENDOR_ID_HAPP 0x078b #define USB_DEVICE_ID_UGCI_DRIVING 0x0010 #define USB_DEVICE_ID_UGCI_FLYING 0x0020 diff -rupN a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c --- a/drivers/hid/hid-multitouch.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/hid/hid-multitouch.c 2010-10-14 01:30:59.009937031 +0200 @@ -0,0 +1,398 @@ +/* + * HID driver for multitouch panels + * + * Copyright (c) 2010 Stephane Chatty + * + */ + +/* + * 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 +#include +#include +#include +#include +#include "usbhid/usbhid.h" + + +MODULE_AUTHOR("Stephane Chatty "); +MODULE_DESCRIPTION("HID multitouch panels"); +MODULE_LICENSE("GPL"); + +#include "hid-ids.h" + +#define MAX_TRKID USHRT_MAX + + +struct mt_slot { + __u16 x, y, p; + bool valid; /* did we just get valid contact data for this slot? */ + bool prev_valid;/* was this slot previously valid/active? */ + __u16 trkid; /* the tracking ID that was assigned to this slot */ +}; + +struct mt_device { + struct mt_class *mtclass;/* our mt device class */ + struct mt_slot *slots; /* buffer with all slots */ + __u8 optfeatures; /* what optional mt features do we get? */ + __u8 curcontact; /* index of the current contact */ + __u8 maxcontact; /* expected last contact index */ + bool curvalid; /* is the current contact valid? */ + __u16 curcontactid; /* ContactID of the current contact */ + __u16 curx, cury, curp; /* other attributes of the current contact */ + __u16 lasttrkid; /* the last tracking ID we assigned */ +}; + +struct mt_class { + int (*compute_slot)(struct mt_device *); + __u8 maxcontacts; + __s8 inputmode; /* InputMode HID feature number, -1 if non-existent */ +}; + +/* classes of device behavior */ +#define DUAL1 0 + +/* contact data that only some devices report */ +#define PRESSURE (1 << 0) +#define SIZE (1 << 1) + +/* + * these device-dependent functions determine what slot corresponds + * to a valid contact that was just read. + */ + +static int slot_from_contactid(struct mt_device *td) +{ + return td->curcontactid; +} + +struct mt_class mt_classes[] = { + /* DUAL1 */ { slot_from_contactid, 2, -1 }, +}; + + +static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi, + struct hid_field *field, struct hid_usage *usage, + unsigned long **bit, int *max) +{ + struct mt_device *td = hid_get_drvdata(hdev); + switch (usage->hid & HID_USAGE_PAGE) { + + case HID_UP_GENDESK: + switch (usage->hid) { + case HID_GD_X: + hid_map_usage(hi, usage, bit, max, + EV_ABS, ABS_MT_POSITION_X); + input_set_abs_params(hi->input, ABS_MT_POSITION_X, + field->logical_minimum, + field->logical_maximum, 0, 0); + /* touchscreen emulation */ + input_set_abs_params(hi->input, ABS_X, + field->logical_minimum, + field->logical_maximum, 0, 0); + return 1; + case HID_GD_Y: + hid_map_usage(hi, usage, bit, max, + EV_ABS, ABS_MT_POSITION_Y); + input_set_abs_params(hi->input, ABS_MT_POSITION_Y, + field->logical_minimum, + field->logical_maximum, 0, 0); + /* touchscreen emulation */ + input_set_abs_params(hi->input, ABS_Y, + field->logical_minimum, + field->logical_maximum, 0, 0); + return 1; + } + return 0; + + case HID_UP_DIGITIZER: + switch (usage->hid) { + case HID_DG_INRANGE: + case HID_DG_CONFIDENCE: + 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); + return 1; + case HID_DG_CONTACTID: + hid_map_usage(hi, usage, bit, max, + EV_ABS, ABS_MT_TRACKING_ID); + input_set_abs_params(hi->input, ABS_MT_TRACKING_ID, + 0, MAX_TRKID, 0, 0); + if (!hi->input->mt) + input_mt_create_slots(hi->input, + td->mtclass->maxcontacts); + + case HID_DG_TIPPRESSURE: + hid_map_usage(hi, usage, bit, max, + EV_ABS, ABS_MT_PRESSURE); + td->optfeatures |= PRESSURE; + return 1; + case HID_DG_CONTACTCOUNT: + case HID_DG_CONTACTMAX: + return -1; + } + /* let hid-input decide for the others */ + return 0; + + case 0xff000000: + /* we do not want to map these: no input-oriented meaning */ + return -1; + } + + return 0; +} + +static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi, + struct hid_field *field, struct hid_usage *usage, + unsigned long **bit, int *max) +{ + 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 contact has been processed, + * so that it can assign it to a slot and store the data there + */ +static void mt_complete_slot(struct mt_device *td) +{ + if (td->curvalid) { + struct mt_slot *slot; + int slotnum = td->mtclass->compute_slot(td); + if (slotnum >= 0 && slotnum <= td->mtclass->maxcontacts - 1) { + slot = td->slots + slotnum; + + slot->valid = true; + slot->x = td->curx; + slot->y = td->cury; + slot->p = td->curp; + } + } + td->curcontact++; +} + + +/* + * this function is called when a whole packet has been received and processed, + * so that it can decide what to send to the input layer. + */ +static void mt_emit_event(struct mt_device *td, struct input_dev *input) +{ + struct mt_slot *oldest = 0; /* touchscreen emulation: oldest touch */ + int i; + + for (i = 0; i < td->mtclass->maxcontacts; ++i) { + struct mt_slot *s = td->slots + i; + if (!s->valid) { + /* + * this slot does not contain useful data, + * notify its closure if necessary + */ + if (s->prev_valid) { + input_mt_slot(input, i); + input_event(input, EV_ABS, + ABS_MT_TRACKING_ID, -1); + s->prev_valid = false; + } + continue; + } + if (!s->prev_valid) + s->trkid = td->lasttrkid++; + input_mt_slot(input, i); + input_event(input, EV_ABS, ABS_MT_TRACKING_ID, s->trkid); + input_event(input, EV_ABS, ABS_MT_POSITION_X, s->x); + input_event(input, EV_ABS, ABS_MT_POSITION_Y, s->y); + if (td->optfeatures & PRESSURE) + input_event(input, EV_ABS, ABS_MT_PRESSURE, s->p); + s->prev_valid = true; + s->valid = false; + + /* touchscreen emulation: is this the oldest contact? */ + if (!oldest || ((s->trkid - oldest->trkid) & (SHRT_MAX + 1))) + oldest = s; + } + + /* touchscreen emulation */ + if (oldest) { + input_event(input, EV_KEY, BTN_TOUCH, 1); + input_event(input, EV_ABS, ABS_X, oldest->x); + input_event(input, EV_ABS, ABS_Y, oldest->y); + } else { + input_event(input, EV_KEY, BTN_TOUCH, 0); + } + + input_sync(input); + td->curcontact = 0; +} + + + +static int mt_event(struct hid_device *hid, struct hid_field *field, + struct hid_usage *usage, __s32 value) +{ + struct mt_device *td = hid_get_drvdata(hid); + + if (hid->claimed & HID_CLAIMED_INPUT) { + struct input_dev *input = field->hidinput->input; + switch (usage->hid) { + case HID_DG_INRANGE: + break; + case HID_DG_TIPSWITCH: + td->curvalid = value; + break; + case HID_DG_CONFIDENCE: + break; + case HID_DG_CONTACTID: + td->curcontactid = value; + break; + case HID_DG_TIPPRESSURE: + td->curp = value; + break; + case HID_GD_X: + td->curx = value; + break; + case HID_GD_Y: + td->cury = value; + /* works for devices where Y is last in a contact */ + mt_complete_slot(td); + break; + case HID_DG_CONTACTCOUNT: + /* + * works for devices where contact count is + * the last field in a message + */ + if (value) + td->maxcontact = value - 1; + if (td->curcontact > td->maxcontact) + mt_emit_event(td, input); + break; + case HID_DG_CONTACTMAX: + 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 mt_probe(struct hid_device *hdev, const struct hid_device_id *id) +{ + int ret; + struct mt_device *td; + +#if 0 + /* + * todo: activate this as soon as the patch where the quirk below + * is defined is commited. This will allow the driver to correctly + * support devices that emit events over several HID messages. + */ + hdev->quirks |= HID_QUIRK_NO_INPUT_SYNC; +#endif + + td = kzalloc(sizeof(struct mt_device), GFP_KERNEL); + if (!td) { + dev_err(&hdev->dev, "cannot allocate multitouch data\n"); + return -ENOMEM; + } + td->mtclass = mt_classes + id->driver_data; + td->slots = kzalloc(td->mtclass->maxcontacts * sizeof(struct mt_slot), + GFP_KERNEL); + if (!td->slots) { + dev_err(&hdev->dev, "cannot allocate multitouch data\n"); + ret = -ENOMEM; + goto fail; + } + hid_set_drvdata(hdev, td); + + ret = hid_parse(hdev); + if (ret != 0) + goto fail; + + ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT); + if (ret != 0) + goto fail; + + if (td->mtclass->inputmode >= 0) { + struct hid_report *r; + struct hid_report_enum *re = hdev->report_enum + + HID_FEATURE_REPORT; + r = re->report_id_hash[td->mtclass->inputmode]; + if (r) { + r->field[0]->value[0] = 0x02; + usbhid_submit_report(hdev, r, USB_DIR_OUT); + } + } + return 0; + +fail: + kfree(td); + return ret; +} + +static void mt_remove(struct hid_device *hdev) +{ + struct mt_device *td = hid_get_drvdata(hdev); + hid_hw_stop(hdev); + kfree(td->slots); + kfree(td); + hid_set_drvdata(hdev, NULL); +} + +static const struct hid_device_id mt_devices[] = { + + /* PixCir-based panels */ + { .driver_data = DUAL1, + HID_USB_DEVICE(USB_VENDOR_ID_HANVON, + USB_DEVICE_ID_HANVON_MULTITOUCH) }, + { .driver_data = DUAL1, + HID_USB_DEVICE(USB_VENDOR_ID_CANDO, + USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH) }, + + { } +}; +MODULE_DEVICE_TABLE(hid, mt_devices); + +static const struct hid_usage_id mt_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 mt_driver = { + .name = "hid-multitouch", + .id_table = mt_devices, + .probe = mt_probe, + .remove = mt_remove, + .input_mapping = mt_input_mapping, + .input_mapped = mt_input_mapped, + .usage_table = mt_grabbed_usages, + .event = mt_event, +}; + +static int __init mt_init(void) +{ + return hid_register_driver(&mt_driver); +} + +static void __exit mt_exit(void) +{ + hid_unregister_driver(&mt_driver); +} + +module_init(mt_init); +module_exit(mt_exit); + diff -rupN a/drivers/hid/Kconfig b/drivers/hid/Kconfig --- a/drivers/hid/Kconfig 2010-10-14 01:39:17.263936923 +0200 +++ b/drivers/hid/Kconfig 2010-10-14 01:42:37.964936879 +0200 @@ -264,6 +264,12 @@ config HID_MONTEREY ---help--- Support for Monterey Genius KB29E. +config HID_MULTITOUCH + tristate "HID Multitouch panels" + depends on USB_HID + ---help--- + Generic support for HID multitouch panels. + config HID_NTRIG tristate "NTrig" depends on USB_HID diff -rupN a/drivers/hid/Makefile b/drivers/hid/Makefile --- a/drivers/hid/Makefile 2010-10-14 01:38:27.873936922 +0200 +++ b/drivers/hid/Makefile 2010-10-14 01:40:25.571936977 +0200 @@ -43,6 +43,7 @@ obj-$(CONFIG_HID_MAGICMOUSE) += hid-m obj-$(CONFIG_HID_MICROSOFT) += hid-microsoft.o obj-$(CONFIG_HID_MONTEREY) += hid-monterey.o obj-$(CONFIG_HID_MOSART) += hid-mosart.o +obj-$(CONFIG_HID_MULTITOUCH) += hid-multitouch.o obj-$(CONFIG_HID_NTRIG) += hid-ntrig.o obj-$(CONFIG_HID_ORTEK) += hid-ortek.o obj-$(CONFIG_HID_PRODIKEYS) += hid-prodikeys.o