diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2024-02-25 19:04:46 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2024-02-25 19:04:46 -0800 |
| commit | bbaeccf80536bb04b95d2988847faff1414cd613 (patch) | |
| tree | d933b098188a04dd959305fa5900fd610cf2638e | |
| parent | f27d184c33a04f575a1d79434c161305eee71518 (diff) | |
| parent | 1185a9f0856b955736393d4db220de339216d6c3 (diff) | |
| download | novatek_touch-android-gs-lynx-5.10-android15-beta.tar.gz | |
Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10android-15-beta-1_r0.5android-15-beta-1_r0.3android-gs-raviole-5.10-android15-dpandroid-gs-raviole-5.10-android15-betaandroid-gs-lynx-5.10-android15-dpandroid-gs-lynx-5.10-android15-beta
SBMerger: 605678113
Change-Id: I1c62562020dbe95f227ed525e913aa8b7578ec92
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | nt36xxx/nt36xxx.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/nt36xxx/nt36xxx.c b/nt36xxx/nt36xxx.c index 9a9e48f..5ff7786 100644 --- a/nt36xxx/nt36xxx.c +++ b/nt36xxx/nt36xxx.c @@ -1600,6 +1600,7 @@ static void process_usi_responses(uint16_t info_buf_flags, const uint8_t *info_b nvt_usi_store_battery(info_buf + USI_BATTERY_OFFSET); nvt_usi_get_battery(&pen_bat_capa); if (ts->pen_bat_capa != pen_bat_capa) { + NVT_LOG("USI BAT Changed 0x%02X\n", pen_bat_capa); ts->pen_bat_capa = pen_bat_capa; power_supply_changed(ts->pen_bat_psy); } @@ -2049,7 +2050,10 @@ static irqreturn_t nvt_ts_work_func(int irq, void *data) /* Snapshot some stylus context information for * offload */ - ts->pen_active = 1; + if (!ts->pen_active) { + NVT_LOG("USI paired"); + ts->pen_active = 1; + } #ifdef GOOG_TOUCH_INTERFACE ts->pen_offload_coord.status = COORD_STATUS_PEN; ts->pen_offload_coord.x = pen_x; @@ -2111,6 +2115,7 @@ static irqreturn_t nvt_ts_work_func(int irq, void *data) /* Snapshot some stylus context information for offload */ ts->pen_active = 0; + NVT_LOG("USI un-paired"); ts->pen_offload_coord_timestamp = ts->timestamp; #ifdef GOOG_TOUCH_INTERFACE memset(&ts->pen_offload_coord, 0, @@ -2149,6 +2154,8 @@ static irqreturn_t nvt_ts_work_func(int irq, void *data) } else { destroy_pen_input_device(ts->pen_input_dev); ts->pen_input_dev = new_pen_input_dev; + NVT_LOG("USI Stylus Switched(v:0x%02X,p:0x%02X)\n", + pen_vid, pen_pid); } } #endif |