HID: multitouch: store a per application quirks value (3ceb3826) · Commits · 戴 / test

drivers/hid/hid-multitouch.c

+32 −32

Original line number	Original line	Diff line number	Diff line
	@@ -99,6 +99,9 @@ struct mt_slot {
	struct mt_application {		struct mt_application {
	struct list_head list;		struct list_head list;
	unsigned int application;		unsigned int application;

			__s32 quirks;

	struct mt_slot curdata; /* placeholder of incoming data */		struct mt_slot curdata; /* placeholder of incoming data */

	int cc_index; /* contact count field index in the report */		int cc_index; /* contact count field index in the report */
	@@ -368,7 +371,6 @@ static ssize_t mt_set_quirks(struct device *dev,
	struct mt_application *application;		struct mt_application *application;

	unsigned long val;		unsigned long val;
	bool confidence_found = false;

	if (kstrtoul(buf, 0, &val))		if (kstrtoul(buf, 0, &val))
	return -EINVAL;		return -EINVAL;
	@@ -376,13 +378,11 @@ static ssize_t mt_set_quirks(struct device *dev,
	td->mtclass.quirks = val;		td->mtclass.quirks = val;

	list_for_each_entry(application, &td->applications, list) {		list_for_each_entry(application, &td->applications, list) {
	if (application->have_contact_count)		application->quirks = val;
	confidence_found = true;		if (!application->have_contact_count)
			application->quirks &= ~MT_QUIRK_CONTACT_CNT_ACCURATE;
	}		}

	if (!confidence_found)
	td->mtclass.quirks &= ~MT_QUIRK_CONTACT_CNT_ACCURATE;

	return count;		return count;
	}		}

	@@ -501,6 +501,7 @@ static struct mt_application mt_allocate_application(struct mt_device td,

	mt_application->cc_index = -1;		mt_application->cc_index = -1;
	mt_application->scantime_index = -1;		mt_application->scantime_index = -1;
			mt_application->quirks = td->mtclass.quirks;

	list_add_tail(&mt_application->list, &td->applications);		list_add_tail(&mt_application->list, &td->applications);

	@@ -590,7 +591,7 @@ static int mt_touch_input_mapping(struct hid_device hdev, struct hid_input hi,
	case HID_UP_DIGITIZER:		case HID_UP_DIGITIZER:
	switch (usage->hid) {		switch (usage->hid) {
	case HID_DG_INRANGE:		case HID_DG_INRANGE:
	if (cls->quirks & MT_QUIRK_HOVERING) {		if (app->quirks & MT_QUIRK_HOVERING) {
	hid_map_usage(hi, usage, bit, max,		hid_map_usage(hi, usage, bit, max,
	EV_ABS, ABS_MT_DISTANCE);		EV_ABS, ABS_MT_DISTANCE);
	input_set_abs_params(hi->input,		input_set_abs_params(hi->input,
	@@ -602,7 +603,7 @@ static int mt_touch_input_mapping(struct hid_device hdev, struct hid_input hi,
	if ((cls->name == MT_CLS_WIN_8 \|\|		if ((cls->name == MT_CLS_WIN_8 \|\|
	cls->name == MT_CLS_WIN_8_DUAL) &&		cls->name == MT_CLS_WIN_8_DUAL) &&
	field->application == HID_DG_TOUCHPAD)		field->application == HID_DG_TOUCHPAD)
	cls->quirks \|= MT_QUIRK_CONFIDENCE;		app->quirks \|= MT_QUIRK_CONFIDENCE;
	mt_store_field(usage, td, hi);		mt_store_field(usage, td, hi);
	return 1;		return 1;
	case HID_DG_TIPSWITCH:		case HID_DG_TIPSWITCH:
	@@ -618,7 +619,7 @@ static int mt_touch_input_mapping(struct hid_device hdev, struct hid_input hi,
	case HID_DG_WIDTH:		case HID_DG_WIDTH:
	hid_map_usage(hi, usage, bit, max,		hid_map_usage(hi, usage, bit, max,
	EV_ABS, ABS_MT_TOUCH_MAJOR);		EV_ABS, ABS_MT_TOUCH_MAJOR);
	if (!(cls->quirks & MT_QUIRK_NO_AREA))		if (!(app->quirks & MT_QUIRK_NO_AREA))
	set_abs(hi->input, ABS_MT_TOUCH_MAJOR, field,		set_abs(hi->input, ABS_MT_TOUCH_MAJOR, field,
	cls->sn_width);		cls->sn_width);
	mt_store_field(usage, td, hi);		mt_store_field(usage, td, hi);
	@@ -626,7 +627,7 @@ static int mt_touch_input_mapping(struct hid_device hdev, struct hid_input hi,
	case HID_DG_HEIGHT:		case HID_DG_HEIGHT:
	hid_map_usage(hi, usage, bit, max,		hid_map_usage(hi, usage, bit, max,
	EV_ABS, ABS_MT_TOUCH_MINOR);		EV_ABS, ABS_MT_TOUCH_MINOR);
	if (!(cls->quirks & MT_QUIRK_NO_AREA)) {		if (!(app->quirks & MT_QUIRK_NO_AREA)) {
	set_abs(hi->input, ABS_MT_TOUCH_MINOR, field,		set_abs(hi->input, ABS_MT_TOUCH_MINOR, field,
	cls->sn_height);		cls->sn_height);

	@@ -700,7 +701,7 @@ static int mt_touch_input_mapping(struct hid_device hdev, struct hid_input hi,
	* MS PTP spec says that external buttons left and right have		* MS PTP spec says that external buttons left and right have
	* usages 2 and 3.		* usages 2 and 3.
	*/		*/
	if ((cls->quirks & MT_QUIRK_WIN8_PTP_BUTTONS) &&		if ((app->quirks & MT_QUIRK_WIN8_PTP_BUTTONS) &&
	field->application == HID_DG_TOUCHPAD &&		field->application == HID_DG_TOUCHPAD &&
	(usage->hid & HID_USAGE) > 1)		(usage->hid & HID_USAGE) > 1)
	code--;		code--;
	@@ -719,7 +720,7 @@ static int mt_touch_input_mapping(struct hid_device hdev, struct hid_input hi,
	static int mt_compute_slot(struct mt_device td, struct mt_application app,		static int mt_compute_slot(struct mt_device td, struct mt_application app,
	struct input_dev *input)		struct input_dev *input)
	{		{
	__s32 quirks = td->mtclass.quirks;		__s32 quirks = app->quirks;

	if (quirks & MT_QUIRK_SLOT_IS_CONTACTID)		if (quirks & MT_QUIRK_SLOT_IS_CONTACTID)
	return app->curdata.contactid;		return app->curdata.contactid;
	@@ -743,11 +744,11 @@ static int mt_compute_slot(struct mt_device td, struct mt_application app,
	static void mt_complete_slot(struct mt_device td, struct mt_application app,		static void mt_complete_slot(struct mt_device td, struct mt_application app,
	struct input_dev *input)		struct input_dev *input)
	{		{
	if ((td->mtclass.quirks & MT_QUIRK_CONTACT_CNT_ACCURATE) &&		if ((app->quirks & MT_QUIRK_CONTACT_CNT_ACCURATE) &&
	app->num_received >= app->num_expected)		app->num_received >= app->num_expected)
	return;		return;

	if (app->curvalid \|\| (td->mtclass.quirks & MT_QUIRK_ALWAYS_VALID)) {		if (app->curvalid \|\| (app->quirks & MT_QUIRK_ALWAYS_VALID)) {
	int active;		int active;
	int slotnum = mt_compute_slot(td, app, input);		int slotnum = mt_compute_slot(td, app, input);
	struct mt_slot *s = &app->curdata;		struct mt_slot *s = &app->curdata;
	@@ -756,14 +757,14 @@ static void mt_complete_slot(struct mt_device td, struct mt_application app,
	if (slotnum < 0 \|\| slotnum >= td->maxcontacts)		if (slotnum < 0 \|\| slotnum >= td->maxcontacts)
	return;		return;

	if ((td->mtclass.quirks & MT_QUIRK_IGNORE_DUPLICATES) && mt) {		if ((app->quirks & MT_QUIRK_IGNORE_DUPLICATES) && mt) {
	struct input_mt_slot *slot = &mt->slots[slotnum];		struct input_mt_slot *slot = &mt->slots[slotnum];
	if (input_mt_is_active(slot) &&		if (input_mt_is_active(slot) &&
	input_mt_is_used(mt, slot))		input_mt_is_used(mt, slot))
	return;		return;
	}		}

	if (!(td->mtclass.quirks & MT_QUIRK_CONFIDENCE))		if (!(app->quirks & MT_QUIRK_CONFIDENCE))
	s->confidence_state = true;		s->confidence_state = true;
	active = (s->touch_state \|\| s->inrange_state) &&		active = (s->touch_state \|\| s->inrange_state) &&
	s->confidence_state;		s->confidence_state;
	@@ -784,7 +785,7 @@ static void mt_complete_slot(struct mt_device td, struct mt_application app,
	* divided by two to match visual scale of touch		* divided by two to match visual scale of touch
	* for devices with this quirk		* for devices with this quirk
	*/		*/
	if (td->mtclass.quirks & MT_QUIRK_TOUCH_SIZE_SCALING) {		if (app->quirks & MT_QUIRK_TOUCH_SIZE_SCALING) {
	major = major >> 1;		major = major >> 1;
	minor = minor >> 1;		minor = minor >> 1;
	}		}
	@@ -815,7 +816,7 @@ static void mt_complete_slot(struct mt_device td, struct mt_application app,
	static void mt_sync_frame(struct mt_device td, struct mt_application app,		static void mt_sync_frame(struct mt_device td, struct mt_application app,
	struct input_dev *input)		struct input_dev *input)
	{		{
	if (td->mtclass.quirks & MT_QUIRK_WIN8_PTP_BUTTONS)		if (app->quirks & MT_QUIRK_WIN8_PTP_BUTTONS)
	input_event(input, EV_KEY, BTN_LEFT, app->left_button_state);		input_event(input, EV_KEY, BTN_LEFT, app->left_button_state);

	input_mt_sync_frame(input);		input_mt_sync_frame(input);
	@@ -867,7 +868,7 @@ static void mt_process_mt_event(struct hid_device hid, struct hid_field field,
	struct mt_application *app, bool first_packet)		struct mt_application *app, bool first_packet)
	{		{
	struct mt_device *td = hid_get_drvdata(hid);		struct mt_device *td = hid_get_drvdata(hid);
	__s32 quirks = td->mtclass.quirks;		__s32 quirks = app->quirks;
	struct input_dev *input = field->hidinput->input;		struct input_dev *input = field->hidinput->input;

	if (hid->claimed & HID_CLAIMED_INPUT) {		if (hid->claimed & HID_CLAIMED_INPUT) {
	@@ -1017,7 +1018,7 @@ static void mt_touch_report(struct hid_device hid, struct hid_report report)
	* of a possible multi-packet frame be checking that the		* of a possible multi-packet frame be checking that the
	* timestamp has changed.		* timestamp has changed.
	*/		*/
	if ((td->mtclass.quirks & MT_QUIRK_WIN8_PTP_BUTTONS) &&		if ((app->quirks & MT_QUIRK_WIN8_PTP_BUTTONS) &&
	app->num_received == 0 &&		app->num_received == 0 &&
	app->prev_scantime != scantime)		app->prev_scantime != scantime)
	app->num_expected = contact_count;		app->num_expected = contact_count;
	@@ -1061,7 +1062,7 @@ static void mt_touch_report(struct hid_device hid, struct hid_report report)
	* only affect laggish machines and the ones that have a firmware		* only affect laggish machines and the ones that have a firmware
	* defect.		* defect.
	*/		*/
	if (td->mtclass.quirks & MT_QUIRK_STICKY_FINGERS) {		if (app->quirks & MT_QUIRK_STICKY_FINGERS) {
	if (test_bit(MT_IO_FLAGS_PENDING_SLOTS, &td->mt_io_flags))		if (test_bit(MT_IO_FLAGS_PENDING_SLOTS, &td->mt_io_flags))
	mod_timer(&td->release_timer,		mod_timer(&td->release_timer,
	jiffies + msecs_to_jiffies(100));		jiffies + msecs_to_jiffies(100));
	@@ -1091,7 +1092,7 @@ static int mt_touch_input_configured(struct hid_device *hdev,
	if (cls->is_indirect)		if (cls->is_indirect)
	app->mt_flags \|= INPUT_MT_POINTER;		app->mt_flags \|= INPUT_MT_POINTER;

	if (cls->quirks & MT_QUIRK_NOT_SEEN_MEANS_UP)		if (app->quirks & MT_QUIRK_NOT_SEEN_MEANS_UP)
	app->mt_flags \|= INPUT_MT_DROP_UNUSED;		app->mt_flags \|= INPUT_MT_DROP_UNUSED;

	/* check for clickpads */		/* check for clickpads */
	@@ -1119,6 +1120,8 @@ static int mt_input_mapping(struct hid_device hdev, struct hid_input hi,
	struct mt_device *td = hid_get_drvdata(hdev);		struct mt_device *td = hid_get_drvdata(hdev);
	struct mt_application *application;		struct mt_application *application;

			application = mt_find_application(td, field->application);

	/*		/*
	* If mtclass.export_all_inputs is not set, only map fields from		* If mtclass.export_all_inputs is not set, only map fields from
	* TouchScreen or TouchPad collections. We need to ignore fields		* TouchScreen or TouchPad collections. We need to ignore fields
	@@ -1134,7 +1137,7 @@ static int mt_input_mapping(struct hid_device hdev, struct hid_input hi,
	field->application != HID_CP_CONSUMER_CONTROL &&		field->application != HID_CP_CONSUMER_CONTROL &&
	field->application != HID_GD_WIRELESS_RADIO_CTLS &&		field->application != HID_GD_WIRELESS_RADIO_CTLS &&
	!(field->application == HID_VD_ASUS_CUSTOM_MEDIA_KEYS &&		!(field->application == HID_VD_ASUS_CUSTOM_MEDIA_KEYS &&
	td->mtclass.quirks & MT_QUIRK_ASUS_CUSTOM_UP))		application->quirks & MT_QUIRK_ASUS_CUSTOM_UP))
	return -1;		return -1;

	/*		/*
	@@ -1143,7 +1146,7 @@ static int mt_input_mapping(struct hid_device hdev, struct hid_input hi,
	* map usages to input keys.		* map usages to input keys.
	*/		*/
	if (field->application == HID_VD_ASUS_CUSTOM_MEDIA_KEYS &&		if (field->application == HID_VD_ASUS_CUSTOM_MEDIA_KEYS &&
	td->mtclass.quirks & MT_QUIRK_ASUS_CUSTOM_UP &&		application->quirks & MT_QUIRK_ASUS_CUSTOM_UP &&
	(usage->hid & HID_USAGE_PAGE) == HID_UP_CUSTOM) {		(usage->hid & HID_USAGE_PAGE) == HID_UP_CUSTOM) {
	set_bit(EV_REP, hi->input->evbit);		set_bit(EV_REP, hi->input->evbit);
	if (field->flags & HID_MAIN_ITEM_VARIABLE)		if (field->flags & HID_MAIN_ITEM_VARIABLE)
	@@ -1160,8 +1163,6 @@ static int mt_input_mapping(struct hid_device hdev, struct hid_input hi,
	return 1;		return 1;
	}		}

	application = mt_find_application(td, field->application);

	/*		/*
	* some egalax touchscreens have "application == HID_DG_TOUCHSCREEN"		* some egalax touchscreens have "application == HID_DG_TOUCHSCREEN"
	* for the stylus.		* for the stylus.
	@@ -1267,9 +1268,9 @@ static bool mt_need_to_apply_feature(struct hid_device *hdev,
	return true;		return true;

	case HID_DG_CONTACTMAX:		case HID_DG_CONTACTMAX:
	if (td->mtclass.maxcontacts) {		if (cls->maxcontacts) {
	max = min_t(int, field->logical_maximum,		max = min_t(int, field->logical_maximum,
	td->mtclass.maxcontacts);		cls->maxcontacts);
	if (field->value[index] != max) {		if (field->value[index] != max) {
	field->value[index] = max;		field->value[index] = max;
	return true;		return true;
	@@ -1332,7 +1333,7 @@ static void mt_set_modes(struct hid_device *hdev, enum latency_mode latency,
	static void mt_post_parse_default_settings(struct mt_device *td,		static void mt_post_parse_default_settings(struct mt_device *td,
	struct mt_application *app)		struct mt_application *app)
	{		{
	__s32 quirks = td->mtclass.quirks;		__s32 quirks = app->quirks;

	/* unknown serial device needs special quirks */		/* unknown serial device needs special quirks */
	if (app->touches_by_report == 1) {		if (app->touches_by_report == 1) {
	@@ -1343,13 +1344,12 @@ static void mt_post_parse_default_settings(struct mt_device *td,
	quirks &= ~MT_QUIRK_CONTACT_CNT_ACCURATE;		quirks &= ~MT_QUIRK_CONTACT_CNT_ACCURATE;
	}		}

	td->mtclass.quirks = quirks;		app->quirks = quirks;
	}		}

	static void mt_post_parse(struct mt_device td, struct mt_application app)		static void mt_post_parse(struct mt_device td, struct mt_application app)
	{		{
	struct mt_fields *f = td->fields;		struct mt_fields *f = td->fields;
	struct mt_class *cls = &td->mtclass;

	if (app->touches_by_report > 0) {		if (app->touches_by_report > 0) {
	int field_count_per_touch;		int field_count_per_touch;
	@@ -1359,7 +1359,7 @@ static void mt_post_parse(struct mt_device td, struct mt_application app)
	}		}

	if (app->cc_index < 0)		if (app->cc_index < 0)
	cls->quirks &= ~MT_QUIRK_CONTACT_CNT_ACCURATE;		app->quirks &= ~MT_QUIRK_CONTACT_CNT_ACCURATE;
	}		}

	static int mt_input_configured(struct hid_device hdev, struct hid_input hi)		static int mt_input_configured(struct hid_device hdev, struct hid_input hi)

Admin message