OSDN Git Service

HID: multitouch: remove unused files
authorBenjamin Tissoires <benjamin.tissoires@gmail.com>
Fri, 22 Apr 2011 08:39:10 +0000 (10:39 +0200)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 22 Apr 2011 12:04:11 +0000 (20:04 +0800)
while committing the migration to hid-multitouch from the other multitouch
drivers (3M, Cando, eGalax, and Stantum), I forgot to remove the files.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
drivers/hid/hid-3m-pct.c [deleted file]
drivers/hid/hid-cando.c [deleted file]
drivers/hid/hid-egalax.c [deleted file]
drivers/hid/hid-stantum.c [deleted file]

diff --git a/drivers/hid/hid-3m-pct.c b/drivers/hid/hid-3m-pct.c
deleted file mode 100644 (file)
index 5243ae2..0000000
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- *  HID driver for 3M PCT multitouch panels
- *
- *  Copyright (c) 2009-2010 Stephane Chatty <chatty@enac.fr>
- *  Copyright (c) 2010      Henrik Rydberg <rydberg@euromail.se>
- *  Copyright (c) 2010      Canonical, Ltd.
- *
- */
-
-/*
- * 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>
-#include <linux/usb.h>
-#include <linux/input/mt.h>
-
-MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>");
-MODULE_DESCRIPTION("3M PCT multitouch panels");
-MODULE_LICENSE("GPL");
-
-#include "hid-ids.h"
-
-#define MAX_SLOTS              60
-
-/* estimated signal-to-noise ratios */
-#define SN_MOVE                        2048
-#define SN_WIDTH               128
-
-struct mmm_finger {
-       __s32 x, y, w, h;
-       bool touch, valid;
-};
-
-struct mmm_data {
-       struct mmm_finger f[MAX_SLOTS];
-       __u8 curid;
-       __u8 nexp, nreal;
-       bool touch, valid;
-};
-
-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)
-{
-       int f1 = field->logical_minimum;
-       int f2 = field->logical_maximum;
-       int df = f2 - f1;
-
-       switch (usage->hid & HID_USAGE_PAGE) {
-
-       case HID_UP_BUTTON:
-               return -1;
-
-       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,
-                                            f1, f2, df / SN_MOVE, 0);
-                       /* touchscreen emulation */
-                       input_set_abs_params(hi->input, ABS_X,
-                                            f1, f2, df / SN_MOVE, 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,
-                                            f1, f2, df / SN_MOVE, 0);
-                       /* touchscreen emulation */
-                       input_set_abs_params(hi->input, ABS_Y,
-                                            f1, f2, df / SN_MOVE, 0);
-                       return 1;
-               }
-               return 0;
-
-       case HID_UP_DIGITIZER:
-               switch (usage->hid) {
-               /* we do not want to map these: no input-oriented meaning */
-               case 0x14:
-               case 0x23:
-               case HID_DG_INPUTMODE:
-               case HID_DG_DEVICEINDEX:
-               case HID_DG_CONTACTCOUNT:
-               case HID_DG_CONTACTMAX:
-               case HID_DG_INRANGE:
-               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(hi->input, EV_KEY, BTN_TOUCH);
-                       return 1;
-               case HID_DG_WIDTH:
-                       hid_map_usage(hi, usage, bit, max,
-                                       EV_ABS, ABS_MT_TOUCH_MAJOR);
-                       input_set_abs_params(hi->input, ABS_MT_TOUCH_MAJOR,
-                                            f1, f2, df / 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_TOUCH_MINOR,
-                                            f1, f2, df / SN_WIDTH, 0);
-                       input_set_abs_params(hi->input, ABS_MT_ORIENTATION,
-                                       0, 1, 0, 0);
-                       return 1;
-               case HID_DG_CONTACTID:
-                       input_mt_init_slots(hi->input, MAX_SLOTS);
-                       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 mmm_input_mapped(struct hid_device *hdev, struct hid_input *hi,
-               struct hid_field *field, struct hid_usage *usage,
-               unsigned long **bit, int *max)
-{
-       /* tell hid-input to skip setup of these event types */
-       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 packet has been received and processed,
- * so that it can decide what to send to the input layer.
- */
-static void mmm_filter_event(struct mmm_data *md, struct input_dev *input)
-{
-       int i;
-       for (i = 0; i < MAX_SLOTS; ++i) {
-               struct mmm_finger *f = &md->f[i];
-               if (!f->valid) {
-                       /* this finger is just placeholder data, ignore */
-                       continue;
-               }
-               input_mt_slot(input, i);
-               input_mt_report_slot_state(input, MT_TOOL_FINGER, f->touch);
-               if (f->touch) {
-                       /* this finger is on the screen */
-                       int wide = (f->w > f->h);
-                       /* divided by two to match visual scale of touch */
-                       int major = max(f->w, f->h) >> 1;
-                       int minor = min(f->w, f->h) >> 1;
-
-                       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, major);
-                       input_event(input, EV_ABS, ABS_MT_TOUCH_MINOR, minor);
-               }
-               f->valid = 0;
-       }
-
-       input_mt_report_pointer_emulation(input, true);
-       input_sync(input);
-}
-
-/*
- * this function is called upon all reports
- * so that we can accumulate contact point information,
- * and call input_mt_sync after each point.
- */
-static int mmm_event(struct hid_device *hid, struct hid_field *field,
-                               struct hid_usage *usage, __s32 value)
-{
-       struct mmm_data *md = hid_get_drvdata(hid);
-       /*
-        * strangely, this function can be called before
-        * field->hidinput is initialized!
-        */
-       if (hid->claimed & HID_CLAIMED_INPUT) {
-               struct input_dev *input = field->hidinput->input;
-               switch (usage->hid) {
-               case HID_DG_TIPSWITCH:
-                       md->touch = value;
-                       break;
-               case HID_DG_CONFIDENCE:
-                       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:
-                       value = clamp_val(value, 0, MAX_SLOTS - 1);
-                       if (md->valid) {
-                               md->curid = value;
-                               md->f[value].touch = md->touch;
-                               md->f[value].valid = 1;
-                               md->nreal++;
-                       }
-                       break;
-               case HID_GD_X:
-                       if (md->valid)
-                               md->f[md->curid].x = value;
-                       break;
-               case HID_GD_Y:
-                       if (md->valid)
-                               md->f[md->curid].y = value;
-                       break;
-               case HID_DG_CONTACTCOUNT:
-                       if (value)
-                               md->nexp = value;
-                       if (md->nreal >= md->nexp) {
-                               mmm_filter_event(md, input);
-                               md->nreal = 0;
-                       }
-                       break;
-               }
-       }
-
-       /* 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 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) {
-               hid_err(hdev, "cannot allocate 3M data\n");
-               return -ENOMEM;
-       }
-       hid_set_drvdata(hdev, md);
-
-       ret = hid_parse(hdev);
-       if (!ret)
-               ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
-
-       if (ret)
-               kfree(md);
-       return ret;
-}
-
-static void mmm_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 mmm_devices[] = {
-       { HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M1968) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M2256) },
-       { }
-};
-MODULE_DEVICE_TABLE(hid, mmm_devices);
-
-static const struct hid_usage_id mmm_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 mmm_driver = {
-       .name = "3m-pct",
-       .id_table = mmm_devices,
-       .probe = mmm_probe,
-       .remove = mmm_remove,
-       .input_mapping = mmm_input_mapping,
-       .input_mapped = mmm_input_mapped,
-       .usage_table = mmm_grabbed_usages,
-       .event = mmm_event,
-};
-
-static int __init mmm_init(void)
-{
-       return hid_register_driver(&mmm_driver);
-}
-
-static void __exit mmm_exit(void)
-{
-       hid_unregister_driver(&mmm_driver);
-}
-
-module_init(mmm_init);
-module_exit(mmm_exit);
-
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);
-
diff --git a/drivers/hid/hid-egalax.c b/drivers/hid/hid-egalax.c
deleted file mode 100644 (file)
index 03bee19..0000000
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- *  HID driver for eGalax dual-touch panels
- *
- *  Copyright (c) 2010 Stephane Chatty <chatty@enac.fr>
- *  Copyright (c) 2010 Henrik Rydberg <rydberg@euromail.se>
- *  Copyright (c) 2010 Canonical, Ltd.
- *
- */
-
-/*
- * 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/usb.h>
-#include <linux/input/mt.h>
-#include <linux/slab.h>
-#include "usbhid/usbhid.h"
-
-MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>");
-MODULE_DESCRIPTION("eGalax dual-touch panel");
-MODULE_LICENSE("GPL");
-
-#include "hid-ids.h"
-
-#define MAX_SLOTS              2
-
-/* estimated signal-to-noise ratios */
-#define SN_MOVE                        4096
-#define SN_PRESSURE            32
-
-struct egalax_data {
-       int valid;
-       int slot;
-       int touch;
-       int x, y, z;
-};
-
-static void set_abs(struct input_dev *input, unsigned int code,
-                   struct hid_field *field, int snratio)
-{
-       int fmin = field->logical_minimum;
-       int fmax = field->logical_maximum;
-       int fuzz = snratio ? (fmax - fmin) / snratio : 0;
-       input_set_abs_params(input, code, fmin, fmax, fuzz, 0);
-}
-
-static int egalax_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;
-
-       switch (usage->hid & HID_USAGE_PAGE) {
-
-       case HID_UP_GENDESK:
-               switch (usage->hid) {
-               case HID_GD_X:
-                       field->logical_maximum = 32760;
-                       hid_map_usage(hi, usage, bit, max,
-                                       EV_ABS, ABS_MT_POSITION_X);
-                       set_abs(input, ABS_MT_POSITION_X, field, SN_MOVE);
-                       /* touchscreen emulation */
-                       set_abs(input, ABS_X, field, SN_MOVE);
-                       return 1;
-               case HID_GD_Y:
-                       field->logical_maximum = 32760;
-                       hid_map_usage(hi, usage, bit, max,
-                                       EV_ABS, ABS_MT_POSITION_Y);
-                       set_abs(input, ABS_MT_POSITION_Y, field, SN_MOVE);
-                       /* touchscreen emulation */
-                       set_abs(input, ABS_Y, field, SN_MOVE);
-                       return 1;
-               }
-               return 0;
-
-       case HID_UP_DIGITIZER:
-               switch (usage->hid) {
-               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_INRANGE:
-               case HID_DG_CONFIDENCE:
-               case HID_DG_CONTACTCOUNT:
-               case HID_DG_CONTACTMAX:
-                       return -1;
-               case HID_DG_CONTACTID:
-                       input_mt_init_slots(input, MAX_SLOTS);
-                       return 1;
-               case HID_DG_TIPPRESSURE:
-                       field->logical_minimum = 0;
-                       hid_map_usage(hi, usage, bit, max,
-                                       EV_ABS, ABS_MT_PRESSURE);
-                       set_abs(input, ABS_MT_PRESSURE, field, SN_PRESSURE);
-                       /* touchscreen emulation */
-                       set_abs(input, ABS_PRESSURE, field, SN_PRESSURE);
-                       return 1;
-               }
-               return 0;
-       }
-
-       /* ignore others (from other reports we won't get anyway) */
-       return -1;
-}
-
-static int egalax_input_mapped(struct hid_device *hdev, struct hid_input *hi,
-               struct hid_field *field, struct hid_usage *usage,
-               unsigned long **bit, int *max)
-{
-       /* tell hid-input to skip setup of these event types */
-       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 finger has been parsed,
- * so that it can decide what to send to the input layer.
- */
-static void egalax_filter_event(struct egalax_data *td, struct input_dev *input)
-{
-       input_mt_slot(input, td->slot);
-       input_mt_report_slot_state(input, MT_TOOL_FINGER, td->touch);
-       if (td->touch) {
-               input_event(input, EV_ABS, ABS_MT_POSITION_X, td->x);
-               input_event(input, EV_ABS, ABS_MT_POSITION_Y, td->y);
-               input_event(input, EV_ABS, ABS_MT_PRESSURE, td->z);
-       }
-       input_mt_report_pointer_emulation(input, true);
-}
-
-static int egalax_event(struct hid_device *hid, struct hid_field *field,
-                               struct hid_usage *usage, __s32 value)
-{
-       struct egalax_data *td = hid_get_drvdata(hid);
-
-       /* Note, eGalax has two product lines: the first is resistive and
-        * uses a standard parallel multitouch protocol (product ID ==
-        * 48xx).  The second is capacitive and uses an unusual "serial"
-        * protocol with a different message for each multitouch finger
-        * (product ID == 72xx).
-        */
-       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_CONFIDENCE:
-                       /* avoid interference from generic hidinput handling */
-                       break;
-               case HID_DG_TIPSWITCH:
-                       td->touch = value;
-                       break;
-               case HID_DG_TIPPRESSURE:
-                       td->z = value;
-                       break;
-               case HID_DG_CONTACTID:
-                       td->slot = clamp_val(value, 0, MAX_SLOTS - 1);
-                       break;
-               case HID_GD_X:
-                       td->x = value;
-                       break;
-               case HID_GD_Y:
-                       td->y = value;
-                       /* this is the last field in a finger */
-                       if (td->valid)
-                               egalax_filter_event(td, input);
-                       break;
-               case HID_DG_CONTACTCOUNT:
-                       /* touch emulation: this is the last field in a frame */
-                       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 egalax_probe(struct hid_device *hdev, const struct hid_device_id *id)
-{
-       int ret;
-       struct egalax_data *td;
-       struct hid_report *report;
-
-       td = kzalloc(sizeof(struct egalax_data), GFP_KERNEL);
-       if (!td) {
-               hid_err(hdev, "cannot allocate eGalax data\n");
-               return -ENOMEM;
-       }
-       hid_set_drvdata(hdev, td);
-
-       ret = hid_parse(hdev);
-       if (ret)
-               goto end;
-
-       ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
-       if (ret)
-               goto end;
-
-       report = hdev->report_enum[HID_FEATURE_REPORT].report_id_hash[5]; 
-       if (report) {
-               report->field[0]->value[0] = 2;
-               usbhid_submit_report(hdev, report, USB_DIR_OUT);
-       }
-
-end:
-       if (ret)
-               kfree(td);
-
-       return ret;
-}
-
-static void egalax_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 egalax_devices[] = {
-       { HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
-       { }
-};
-MODULE_DEVICE_TABLE(hid, egalax_devices);
-
-static const struct hid_usage_id egalax_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 egalax_driver = {
-       .name = "egalax-touch",
-       .id_table = egalax_devices,
-       .probe = egalax_probe,
-       .remove = egalax_remove,
-       .input_mapping = egalax_input_mapping,
-       .input_mapped = egalax_input_mapped,
-       .usage_table = egalax_grabbed_usages,
-       .event = egalax_event,
-};
-
-static int __init egalax_init(void)
-{
-       return hid_register_driver(&egalax_driver);
-}
-
-static void __exit egalax_exit(void)
-{
-       hid_unregister_driver(&egalax_driver);
-}
-
-module_init(egalax_init);
-module_exit(egalax_exit);
-
diff --git a/drivers/hid/hid-stantum.c b/drivers/hid/hid-stantum.c
deleted file mode 100644 (file)
index b2be1d1..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- *  HID driver for Stantum multitouch panels
- *
- *  Copyright (c) 2009 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("Stantum HID multitouch panels");
-MODULE_LICENSE("GPL");
-
-#include "hid-ids.h"
-
-struct stantum_data {
-       __s32 x, y, z, w, h;    /* x, y, pressure, width, height */
-       __u16 id;               /* touch id */
-       bool valid;             /* valid finger data, or just placeholder? */
-       bool first;             /* first finger in the HID packet? */
-       bool activity;          /* at least one active finger so far? */
-};
-
-static int stantum_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_INRANGE:
-               case HID_DG_CONFIDENCE:
-               case HID_DG_INPUTMODE:
-               case HID_DG_DEVICEINDEX:
-               case HID_DG_CONTACTCOUNT:
-               case HID_DG_CONTACTMAX:
-                       return -1;
-
-               case HID_DG_TIPSWITCH:
-                       /* touchscreen emulation */
-                       hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);
-                       return 1;
-
-               case HID_DG_WIDTH:
-                       hid_map_usage(hi, usage, bit, max,
-                                       EV_ABS, ABS_MT_TOUCH_MAJOR);
-                       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);
-                       return 1;
-               case HID_DG_TIPPRESSURE:
-                       hid_map_usage(hi, usage, bit, max,
-                                       EV_ABS, ABS_MT_PRESSURE);
-                       return 1;
-
-               case HID_DG_CONTACTID:
-                       hid_map_usage(hi, usage, bit, max,
-                                       EV_ABS, ABS_MT_TRACKING_ID);
-                       return 1;
-
-               }
-               return 0;
-
-       case 0xff000000:
-               /* no input-oriented meaning */
-               return -1;
-       }
-
-       return 0;
-}
-
-static int stantum_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 stantum_filter_event(struct stantum_data *sd,
-                                       struct input_dev *input)
-{
-       bool wide;
-
-       if (!sd->valid) {
-               /*
-                * touchscreen emulation: if the first finger is not valid and
-                * there previously was finger activity, this is a release
-                */
-               if (sd->first && sd->activity) {
-                       input_event(input, EV_KEY, BTN_TOUCH, 0);
-                       sd->activity = false;
-               }
-               return;
-       }
-
-       input_event(input, EV_ABS, ABS_MT_TRACKING_ID, sd->id);
-       input_event(input, EV_ABS, ABS_MT_POSITION_X, sd->x);
-       input_event(input, EV_ABS, ABS_MT_POSITION_Y, sd->y);
-
-       wide = (sd->w > sd->h);
-       input_event(input, EV_ABS, ABS_MT_ORIENTATION, wide);
-       input_event(input, EV_ABS, ABS_MT_TOUCH_MAJOR, wide ? sd->w : sd->h);
-       input_event(input, EV_ABS, ABS_MT_TOUCH_MINOR, wide ? sd->h : sd->w);
-
-       input_event(input, EV_ABS, ABS_MT_PRESSURE, sd->z);
-
-       input_mt_sync(input);
-       sd->valid = false;
-
-       /* touchscreen emulation */
-       if (sd->first) {
-               if (!sd->activity) {
-                       input_event(input, EV_KEY, BTN_TOUCH, 1);
-                       sd->activity = true;
-               }
-               input_event(input, EV_ABS, ABS_X, sd->x);
-               input_event(input, EV_ABS, ABS_Y, sd->y);
-       }
-       sd->first = false;
-}
-
-
-static int stantum_event(struct hid_device *hid, struct hid_field *field,
-                               struct hid_usage *usage, __s32 value)
-{
-       struct stantum_data *sd = hid_get_drvdata(hid);
-
-       if (hid->claimed & HID_CLAIMED_INPUT) {
-               struct input_dev *input = field->hidinput->input;
-
-               switch (usage->hid) {
-               case HID_DG_INRANGE:
-                       /* this is the last field in a finger */
-                       stantum_filter_event(sd, input);
-                       break;
-               case HID_DG_WIDTH:
-                       sd->w = value;
-                       break;
-               case HID_DG_HEIGHT:
-                       sd->h = value;
-                       break;
-               case HID_GD_X:
-                       sd->x = value;
-                       break;
-               case HID_GD_Y:
-                       sd->y = value;
-                       break;
-               case HID_DG_TIPPRESSURE:
-                       sd->z = value;
-                       break;
-               case HID_DG_CONTACTID:
-                       sd->id = value;
-                       break;
-               case HID_DG_CONFIDENCE:
-                       sd->valid = !!value;
-                       break;
-               case 0xff000002:
-                       /* this comes only before the first finger */
-                       sd->first = true;
-                       break;
-
-               default:
-                       /* ignore the others */
-                       return 1;
-               }
-       }
-
-       /* 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 stantum_probe(struct hid_device *hdev,
-                               const struct hid_device_id *id)
-{
-       int ret;
-       struct stantum_data *sd;
-
-       sd = kmalloc(sizeof(struct stantum_data), GFP_KERNEL);
-       if (!sd) {
-               hid_err(hdev, "cannot allocate Stantum data\n");
-               return -ENOMEM;
-       }
-       sd->valid = false;
-       sd->first = false;
-       sd->activity = false;
-       hid_set_drvdata(hdev, sd);
-
-       ret = hid_parse(hdev);
-       if (!ret)
-               ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
-
-       if (ret)
-               kfree(sd);
-
-       return ret;
-}
-
-static void stantum_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 stantum_devices[] = {
-       { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM, USB_DEVICE_ID_MTP_STM) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_SITRONIX, USB_DEVICE_ID_MTP_SITRONIX) },
-       { }
-};
-MODULE_DEVICE_TABLE(hid, stantum_devices);
-
-static const struct hid_usage_id stantum_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 stantum_driver = {
-       .name = "stantum",
-       .id_table = stantum_devices,
-       .probe = stantum_probe,
-       .remove = stantum_remove,
-       .input_mapping = stantum_input_mapping,
-       .input_mapped = stantum_input_mapped,
-       .usage_table = stantum_grabbed_usages,
-       .event = stantum_event,
-};
-
-static int __init stantum_init(void)
-{
-       return hid_register_driver(&stantum_driver);
-}
-
-static void __exit stantum_exit(void)
-{
-       hid_unregister_driver(&stantum_driver);
-}
-
-module_init(stantum_init);
-module_exit(stantum_exit);
-