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

Input: elantech - add helper function elantech_is_buttonpad() 



We check for this bit all over the code, better have it defined once
for all.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 37548659

drivers/input/mouse/elantech.c

+49 −44
Original line number Diff line number Diff line
@@ -229,6 +229,52 @@ static void elantech_packet_dump(struct psmouse *psmouse) 
		       psmouse->pktsize, psmouse->packet);

}



/*

 * Advertise INPUT_PROP_BUTTONPAD for clickpads. The testing of bit 12 in

 * fw_version for this is based on the following fw_version & caps table:

 *

 * Laptop-model:           fw_version:     caps:           buttons:

 * Acer S3                 0x461f00        10, 13, 0e      clickpad

 * Acer S7-392             0x581f01        50, 17, 0d      clickpad

 * Acer V5-131             0x461f02        01, 16, 0c      clickpad

 * Acer V5-551             0x461f00        ?               clickpad

 * Asus K53SV              0x450f01        78, 15, 0c      2 hw buttons

 * Asus G46VW              0x460f02        00, 18, 0c      2 hw buttons

 * Asus G750JX             0x360f00        00, 16, 0c      2 hw buttons

 * Asus TP500LN            0x381f17        10, 14, 0e      clickpad

 * Asus X750JN             0x381f17        10, 14, 0e      clickpad

 * Asus UX31               0x361f00        20, 15, 0e      clickpad

 * Asus UX32VD             0x361f02        00, 15, 0e      clickpad

 * Avatar AVIU-145A2       0x361f00        ?               clickpad

 * Fujitsu CELSIUS H760    0x570f02        40, 14, 0c      3 hw buttons (**)

 * Fujitsu CELSIUS H780    0x5d0f02        41, 16, 0d      3 hw buttons (**)

 * Fujitsu LIFEBOOK E544   0x470f00        d0, 12, 09      2 hw buttons

 * Fujitsu LIFEBOOK E546   0x470f00        50, 12, 09      2 hw buttons

 * Fujitsu LIFEBOOK E547   0x470f00        50, 12, 09      2 hw buttons

 * Fujitsu LIFEBOOK E554   0x570f01        40, 14, 0c      2 hw buttons

 * Fujitsu LIFEBOOK E557   0x570f01        40, 14, 0c      2 hw buttons

 * Fujitsu T725            0x470f01        05, 12, 09      2 hw buttons

 * Fujitsu H730            0x570f00        c0, 14, 0c      3 hw buttons (**)

 * Gigabyte U2442          0x450f01        58, 17, 0c      2 hw buttons

 * Lenovo L430             0x350f02        b9, 15, 0c      2 hw buttons (*)

 * Lenovo L530             0x350f02        b9, 15, 0c      2 hw buttons (*)

 * Samsung NF210           0x150b00        78, 14, 0a      2 hw buttons

 * Samsung NP770Z5E        0x575f01        10, 15, 0f      clickpad

 * Samsung NP700Z5B        0x361f06        21, 15, 0f      clickpad

 * Samsung NP900X3E-A02    0x575f03        ?               clickpad

 * Samsung NP-QX410        0x851b00        19, 14, 0c      clickpad

 * Samsung RC512           0x450f00        08, 15, 0c      2 hw buttons

 * Samsung RF710           0x450f00        ?               2 hw buttons

 * System76 Pangolin       0x250f01        ?               2 hw buttons

 * (*) + 3 trackpoint buttons

 * (**) + 0 trackpoint buttons

 * Note: Lenovo L430 and Lenovo L530 have the same fw_version/caps

 */

static inline int elantech_is_buttonpad(struct elantech_device_info *info)

{

	return info->fw_version & 0x001000;

}



/*

 * Interpret complete data packets and report absolute mode input events for

 * hardware version 1. (4 byte packets)
@@ -526,7 +572,7 @@ static void elantech_report_absolute_v3(struct psmouse *psmouse, 
	input_report_key(dev, BTN_TOOL_TRIPLETAP, fingers == 3);



	/* For clickpads map both buttons to BTN_LEFT */

	if (etd->info.fw_version & 0x001000)

	if (elantech_is_buttonpad(&etd->info))

		input_report_key(dev, BTN_LEFT, packet[0] & 0x03);

	else

		psmouse_report_standard_buttons(dev, packet[0]);
@@ -544,7 +590,7 @@ static void elantech_input_sync_v4(struct psmouse *psmouse) 
	unsigned char *packet = psmouse->packet;



	/* For clickpads map both buttons to BTN_LEFT */

	if (etd->info.fw_version & 0x001000)

	if (elantech_is_buttonpad(&etd->info))

		input_report_key(dev, BTN_LEFT, packet[0] & 0x03);

	else

		psmouse_report_standard_buttons(dev, packet[0]);
@@ -1020,53 +1066,12 @@ static int elantech_get_resolution_v4(struct psmouse *psmouse, 
	return 0;

}



/*

 * Advertise INPUT_PROP_BUTTONPAD for clickpads. The testing of bit 12 in

 * fw_version for this is based on the following fw_version & caps table:

 *

 * Laptop-model:           fw_version:     caps:           buttons:

 * Acer S3                 0x461f00        10, 13, 0e      clickpad

 * Acer S7-392             0x581f01        50, 17, 0d      clickpad

 * Acer V5-131             0x461f02        01, 16, 0c      clickpad

 * Acer V5-551             0x461f00        ?               clickpad

 * Asus K53SV              0x450f01        78, 15, 0c      2 hw buttons

 * Asus G46VW              0x460f02        00, 18, 0c      2 hw buttons

 * Asus G750JX             0x360f00        00, 16, 0c      2 hw buttons

 * Asus TP500LN            0x381f17        10, 14, 0e      clickpad

 * Asus X750JN             0x381f17        10, 14, 0e      clickpad

 * Asus UX31               0x361f00        20, 15, 0e      clickpad

 * Asus UX32VD             0x361f02        00, 15, 0e      clickpad

 * Avatar AVIU-145A2       0x361f00        ?               clickpad

 * Fujitsu CELSIUS H760    0x570f02        40, 14, 0c      3 hw buttons (**)

 * Fujitsu CELSIUS H780    0x5d0f02        41, 16, 0d      3 hw buttons (**)

 * Fujitsu LIFEBOOK E544   0x470f00        d0, 12, 09      2 hw buttons

 * Fujitsu LIFEBOOK E546   0x470f00        50, 12, 09      2 hw buttons

 * Fujitsu LIFEBOOK E547   0x470f00        50, 12, 09      2 hw buttons

 * Fujitsu LIFEBOOK E554   0x570f01        40, 14, 0c      2 hw buttons

 * Fujitsu LIFEBOOK E557   0x570f01        40, 14, 0c      2 hw buttons

 * Fujitsu T725            0x470f01        05, 12, 09      2 hw buttons

 * Fujitsu H730            0x570f00        c0, 14, 0c      3 hw buttons (**)

 * Gigabyte U2442          0x450f01        58, 17, 0c      2 hw buttons

 * Lenovo L430             0x350f02        b9, 15, 0c      2 hw buttons (*)

 * Lenovo L530             0x350f02        b9, 15, 0c      2 hw buttons (*)

 * Samsung NF210           0x150b00        78, 14, 0a      2 hw buttons

 * Samsung NP770Z5E        0x575f01        10, 15, 0f      clickpad

 * Samsung NP700Z5B        0x361f06        21, 15, 0f      clickpad

 * Samsung NP900X3E-A02    0x575f03        ?               clickpad

 * Samsung NP-QX410        0x851b00        19, 14, 0c      clickpad

 * Samsung RC512           0x450f00        08, 15, 0c      2 hw buttons

 * Samsung RF710           0x450f00        ?               2 hw buttons

 * System76 Pangolin       0x250f01        ?               2 hw buttons

 * (*) + 3 trackpoint buttons

 * (**) + 0 trackpoint buttons

 * Note: Lenovo L430 and Lenovo L530 have the same fw_version/caps

 */

static void elantech_set_buttonpad_prop(struct psmouse *psmouse)

{

	struct input_dev *dev = psmouse->dev;

	struct elantech_data *etd = psmouse->private;



	if (etd->info.fw_version & 0x001000) {

	if (elantech_is_buttonpad(&etd->info)) {

		__set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);

		__clear_bit(BTN_RIGHT, dev->keybit);

	}