Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80212ed7 authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Dmitry Torokhov
Browse files

Input: elantech - query the resolution in query_info 



The command ETP_RESOLUTION_QUERY also contains the bus information.
It is better to fetch it once, while we are querying for device
information.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: default avatarKT Liao <kt.liao@emc.com.tw>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent f0787592

drivers/input/mouse/elantech.c

+15 −12
Original line number Diff line number Diff line
@@ -1179,7 +1179,6 @@ static int elantech_set_input_params(struct psmouse *psmouse) 
	struct elantech_data *etd = psmouse->private;

	struct elantech_device_info *info = &etd->info;

	unsigned int x_min = 0, y_min = 0, x_max = 0, y_max = 0, width = 0;

	unsigned int x_res = 31, y_res = 31;



	if (elantech_set_range(psmouse, &x_min, &y_min, &x_max, &y_max, &width))

		return -1;
@@ -1232,13 +1231,6 @@ static int elantech_set_input_params(struct psmouse *psmouse) 
		break;



	case 4:

		if (elantech_get_resolution_v4(psmouse, &x_res, &y_res)) {

			/*

			 * if query failed, print a warning and leave the values

			 * zero to resemble synaptics.c behavior.

			 */

			psmouse_warn(psmouse, "couldn't query resolution data.\n");

		}

		elantech_set_buttonpad_prop(psmouse);

		__set_bit(BTN_TOOL_QUADTAP, dev->keybit);

		/* For X to recognize me as touchpad. */
@@ -1267,11 +1259,11 @@ static int elantech_set_input_params(struct psmouse *psmouse) 
		break;

	}



	input_abs_set_res(dev, ABS_X, x_res);

	input_abs_set_res(dev, ABS_Y, y_res);

	input_abs_set_res(dev, ABS_X, info->x_res);

	input_abs_set_res(dev, ABS_Y, info->y_res);

	if (info->hw_version > 1) {

		input_abs_set_res(dev, ABS_MT_POSITION_X, x_res);

		input_abs_set_res(dev, ABS_MT_POSITION_Y, y_res);

		input_abs_set_res(dev, ABS_MT_POSITION_X, info->x_res);

		input_abs_set_res(dev, ABS_MT_POSITION_Y, info->y_res);

	}



	etd->y_max = y_max;
@@ -1720,6 +1712,17 @@ static int elantech_query_info(struct psmouse *psmouse, 
	/* The MSB indicates the presence of the trackpoint */

	info->has_trackpoint = (info->capabilities[0] & 0x80) == 0x80;



	info->x_res = 31;

	info->y_res = 31;

	if (info->hw_version == 4) {

		if (elantech_get_resolution_v4(psmouse,

					       &info->x_res,

					       &info->y_res)) {

			psmouse_warn(psmouse,

				     "failed to query resolution data.\n");

		}

	}



	return 0;

}

drivers/input/mouse/elantech.h

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ struct elantech_device_info { 
	unsigned char debug;

	unsigned char hw_version;

	unsigned int fw_version;

	unsigned int x_res;

	unsigned int y_res;

	bool paritycheck;

	bool jumpy_cursor;

	bool reports_pressure;