From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pau Oliva Fora Subject: Re: [PATCH] Add support for HTC Shift Touchscreen Date: Tue, 20 May 2008 21:09:48 +0200 Message-ID: <483321FC.8070603@eslack.org> References: <482ED31E.2000009@eslack.org> <483198F8.3000201@eslack.org> <20080519112104.ZZRA012@mailhub.coreip.homeip.net> <4832087C.6060009@eslack.org> <20080520014937.GA23247@anvil.corenet.prv> <4832AFCA.30701@eslack.org> <20080520094647.ZZRA012@mailhub.coreip.homeip.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20080520094647.ZZRA012@mailhub.coreip.homeip.net> Sender: linux-kernel-owner@vger.kernel.org To: Dmitry Torokhov Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, pazke@pazke.donpac.ru List-Id: linux-input@vger.kernel.org Dmitry Torokhov wrote: > On Tue, May 20, 2008 at 01:02:34PM +0200, Pau Oliva Fora wrote: >> Dmitry Torokhov wrote: >>> On Tue, May 20, 2008 at 01:08:44AM +0200, Pau Oliva Fora wrote: >>>> + >>>> +static int htcpen_open(struct input_dev *dev) >>>> +{ >>>> + outb_p(DEVICE_ENABLE, HTCPEN_PORT_INIT); >>>> + return 0; >>>> +} >>>> + >>>> +static void htcpen_close(struct input_dev *dev) >>>> +{ >>>> + free_irq(HTCPEN_IRQ, dev); >>>> +} >>>> + >>> No, this will not work.. next time you open the device you won't have >>> IRQ anymore. You need the opposite of outb_p(DEVICE_ENABLE, >>> HTCPEN_PORT_INIT); here. >>> >> It is actually working; it also works after suspend/resume without any >> issues. >> > > You need to close the device. Making evdev a module and unloading it > should do the trick (you don't use tsdev, do you?). I use evdev. >> Let me know if you think it's ok to leave it as is, otherwise I'll try >> to find the proper way to disable the device (it should not be much >> different than the way of enabling it). > > If you can't find the way to disable device then you need to revert to > the old way, with enabling it in _probe() and freein irq in _remove(), > you just need to make sure that you free_irq() first and then call > input_unregister_device(). Finding a way to disable it was easy :-) just need to write 0xa3 to 0x6c. > Also, like Andrey said, we might consider using DMI table so we dont > poke IO ports on random boxes. Thanks Andrey for the suggestion of using DMI table, see the patch below. Should I keep the old device detection using IO port stuff or just dmi_check_system() should be fine? > Oh, and one more thing, you need to > reserve the IO ports your driver is using with request_region. Thanks, I implemented this too in the patch below, but I have a problem: I can successfully reserve 0x250-0x251, but 0x68 and 0x6c are already reserved by the keyboard which takes range 0x60-0x6f according to /proc/ioports. I left the code for those ports commented out. What should I do in that case? I am a kernel newbie :) diff -uprN linux-2.6.25.4/drivers/input/touchscreen/htcpen.c linux/drivers/input/touchscreen/htcpen.c --- linux-2.6.25.4/drivers/input/touchscreen/htcpen.c 1970-01-01 01:00:00.000000000 +0100 +++ linux/drivers/input/touchscreen/htcpen.c 2008-05-20 21:05:54.000000000 +0200 @@ -0,0 +1,246 @@ +/* + * HTC Shift touchscreen driver + * + * Copyright (C) 2008 Pau Oliva Fora + * + * Thanks to: + * Heikki Linnakangas - Penmount LPC touchscreen driver + * Wacom / Ping Cheng - Help on linuxwacom-devel + * Esteve Espuna - Ideas, tips, moral support :) + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +MODULE_AUTHOR("Pau Oliva Fora "); +MODULE_DESCRIPTION("HTC Shift touchscreen driver"); +MODULE_LICENSE("GPL"); + +#define HTCPEN_PORT_IRQ_CLEAR 0x068 +#define HTCPEN_PORT_INIT 0x06c +#define HTCPEN_PORT_INDEX 0x0250 +#define HTCPEN_PORT_DATA 0x0251 +#define HTCPEN_IRQ 3 + +#define X_INDEX 3 +#define Y_INDEX 5 +#define TOUCH_INDEX 0xb +#define LSB_XY_INDEX 0xc +#define X_AXIS_MAX 2040 +#define Y_AXIS_MAX 2040 +#define DEVICE_ENABLE 0xa2 +#define DEVICE_DISABLE 0xa3 + +static int invert_x; +module_param(invert_x, bool, 0644); +MODULE_PARM_DESC(invert_x, "If set, X axis is inverted"); +static int invert_y; +module_param(invert_y, bool, 0644); +MODULE_PARM_DESC(invert_y, "If set, Y axis is inverted"); + +static const struct dmi_system_id htcshift_dmi_table[] = { + { + .ident = "Shift", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "High Tech Computer Corp"), + DMI_MATCH(DMI_PRODUCT_NAME, "Shift"), + }, + }, + { } +}; + +static irqreturn_t htcpen_interrupt(int irq, void *handle) +{ + struct input_dev *htcpen_dev = handle; + unsigned short x, y, xy; + + /* 0=press ; 1=release */ + outb_p(TOUCH_INDEX, HTCPEN_PORT_INDEX); + + /* only update X/Y when screen is being touched */ + if (inb_p(HTCPEN_PORT_DATA)) { + input_report_key(htcpen_dev, BTN_TOUCH, 0); + } else { + outb_p(X_INDEX, HTCPEN_PORT_INDEX); + x = inb_p(HTCPEN_PORT_DATA); + + outb_p(Y_INDEX, HTCPEN_PORT_INDEX); + y = inb_p(HTCPEN_PORT_DATA); + + outb_p(LSB_XY_INDEX, HTCPEN_PORT_INDEX); + xy = inb_p(HTCPEN_PORT_DATA); + + /* get high resolution value of X and Y using LSB */ + x = X_AXIS_MAX - ((x * 8) + ((xy >> 4) & 0xf)); + y = (y * 8) + (xy & 0xf); + if (invert_x) + x = X_AXIS_MAX - x; + if (invert_y) + y = Y_AXIS_MAX - y; + + input_report_key(htcpen_dev, BTN_TOUCH, 1); + input_report_abs(htcpen_dev, ABS_X, x); + input_report_abs(htcpen_dev, ABS_Y, y); + } + + input_sync(htcpen_dev); + + inb_p(HTCPEN_PORT_IRQ_CLEAR); + + return IRQ_HANDLED; +} + +static int htcpen_open(struct input_dev *dev) +{ + outb_p(DEVICE_ENABLE, HTCPEN_PORT_INIT); + return 0; +} + +static void htcpen_close(struct input_dev *dev) +{ + free_irq(HTCPEN_IRQ, dev); + outb_p(DEVICE_DISABLE, HTCPEN_PORT_INIT); +} + +static int __devinit htcpen_isa_probe(struct device *dev, unsigned int id) +{ + int err; + struct input_dev *htcpen_dev; + + inb_p(HTCPEN_PORT_IRQ_CLEAR); + + htcpen_dev = input_allocate_device(); + if (!htcpen_dev) { + printk(KERN_ERR "htcpen: can't allocate device\n"); + err = -ENOMEM; + goto input_alloc_failed; + } + + htcpen_dev->name = "HTC Pen TouchScreen"; + htcpen_dev->id.bustype = BUS_ISA; + + input_set_abs_params(htcpen_dev, ABS_X, 0, X_AXIS_MAX, 0, 0); + input_set_abs_params(htcpen_dev, ABS_Y, 0, Y_AXIS_MAX, 0, 0); + + htcpen_dev->evbit[0] = BIT_MASK(EV_ABS) | BIT_MASK(EV_KEY); + htcpen_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); + htcpen_dev->open = htcpen_open; + htcpen_dev->close = htcpen_close; + + err = request_irq(HTCPEN_IRQ, htcpen_interrupt, 0, "htcpen", + htcpen_dev); + if (err) { + printk(KERN_ERR "htcpen: irq busy\n"); + err = -ENODEV; + goto request_irq_failed; + } + +/* + if (!request_region(HTCPEN_PORT_IRQ_CLEAR, 1, "htcpen")) { + printk(KERN_WARNING "htcpen: unable to get IO region1\n"); + err = -ENODEV; + goto request_region1_failed; + } + + if (!request_region(HTCPEN_PORT_INIT, 1, "htcpen")) { + printk(KERN_WARNING "htcpen: unable to get IO region2\n"); + err = -ENODEV; + goto request_region2_failed; + } +*/ + + if (!request_region(HTCPEN_PORT_INDEX, 2, "htcpen")) { + printk(KERN_WARNING "htcpen: unable to get IO region3\n"); + err = -ENODEV; + goto request_region3_failed; + } + + err = input_register_device(htcpen_dev); + if (err) + goto input_register_failed; + + dev_set_drvdata(dev, htcpen_dev); + return 0; + + input_register_failed: + release_region(HTCPEN_PORT_INDEX, 2); + request_region3_failed: +/* + release_region(HTCPEN_PORT_INIT, 1); + request_region2_failed: + release_region(HTCPEN_PORT_IRQ_CLEAR, 1); + request_region1_failed: +*/ + free_irq(HTCPEN_IRQ, htcpen_dev); + request_irq_failed: + input_free_device(htcpen_dev); + input_alloc_failed: + return err; +} + +static int __devinit htcpen_isa_match(struct device *dev, unsigned int id) +{ + unsigned short val1, val2; + + if (!dmi_check_system(htcshift_dmi_table)) + return 0; + + /* device detection */ + outb_p(0x8, HTCPEN_PORT_INIT); + val1 = inb_p(HTCPEN_PORT_INIT); + val2 = inb_p(HTCPEN_PORT_IRQ_CLEAR); + if ((val1 > 0xc) || (val2 != 0x55)) { + printk(KERN_DEBUG "htcpen: no such device (%x|%x)\n", + val1, val2); + return 0; + } + return 1; +} + +static int __devexit htcpen_isa_remove(struct device *dev, unsigned int id) +{ + input_unregister_device(dev_get_drvdata(dev)); + dev_set_drvdata(dev, NULL); +/* + release_region(HTCPEN_PORT_IRQ_CLEAR, 1); + release_region(HTCPEN_PORT_INIT, 1); +*/ + release_region(HTCPEN_PORT_INDEX, 2); + return 0; +} + +static struct isa_driver htcpen_isa_driver = { + .match = htcpen_isa_match, + .probe = htcpen_isa_probe, + .remove = __devexit_p(htcpen_isa_remove), + .driver = { + .owner = THIS_MODULE, + .name = "htcpen", + } +}; + +static int __init htcpen_isa_init(void) +{ + return isa_register_driver(&htcpen_isa_driver, 1); +} + +static void __exit htcpen_isa_exit(void) +{ + isa_unregister_driver(&htcpen_isa_driver); +} + +module_init(htcpen_isa_init); +module_exit(htcpen_isa_exit); diff -uprN linux-2.6.25.4/drivers/input/touchscreen/Kconfig linux/drivers/input/touchscreen/Kconfig --- linux-2.6.25.4/drivers/input/touchscreen/Kconfig 2008-05-15 17:00:12.000000000 +0200 +++ linux/drivers/input/touchscreen/Kconfig 2008-05-19 15:48:52.000000000 +0200 @@ -134,6 +134,18 @@ config TOUCHSCREEN_HP7XX To compile this driver as a module, choose M here: the module will be called jornada720_ts. +config TOUCHSCREEN_HTCPEN + tristate "HTC Shift X9500 touchscreen" + depends on ISA + help + Say Y here if you have an HTC Shift UMPC also known as HTC X9500 + Clio / Shangrila and want to support the built-in touchscreen. + + If unsure, say N. + + To compile this driver as a module, choose M here: the + module will be called htcpen. + config TOUCHSCREEN_PENMOUNT tristate "Penmount serial touchscreen" select SERIO diff -uprN linux-2.6.25.4/drivers/input/touchscreen/Makefile linux/drivers/input/touchscreen/Makefile --- linux-2.6.25.4/drivers/input/touchscreen/Makefile 2008-05-15 17:00:12.000000000 +0200 +++ linux/drivers/input/touchscreen/Makefile 2008-05-17 03:10:12.000000000 +0200 @@ -14,6 +14,7 @@ obj-$(CONFIG_TOUCHSCREEN_MTOUCH) += mtou obj-$(CONFIG_TOUCHSCREEN_MK712) += mk712.o obj-$(CONFIG_TOUCHSCREEN_HP600) += hp680_ts_input.o obj-$(CONFIG_TOUCHSCREEN_HP7XX) += jornada720_ts.o +obj-$(CONFIG_TOUCHSCREEN_HTCPEN) += htcpen.o obj-$(CONFIG_TOUCHSCREEN_USB_COMPOSITE) += usbtouchscreen.o obj-$(CONFIG_TOUCHSCREEN_PENMOUNT) += penmount.o obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o --- linux-2.6.25.4/MAINTAINERS 2008-05-15 17:00:12.000000000 +0200 +++ linux/MAINTAINERS 2008-05-19 15:40:11.000000000 +0200 @@ -1875,6 +1875,12 @@ M: mikulas@artax.karlin.mff.cuni.cz W: http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi S: Maintained +HTCPEN TOUCHSCREEN DRIVER +P: Pau Oliva Fora +M: pof@eslack.org +L: linux-input@vger.kernel.org +S: Maintained + HUGETLB FILESYSTEM P: William Irwin M: wli@holomorphy.com