X-Git-Url: https://rtime.felk.cvut.cz/gitweb/mx1ts.git/blobdiff_plain/50fc0d0f3bda43f9d10e7a9a34186d95b6579a00..HEAD:/mx1_ts-driver.c diff --git a/mx1_ts-driver.c b/mx1_ts-driver.c index 59d809a..8a65d42 100644 --- a/mx1_ts-driver.c +++ b/mx1_ts-driver.c @@ -19,41 +19,14 @@ #include -#include -#include -#include #include #include -#include #include -#include -#include -#include -#include -#include - #include -#include -#include - -#include //bonus XXX - +#include #include - -/* - * originaly from - * linux/drivers/misc/mx1ts.h - * - * Copyright (C) 2003 Blue Mug, Inc. for Motorola, Inc. - * - * 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. - * - */ - /* Interrupt numbers */ #define ASP_COMPARE_IRQ 5 #define ASP_PENDATA_IRQ 33 @@ -61,6 +34,7 @@ /* Analog signal processor (ASP) control registers */ #define ASP_BASE_ADDR 0x00215000 +#define ASP_BASE_ADDR_LEN 0x38 #define ASP_ACNTLCR (0x10) /* Control register */ #define ASP_PSMPLRG (0x14) /* Pen A/D sampe rate control */ @@ -158,17 +132,16 @@ struct mx1ts { struct input_dev *ts_idev; - struct resource pamet; - int irq; + /*struct resource pamet;*/ + unsigned int irq_touch; + unsigned int irq_pen_data; wait_queue_head_t ts_wait; struct task_struct *ts_task; - unsigned int irq_pending; - unsigned int ts_restart:1; - unsigned int adcsync:1; - void __iomem* mx1ts_mem; - + void __iomem* mx1ts_mem; /* remaped memmory */ + unsigned int baseaddr; + unsigned int baseaddr_len; u16 x_res; u16 y_res; u16 x_akt; @@ -177,20 +150,17 @@ struct mx1ts { u16 cal_auto_zero; u16 cal_range_x; u16 cal_range_y; - unsigned int stav; + /*unsigned int stav; */ u8 auto_calibration; u8 is_open; }; -static int MX1TS_presed = 0; -static int MX1TS_lastx = 0; -static int MX1TS_lasty = 0; static inline void mx1ts_reg_set_mask(struct mx1ts *mts , unsigned int reg, u32 mask) { u32 val; - val = __raw_readl(mts->mx1ts_mem+reg); + val = __raw_readl(mts->mx1ts_mem+reg); /* TODO zvazit pouziti ioread32 */ val |= mask; __raw_writel(val, mts->mx1ts_mem+reg ); } @@ -206,14 +176,13 @@ static inline void mx1ts_reg_clear_mask(struct mx1ts *mts , unsigned int reg, u3 static inline void mx1ts_reg_write(struct mx1ts *mts, unsigned int reg, unsigned int val) { __raw_writel(val, mts->mx1ts_mem+reg); - printk(KERN_DEBUG "mx1_touchscreen: writing into : %p value %x\n",mts->mx1ts_mem+reg, val); + /*printk(KERN_DEBUG "mx1_touchscreen: writing into : %p value %x\n",mts->mx1ts_mem+reg, val);*/ } static inline unsigned int mx1ts_reg_read(struct mx1ts *mts, unsigned int reg) { unsigned int out; - out = __raw_readl( mts->mx1ts_mem + reg ); /*printk(KERN_DEBUG "mx1_touchscreen: reading from %p : %d \n",mts->mx1ts_mem + reg, out);*/ @@ -231,7 +200,6 @@ static inline void mx1ts_flush_fifo(struct mx1ts *mts) static void mx1ts_enable_auto_sample(struct mx1ts *mts) { unsigned int value; - mx1ts_flush_fifo(mts); value = mx1ts_reg_read(mts, ASP_ACNTLCR); @@ -301,7 +269,6 @@ static void mx1ts_disable_pen_touch_interrupt(struct mx1ts *mts) /* Enable pen touch interrupt. */ value = mx1ts_reg_read(mts, ASP_ICNTLR); value &= ~ASP_PIRQE; - value = 0; /* TODO tohle se musi smazat*/ mx1ts_reg_write(mts, ASP_ICNTLR, value); printk(KERN_DEBUG "mx1_touchscreen: pen_touch: deaktivating pen_down interrupt \n"); } @@ -399,6 +366,10 @@ static void mx1ts_reset_asp(struct mx1ts *mts) static void mx1ts_evt_add_touch(struct input_dev *idev, u8 p , u16 x, u16 y) { + struct mx1ts *mts = dev_get_drvdata(idev->dev.parent); + mts->x_akt = x; + mts->y_akt = y; + input_report_key(idev, BTN_TOUCH, 1); input_report_abs(idev, ABS_X, x); input_report_abs(idev, ABS_Y, y); @@ -407,32 +378,17 @@ static void mx1ts_evt_add_touch(struct input_dev *idev, u8 p , u16 x, u16 y) input_sync(idev); } -static void mx1ts_evt_add_up(struct input_dev *idev, u16 x, u16 y) +static void mx1ts_evt_add_up(struct input_dev *idev) { - input_report_abs(idev, ABS_X, x); - input_report_abs(idev, ABS_Y, y); + struct mx1ts *mts = dev_get_drvdata(idev->dev.parent); + + input_report_abs(idev, ABS_X, mts->x_akt); + input_report_abs(idev, ABS_Y, mts->y_akt); input_report_abs(idev, ABS_PRESSURE, 0); /*input_report_key(idev, BTN_TOUCH, 0);*/ input_sync(idev); } -static void mx1ts_evt_add(struct input_dev *idev, u8 p , u16 x, u16 y) -{ - if((x < 7900 || x > 8900) && (y < 7751 || y > 10900)) { - MX1TS_presed = 1; - MX1TS_lastx = x; - MX1TS_lasty = y; - mx1ts_evt_add_touch(idev,p, x, y); /* TODO opravit pen_up pen_down zrejme chyba HW ??? TODO */ - - - } else { - if(MX1TS_presed == 1) { - MX1TS_presed = 0; - mx1ts_evt_add_up(idev, MX1TS_lastx, MX1TS_lasty); - } - } -} - /* * Handle the pen data ready interrupt, generated when pen data is * in the FIFO. @@ -449,18 +405,17 @@ static irqreturn_t mx1ts_pendata_irq(int irq, void *dev_id) mx1_cal_range_x = 1; mx1_cal_range_y = 1; - /*printk(KERN_DEBUG "mx1_touchscreen mx1ts_pendata_irq \n");*/ -/* printk(KERN_DEBUG "mx1_touchscreen: mx1_pendata_irq interrupt recived from struct %p\n", mts);*/ + /*printk(KERN_DEBUG "mx1_touchscreen: mx1_pendata_irq interrupt recived from struct %p\n", mts);*/ - if (mx1ts_reg_read(mts, ASP_ISTATR) & ASP_PUIS) { /*pen up interupt pending*/ - mx1ts_reg_set_mask(mts, ASP_ISTATR, ASP_PUIS); /*clearing pen up interupt*/ + if (mx1ts_reg_read(mts, ASP_ISTATR) & ASP_PUIS) { /*pen up interupt pending*/ + mx1ts_reg_set_mask(mts, ASP_ISTATR, ASP_PUIS); /*clearing pen up interupt*/ mx1ts_disable_auto_sample(mts); mx1ts_disable_pen_up_interrupt(mts); mx1ts_enable_pen_touch_interrupt(mts); if(mts->is_open) /*report last known touch*/ - mx1ts_evt_add_up(mts->ts_idev, 100, 100); + mx1ts_evt_add_up(mts->ts_idev); printk(KERN_DEBUG "Pen up interrupt.\n"); mx1ts_flush_fifo(mts); @@ -505,7 +460,7 @@ static irqreturn_t mx1ts_pendata_irq(int irq, void *dev_id) // generated as long as there is data in the FIFO. if ((mx1ts_reg_read(mts, ASP_ISTATR) & ASP_PDR) != ASP_PDR) { - return IRQ_NONE; /* TODO je to tak? */ + return IRQ_NONE; } auto_zero = mx1ts_reg_read(mts, ASP_PADFIFO); @@ -517,13 +472,13 @@ static irqreturn_t mx1ts_pendata_irq(int irq, void *dev_id) pen_y = mx1ts_reg_read(mts, ASP_PADFIFO); pen_u = mx1ts_reg_read(mts, ASP_PADFIFO); - pen_x = (u32)(((pen_x - auto_zero) << 16) / + pen_x = mts->x_res - (u32)(((pen_x - auto_zero) << 16) / mts->cal_range_x); - pen_y = (u32)(((pen_y - auto_zero) << 16) / + pen_y = mts->y_res - (u32)(((pen_y - auto_zero) << 16) / mts->cal_range_y); if(mts->is_open) - mx1ts_evt_add(mts->ts_idev, 200 , pen_x, pen_y); + mx1ts_evt_add_touch(mts->ts_idev, 200 , pen_x, pen_y); } return IRQ_HANDLED; } @@ -553,8 +508,8 @@ static irqreturn_t mx1ts_touch_irq(int irq, void *dev_id) static inline int mx1ts_enable_irqs(struct mx1ts *mts) //zaregistruje preruseni { int result; -//TODO printk(KERN_ERR "enabling irq %d.\n",mts->ts_idev->dev.parent.resource[1]->start); - result = request_irq(ASP_PENDATA_IRQ, + + result = request_irq(mts->irq_pen_data, mx1ts_pendata_irq, 0, DEV_IRQ_ID, @@ -563,15 +518,15 @@ static inline int mx1ts_enable_irqs(struct mx1ts *mts) //zaregistruje preruseni printk(KERN_ERR "mx1 touchscreen: Couldn't request pen data IRQ.\n"); return result; } - - result = request_irq(ASP_TOUCH_IRQ, + + result = request_irq(mts->irq_touch, mx1ts_touch_irq, /*IRQF_*/ 0, DEV_IRQ_ID, mts); if (result) { printk(KERN_ERR "mx1 touchscreen: Couldn't request pen touch IRQ.\n"); - free_irq(ASP_PENDATA_IRQ, mts); + free_irq(mts->irq_pen_data, mts); return result; } return result; @@ -583,15 +538,21 @@ static int mx1ts_on(struct mx1ts *mts) { int ret = 0; - if(!request_mem_region(ASP_BASE_ADDR, 0x38 , "mx1ts")) { + if(!request_mem_region(mts->baseaddr, mts->baseaddr_len , "mx1ts")) { printk(KERN_ERR "mx1 touchscreen: request_mem_region \tFAILED\n"); - return -1; + return -ENOMEM; } printk(KERN_DEBUG "mx1 touchscreen: request_mem_region \tOK\n"); - mts->mx1ts_mem = ioremap ( ASP_BASE_ADDR, 0x38); + mts->mx1ts_mem = ioremap ( mts->baseaddr, mts->baseaddr_len); + if(!mts->mx1ts_mem) { + release_mem_region(mts->baseaddr, mts->baseaddr_len); + printk(KERN_ERR "mx1 touchscreen: ioremap \tFAILED\n"); + return -1; + } + printk(KERN_DEBUG "mx1 touchscreen: memory remaped on %p \n", mts->mx1ts_mem); @@ -634,11 +595,11 @@ static int mx1ts_probe(struct platform_device *dev) { struct mx1ts *mts; struct input_dev *idev; - int error, x_res, y_res; + int error; /* TODO jak poznat ze zarizeni je pritomne ? */ - mts = kzalloc(sizeof(struct mx1ts), GFP_KERNEL); /* alokuje pamet */ + mts = kzalloc(sizeof(struct mx1ts), GFP_KERNEL); idev = input_allocate_device(); if (!mts || !idev) { error = -ENOMEM; @@ -646,21 +607,32 @@ static int mx1ts_probe(struct platform_device *dev) goto err_free_devs; return error; } - - mx1ts_on(mts); /* remaping registers, reseting device */ + mts->baseaddr = dev->resource[0].start; + mts->baseaddr_len = dev->resource[0].end - dev->resource[0].start; + printk(KERN_ERR "mx1 touchscreen: memorry base addr %d \n", mts->baseaddr); + printk(KERN_ERR "mx1 touchscreen: memorry base addr_len %d \n", mts->baseaddr_len); + mts->irq_pen_data = dev->resource[1].start; + mts->irq_touch = dev->resource[2].start; + + error = mx1ts_on(mts); + if(error<0) { /* remaping registers, reseting device */ + printk(KERN_ERR "mx1 touchscreen: failed mx1ts_on - remaping registers, reseting device\n"); + goto err_free_devs; + return error; + } mts->ts_idev = idev; init_waitqueue_head(&mts->ts_wait); //input_set_drvdata(idev, mts); /*moznost ulozit ukazatel na trukturu do input_driver*/ platform_set_drvdata(dev, mts); - + idev->dev.parent = &dev->dev; idev->name = "MX1 touchscreen interface"; - idev->phys = "mx1ts/input0"; //dodano + idev->phys = "mx1ts/input0"; idev->id.vendor = (unsigned int) 345; /*mx1ts_reg_read(mx1_ts, AC97_VENDOR_ID1);*/ - idev->id.product = (unsigned int) 354; /*id;*/ - idev->id.version = 0x0100; //dodano + idev->id.product = (unsigned int) 354; + idev->id.version = 0x0100; idev->id.bustype = BUS_HOST; idev->open = mx1ts_open; idev->close = mx1ts_close; @@ -669,12 +641,12 @@ static int mx1ts_probe(struct platform_device *dev) printk(KERN_DEBUG "mx1ts: setting idev struct \tOK\n"); - x_res = 60000; - y_res = 60000; - printk(KERN_DEBUG "mx1ts: x/y = %d/%d\n", x_res, y_res); + mts->x_res = 60000; /*TODO neni mozne zmerit ? */ + mts->y_res = 60000; + printk(KERN_DEBUG "mx1ts: x/y = %d/%d\n", mts->x_res, mts->y_res); - input_set_abs_params(idev, ABS_X, 0, x_res, 0, 0); - input_set_abs_params(idev, ABS_Y, 0, y_res, 0, 0); + input_set_abs_params(idev, ABS_X, 0, mts->x_res, 0, 0); + input_set_abs_params(idev, ABS_Y, 0, mts->y_res, 0, 0); input_set_abs_params(idev, ABS_PRESSURE, 0, 1, 0, 0); error = input_register_device(idev); @@ -689,7 +661,7 @@ static int mx1ts_probe(struct platform_device *dev) err_free_devs: printk(KERN_ERR "mx1 touchscreen: error in device probe \n"); - /*input_free_device(idev);*/ + input_free_device(idev); kfree(mts); return error; @@ -703,8 +675,8 @@ static int mx1ts_remove(struct platform_device *dev) //BUG_ON(mts == NULL); - free_irq(ASP_PENDATA_IRQ, mts); - free_irq(ASP_TOUCH_IRQ, mts); + free_irq(mts->irq_pen_data, mts); + free_irq(mts->irq_touch, mts); /*input_free_device(mts->ts_idev); printk(KERN_DEBUG "Free device \tOK\n");*/ @@ -712,7 +684,7 @@ static int mx1ts_remove(struct platform_device *dev) input_unregister_device(mts->ts_idev); printk(KERN_INFO "mx1 touchscreen: Unregister device \tOK\n"); iounmap(mts->mx1ts_mem); - release_mem_region(ASP_BASE_ADDR, 0x38); + release_mem_region(mts->baseaddr, mts->baseaddr_len); kfree(mts); @@ -727,8 +699,6 @@ static int mx1ts_resume(struct platform_device *dev) return 0; } -/* inicializace ovladace a driveru (insmod, rmmmod ) */ - static struct platform_driver mx1ts_driver = { .probe = mx1ts_probe, .remove = mx1ts_remove, @@ -742,7 +712,7 @@ static struct platform_driver mx1ts_driver = { static struct resource mx1ts_resources[] = { [0] = { .start = ASP_BASE_ADDR + 0, - .end = ASP_BASE_ADDR + 0x37, + .end = ASP_BASE_ADDR + ASP_BASE_ADDR_LEN, .flags = IORESOURCE_MEM, }, [1] = { @@ -808,16 +778,9 @@ static void __exit mx1ts_exit(void) return; } -//module_param(adcsync, bool, 0444); +//module_param(adcsync, bool, 0444); /* priklad parametru modulu*/ //MODULE_PARM_DESC(adcsync, "Synchronize touch readings with ADCSYNC pin."); -//module_param(ts_delay, int, 0444); -//MODULE_PARM_DESC(ts_delay, "Delay between panel setup and position read. Default = 55us."); - -//module_param(ts_delay_pressure, int, 0444); -//MODULE_PARM_DESC(ts_delay_pressure, -// "delay between panel setup and pressure read. Default = 0us."); - module_init(mx1ts_init); module_exit(mx1ts_exit);