Add iptsd support

Author: qzed

0001-Add-support-for-BUS_VIRTUAL.patch

@@ -0,0 +1,92 @@
+From 174ac028e838a4e564aac4d791aa64209e5cbfa1 Mon Sep 17 00:00:00 2001
+From: Dorian Stoll <[email protected]>
+Date: Sat, 27 Jun 2020 18:21:11 +0200
+Subject: [PATCH 01/12] Add support for BUS_VIRTUAL
+
+This is needed to support IPTS devices through the iptsd userspace
+daemon. It exposes the touchscreen / stylus as uinput, since the parsing
+of raw IPTS data needs to happen in userspace.
+
+Because these devices are not backed by an actual bus, they are created
+as BUS_VIRTUAL.
+
+Signed-off-by: Dorian Stoll <[email protected]>
+---
+ libwacom/libwacom-database.c | 4 ++++
+ libwacom/libwacom.c          | 5 +++++
+ libwacom/libwacom.h          | 1 +
+ test/test-tablet-validity.c  | 1 +
+ 4 files changed, 11 insertions(+)
+
+diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
+index 9f2657b..7be5247 100644
+--- a/libwacom/libwacom-database.c
++++ b/libwacom/libwacom-database.c
+@@ -130,6 +130,8 @@ bus_from_str (const char *str)
+ 		return WBUSTYPE_BLUETOOTH;
+ 	if (streq(str, "i2c"))
+ 		return WBUSTYPE_I2C;
++	if (streq(str, "virt"))
++		return WBUSTYPE_VIRTUAL;
+ 	return WBUSTYPE_UNKNOWN;
+ }
+ 
+@@ -148,6 +150,8 @@ bus_to_str (WacomBusType bus)
+ 		return "bluetooth";
+ 	case WBUSTYPE_I2C:
+ 		return "i2c";
++	case WBUSTYPE_VIRTUAL:
++		return "virt";
+ 	}
+ 	g_assert_not_reached ();
+ }
+diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
+index 627354c..aa1d47f 100644
+--- a/libwacom/libwacom.c
++++ b/libwacom/libwacom.c
+@@ -147,6 +147,10 @@ get_bus_vid_pid (GUdevDevice  *device,
+ 		*bus = WBUSTYPE_I2C;
+ 		retval = TRUE;
+ 		break;
++	case 6:
++		*bus = WBUSTYPE_VIRTUAL;
++		retval = TRUE;
++		break;
+ 	}
+ 
+ out:
+@@ -765,6 +769,7 @@ static void print_match(int fd, const WacomMatch *match)
+ 		case WBUSTYPE_USB:		bus_name = "usb";	break;
+ 		case WBUSTYPE_SERIAL:		bus_name = "serial";	break;
+ 		case WBUSTYPE_I2C:		bus_name = "i2c";	break;
++		case WBUSTYPE_VIRTUAL:		bus_name = "virt";	break;
+ 		case WBUSTYPE_UNKNOWN:		bus_name = "unknown";	break;
+ 		default:			g_assert_not_reached(); break;
+ 	}
+diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
+index a848133..30636b4 100644
+--- a/libwacom/libwacom.h
++++ b/libwacom/libwacom.h
+@@ -117,6 +117,7 @@ typedef enum {
+ 	WBUSTYPE_SERIAL,	/**< Serial tablet */
+ 	WBUSTYPE_BLUETOOTH,	/**< Bluetooth tablet */
+ 	WBUSTYPE_I2C,		/**< I2C tablet */
++	WBUSTYPE_VIRTUAL,	/**< Virtual (uinput) tablet */
+ } WacomBusType;
+ 
+ /**
+diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
+index 65b87c0..0b117eb 100644
+--- a/test/test-tablet-validity.c
++++ b/test/test-tablet-validity.c
+@@ -177,6 +177,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
+ 			/* fall through */
+ 		case WBUSTYPE_BLUETOOTH:
+ 		case WBUSTYPE_I2C:
++		case WBUSTYPE_VIRTUAL:
+ 			g_assert_cmpint(vid, >, 0);
+ 			g_assert_cmpint(pid, >, 0);
+ 			break;
+-- 
+2.28.0
+

…rt-for-Intel-Management-Engine-bus.patch …rt-for-Intel-Management-Engine-bus.patch0001-Add-support-for-Intel-Management-Engine-bus.patch renamed to 0002-Add-support-for-Intel-Management-Engine-bus.patch 0001-Add-support-for-Intel-Management-Engine-bus.patch renamed to 0002-Add-support-for-Intel-Management-Engine-bus.patch

@@ -1,7 +1,7 @@
-From 5bf2b290f25006f5e97c868f4423048074d96dbe Mon Sep 17 00:00:00 2001
+From fb31b52509797b47119e95dc15d46a5d0ed23352 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Sat, 1 Jun 2019 21:17:15 +0200
-Subject: [PATCH 1/8] Add support for Intel Management Engine bus
+Subject: [PATCH 02/12] Add support for Intel Management Engine bus
 
 Add support for devices connected via the Intel Management Engine (MEI).
 This is required to support IPTS based devices, such as (among others)
@@ -14,33 +14,33 @@ the Microsoft Surface Books, Surface Pro 5 and 6, and Surface Laptops.
  4 files changed, 11 insertions(+)
 
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index 9f2657b..6084818 100644
+index 7be5247..37ffd37 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
-@@ -130,6 +130,8 @@ bus_from_str (const char *str)
- 		return WBUSTYPE_BLUETOOTH;
- 	if (streq(str, "i2c"))
+@@ -132,6 +132,8 @@ bus_from_str (const char *str)
  		return WBUSTYPE_I2C;
+ 	if (streq(str, "virt"))
+ 		return WBUSTYPE_VIRTUAL;
 +	if (strcmp (str, "mei") == 0)
 +		return WBUSTYPE_MEI;
  	return WBUSTYPE_UNKNOWN;
  }
 
-@@ -148,6 +150,8 @@ bus_to_str (WacomBusType bus)
- 		return "bluetooth";
- 	case WBUSTYPE_I2C:
+@@ -152,6 +154,8 @@ bus_to_str (WacomBusType bus)
  		return "i2c";
+ 	case WBUSTYPE_VIRTUAL:
+ 		return "virt";
 +	case WBUSTYPE_MEI:
 +		return "mei";
  	}
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index 627354c..c52daed 100644
+index aa1d47f..c6551ad 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
-@@ -147,6 +147,10 @@ get_bus_vid_pid (GUdevDevice  *device,
- 		*bus = WBUSTYPE_I2C;
+@@ -151,6 +151,10 @@ get_bus_vid_pid (GUdevDevice  *device,
+ 		*bus = WBUSTYPE_VIRTUAL;
  		retval = TRUE;
  		break;
 +	case 68:
@@ -50,38 +50,38 @@ index 627354c..c52daed 100644
  	}
 
  out:
-@@ -765,6 +769,7 @@ static void print_match(int fd, const WacomMatch *match)
- 		case WBUSTYPE_USB:		bus_name = "usb";	break;
+@@ -770,6 +774,7 @@ static void print_match(int fd, const WacomMatch *match)
  		case WBUSTYPE_SERIAL:		bus_name = "serial";	break;
  		case WBUSTYPE_I2C:		bus_name = "i2c";	break;
+ 		case WBUSTYPE_VIRTUAL:		bus_name = "virt";	break;
 +		case WBUSTYPE_MEI:		bus_name = "mei";	break;
  		case WBUSTYPE_UNKNOWN:		bus_name = "unknown";	break;
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index a848133..af0f134 100644
+index 30636b4..e555be3 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
-@@ -117,6 +117,7 @@ typedef enum {
- 	WBUSTYPE_SERIAL,	/**< Serial tablet */
+@@ -118,6 +118,7 @@ typedef enum {
  	WBUSTYPE_BLUETOOTH,	/**< Bluetooth tablet */
  	WBUSTYPE_I2C,		/**< I2C tablet */
+ 	WBUSTYPE_VIRTUAL,	/**< Virtual (uinput) tablet */
 +	WBUSTYPE_MEI,		/**< MEI */
  } WacomBusType;
 
  /**
 diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index 65b87c0..745c46d 100644
+index 0b117eb..58b909f 100644
 --- a/test/test-tablet-validity.c
 +++ b/test/test-tablet-validity.c
-@@ -177,6 +177,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
- 			/* fall through */
+@@ -178,6 +178,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
  		case WBUSTYPE_BLUETOOTH:
  		case WBUSTYPE_I2C:
+ 		case WBUSTYPE_VIRTUAL:
 +		case WBUSTYPE_MEI:
  			g_assert_cmpint(vid, >, 0);
  			g_assert_cmpint(pid, >, 0);
  			break;
 -- 
-2.27.0
+2.28.0
 

…2-data-Add-Microsoft-Surface-Pro-4.patch …3-data-Add-Microsoft-Surface-pro-4.patch0002-data-Add-Microsoft-Surface-Pro-4.patch renamed to 0003-data-Add-Microsoft-Surface-pro-4.patch 0002-data-Add-Microsoft-Surface-Pro-4.patch renamed to 0003-data-Add-Microsoft-Surface-pro-4.patch

@@ -1,7 +1,7 @@
-From 50e1eff057aab7b2b92ea65de3097ab37692fb75 Mon Sep 17 00:00:00 2001
+From 40978156216b4158d0b3fcbcbc712382c193fcbd Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
-Date: Mon, 3 Jun 2019 00:42:30 +0200
-Subject: [PATCH 2/8] data: Add Microsoft Surface Pro 4
+Date: Tue, 18 Aug 2020 20:18:55 +0200
+Subject: [PATCH 03/12] data: Add Microsoft Surface pro 4
 
 ---
  data/surface-pro4.tablet | 14 ++++++++++++++
@@ -10,16 +10,16 @@ Subject: [PATCH 2/8] data: Add Microsoft Surface Pro 4
 
 diff --git a/data/surface-pro4.tablet b/data/surface-pro4.tablet
 new file mode 100644
-index 0000000..bb6f02f
+index 0000000..bfbe809
 --- /dev/null
 +++ b/data/surface-pro4.tablet
 @@ -0,0 +1,14 @@
 +# This is for the Microsoft Surface Pro 4
 +
 +[Device]
 +Name=Microsoft Surface Pro 4
-+DeviceMatch=mei:1B96:006A
-+Class=ISDV4
++Class=PenDisplay
++DeviceMatch=virt:1B96:006A;virt:1B96:0021;mei:1B96:006A;mei:1B96:0021
 +Width=10
 +Height=6
 +IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..bb6f02f
 +Touch=true
 +Buttons=0
 -- 
-2.27.0
+2.28.0
 

…3-data-Add-Microsoft-Surface-Pro-5.patch …4-data-Add-Microsoft-Surface-pro-5.patch0003-data-Add-Microsoft-Surface-Pro-5.patch renamed to 0004-data-Add-Microsoft-Surface-pro-5.patch 0003-data-Add-Microsoft-Surface-Pro-5.patch renamed to 0004-data-Add-Microsoft-Surface-pro-5.patch

@@ -1,7 +1,7 @@
-From a66716aa122b99f2c3c12b9d487640c120be7426 Mon Sep 17 00:00:00 2001
+From 9437dac1f05a295afc2fb6fd9a7a89018757b5dd Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
-Date: Sat, 1 Jun 2019 22:09:47 +0200
-Subject: [PATCH 3/8] data: Add Microsoft Surface Pro 5
+Date: Tue, 18 Aug 2020 20:19:02 +0200
+Subject: [PATCH 04/12] data: Add Microsoft Surface pro 5
 
 ---
  data/surface-pro5.tablet | 14 ++++++++++++++
@@ -10,16 +10,16 @@ Subject: [PATCH 3/8] data: Add Microsoft Surface Pro 5
 
 diff --git a/data/surface-pro5.tablet b/data/surface-pro5.tablet
 new file mode 100644
-index 0000000..2ad6539
+index 0000000..4fdbac6
 --- /dev/null
 +++ b/data/surface-pro5.tablet
 @@ -0,0 +1,14 @@
 +# This is for the Microsoft Surface Pro 5 (2017)
 +
 +[Device]
 +Name=Microsoft Surface Pro 5
-+DeviceMatch=mei:1B96:001F
-+Class=ISDV4
++Class=PenDisplay
++DeviceMatch=virt:1B96:001F;mei:1B96:001F
 +Width=10
 +Height=6
 +IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..2ad6539
 +Touch=true
 +Buttons=0
 -- 
-2.27.0
+2.28.0
 

…4-data-Add-Microsoft-Surface-Pro-6.patch …5-data-Add-Microsoft-Surface-pro-6.patch0004-data-Add-Microsoft-Surface-Pro-6.patch renamed to 0005-data-Add-Microsoft-Surface-pro-6.patch 0004-data-Add-Microsoft-Surface-Pro-6.patch renamed to 0005-data-Add-Microsoft-Surface-pro-6.patch

@@ -1,7 +1,7 @@
-From cfdb0ebe6303ec2eada62b9f61e4e1c1b0fc0233 Mon Sep 17 00:00:00 2001
+From 31f366ad82ac7ee32526bb3c429a9c98a0391463 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
-Date: Mon, 3 Jun 2019 00:40:34 +0200
-Subject: [PATCH 4/8] data: Add Microsoft Surface Pro 6
+Date: Tue, 18 Aug 2020 20:19:07 +0200
+Subject: [PATCH 05/12] data: Add Microsoft Surface pro 6
 
 ---
  data/surface-pro6.tablet | 14 ++++++++++++++
@@ -10,16 +10,16 @@ Subject: [PATCH 4/8] data: Add Microsoft Surface Pro 6
 
 diff --git a/data/surface-pro6.tablet b/data/surface-pro6.tablet
 new file mode 100644
-index 0000000..da31e8f
+index 0000000..787fd7a
 --- /dev/null
 +++ b/data/surface-pro6.tablet
 @@ -0,0 +1,14 @@
 +# This is for the Microsoft Surface Pro 6
 +
 +[Device]
 +Name=Microsoft Surface Pro 6
-+DeviceMatch=mei:045E:001F
-+Class=ISDV4
++Class=PenDisplay
++DeviceMatch=virt:045E:001F;mei:045E:001F
 +Width=10
 +Height=6
 +IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..da31e8f
 +Touch=true
 +Buttons=0
 -- 
-2.27.0
+2.28.0
 

0006-data-Add-Microsoft-Surface-pro-7.patch

@@ -0,0 +1,33 @@
+From 65e14e2a29dffae46526c7e1b7f0efba1477dbfa Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <[email protected]>
+Date: Tue, 18 Aug 2020 20:19:13 +0200
+Subject: [PATCH 06/12] data: Add Microsoft Surface pro 7
+
+---
+ data/surface-pro7.tablet | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+ create mode 100644 data/surface-pro7.tablet
+
+diff --git a/data/surface-pro7.tablet b/data/surface-pro7.tablet
+new file mode 100644
+index 0000000..4659131
+--- /dev/null
++++ b/data/surface-pro7.tablet
+@@ -0,0 +1,14 @@
++# This is for the Microsoft Surface Pro 7
++
++[Device]
++Name=Microsoft Surface Pro 7
++Class=PenDisplay
++DeviceMatch=virt:045E:099F;mei:045E:099F
++Width=10
++Height=6
++IntegratedIn=Display;System;
++
++[Features]
++Stylus=false
++Touch=true
++Buttons=0
+-- 
+2.28.0
+

…05-data-Add-Microsoft-Surface-Book.patch …07-data-Add-Microsoft-Surface-Book.patch0005-data-Add-Microsoft-Surface-Book.patch renamed to 0007-data-Add-Microsoft-Surface-Book.patch 0005-data-Add-Microsoft-Surface-Book.patch renamed to 0007-data-Add-Microsoft-Surface-Book.patch

@@ -1,7 +1,7 @@
-From 122fcb323532c576fb3913b6c2230dc57cf35b12 Mon Sep 17 00:00:00 2001
+From 910d868d837aa1989695cdbcbf07f47fae3086d3 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
-Date: Mon, 3 Jun 2019 00:45:41 +0200
-Subject: [PATCH 5/8] data: Add Microsoft Surface Book
+Date: Tue, 18 Aug 2020 20:19:38 +0200
+Subject: [PATCH 07/12] data: Add Microsoft Surface Book
 
 ---
  data/surface-book.tablet | 14 ++++++++++++++
@@ -10,16 +10,16 @@ Subject: [PATCH 5/8] data: Add Microsoft Surface Book
 
 diff --git a/data/surface-book.tablet b/data/surface-book.tablet
 new file mode 100644
-index 0000000..45e17db
+index 0000000..a551c9b
 --- /dev/null
 +++ b/data/surface-book.tablet
 @@ -0,0 +1,14 @@
 +# This is for the Microsoft Surface Book (1)
 +
 +[Device]
 +Name=Microsoft Surface Book
-+DeviceMatch=mei:1B96:005e
-+Class=ISDV4
++Class=PenDisplay
++DeviceMatch=virt:1B96:005e;mei:1B96:005e
 +Width=11
 +Height=7
 +IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..45e17db
 +Touch=true
 +Buttons=0
 -- 
-2.27.0
+2.28.0