History

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.

Jiada Wang committed 6 years ago

Commit 5fc70e31 parent c9c457012 files · +21 −21Browse files

Unified · Split

12 files
  1. drivers/hid/hid-alps.c +1 −2
  2. drivers/hid/hid-multitouch.c +2 −4
  3. drivers/input/misc/xen-kbdfront.c +1 −1
  4. drivers/input/mouse/elan_i2c_core.c +1 −1
  5. drivers/input/touchscreen/atmel_mxt_ts.c +3 −4
  6. drivers/input/touchscreen/cyttsp4_core.c +2 −3
  7. drivers/input/touchscreen/cyttsp_core.c +1 −1
  8. drivers/input/touchscreen/melfas_mip4.c +2 −2
  9. drivers/input/touchscreen/mms114.c +1 −1
  10. drivers/input/touchscreen/raspberrypi-ts.c +1 −1
  11. drivers/input/touchscreen/stmfts.c +1 −1
  12. include/linux/input/mt.h +5 −0
drivers/hid/hid-alps.c+1−2
@@ -387,8 +387,7 @@ static int u1_raw_event(struct alps_dev *hdata, u8 *data, int size) · 386 unmodified lines
387387 input_report_abs(hdata->input,
388388 ABS_MT_PRESSURE, z);
389389 } else {
390− input_mt_report_slot_state(hdata->input,
391− MT_TOOL_FINGER, 0);
390+ input_mt_report_slot_inactive(hdata->input);
392391 }
393392 }
394393
drivers/hid/hid-multitouch.c+2−4
@@ -896,7 +896,7 @@ static void mt_release_pending_palms(struct mt_device *td, · 895 unmodified lines
896896 clear_bit(slotnum, app->pending_palm_slots);
897897
898898 input_mt_slot(input, slotnum);
899− input_mt_report_slot_state(input, MT_TOOL_PALM, false);
899+ input_mt_report_slot_inactive(input);
900900
901901 need_sync = true;
902902 }
@@ -1640,9 +1640,7 @@ static void mt_release_contacts(struct hid_device *hid) · 737 unmodified lines
16401640 if (mt) {
16411641 for (i = 0; i < mt->num_slots; i++) {
16421642 input_mt_slot(input_dev, i);
1643− input_mt_report_slot_state(input_dev,
1644− MT_TOOL_FINGER,
1645− false);
1643+ input_mt_report_slot_inactive(input_dev);
16461644 }
16471645 input_mt_sync_frame(input_dev);
16481646 input_sync(input_dev);
drivers/input/misc/xen-kbdfront.c+1−1
@@ -146,7 +146,7 @@ static void xenkbd_handle_mt_event(struct xenkbd_info *info, · 145 unmodified lines
146146 break;
147147
148148 case XENKBD_MT_EV_UP:
149− input_mt_report_slot_state(info->mtouch, MT_TOOL_FINGER, false);
149+ input_mt_report_slot_inactive(info->mtouch);
150150 break;
151151
152152 case XENKBD_MT_EV_SYN:
drivers/input/mouse/elan_i2c_core.c+1−1
@@ -938,7 +938,7 @@ static void elan_report_contact(struct elan_tp_data *data, · 937 unmodified lines
938938 input_report_abs(input, ABS_MT_TOUCH_MINOR, minor);
939939 } else {
940940 input_mt_slot(input, contact_num);
941− input_mt_report_slot_state(input, MT_TOOL_FINGER, false);
941+ input_mt_report_slot_inactive(input);
942942 }
943943 }
944944
drivers/input/touchscreen/atmel_mxt_ts.c+3−4
@@ -822,8 +822,7 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 *message) · 821 unmodified lines
822822 * have happened.
823823 */
824824 if (status & MXT_T9_RELEASE) {
825− input_mt_report_slot_state(input_dev,
826− MT_TOOL_FINGER, 0);
825+ input_mt_report_slot_inactive(input_dev);
827826 mxt_input_sync(data);
828827 }
829828
@@ -839,7 +838,7 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 *message) · 9 unmodified lines
839838 input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR, area);
840839 } else {
841840 /* Touch no longer active, close out slot */
842− input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, 0);
841+ input_mt_report_slot_inactive(input_dev);
843842 }
844843
845844 data->update_input = true;
@@ -947,7 +946,7 @@ static void mxt_proc_t100_message(struct mxt_data *data, u8 *message) · 101 unmodified lines
947946 dev_dbg(dev, "[%u] release\n", id);
948947
949948 /* close out slot */
950− input_mt_report_slot_state(input_dev, 0, 0);
949+ input_mt_report_slot_inactive(input_dev);
951950 }
952951
953952 data->update_input = true;
drivers/input/touchscreen/cyttsp4_core.c+2−3
@@ -744,8 +744,7 @@ static void cyttsp4_report_slot_liftoff(struct cyttsp4_mt_data *md, · 743 unmodified lines
744744
745745 for (t = 0; t < max_slots; t++) {
746746 input_mt_slot(md->input, t);
747− input_mt_report_slot_state(md->input,
748− MT_TOOL_FINGER, false);
747+ input_mt_report_slot_inactive(md->input);
749748 }
750749 }
751750
@@ -845,7 +844,7 @@ static void cyttsp4_final_sync(struct input_dev *input, int max_slots, int *ids) · 93 unmodified lines
845844 if (ids[t])
846845 continue;
847846 input_mt_slot(input, t);
848− input_mt_report_slot_state(input, MT_TOOL_FINGER, false);
847+ input_mt_report_slot_inactive(input);
849848 }
850849
851850 input_sync(input);
drivers/input/touchscreen/cyttsp_core.c+1−1
@@ -340,7 +340,7 @@ static void cyttsp_report_tchdata(struct cyttsp *ts) · 339 unmodified lines
340340 continue;
341341
342342 input_mt_slot(input, i);
343− input_mt_report_slot_state(input, MT_TOOL_FINGER, false);
343+ input_mt_report_slot_inactive(input);
344344 }
345345
346346 input_sync(input);
drivers/input/touchscreen/melfas_mip4.c+2−2
@@ -391,7 +391,7 @@ static void mip4_clear_input(struct mip4_ts *ts) · 390 unmodified lines
391391 /* Screen */
392392 for (i = 0; i < MIP4_MAX_FINGERS; i++) {
393393 input_mt_slot(ts->input, i);
394− input_mt_report_slot_state(ts->input, MT_TOOL_FINGER, 0);
394+ input_mt_report_slot_inactive(ts->input);
395395 }
396396
397397 /* Keys */
@@ -534,7 +534,7 @@ static void mip4_report_touch(struct mip4_ts *ts, u8 *packet) · 136 unmodified lines
534534 } else {
535535 /* Release event */
536536 input_mt_slot(ts->input, id);
537− input_mt_report_slot_state(ts->input, MT_TOOL_FINGER, 0);
537+ input_mt_report_slot_inactive(ts->input);
538538 }
539539
540540 input_mt_sync_frame(ts->input);
drivers/input/touchscreen/mms114.c+1−1
@@ -559,7 +559,7 @@ static int __maybe_unused mms114_suspend(struct device *dev) · 558 unmodified lines
559559 /* Release all touch */
560560 for (id = 0; id < MMS114_MAX_TOUCH; id++) {
561561 input_mt_slot(input_dev, id);
562− input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, false);
562+ input_mt_report_slot_inactive(input_dev);
563563 }
564564
565565 input_mt_report_pointer_emulation(input_dev, true);
drivers/input/touchscreen/raspberrypi-ts.c+1−1
@@ -100,7 +100,7 @@ static void rpi_ts_poll(struct input_dev *input) · 99 unmodified lines
100100 released_ids = ts->known_ids & ~modified_ids;
101101 for_each_set_bit(i, &released_ids, RPI_TS_MAX_SUPPORTED_POINTS) {
102102 input_mt_slot(input, i);
103− input_mt_report_slot_state(input, MT_TOOL_FINGER, 0);
103+ input_mt_report_slot_inactive(input);
104104 modified_ids &= ~(BIT(i));
105105 }
106106 ts->known_ids = modified_ids;
drivers/input/touchscreen/stmfts.c+1−1
@@ -198,7 +198,7 @@ static void stmfts_report_contact_release(struct stmfts_data *sdata, · 197 unmodified lines
198198 u8 slot_id = (event[0] & STMFTS_MASK_TOUCH_ID) >> 4;
199199
200200 input_mt_slot(sdata->input, slot_id);
201− input_mt_report_slot_state(sdata->input, MT_TOOL_FINGER, false);
201+ input_mt_report_slot_inactive(sdata->input);
202202
203203 input_sync(sdata->input);
204204 }
include/linux/input/mt.h+5−0
@@ -100,6 +100,11 @@ static inline bool input_is_mt_axis(int axis) · 99 unmodified lines
100100 bool input_mt_report_slot_state(struct input_dev *dev,
101101 unsigned int tool_type, bool active);
102102
103+static inline void input_mt_report_slot_inactive(struct input_dev *dev)
104+{
105+ input_mt_report_slot_state(dev, 0, false);
106+}
107+
103108 void input_mt_report_finger_count(struct input_dev *dev, int count);
104109 void input_mt_report_pointer_emulation(struct input_dev *dev, bool use_count);
105110 void input_mt_drop_unused(struct input_dev *dev);