[PATCH libinput 5/6] test: Add description for the T440 synaptics touchpad

Hans de Goede hdegoede at redhat.com
Wed Jun 11 02:04:19 PDT 2014


Hi,

On 06/11/2014 02:11 AM, Peter Hutterer wrote:
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>  test/Makefile.am             |   1 +
>  test/litest-synaptics-t440.c | 112 +++++++++++++++++++++++++++++++++++++++++++
>  test/litest.c                |   2 +
>  test/litest.h                |   2 +
>  4 files changed, 117 insertions(+)
>  create mode 100644 test/litest-synaptics-t440.c

Looks good:

Reviewed-by: Hans de Goede <hdegoede at redhat.com>

Regards,

Hans

> 
> diff --git a/test/Makefile.am b/test/Makefile.am
> index 70e83d4..b5dc33c 100644
> --- a/test/Makefile.am
> +++ b/test/Makefile.am
> @@ -19,6 +19,7 @@ liblitest_la_SOURCES = \
>  	litest-mouse.c \
>  	litest-synaptics.c \
>  	litest-synaptics-st.c \
> +	litest-synaptics-t440.c \
>  	litest-trackpoint.c \
>  	litest-wacom-touch.c \
>  	litest.c
> diff --git a/test/litest-synaptics-t440.c b/test/litest-synaptics-t440.c
> new file mode 100644
> index 0000000..1b66494
> --- /dev/null
> +++ b/test/litest-synaptics-t440.c
> @@ -0,0 +1,112 @@
> +/*
> + * Copyright © 2014 Red Hat, Inc.
> + *
> + * Permission to use, copy, modify, distribute, and sell this software and its
> + * documentation for any purpose is hereby granted without fee, provided that
> + * the above copyright notice appear in all copies and that both that copyright
> + * notice and this permission notice appear in supporting documentation, and
> + * that the name of the copyright holders not be used in advertising or
> + * publicity pertaining to distribution of the software without specific,
> + * written prior permission.  The copyright holders make no representations
> + * about the suitability of this software for any purpose.  It is provided "as
> + * is" without express or implied warranty.
> + *
> + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
> + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
> + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
> + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
> + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
> + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
> + * OF THIS SOFTWARE.
> + */
> +
> +#if HAVE_CONFIG_H
> +#include "config.h"
> +#endif
> +
> +#include "litest.h"
> +#include "litest-int.h"
> +
> +static void
> +litest_synaptics_t440_setup(void)
> +{
> +	struct litest_device *d = litest_create_device(LITEST_SYNAPTICS_TOPBUTTONPAD);
> +	litest_set_current_device(d);
> +}
> +
> +static struct input_event down[] = {
> +	{ .type = EV_KEY, .code = BTN_TOOL_FINGER, .value = 1 },
> +	{ .type = EV_KEY, .code = BTN_TOUCH, .value = 1 },
> +	{ .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN  },
> +	{ .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN },
> +	{ .type = EV_ABS, .code = ABS_PRESSURE, .value = 30  },
> +	{ .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN },
> +	{ .type = EV_ABS, .code = ABS_MT_TRACKING_ID, .value = LITEST_AUTO_ASSIGN },
> +	{ .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN },
> +	{ .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN },
> +	{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
> +	{ .type = -1, .code = -1 },
> +};
> +
> +static struct input_event move[] = {
> +	{ .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN },
> +	{ .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN  },
> +	{ .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN },
> +	{ .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN },
> +	{ .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN },
> +	{ .type = EV_KEY, .code = BTN_TOOL_FINGER, .value = 1 },
> +	{ .type = EV_KEY, .code = BTN_TOUCH, .value = 1 },
> +	{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
> +	{ .type = -1, .code = -1 },
> +};
> +
> +static struct litest_device_interface interface = {
> +	.touch_down_events = down,
> +	.touch_move_events = move,
> +};
> +
> +static struct input_id input_id = {
> +	.bustype = 0x11,
> +	.vendor = 0x2,
> +	.product = 0x7,
> +};
> +
> +static int events[] = {
> +	EV_KEY, BTN_LEFT,
> +	EV_KEY, BTN_TOOL_FINGER,
> +	EV_KEY, BTN_TOOL_QUINTTAP,
> +	EV_KEY, BTN_TOUCH,
> +	EV_KEY, BTN_TOOL_DOUBLETAP,
> +	EV_KEY, BTN_TOOL_TRIPLETAP,
> +	EV_KEY, BTN_TOOL_QUADTAP,
> +	INPUT_PROP_MAX, INPUT_PROP_POINTER,
> +	INPUT_PROP_MAX, INPUT_PROP_BUTTONPAD,
> +	INPUT_PROP_MAX, INPUT_PROP_TOPBUTTONPAD,
> +	-1, -1,
> +};
> +
> +static struct input_absinfo absinfo[] = {
> +	{ ABS_X, 1024, 5112, 0, 0, 42 },
> +	{ ABS_Y, 2024, 4832, 0, 0, 42 },
> +	{ ABS_PRESSURE, 0, 255, 0, 0, 0 },
> +	{ ABS_TOOL_WIDTH, 0, 15, 0, 0, 0 },
> +	{ ABS_MT_SLOT, 0, 1, 0, 0, 0 },
> +	{ ABS_MT_POSITION_X, 1024, 5112, 0, 0, 75 },
> +	{ ABS_MT_POSITION_Y, 2024, 4832, 0, 0, 129 },
> +	{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
> +	{ ABS_MT_PRESSURE, 0, 255, 0, 0, 0 },
> +	{ .value = -1 }
> +};
> +
> +struct litest_test_device litest_synaptics_t440_device = {
> +	.type = LITEST_SYNAPTICS_TOPBUTTONPAD,
> +	.features = LITEST_TOUCHPAD | LITEST_CLICKPAD | LITEST_BUTTON | LITEST_TOPBUTTONPAD,
> +	.shortname = "synaptics t440",
> +	.setup = litest_synaptics_t440_setup,
> +	.interface = &interface,
> +
> +	.name = "SynPS/2 Synaptics TouchPad",
> +	.id = &input_id,
> +	.events = events,
> +	.absinfo = absinfo,
> +};
> diff --git a/test/litest.c b/test/litest.c
> index 571cf76..0a9cc72 100644
> --- a/test/litest.c
> +++ b/test/litest.c
> @@ -78,6 +78,7 @@ void litest_generic_device_teardown(void)
>  extern struct litest_test_device litest_keyboard_device;
>  extern struct litest_test_device litest_synaptics_clickpad_device;
>  extern struct litest_test_device litest_synaptics_touchpad_device;
> +extern struct litest_test_device litest_synaptics_t440_device;
>  extern struct litest_test_device litest_trackpoint_device;
>  extern struct litest_test_device litest_bcm5974_device;
>  extern struct litest_test_device litest_mouse_device;
> @@ -86,6 +87,7 @@ extern struct litest_test_device litest_wacom_touch_device;
>  struct litest_test_device* devices[] = {
>  	&litest_synaptics_clickpad_device,
>  	&litest_synaptics_touchpad_device,
> +	&litest_synaptics_t440_device,
>  	&litest_keyboard_device,
>  	&litest_trackpoint_device,
>  	&litest_bcm5974_device,
> diff --git a/test/litest.h b/test/litest.h
> index ea7d299..3e75dd5 100644
> --- a/test/litest.h
> +++ b/test/litest.h
> @@ -37,6 +37,7 @@ enum litest_device_type {
>  	LITEST_NO_DEVICE = -1,
>  	LITEST_SYNAPTICS_CLICKPAD,
>  	LITEST_SYNAPTICS_TOUCHPAD,
> +	LITEST_SYNAPTICS_TOPBUTTONPAD,
>  	LITEST_BCM5974,
>  	LITEST_KEYBOARD,
>  	LITEST_TRACKPOINT,
> @@ -56,6 +57,7 @@ enum litest_device_feature {
>  	LITEST_TOUCH = 1 << 6,
>  	LITEST_SINGLE_TOUCH = 1 << 7,
>  	LITEST_APPLE_CLICKPAD = 1 << 8,
> +	LITEST_TOPBUTTONPAD = 1 << 9,
>  };
>  
>  struct litest_device {
> 


More information about the wayland-devel mailing list