Input: ALPS - split protocol data from model info (8326bb57) · Commits · e / devices / android_kernel_xiaomi_sm6125

drivers/input/mouse/alps.c

+29 −29

Original line number	Original line	Diff line number	Diff line
	@@ -102,32 +102,32 @@ static const struct alps_nibble_commands alps_v6_nibble_commands[] = {
	#define ALPS_BUTTONPAD 0x200 /* device is a clickpad */		#define ALPS_BUTTONPAD 0x200 /* device is a clickpad */

	static const struct alps_model_info alps_model_data[] = {		static const struct alps_model_info alps_model_data[] = {
	{ { 0x32, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS \| ALPS_DUALPOINT }, /* Toshiba Salellite Pro M10 */		{ { 0x32, 0x02, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS \| ALPS_DUALPOINT } }, /* Toshiba Salellite Pro M10 */
	{ { 0x33, 0x02, 0x0a }, 0x00, ALPS_PROTO_V1, 0x88, 0xf8, 0 }, /* UMAX-530T */		{ { 0x33, 0x02, 0x0a }, 0x00, { ALPS_PROTO_V1, 0x88, 0xf8, 0 } }, /* UMAX-530T */
	{ { 0x53, 0x02, 0x0a }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 },		{ { 0x53, 0x02, 0x0a }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, 0 } },
	{ { 0x53, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 },		{ { 0x53, 0x02, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, 0 } },
	{ { 0x60, 0x03, 0xc8 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 }, /* HP ze1115 */		{ { 0x60, 0x03, 0xc8 }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, 0 } }, /* HP ze1115 */
	{ { 0x63, 0x02, 0x0a }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 },		{ { 0x63, 0x02, 0x0a }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, 0 } },
	{ { 0x63, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 },		{ { 0x63, 0x02, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, 0 } },
	{ { 0x63, 0x02, 0x28 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_FW_BK_2 }, /* Fujitsu Siemens S6010 */		{ { 0x63, 0x02, 0x28 }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_FW_BK_2 } }, /* Fujitsu Siemens S6010 */
	{ { 0x63, 0x02, 0x3c }, 0x00, ALPS_PROTO_V2, 0x8f, 0x8f, ALPS_WHEEL }, /* Toshiba Satellite S2400-103 */		{ { 0x63, 0x02, 0x3c }, 0x00, { ALPS_PROTO_V2, 0x8f, 0x8f, ALPS_WHEEL } }, /* Toshiba Satellite S2400-103 */
	{ { 0x63, 0x02, 0x50 }, 0x00, ALPS_PROTO_V2, 0xef, 0xef, ALPS_FW_BK_1 }, /* NEC Versa L320 */		{ { 0x63, 0x02, 0x50 }, 0x00, { ALPS_PROTO_V2, 0xef, 0xef, ALPS_FW_BK_1 } }, /* NEC Versa L320 */
	{ { 0x63, 0x02, 0x64 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 },		{ { 0x63, 0x02, 0x64 }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, 0 } },
	{ { 0x63, 0x03, 0xc8 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS \| ALPS_DUALPOINT }, /* Dell Latitude D800 */		{ { 0x63, 0x03, 0xc8 }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS \| ALPS_DUALPOINT } }, /* Dell Latitude D800 */
	{ { 0x73, 0x00, 0x0a }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_DUALPOINT }, /* ThinkPad R61 8918-5QG */		{ { 0x73, 0x00, 0x0a }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_DUALPOINT } }, /* ThinkPad R61 8918-5QG */
	{ { 0x73, 0x02, 0x0a }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 },		{ { 0x73, 0x02, 0x0a }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, 0 } },
	{ { 0x73, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_FW_BK_2 }, /* Ahtec Laptop */		{ { 0x73, 0x02, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_FW_BK_2 } }, /* Ahtec Laptop */
	{ { 0x20, 0x02, 0x0e }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS \| ALPS_DUALPOINT }, /* XXX */		{ { 0x20, 0x02, 0x0e }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS \| ALPS_DUALPOINT } }, /* XXX */
	{ { 0x22, 0x02, 0x0a }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS \| ALPS_DUALPOINT },		{ { 0x22, 0x02, 0x0a }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS \| ALPS_DUALPOINT } },
	{ { 0x22, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xff, 0xff, ALPS_PASS \| ALPS_DUALPOINT }, /* Dell Latitude D600 */		{ { 0x22, 0x02, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xff, 0xff, ALPS_PASS \| ALPS_DUALPOINT } }, /* Dell Latitude D600 */
	/* Dell Latitude E5500, E6400, E6500, Precision M4400 */		/* Dell Latitude E5500, E6400, E6500, Precision M4400 */
	{ { 0x62, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xcf, 0xcf,		{ { 0x62, 0x02, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xcf, 0xcf,
	ALPS_PASS \| ALPS_DUALPOINT \| ALPS_PS2_INTERLEAVED },		ALPS_PASS \| ALPS_DUALPOINT \| ALPS_PS2_INTERLEAVED } },
	{ { 0x73, 0x00, 0x14 }, 0x00, ALPS_PROTO_V6, 0xff, 0xff, ALPS_DUALPOINT }, /* Dell XT2 */		{ { 0x73, 0x00, 0x14 }, 0x00, { ALPS_PROTO_V6, 0xff, 0xff, ALPS_DUALPOINT } }, /* Dell XT2 */
	{ { 0x73, 0x02, 0x50 }, 0x00, ALPS_PROTO_V2, 0xcf, 0xcf, ALPS_FOUR_BUTTONS }, /* Dell Vostro 1400 */		{ { 0x73, 0x02, 0x50 }, 0x00, { ALPS_PROTO_V2, 0xcf, 0xcf, ALPS_FOUR_BUTTONS } }, /* Dell Vostro 1400 */
	{ { 0x52, 0x01, 0x14 }, 0x00, ALPS_PROTO_V2, 0xff, 0xff,		{ { 0x52, 0x01, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xff, 0xff,
	ALPS_PASS \| ALPS_DUALPOINT \| ALPS_PS2_INTERLEAVED }, /* Toshiba Tecra A11-11L */		ALPS_PASS \| ALPS_DUALPOINT \| ALPS_PS2_INTERLEAVED } }, /* Toshiba Tecra A11-11L */
	{ { 0x73, 0x02, 0x64 }, 0x8a, ALPS_PROTO_V4, 0x8f, 0x8f, 0 },		{ { 0x73, 0x02, 0x64 }, 0x8a, { ALPS_PROTO_V4, 0x8f, 0x8f, 0 } },
	};		};

	static void alps_set_abs_params_st(struct alps_data *priv,		static void alps_set_abs_params_st(struct alps_data *priv,
	@@ -2264,12 +2264,12 @@ static int alps_match_table(struct psmouse psmouse, struct alps_data priv,
	(!model->command_mode_resp \|\|		(!model->command_mode_resp \|\|
	model->command_mode_resp == ec[2])) {		model->command_mode_resp == ec[2])) {

	priv->proto_version = model->proto_version;		priv->proto_version = model->protocol_info.version;
	alps_set_defaults(priv);		alps_set_defaults(priv);

	priv->flags = model->flags;		priv->flags = model->protocol_info.flags;
	priv->byte0 = model->byte0;		priv->byte0 = model->protocol_info.byte0;
	priv->mask0 = model->mask0;		priv->mask0 = model->protocol_info.mask0;

	return 0;		return 0;
	}		}

drivers/input/mouse/alps.h

+17 −9

Original line number	Original line	Diff line number	Diff line
	@@ -46,6 +46,21 @@ enum V7_PACKET_ID {
	V7_PACKET_ID_UNKNOWN,		V7_PACKET_ID_UNKNOWN,
	};		};

			/**
			* struct alps_protocol_info - information about protocol used by a device
			* @version: Indicates V1/V2/V3/...
			* @byte0: Helps figure out whether a position report packet matches the
			* known format for this model. The first byte of the report, ANDed with
			* mask0, should match byte0.
			* @mask0: The mask used to check the first byte of the report.
			* @flags: Additional device capabilities (passthrough port, trackstick, etc.).
			*/
			struct alps_protocol_info {
			u16 version;
			u8 byte0, mask0;
			unsigned int flags;
			};

	/**		/**
	* struct alps_model_info - touchpad ID table		* struct alps_model_info - touchpad ID table
	* @signature: E7 response string to match.		* @signature: E7 response string to match.
	@@ -53,12 +68,7 @@ enum V7_PACKET_ID {
	* (aka command mode response) identifies the firmware minor version. This		* (aka command mode response) identifies the firmware minor version. This
	* can be used to distinguish different hardware models which are not		* can be used to distinguish different hardware models which are not
	* uniquely identifiable through their E7 responses.		* uniquely identifiable through their E7 responses.
	* @proto_version: Indicates V1/V2/V3/...		* @protocol_info: information about protcol used by the device.
	* @byte0: Helps figure out whether a position report packet matches the
	* known format for this model. The first byte of the report, ANDed with
	* mask0, should match byte0.
	* @mask0: The mask used to check the first byte of the report.
	* @flags: Additional device capabilities (passthrough port, trackstick, etc.).
	*		*
	* Many (but not all) ALPS touchpads can be identified by looking at the		* Many (but not all) ALPS touchpads can be identified by looking at the
	* values returned in the "E7 report" and/or the "EC report." This table		* values returned in the "E7 report" and/or the "EC report." This table
	@@ -67,9 +77,7 @@ enum V7_PACKET_ID {
	struct alps_model_info {		struct alps_model_info {
	u8 signature[3];		u8 signature[3];
	u8 command_mode_resp;		u8 command_mode_resp;
	u16 proto_version;		struct alps_protocol_info protocol_info;
	u8 byte0, mask0;
	unsigned int flags;
	};		};

	/**		/**