On Sat, Aug 30, 2014 at 04:10:42PM +0200, Ulrik De Bie wrote:
> The Fujitsu H730 has hardware v4 with a trackpoint. This enables
> the elantech_report_trackpoint for v4.
>
> Reported-by: Stefan Valouch <stefan@xxxxxxxxxxx>
> Tested-by: Stefan Valouch <stefan@xxxxxxxxxxx>
> Tested-by: Alfredo Gemma <alfredo.gemma@xxxxxxxxx>
> Signed-off-by: Ulrik De Bie <ulrik.debie-os@xxxxxxxxx>
Applied, thank you.
> ---
> drivers/input/mouse/elantech.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
> index da51738..f0a55b4d 100644
> --- a/drivers/input/mouse/elantech.c
> +++ b/drivers/input/mouse/elantech.c
> @@ -792,6 +792,9 @@ static int elantech_packet_check_v4(struct psmouse *psmouse)
> unsigned char packet_type = packet[3] & 0x03;
> bool sanity_check;
>
> + if ((packet[3]&0x0f) == 0x06)
> + return PACKET_TRACKPOINT;
> +
> /*
> * Sanity check based on the constant bits of a packet.
> * The constant bits change depending on the value of
> @@ -877,10 +880,19 @@ static psmouse_ret_t elantech_process_byte(struct psmouse *psmouse)
>
> case 4:
> packet_type = elantech_packet_check_v4(psmouse);
> - if (packet_type == PACKET_UNKNOWN)
> + switch (packet_type) {
> + case PACKET_UNKNOWN:
> return PSMOUSE_BAD_DATA;
>
> - elantech_report_absolute_v4(psmouse, packet_type);
> + case PACKET_TRACKPOINT:
> + elantech_report_trackpoint(psmouse, packet_type);
> + break;
> +
> + default:
> + elantech_report_absolute_v4(psmouse, packet_type);
> + break;
> + }
> +
> break;
> }
>
> --
> 2.1.0
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
