From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 22 Oct 2018 08:49:33 +0000 (+1000)
Subject: include: sync event codes with kernel 4.19
X-Git-Tag: libevdev-1.6.0~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41e47b704377ccd1de2046795d9bd6009bf0a178;p=platform%2Fupstream%2Flibevdev.git

include: sync event codes with kernel 4.19

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---

diff --git a/include/linux/input.h b/include/linux/input.h
index b3044ae..8574807 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -268,10 +268,11 @@ struct input_mask {
 /*
  * MT_TOOL types
  */
-#define MT_TOOL_FINGER		0
-#define MT_TOOL_PEN		1
-#define MT_TOOL_PALM		2
-#define MT_TOOL_MAX		2
+#define MT_TOOL_FINGER		0x00
+#define MT_TOOL_PEN		0x01
+#define MT_TOOL_PALM		0x02
+#define MT_TOOL_DIAL		0x0a
+#define MT_TOOL_MAX		0x0f
 
 /*
  * Values describing the status of a force-feedback effect
diff --git a/libevdev/make-event-names.py b/libevdev/make-event-names.py
index 8d572d0..716c1d7 100755
--- a/libevdev/make-event-names.py
+++ b/libevdev/make-event-names.py
@@ -40,7 +40,6 @@ duplicates = [
 		"BTN_TRIGGER_HAPPY",
 		"SW_MAX",
 		"REP_MAX",
-		"MT_TOOL_MAX",
 ]
 
 btn_additional = [
diff --git a/test/test-event-names.c b/test/test-event-names.c
index 0116fab..8a2b040 100644
--- a/test/test-event-names.c
+++ b/test/test-event-names.c
@@ -226,8 +226,7 @@ START_TEST(test_value_name)
 	ck_assert_str_eq(libevdev_event_value_get_name(EV_ABS, ABS_MT_TOOL_TYPE, MT_TOOL_FINGER), "MT_TOOL_FINGER");
 	ck_assert_str_eq(libevdev_event_value_get_name(EV_ABS, ABS_MT_TOOL_TYPE, MT_TOOL_PALM), "MT_TOOL_PALM");
 	ck_assert_str_eq(libevdev_event_value_get_name(EV_ABS, ABS_MT_TOOL_TYPE, MT_TOOL_PEN), "MT_TOOL_PEN");
-	/* overlapping value */
-	ck_assert_str_eq(libevdev_event_value_get_name(EV_ABS, ABS_MT_TOOL_TYPE, MT_TOOL_MAX), "MT_TOOL_PALM");
+	ck_assert_str_eq(libevdev_event_value_get_name(EV_ABS, ABS_MT_TOOL_TYPE, MT_TOOL_MAX), "MT_TOOL_MAX");
 }
 END_TEST