diff options
| author | Robin Peng <robinpeng@google.com> | 2022-01-03 20:37:33 +0800 |
|---|---|---|
| committer | Robin Peng <robinpeng@google.com> | 2022-01-03 20:37:33 +0800 |
| commit | 86e56d73dc1eb5b1de665947b2a79d8f97443d92 (patch) | |
| tree | 1e39aef24026ac75a4257178f9bf0578de5da43e | |
| parent | a37c57a288565a29b45c1578842643f6cc8cad5f (diff) | |
| parent | b1348bbf79b84911616554844d6de03c4a491fe4 (diff) | |
| download | fts_touch-86e56d73dc1eb5b1de665947b2a79d8f97443d92.tar.gz | |
Merge android12-gs-pixel-5.10-sc-v2 into android13-gs-pixel-5.10
Bug: 211546634
Signed-off-by: Robin Peng <robinpeng@google.com>
Change-Id: I5ebde8249a90fc6b3d335b60c91a8afa431fec63
| -rw-r--r-- | ftm5/fts.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -2985,8 +2985,8 @@ static bool fts_enter_pointer_event_handler(struct fts_ts_info *info, unsigned #endif z = 1; /* smallest non-zero pressure value */ } - major = (int)(((event[0] & 0x0C) << 2) | ((event[6] & 0xF0) >> 4)); - minor = (int)(((event[7] & 0xC0) >> 2) | (event[6] & 0x0F)); + major = (int)((((event[0] & 0x0C) << 2) | ((event[6] & 0xF0) >> 4)) * AREA_SCALE); + minor = (int)((((event[7] & 0xC0) >> 2) | (event[6] & 0x0F)) * AREA_SCALE); /* TODO: check with fw how they will report distance */ distance = 0; /* if the tool is touching the display * the distance should be 0 */ @@ -3079,8 +3079,8 @@ static bool fts_enter_pointer_event_handler(struct fts_ts_info *info, unsigned input_mt_report_slot_state(info->input_dev, tool, 1); input_report_abs(info->input_dev, ABS_MT_POSITION_X, x); input_report_abs(info->input_dev, ABS_MT_POSITION_Y, y); - input_report_abs(info->input_dev, ABS_MT_TOUCH_MAJOR, major * AREA_SCALE); - input_report_abs(info->input_dev, ABS_MT_TOUCH_MINOR, minor * AREA_SCALE); + input_report_abs(info->input_dev, ABS_MT_TOUCH_MAJOR, major); + input_report_abs(info->input_dev, ABS_MT_TOUCH_MINOR, minor); #ifndef SKIP_PRESSURE input_report_abs(info->input_dev, ABS_MT_PRESSURE, z); #endif @@ -4514,9 +4514,9 @@ static void fts_offload_report(void *handle, input_report_abs(info->input_dev, ABS_MT_POSITION_Y, report->coords[i].y); input_report_abs(info->input_dev, ABS_MT_TOUCH_MAJOR, - report->coords[i].major * AREA_SCALE); + report->coords[i].major); input_report_abs(info->input_dev, ABS_MT_TOUCH_MINOR, - report->coords[i].minor * AREA_SCALE); + report->coords[i].minor); #ifndef SKIP_PRESSURE if ((int)report->coords[i].pressure <= 0) { |