TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

input: cyttsp-i2c-qc: move to multitouch protocol B

Browse Source 
Move from multitouch protocol A to protocol B, and since some
applications are not working under BTN_2 reporting, all the instances
of HAT are removed along with BTN_2 reporting.

Change-Id: I25c9c811078452eb9ff11159d0f45c9e3f831849
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
(cherry picked from commit 94f65fcf5d89b7943777750b2e358c7421f26400)

Signed-off-by: Sudhir Sharma <sudsha@codeaurora.org>
This commit is contained in:
Amy Maloche
2012-08-01 17:27:25 -07:00
committed by Stephen Boyd
parent f9a17848f0
commit 2dab38962a
1 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/input/touchscreen/cyttsp-i2c-qc.c
View File

@@ -32,6 +32,7 @@
#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/input.h>
#include <linux/input/mt.h>
#include <linux/slab.h>
#include <linux/gpio.h>
#include <linux/irq.h>
@@ -1693,22 +1694,9 @@ static void cyttsp_xy_handler(struct cyttsp *ts)
cyttsp_debug("ST->F1:%3d X:%3d Y:%3d Z:%3d\n", \
cur_st_tch[CY_ST_FNGR1_IDX], \
st_x1, st_y1, st_z1);
if (cur_st_tch[CY_ST_FNGR2_IDX] < CY_NUM_TRK_ID) {
input_report_key(ts->input, BTN_2, CY_TCH);
input_report_abs(ts->input, ABS_HAT0X, st_x2);
input_report_abs(ts->input, ABS_HAT0Y, st_y2);
cyttsp_debug("ST->F2:%3d X:%3d Y:%3d Z:%3d\n", \
cur_st_tch[CY_ST_FNGR2_IDX],
st_x2, st_y2, st_z2);
} else {
input_report_key(ts->input,
BTN_2,
CY_NTCH);
}
} else {
input_report_abs(ts->input, ABS_PRESSURE, CY_NTCH);
input_report_key(ts->input, BTN_TOUCH, CY_NTCH);
input_report_key(ts->input, BTN_2, CY_NTCH);
}
/* update platform data for the current single touch info */
ts->prv_st_tch[CY_ST_FNGR1_IDX] = cur_st_tch[CY_ST_FNGR1_IDX];
@@ -1852,6 +1840,9 @@ static void cyttsp_xy_handler(struct cyttsp *ts)
id, tmp_trk[id], \
id, snd_trk[id]);
if (snd_trk[id] < CY_NUM_TRK_ID) {
input_mt_slot(ts->input, snd_trk[id]);
input_mt_report_slot_state(ts->input,
MT_TOOL_FINGER, true);
input_report_abs(ts->input,
ABS_MT_TOUCH_MAJOR,
cur_mt_z[snd_trk[id]]);
@@ -1864,7 +1855,6 @@ static void cyttsp_xy_handler(struct cyttsp *ts)
input_report_abs(ts->input,
ABS_MT_POSITION_Y,
cur_mt_pos[snd_trk[id]][CY_YPOS]);
CY_MT_SYNC(ts->input);
cyttsp_debug("MT1->TID:%2d X:%3d Y:%3d Z:%3d touch-sent\n", \
snd_trk[id], \
cur_mt_pos[snd_trk[id]][CY_XPOS], \
@@ -1872,19 +1862,10 @@ static void cyttsp_xy_handler(struct cyttsp *ts)
cur_mt_z[snd_trk[id]]);
} else if (ts->prv_mt_tch[id] < CY_NUM_TRK_ID) {
/* void out this touch */
input_report_abs(ts->input,
ABS_MT_TOUCH_MAJOR,
CY_NTCH);
input_report_abs(ts->input,
ABS_MT_WIDTH_MAJOR,
curr_tool_width);
input_report_abs(ts->input,
ABS_MT_POSITION_X,
ts->prv_mt_pos[ts->prv_mt_tch[id]][CY_XPOS]);
input_report_abs(ts->input,
ABS_MT_POSITION_Y,
ts->prv_mt_pos[ts->prv_mt_tch[id]][CY_YPOS]);
CY_MT_SYNC(ts->input);
input_mt_slot(ts->input,
ts->prv_mt_tch[id]);
input_mt_report_slot_state(ts->input,
MT_TOOL_FINGER, false);
cyttsp_debug("MT2->TID:%2d X:%3d Y:%3d Z:%3d lift off-sent\n", \
ts->prv_mt_tch[id], \
ts->prv_mt_pos[ts->prv_mt_tch[id]][CY_XPOS], \
@@ -2667,7 +2648,6 @@ static int cyttsp_initialize(struct i2c_client *client, struct cyttsp *ts)
set_bit(EV_KEY, input_device->evbit);
set_bit(EV_ABS, input_device->evbit);
set_bit(BTN_TOUCH, input_device->keybit);
set_bit(BTN_2, input_device->keybit);
set_bit(INPUT_PROP_DIRECT, input_device->propbit);
if (ts->platform_data->use_gestures)
@@ -2681,10 +2661,6 @@ static int cyttsp_initialize(struct i2c_client *client, struct cyttsp *ts)
ABS_TOOL_WIDTH, 0, CY_LARGE_TOOL_WIDTH, 0 , 0);
input_set_abs_params(input_device,
ABS_PRESSURE, 0, CY_MAXZ, 0, 0);
input_set_abs_params(input_device,
ABS_HAT0X, 0, ts->platform_data->panel_maxx, 0, 0);
input_set_abs_params(input_device,
ABS_HAT0Y, 0, ts->platform_data->panel_maxy, 0, 0);
if (ts->platform_data->use_gestures) {
input_set_abs_params(input_device,
ABS_HAT1X, 0, CY_MAXZ, 0, 0);
@@ -2702,6 +2678,7 @@ static int cyttsp_initialize(struct i2c_client *client, struct cyttsp *ts)
ABS_MT_TOUCH_MAJOR, 0, CY_MAXZ, 0, 0);
input_set_abs_params(input_device,
ABS_MT_WIDTH_MAJOR, 0, CY_LARGE_TOOL_WIDTH, 0, 0);
input_mt_init_slots(input_device, CY_NUM_TRK_ID);
if (ts->platform_data->use_trk_id) {
input_set_abs_params(input_device,
ABS_MT_TRACKING_ID, 0, CY_NUM_TRK_ID, 0, 0);