From c7f06b0bdd0de7cd0cd4946b055cf142588ed493 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 27 Feb 2020 15:27:46 +1000
Subject: [PATCH] quirks: rename the alps touchpad quirk to note it's a serial
 TP quirk

This quirk only applies to serial ALPS touchpads, so let's name it
accordingly.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 quirks/30-vendor-alps.quirks    | 2 +-
 src/evdev-mt-touchpad-buttons.c | 2 +-
 src/quirks.c                    | 4 ++--
 src/quirks.h                    | 2 +-
 test/test-quirks.c              | 2 +-
 tools/shared.c                  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/quirks/30-vendor-alps.quirks b/quirks/30-vendor-alps.quirks
index e4e5d47e..6ebcbb85 100644
--- a/quirks/30-vendor-alps.quirks
+++ b/quirks/30-vendor-alps.quirks
@@ -17,7 +17,7 @@ MatchUdevType=touchpad
 MatchBus=ps2
 MatchVendor=0x0002
 MatchProduct=0x0008
-ModelALPSTouchpad=1
+ModelALPSSerialTouchpad=1
 
 [ALPS v8 Touchpads]
 MatchUdevType=touchpad
diff --git a/src/evdev-mt-touchpad-buttons.c b/src/evdev-mt-touchpad-buttons.c
index 3fb7842c..2a6092bc 100644
--- a/src/evdev-mt-touchpad-buttons.c
+++ b/src/evdev-mt-touchpad-buttons.c
@@ -906,7 +906,7 @@ tp_init_middlebutton_emulation(struct tp_dispatch *tp,
 		enable_by_default = true;
 		want_config_option = false;
 	} else if (evdev_device_has_model_quirk(device,
-						QUIRK_MODEL_ALPS_TOUCHPAD)) {
+						QUIRK_MODEL_ALPS_SERIAL_TOUCHPAD)) {
 		enable_by_default = true;
 		want_config_option = true;
 	} else
diff --git a/src/quirks.c b/src/quirks.c
index 8c0bb96e..3f913031 100644
--- a/src/quirks.c
+++ b/src/quirks.c
@@ -229,7 +229,7 @@ const char *
 quirk_get_name(enum quirk q)
 {
 	switch(q) {
-	case QUIRK_MODEL_ALPS_TOUCHPAD:			return "ModelALPSTouchpad";
+	case QUIRK_MODEL_ALPS_SERIAL_TOUCHPAD:		return "ModelALPSSerialTouchpad";
 	case QUIRK_MODEL_APPLE_TOUCHPAD:		return "ModelAppleTouchpad";
 	case QUIRK_MODEL_APPLE_TOUCHPAD_ONEBUTTON:	return "ModelAppleTouchpadOneButton";
 	case QUIRK_MODEL_BOUNCING_KEYS:			return "ModelBouncingKeys";
@@ -574,7 +574,7 @@ parse_model(struct quirks_context *ctx,
 	    const char *value)
 {
 	bool b;
-	enum quirk q = QUIRK_MODEL_ALPS_TOUCHPAD;
+	enum quirk q = QUIRK_MODEL_ALPS_SERIAL_TOUCHPAD;
 
 	assert(strneq(key, "Model", 5));
 
diff --git a/src/quirks.h b/src/quirks.h
index 88159b59..16f6cd93 100644
--- a/src/quirks.h
+++ b/src/quirks.h
@@ -62,7 +62,7 @@ struct quirk_tuples {
  * Quirks known to libinput
  */
 enum quirk {
-	QUIRK_MODEL_ALPS_TOUCHPAD = 100,
+	QUIRK_MODEL_ALPS_SERIAL_TOUCHPAD = 100,
 	QUIRK_MODEL_APPLE_TOUCHPAD,
 	QUIRK_MODEL_APPLE_TOUCHPAD_ONEBUTTON,
 	QUIRK_MODEL_BOUNCING_KEYS,
diff --git a/test/test-quirks.c b/test/test-quirks.c
index 876a1a7d..b40b06d0 100644
--- a/test/test-quirks.c
+++ b/test/test-quirks.c
@@ -1313,7 +1313,7 @@ START_TEST(quirks_model_alps)
 	bool exists, value = false;
 
 	q = dev->quirks;
-	exists = quirks_get_bool(q, QUIRK_MODEL_ALPS_TOUCHPAD, &value);
+	exists = quirks_get_bool(q, QUIRK_MODEL_ALPS_SERIAL_TOUCHPAD, &value);
 
 	if (strstr(libinput_device_get_name(device), "ALPS")) {
 		ck_assert(exists);
diff --git a/tools/shared.c b/tools/shared.c
index e80094bc..3bd48c84 100644
--- a/tools/shared.c
+++ b/tools/shared.c
@@ -616,7 +616,7 @@ tools_list_device_quirks(struct quirks_context *ctx,
 	if (!quirks)
 		return;
 
-	q = QUIRK_MODEL_ALPS_TOUCHPAD;
+	q = QUIRK_MODEL_ALPS_SERIAL_TOUCHPAD;
 	do {
 		if (quirks_has_quirk(quirks, q)) {
 			const char *name;