]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
HID: hid-multitouch: migrate Cando dual touch panels to hid-multitouch
authorBenjamin Tissoires <benjamin.tissoires@enac.fr>
Fri, 18 Mar 2011 13:27:54 +0000 (14:27 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 21 Mar 2011 16:05:51 +0000 (17:05 +0100)
This patch merges hid-cando into the unified multitouch driver.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Reviewed-by: Stéphane Chatty <chatty@enac.fr>
Reviewed-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-cando.c [deleted file]
drivers/hid/hid-multitouch.c

index 3c72f16e725ff198a42f72b2c0a0278e2a105522..1edb0bd72a6003a4c4b215162ed05c4db99ca247 100644 (file)
@@ -100,12 +100,6 @@ config HID_BELKIN
        ---help---
        Support for Belkin Flip KVM and Wireless keyboard.
 
-config HID_CANDO
-       tristate "Cando dual touch panel"
-       depends on USB_HID
-       ---help---
-       Support for Cando dual touch panel.
-
 config HID_CHERRY
        tristate "Cherry Cymotion keyboard" if EXPERT
        depends on USB_HID
@@ -320,6 +314,7 @@ config HID_MULTITOUCH
          Generic support for HID multitouch panels.
 
          Say Y here if you have one of the following devices:
+         - Cando dual touch panel
          - Cypress TrueTouch panels
          - Hanvon dual touch panels
          - IrTouch Infrared USB panels
index a13cb4e99fffc3ed09a2cae1b55ab83a06f4ebd0..f8b90e4e484147d42e270a0d54721ac343701cb3 100644 (file)
@@ -30,7 +30,6 @@ obj-$(CONFIG_HID_A4TECH)      += hid-a4tech.o
 obj-$(CONFIG_HID_ACRUX)                += hid-axff.o
 obj-$(CONFIG_HID_APPLE)                += hid-apple.o
 obj-$(CONFIG_HID_BELKIN)       += hid-belkin.o
-obj-$(CONFIG_HID_CANDO)                += hid-cando.o
 obj-$(CONFIG_HID_CHERRY)       += hid-cherry.o
 obj-$(CONFIG_HID_CHICONY)      += hid-chicony.o
 obj-$(CONFIG_HID_CYPRESS)      += hid-cypress.o
diff --git a/drivers/hid/hid-cando.c b/drivers/hid/hid-cando.c
deleted file mode 100644 (file)
index 1ea066c..0000000
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- *  HID driver for Cando dual-touch panels
- *
- *  Copyright (c) 2010 Stephane Chatty <chatty@enac.fr>
- *
- */
-
-/*
- * 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 <linux/device.h>
-#include <linux/hid.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-
-MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>");
-MODULE_DESCRIPTION("Cando dual-touch panel");
-MODULE_LICENSE("GPL");
-
-#include "hid-ids.h"
-
-struct cando_data {
-       __u16 x, y;
-       __u8 id;
-       __s8 oldest;            /* id of the oldest finger in previous frame */
-       bool valid;             /* valid finger data, or just placeholder? */
-       bool first;             /* is this the first finger in this frame? */
-       __s8 firstid;           /* id of the first finger in the frame */
-       __u16 firstx, firsty;   /* (x, y) of the first finger in the frame */
-};
-
-static int cando_input_mapping(struct hid_device *hdev, struct hid_input *hi,
-               struct hid_field *field, struct hid_usage *usage,
-               unsigned long **bit, int *max)
-{
-       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);
-                       /* 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);
-                       /* 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_TIPSWITCH:
-               case HID_DG_CONTACTMAX:
-                       return -1;
-               case HID_DG_INRANGE:
-                       /* touchscreen emulation */
-                       hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);
-                       return 1;
-               case HID_DG_CONTACTID:
-                       hid_map_usage(hi, usage, bit, max,
-                                       EV_ABS, ABS_MT_TRACKING_ID);
-                       return 1;
-               }
-               return 0;
-       }
-
-       return 0;
-}
-
-static int cando_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)
-               clear_bit(usage->code, *bit);
-
-       return 0;
-}
-
-/*
- * this function is called when a whole finger has been parsed,
- * so that it can decide what to send to the input layer.
- */
-static void cando_filter_event(struct cando_data *td, struct input_dev *input)
-{
-       td->first = !td->first; /* touchscreen emulation */
-
-       if (!td->valid) {
-               /*
-                * touchscreen emulation: if this is the second finger and
-                * the first was valid, the first was the oldest; if the
-                * first was not valid and there was a valid finger in the
-                * previous frame, this is a release.
-                */
-               if (td->first) {
-                       td->firstid = -1;
-               } else if (td->firstid >= 0) {
-                       input_event(input, EV_ABS, ABS_X, td->firstx);
-                       input_event(input, EV_ABS, ABS_Y, td->firsty);
-                       td->oldest = td->firstid;
-               } else if (td->oldest >= 0) {
-                       input_event(input, EV_KEY, BTN_TOUCH, 0);
-                       td->oldest = -1;
-               }
-
-               return;
-       }
-       
-       input_event(input, EV_ABS, ABS_MT_TRACKING_ID, td->id);
-       input_event(input, EV_ABS, ABS_MT_POSITION_X, td->x);
-       input_event(input, EV_ABS, ABS_MT_POSITION_Y, td->y);
-
-       input_mt_sync(input);
-
-       /*
-        * touchscreen emulation: if there was no touching finger previously,
-        * emit touch event
-        */
-       if (td->oldest < 0) {
-               input_event(input, EV_KEY, BTN_TOUCH, 1);
-               td->oldest = td->id;
-       }
-
-       /*
-        * touchscreen emulation: if this is the first finger, wait for the
-        * second; the oldest is then the second if it was the oldest already
-        * or if there was no first, the first otherwise.
-        */
-       if (td->first) {
-               td->firstx = td->x;
-               td->firsty = td->y;
-               td->firstid = td->id;
-       } else {
-               int x, y, oldest;
-               if (td->id == td->oldest || td->firstid < 0) {
-                       x = td->x;
-                       y = td->y;
-                       oldest = td->id;
-               } else {
-                       x = td->firstx;
-                       y = td->firsty;
-                       oldest = td->firstid;
-               }
-               input_event(input, EV_ABS, ABS_X, x);
-               input_event(input, EV_ABS, ABS_Y, y);
-               td->oldest = oldest;
-       }
-}
-
-
-static int cando_event(struct hid_device *hid, struct hid_field *field,
-                               struct hid_usage *usage, __s32 value)
-{
-       struct cando_data *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:
-                       td->valid = value;
-                       break;
-               case HID_DG_CONTACTID:
-                       td->id = value;
-                       break;
-               case HID_GD_X:
-                       td->x = value;
-                       break;
-               case HID_GD_Y:
-                       td->y = value;
-                       cando_filter_event(td, input);
-                       break;
-               case HID_DG_TIPSWITCH:
-                       /* avoid interference from generic hidinput handling */
-                       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 cando_probe(struct hid_device *hdev, const struct hid_device_id *id)
-{
-       int ret;
-       struct cando_data *td;
-
-       td = kmalloc(sizeof(struct cando_data), GFP_KERNEL);
-       if (!td) {
-               hid_err(hdev, "cannot allocate Cando Touch data\n");
-               return -ENOMEM;
-       }
-       hid_set_drvdata(hdev, td);
-       td->first = false;
-       td->oldest = -1;
-       td->valid = false;
-
-       ret = hid_parse(hdev);
-       if (!ret)
-               ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
-
-       if (ret)
-               kfree(td);
-
-       return ret;
-}
-
-static void cando_remove(struct hid_device *hdev)
-{
-       hid_hw_stop(hdev);
-       kfree(hid_get_drvdata(hdev));
-       hid_set_drvdata(hdev, NULL);
-}
-
-static const struct hid_device_id cando_devices[] = {
-       { 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_10_1) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
-                       USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
-               USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) },
-       { }
-};
-MODULE_DEVICE_TABLE(hid, cando_devices);
-
-static const struct hid_usage_id cando_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 cando_driver = {
-       .name = "cando-touch",
-       .id_table = cando_devices,
-       .probe = cando_probe,
-       .remove = cando_remove,
-       .input_mapping = cando_input_mapping,
-       .input_mapped = cando_input_mapped,
-       .usage_table = cando_grabbed_usages,
-       .event = cando_event,
-};
-
-static int __init cando_init(void)
-{
-       return hid_register_driver(&cando_driver);
-}
-
-static void __exit cando_exit(void)
-{
-       hid_unregister_driver(&cando_driver);
-}
-
-module_init(cando_init);
-module_exit(cando_exit);
-
index 5983e5559e8105422f6722c1617bda33603f70e9..e6e1ea2514906ab33ac55b2d5e7752fbd627b5a5 100644 (file)
@@ -514,6 +514,20 @@ static void mt_remove(struct hid_device *hdev)
 
 static const struct hid_device_id mt_devices[] = {
 
+       /* Cando panels */
+       { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
+               HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
+                       USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
+       { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
+               HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
+                       USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1) },
+       { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
+               HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
+                       USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
+       { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
+               HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
+                       USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) },
+
        /* Cypress panel */
        { .driver_data = MT_CLS_CYPRESS,
                HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS,