diff options
| author | davidycchen <davidycchen@google.com> | 2022-11-22 09:33:16 +0800 |
|---|---|---|
| committer | davidycchen <davidycchen@google.com> | 2022-11-22 11:15:26 +0800 |
| commit | d489225c2902cb3f3a3d5fc248e13533ab2daa2d (patch) | |
| tree | 1a1980cd77e77855812b807befb87a11ea1055fb | |
| parent | 7bc4ab91507ea62ee15fa506b5eebdcd26e57de9 (diff) | |
| parent | ace1c47def43c3d0c6f83dc40b7e9f54d4db3bab (diff) | |
| download | goodix_touch-d489225c2902cb3f3a3d5fc248e13533ab2daa2d.tar.gz | |
Merge branch 'android13-gs-pixel-5.10-tm-qpr2' into android13-gs-pixel-5.15
Change-Id: I6c0a2093fb9d33175810ac6ba3338a04c22e1aff
| -rw-r--r-- | goodix_ts_core.c | 10 | ||||
| -rw-r--r-- | goodix_ts_proc.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/goodix_ts_core.c b/goodix_ts_core.c index fe27cd6..10617c5 100644 --- a/goodix_ts_core.c +++ b/goodix_ts_core.c @@ -932,7 +932,7 @@ static int get_self_sensor_data( if (ret == 0) { cmd->buffer = (u8 *)cd->self_sensing_data_manual; - cmd->size = tx * rx * sizeof(uint16_t); + cmd->size = (tx + rx) * sizeof(uint16_t); } /* enable irq & esd */ @@ -1713,24 +1713,24 @@ void goodix_ts_report_status(struct goodix_ts_core *core_data, st->noise_lv, st->grip_type, st->event_id, ts_event->clear_count); #if IS_ENABLED(CONFIG_GOOG_TOUCH_INTERFACE) if (st->soft_reset) - goog_notify_fw_status_changed(core_data->gti, GTI_FW_STATUE_RESET, + goog_notify_fw_status_changed(core_data->gti, GTI_FW_STATUS_RESET, &status_data); if (st->palm_change) { goog_notify_fw_status_changed(core_data->gti, - st->palm_sta ? GTI_FW_STATUE_PALM_ENTER : GTI_FW_STATUE_PALM_EXIT, + st->palm_sta ? GTI_FW_STATUS_PALM_ENTER : GTI_FW_STATUS_PALM_EXIT, &status_data); } if (st->grip_change) { goog_notify_fw_status_changed(core_data->gti, - st->grip_type ? GTI_FW_STATUE_GRIP_ENTER : GTI_FW_STATUE_GRIP_EXIT, + st->grip_type ? GTI_FW_STATUS_GRIP_ENTER : GTI_FW_STATUS_GRIP_EXIT, &status_data); } if (st->noise_lv_change) { status_data.noise_level = st->noise_lv; - goog_notify_fw_status_changed(core_data->gti, GTI_FW_STATUE_NOISE_MODE, + goog_notify_fw_status_changed(core_data->gti, GTI_FW_STATUS_NOISE_MODE, &status_data); } #endif diff --git a/goodix_ts_proc.c b/goodix_ts_proc.c index 1688dea..90031e9 100644 --- a/goodix_ts_proc.c +++ b/goodix_ts_proc.c @@ -3010,7 +3010,7 @@ static void goodix_get_dump_log(void) static void goodix_get_stylus_data(void) { struct goodix_stylus_data stylus_data; - u8 temp_buf[320] = { 0 }; + u8 temp_buf[40] = { 0 }; u32 flag_addr = cd->ic_info.misc.touch_data_addr; int tx = cd->ic_info.parm.drv_num; int rx = cd->ic_info.parm.sen_num; @@ -3075,7 +3075,7 @@ static void goodix_get_stylus_data(void) cd->ic_info.misc.fw_attr_len + cd->ic_info.misc.fw_log_len; ret = cd->hw_ops->read( - cd, stylus_struct_addr, temp_buf, sizeof(stylus_data)); + cd, stylus_struct_addr, (u8 *)&stylus_data, sizeof(stylus_data)); if (ret < 0) { ts_err("read stylus struct data failed"); goto exit; |