forked from luck/tmp_suning_uos_patched
Input: introduce input_mt_report_slot_inactive()
input_mt_report_slot_state() ignores "tool" argument when the slot is closed, which has caused a bit of confusion. Let's introduce input_mt_report_slot_inactive() to report inactive slot state. Suggested-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Jiada Wang <jiada_wang@mentor.com> Link: https://lore.kernel.org/r/20200508055656.96389-2-jiada_wang@mentor.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
parent
c9c457022b
commit
5fc70e350e
|
@ -387,8 +387,7 @@ static int u1_raw_event(struct alps_dev *hdata, u8 *data, int size)
|
|||
input_report_abs(hdata->input,
|
||||
ABS_MT_PRESSURE, z);
|
||||
} else {
|
||||
input_mt_report_slot_state(hdata->input,
|
||||
MT_TOOL_FINGER, 0);
|
||||
input_mt_report_slot_inactive(hdata->input);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -896,7 +896,7 @@ static void mt_release_pending_palms(struct mt_device *td,
|
|||
clear_bit(slotnum, app->pending_palm_slots);
|
||||
|
||||
input_mt_slot(input, slotnum);
|
||||
input_mt_report_slot_state(input, MT_TOOL_PALM, false);
|
||||
input_mt_report_slot_inactive(input);
|
||||
|
||||
need_sync = true;
|
||||
}
|
||||
|
@ -1640,9 +1640,7 @@ static void mt_release_contacts(struct hid_device *hid)
|
|||
if (mt) {
|
||||
for (i = 0; i < mt->num_slots; i++) {
|
||||
input_mt_slot(input_dev, i);
|
||||
input_mt_report_slot_state(input_dev,
|
||||
MT_TOOL_FINGER,
|
||||
false);
|
||||
input_mt_report_slot_inactive(input_dev);
|
||||
}
|
||||
input_mt_sync_frame(input_dev);
|
||||
input_sync(input_dev);
|
||||
|
|
|
@ -146,7 +146,7 @@ static void xenkbd_handle_mt_event(struct xenkbd_info *info,
|
|||
break;
|
||||
|
||||
case XENKBD_MT_EV_UP:
|
||||
input_mt_report_slot_state(info->mtouch, MT_TOOL_FINGER, false);
|
||||
input_mt_report_slot_inactive(info->mtouch);
|
||||
break;
|
||||
|
||||
case XENKBD_MT_EV_SYN:
|
||||
|
|
|
@ -938,7 +938,7 @@ static void elan_report_contact(struct elan_tp_data *data,
|
|||
input_report_abs(input, ABS_MT_TOUCH_MINOR, minor);
|
||||
} else {
|
||||
input_mt_slot(input, contact_num);
|
||||
input_mt_report_slot_state(input, MT_TOOL_FINGER, false);
|
||||
input_mt_report_slot_inactive(input);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -822,8 +822,7 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 *message)
|
|||
* have happened.
|
||||
*/
|
||||
if (status & MXT_T9_RELEASE) {
|
||||
input_mt_report_slot_state(input_dev,
|
||||
MT_TOOL_FINGER, 0);
|
||||
input_mt_report_slot_inactive(input_dev);
|
||||
mxt_input_sync(data);
|
||||
}
|
||||
|
||||
|
@ -839,7 +838,7 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 *message)
|
|||
input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR, area);
|
||||
} else {
|
||||
/* Touch no longer active, close out slot */
|
||||
input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, 0);
|
||||
input_mt_report_slot_inactive(input_dev);
|
||||
}
|
||||
|
||||
data->update_input = true;
|
||||
|
@ -947,7 +946,7 @@ static void mxt_proc_t100_message(struct mxt_data *data, u8 *message)
|
|||
dev_dbg(dev, "[%u] release\n", id);
|
||||
|
||||
/* close out slot */
|
||||
input_mt_report_slot_state(input_dev, 0, 0);
|
||||
input_mt_report_slot_inactive(input_dev);
|
||||
}
|
||||
|
||||
data->update_input = true;
|
||||
|
|
|
@ -744,8 +744,7 @@ static void cyttsp4_report_slot_liftoff(struct cyttsp4_mt_data *md,
|
|||
|
||||
for (t = 0; t < max_slots; t++) {
|
||||
input_mt_slot(md->input, t);
|
||||
input_mt_report_slot_state(md->input,
|
||||
MT_TOOL_FINGER, false);
|
||||
input_mt_report_slot_inactive(md->input);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -845,7 +844,7 @@ static void cyttsp4_final_sync(struct input_dev *input, int max_slots, int *ids)
|
|||
if (ids[t])
|
||||
continue;
|
||||
input_mt_slot(input, t);
|
||||
input_mt_report_slot_state(input, MT_TOOL_FINGER, false);
|
||||
input_mt_report_slot_inactive(input);
|
||||
}
|
||||
|
||||
input_sync(input);
|
||||
|
|
|
@ -340,7 +340,7 @@ static void cyttsp_report_tchdata(struct cyttsp *ts)
|
|||
continue;
|
||||
|
||||
input_mt_slot(input, i);
|
||||
input_mt_report_slot_state(input, MT_TOOL_FINGER, false);
|
||||
input_mt_report_slot_inactive(input);
|
||||
}
|
||||
|
||||
input_sync(input);
|
||||
|
|
|
@ -391,7 +391,7 @@ static void mip4_clear_input(struct mip4_ts *ts)
|
|||
/* Screen */
|
||||
for (i = 0; i < MIP4_MAX_FINGERS; i++) {
|
||||
input_mt_slot(ts->input, i);
|
||||
input_mt_report_slot_state(ts->input, MT_TOOL_FINGER, 0);
|
||||
input_mt_report_slot_inactive(ts->input);
|
||||
}
|
||||
|
||||
/* Keys */
|
||||
|
@ -534,7 +534,7 @@ static void mip4_report_touch(struct mip4_ts *ts, u8 *packet)
|
|||
} else {
|
||||
/* Release event */
|
||||
input_mt_slot(ts->input, id);
|
||||
input_mt_report_slot_state(ts->input, MT_TOOL_FINGER, 0);
|
||||
input_mt_report_slot_inactive(ts->input);
|
||||
}
|
||||
|
||||
input_mt_sync_frame(ts->input);
|
||||
|
|
|
@ -559,7 +559,7 @@ static int __maybe_unused mms114_suspend(struct device *dev)
|
|||
/* Release all touch */
|
||||
for (id = 0; id < MMS114_MAX_TOUCH; id++) {
|
||||
input_mt_slot(input_dev, id);
|
||||
input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, false);
|
||||
input_mt_report_slot_inactive(input_dev);
|
||||
}
|
||||
|
||||
input_mt_report_pointer_emulation(input_dev, true);
|
||||
|
|
|
@ -100,7 +100,7 @@ static void rpi_ts_poll(struct input_dev *input)
|
|||
released_ids = ts->known_ids & ~modified_ids;
|
||||
for_each_set_bit(i, &released_ids, RPI_TS_MAX_SUPPORTED_POINTS) {
|
||||
input_mt_slot(input, i);
|
||||
input_mt_report_slot_state(input, MT_TOOL_FINGER, 0);
|
||||
input_mt_report_slot_inactive(input);
|
||||
modified_ids &= ~(BIT(i));
|
||||
}
|
||||
ts->known_ids = modified_ids;
|
||||
|
|
|
@ -198,7 +198,7 @@ static void stmfts_report_contact_release(struct stmfts_data *sdata,
|
|||
u8 slot_id = (event[0] & STMFTS_MASK_TOUCH_ID) >> 4;
|
||||
|
||||
input_mt_slot(sdata->input, slot_id);
|
||||
input_mt_report_slot_state(sdata->input, MT_TOOL_FINGER, false);
|
||||
input_mt_report_slot_inactive(sdata->input);
|
||||
|
||||
input_sync(sdata->input);
|
||||
}
|
||||
|
|
|
@ -100,6 +100,11 @@ static inline bool input_is_mt_axis(int axis)
|
|||
bool input_mt_report_slot_state(struct input_dev *dev,
|
||||
unsigned int tool_type, bool active);
|
||||
|
||||
static inline void input_mt_report_slot_inactive(struct input_dev *dev)
|
||||
{
|
||||
input_mt_report_slot_state(dev, 0, false);
|
||||
}
|
||||
|
||||
void input_mt_report_finger_count(struct input_dev *dev, int count);
|
||||
void input_mt_report_pointer_emulation(struct input_dev *dev, bool use_count);
|
||||
void input_mt_drop_unused(struct input_dev *dev);
|
||||
|
|
Loading…
Reference in New Issue
Block a user