Skip to content

Commit b5e9588

Browse files
qzedqzed
committed
Re-add accidentally dropped tablet data for Surface Pro 3
1 parent 4786a0b commit b5e9588

24 files changed

Lines changed: 142 additions & 76 deletions

‎patches/v1/0001-Add-support-for-BUS_VIRTUAL.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 3bb2424c1a5db35c454b1c5995f8afec2fb34b86 Mon Sep 17 00:00:00 2001
1+
From 3f437a3a53b2159bb385335be0598f8859ff385f Mon Sep 17 00:00:00 2001
22
From: Dorian Stoll <dorian.stoll@tmsp.io>
33
Date: Sat, 27 Jun 2020 18:21:11 +0200
4-
Subject: [PATCH 01/11] Add support for BUS_VIRTUAL
4+
Subject: [PATCH 01/12] Add support for BUS_VIRTUAL
55

66
This is needed to support IPTS devices through the iptsd userspace
77
daemon. It exposes the touchscreen / stylus as uinput, since the parsing
@@ -42,7 +42,7 @@ index a8987f7..3c7d0de 100644
4242
g_assert_not_reached ();
4343
}
4444
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
45-
index ccfe43a..d9b8a22 100644
45+
index 935344c..88d0777 100644
4646
--- a/libwacom/libwacom.c
4747
+++ b/libwacom/libwacom.c
4848
@@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice *device,
@@ -56,7 +56,7 @@ index ccfe43a..d9b8a22 100644
5656
}
5757

5858
out:
59-
@@ -817,6 +821,7 @@ static void print_match(int fd, const WacomMatch *match)
59+
@@ -797,6 +801,7 @@ static void print_match(int fd, const WacomMatch *match)
6060
case WBUSTYPE_USB: bus_name = "usb"; break;
6161
case WBUSTYPE_SERIAL: bus_name = "serial"; break;
6262
case WBUSTYPE_I2C: bus_name = "i2c"; break;
@@ -65,7 +65,7 @@ index ccfe43a..d9b8a22 100644
6565
default: g_assert_not_reached(); break;
6666
}
6767
diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
68-
index cafed64..b184ed7 100644
68+
index d611c9d..a4cbb23 100644
6969
--- a/libwacom/libwacom.h
7070
+++ b/libwacom/libwacom.h
7171
@@ -149,6 +149,7 @@ typedef enum {
@@ -102,5 +102,5 @@ index 3953b1e..734463f 100755
102102
assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
103103

104104
--
105-
2.35.1
105+
2.36.1
106106

‎patches/v1/0002-Add-support-for-Intel-Management-Engine-bus.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 46b769dba27c6098b4b35b400aacd30fb4b89d37 Mon Sep 17 00:00:00 2001
1+
From 52157eec5eb3c6f172531f741d2897b0401ac6c2 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <luzmaximilian@gmail.com>
33
Date: Sat, 1 Jun 2019 21:17:15 +0200
4-
Subject: [PATCH 02/11] Add support for Intel Management Engine bus
4+
Subject: [PATCH 02/12] Add support for Intel Management Engine bus
55

66
Add support for devices connected via the Intel Management Engine (MEI).
77
This is required to support IPTS based devices, such as (among others)
@@ -37,7 +37,7 @@ index 3c7d0de..28c0ac5 100644
3737
g_assert_not_reached ();
3838
}
3939
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
40-
index d9b8a22..e3364f4 100644
40+
index 88d0777..09e289f 100644
4141
--- a/libwacom/libwacom.c
4242
+++ b/libwacom/libwacom.c
4343
@@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice *device,
@@ -51,7 +51,7 @@ index d9b8a22..e3364f4 100644
5151
}
5252

5353
out:
54-
@@ -822,6 +826,7 @@ static void print_match(int fd, const WacomMatch *match)
54+
@@ -802,6 +806,7 @@ static void print_match(int fd, const WacomMatch *match)
5555
case WBUSTYPE_SERIAL: bus_name = "serial"; break;
5656
case WBUSTYPE_I2C: bus_name = "i2c"; break;
5757
case WBUSTYPE_VIRTUAL: bus_name = "virt"; break;
@@ -60,7 +60,7 @@ index d9b8a22..e3364f4 100644
6060
default: g_assert_not_reached(); break;
6161
}
6262
diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
63-
index b184ed7..5cd6736 100644
63+
index a4cbb23..034a894 100644
6464
--- a/libwacom/libwacom.h
6565
+++ b/libwacom/libwacom.h
6666
@@ -150,6 +150,7 @@ typedef enum {
@@ -97,5 +97,5 @@ index 734463f..c9c6312 100755
9797
assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
9898

9999
--
100-
2.35.1
100+
2.36.1
101101

‎patches/v1/0003-data-Add-Microsoft-Surface-Pro-3.patch‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
From 75db7ee0734d19b8d68ee1d2b8e85706e743cfc8 Mon Sep 17 00:00:00 2001
2+
From: "Antony Jordan (Tablet)" <wiccan.two@gmail.com>
3+
Date: Wed, 8 Jun 2022 22:03:33 +0200
4+
Subject: [PATCH 03/12] data: Add Microsoft Surface Pro 3
5+
6+
---
7+
data/surface-pro3.tablet | 14 ++++++++++++++
8+
1 file changed, 14 insertions(+)
9+
create mode 100644 data/surface-pro3.tablet
10+
11+
diff --git a/data/surface-pro3.tablet b/data/surface-pro3.tablet
12+
new file mode 100644
13+
index 0000000..3238d43
14+
--- /dev/null
15+
+++ b/data/surface-pro3.tablet
16+
@@ -0,0 +1,14 @@
17+
+# This is for the Microsoft Surface Pro 3
18+
+
19+
+[Device]
20+
+Name=Microsoft Surface Pro 3
21+
+Class=PenDisplay
22+
+DeviceMatch=i2c:1b96:1b05
23+
+Width=10
24+
+Height=6
25+
+IntegratedIn=Display;System;
26+
+
27+
+[Features]
28+
+Stylus=true
29+
+Touch=true
30+
+Buttons=0
31+
--
32+
2.36.1
33+

patches/v1/0003-data-Add-Microsoft-Surface-pro-4.patch renamed to patches/v1/0004-data-Add-Microsoft-Surface-Pro-4.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 673715eb15119d36d075562fe4f4b06d9e6a87d6 Mon Sep 17 00:00:00 2001
1+
From c8700d17bda8620d372e07c9789eba84984c6db1 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <luzmaximilian@gmail.com>
33
Date: Tue, 18 Aug 2020 20:18:55 +0200
4-
Subject: [PATCH 03/11] data: Add Microsoft Surface pro 4
4+
Subject: [PATCH 04/12] data: Add Microsoft Surface Pro 4
55

66
---
77
data/surface-pro4.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.35.1
32+
2.36.1
3333

patches/v2/0004-data-Add-Microsoft-Surface-pro-5.patch renamed to patches/v1/0005-data-Add-Microsoft-Surface-Pro-5.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 00c8f238b530d44067838d74f2229b7a6809302b Mon Sep 17 00:00:00 2001
1+
From 0531299aabb786c049e7046578f317f2e8999d26 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <luzmaximilian@gmail.com>
33
Date: Tue, 18 Aug 2020 20:19:02 +0200
4-
Subject: [PATCH 04/11] data: Add Microsoft Surface pro 5
4+
Subject: [PATCH 05/12] data: Add Microsoft Surface Pro 5
55

66
---
77
data/surface-pro5.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..b26af3a
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.35.1
32+
2.36.1
3333

patches/v1/0005-data-Add-Microsoft-Surface-pro-6.patch renamed to patches/v1/0006-data-Add-Microsoft-Surface-Pro-6.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 870ca0bd105720c49854f7b7ac289d102979dc13 Mon Sep 17 00:00:00 2001
1+
From 2c4b1f3e0c2f7b8c06c439cbc01438ef92ba13b7 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <luzmaximilian@gmail.com>
33
Date: Tue, 18 Aug 2020 20:19:07 +0200
4-
Subject: [PATCH 05/11] data: Add Microsoft Surface pro 6
4+
Subject: [PATCH 06/12] data: Add Microsoft Surface Pro 6
55

66
---
77
data/surface-pro6.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..e97fad8
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.35.1
32+
2.36.1
3333

patches/v2/0006-data-Add-Microsoft-Surface-pro-7.patch renamed to patches/v1/0007-data-Add-Microsoft-Surface-Pro-7.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From f530e759e834f3324c7836c92b68ca1c1020e187 Mon Sep 17 00:00:00 2001
1+
From fb983a5b9bd17510c370d0b8d242dd48cd6b77f0 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <luzmaximilian@gmail.com>
33
Date: Tue, 18 Aug 2020 20:19:13 +0200
4-
Subject: [PATCH 06/11] data: Add Microsoft Surface pro 7
4+
Subject: [PATCH 07/12] data: Add Microsoft Surface Pro 7
55

66
---
77
data/surface-pro7.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..7961379
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.35.1
32+
2.36.1
3333

patches/v2/0007-data-Add-Microsoft-Surface-Book.patch renamed to patches/v1/0008-data-Add-Microsoft-Surface-Book.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From a39a80b17edd92215b8a8c85d78a20017fdace3c Mon Sep 17 00:00:00 2001
1+
From ec23f66a61c3eab3d60d9135550f7ac67d40916f Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <luzmaximilian@gmail.com>
33
Date: Tue, 18 Aug 2020 20:19:38 +0200
4-
Subject: [PATCH 07/11] data: Add Microsoft Surface Book
4+
Subject: [PATCH 08/12] data: Add Microsoft Surface Book
55

66
---
77
data/surface-book.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..e2a5401
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.35.1
32+
2.36.1
3333

patches/v1/0008-data-Add-Microsoft-Surface-Book-2-13.5.patch renamed to patches/v1/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 50cb3db5bb3420c4d1001d07e3e28a8c26775626 Mon Sep 17 00:00:00 2001
1+
From 0006283ddcbf9641561573a862e32836cfa096db Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <luzmaximilian@gmail.com>
33
Date: Tue, 18 Aug 2020 20:20:04 +0200
4-
Subject: [PATCH 08/11] data: Add Microsoft Surface Book 2 (13.5")
4+
Subject: [PATCH 09/12] data: Add Microsoft Surface Book 2 (13.5")
55

66
---
77
data/surface-book2-13.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..b13cb07
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.35.1
32+
2.36.1
3333

patches/v1/0009-data-Add-Microsoft-Surface-Book-2-15.patch renamed to patches/v1/0010-data-Add-Microsoft-Surface-Book-2-15.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 64602455ae585838320bce2f3c046149939e7991 Mon Sep 17 00:00:00 2001
1+
From 8716bc994c30261d470c96f5f2c70421d12901f8 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <luzmaximilian@gmail.com>
33
Date: Tue, 18 Aug 2020 20:20:13 +0200
4-
Subject: [PATCH 09/11] data: Add Microsoft Surface Book 2 (15")
4+
Subject: [PATCH 10/12] data: Add Microsoft Surface Book 2 (15")
55

66
---
77
data/surface-book2-15.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..ad98cc7
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.35.1
32+
2.36.1
3333

0 commit comments

Comments
 (0)