diff options
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/Makefile | 1 | ||||
-rw-r--r-- | drivers/input/evbug.c | 4 | ||||
-rw-r--r-- | drivers/input/touchscreen/mxc_ts.c | 24 |
3 files changed, 25 insertions, 4 deletions
diff --git a/drivers/input/Makefile b/drivers/input/Makefile index 98c4f9a77876..d69ccbd3aea5 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -1,3 +1,4 @@ +CFLAGS_evbug.o := -DDEBUG # # Makefile for the input core drivers. # diff --git a/drivers/input/evbug.c b/drivers/input/evbug.c index 0353601ac3b5..bcd176eedb47 100644 --- a/drivers/input/evbug.c +++ b/drivers/input/evbug.c @@ -64,11 +64,13 @@ static int evbug_connect(struct input_handler *handler, struct input_dev *dev, if (error) goto err_unregister_handle; +/* +// Messing up debugging by interfering with init scripts , so I'm temporarily removing this. printk(KERN_DEBUG "evbug.c: Connected device: %s (%s at %s)\n", dev->dev.bus_id, dev->name ?: "unknown", dev->phys ?: "unknown"); - +*/ return 0; err_unregister_handle: diff --git a/drivers/input/touchscreen/mxc_ts.c b/drivers/input/touchscreen/mxc_ts.c index b354d81c5465..2b57a26804b6 100644 --- a/drivers/input/touchscreen/mxc_ts.c +++ b/drivers/input/touchscreen/mxc_ts.c @@ -43,6 +43,7 @@ static u32 input_ts_installed; static int ts_thread(void *arg) { + int j1=0, j2=0, j3=0, j4=0; t_touch_screen ts_sample; s32 wait = 0; @@ -50,19 +51,36 @@ static int ts_thread(void *arg) while (input_ts_installed) { try_to_freeze(); memset(&ts_sample, 0, sizeof(t_touch_screen)); - if (0 != pmic_adc_get_touch_sample(&ts_sample, !wait)) - continue; - if (!(ts_sample.contact_resistance || wait)) + j3 = jiffies; + if (0 != pmic_adc_get_touch_sample(&ts_sample, !wait)){ + printk("ttd: pmic_adc_get_touch_sample() RETURNS NONZERO\n"); continue; + } + j4 = jiffies; +// printk("ts_thread: pmic_adc_get_touch_sample() took %d jiffies\n", j4 - j3); + if (!(ts_sample.contact_resistance || wait)){ + printk("ttd: continue: res=%d, wait=%d\n", ts_sample.contact_resistance, wait); + continue; + } + + printk("ttd: ts_thread sending event: abs x=%d, abx y = %d, resistance = %d\n", + ts_sample.x_position, + ts_sample.y_position, + ts_sample.contact_resistance + ); + j1 = jiffies; input_report_abs(mxc_inputdev, ABS_X, ts_sample.x_position); input_report_abs(mxc_inputdev, ABS_Y, ts_sample.y_position); input_report_abs(mxc_inputdev, ABS_PRESSURE, ts_sample.contact_resistance); input_sync(mxc_inputdev); + j2 = jiffies; wait = ts_sample.contact_resistance; + j1 = jiffies; msleep(20); + j2 = jiffies; } return 0; |