summaryrefslogtreecommitdiff
path: root/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.34-cando-dual-touch-driver.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.34-cando-dual-touch-driver.patch')
-rw-r--r--meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.34-cando-dual-touch-driver.patch366
1 files changed, 366 insertions, 0 deletions
diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.34-cando-dual-touch-driver.patch b/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.34-cando-dual-touch-driver.patch
new file mode 100644
index 0000000000..ec35072541
--- /dev/null
+++ b/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.34-cando-dual-touch-driver.patch
@@ -0,0 +1,366 @@
+From ff4cd0510defa74c5b9b3c1bd5c5a02b8af53fd1 Mon Sep 17 00:00:00 2001
+From: Priya Vijayan <priya.vijayan@intel.com>
+Date: Tue, 27 Apr 2010 14:43:04 -0700
+Subject: [PATCH] Touch driver and configs for Cando dual touch panels
+
+Added support for the Cando dual touch panels, found in the Lenovo S10-3t.
+
+Signed-off-by: Stephane Chatty <chatty@enac.fr>
+Tested-by: Priya Vijayan <priya.vijayan@intel.com>
+Tested-by: Florian Echtler <floe@butterbrot.org>
+Signed-off-by: Priya Vijayan <priya.vijayan@intel.com>
+---
+ drivers/hid/Kconfig | 6 +
+ drivers/hid/Makefile | 1 +
+ drivers/hid/hid-cando.c | 268 +++++++++++++++++++++++++++++++++++++++++++++++
+ drivers/hid/hid-core.c | 1 +
+ drivers/hid/hid-ids.h | 3 +
+ include/linux/hid.h | 2 +-
+ 6 files changed, 280 insertions(+), 1 deletions(-)
+ create mode 100644 drivers/hid/hid-cando.c
+
+diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
+index 24d90ea..37fb241 100644
+--- a/drivers/hid/Kconfig
++++ b/drivers/hid/Kconfig
+@@ -80,6 +80,12 @@ 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" if EMBEDDED
+ depends on USB_HID
+diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
+index 0de2dff..b05f921 100644
+--- a/drivers/hid/Makefile
++++ b/drivers/hid/Makefile
+@@ -22,6 +22,7 @@ endif
+ obj-$(CONFIG_HID_A4TECH) += hid-a4tech.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
+new file mode 100644
+index 0000000..ed8c093
+--- /dev/null
++++ b/drivers/hid/hid-cando.c
+@@ -0,0 +1,268 @@
++/*
++ * 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>
++
++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) {
++ dev_err(&hdev->dev, "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) },
++ { }
++};
++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-core.c b/drivers/hid/hid-core.c
+index 8455f3d..b126102 100644
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1291,6 +1291,7 @@ static const struct hid_device_id hid_blacklist[] = {
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
++ { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index 793691f..6865ca2 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -116,6 +116,9 @@
+ #define USB_VENDOR_ID_BERKSHIRE 0x0c98
+ #define USB_DEVICE_ID_BERKSHIRE_PCWD 0x1140
+
++#define USB_VENDOR_ID_CANDO 0x2087
++#define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01
++
+ #define USB_VENDOR_ID_CH 0x068e
+ #define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2
+ #define USB_DEVICE_ID_CH_COMBATSTICK 0x00f4
+diff --git a/include/linux/hid.h b/include/linux/hid.h
+index 8709365..b978c1e 100644
+--- a/include/linux/hid.h
++++ b/include/linux/hid.h
+@@ -663,7 +663,7 @@ struct hid_ll_driver {
+
+ /* Applications from HID Usage Tables 4/8/99 Version 1.1 */
+ /* We ignore a few input applications that are not widely used */
+-#define IS_INPUT_APPLICATION(a) (((a >= 0x00010000) && (a <= 0x00010008)) || (a == 0x00010080) || (a == 0x000c0001) || (a == 0x000d0002))
++#define IS_INPUT_APPLICATION(a) (((a >= 0x00010000) && (a <= 0x00010008)) || (a == 0x00010080) || (a == 0x000c0001) || ((a >= 0x000d0002) && (a <= 0x000d0006)))
+
+ /* HID core API */
+
+--
+1.6.2.2
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 03:09:18 +0000