diff options
Diffstat (limited to '0001-Add-support-for-BUS_VIRTUAL.patch')
-rw-r--r-- | 0001-Add-support-for-BUS_VIRTUAL.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch index ed0e1d35e519..52b296bcdaf8 100644 --- a/0001-Add-support-for-BUS_VIRTUAL.patch +++ b/0001-Add-support-for-BUS_VIRTUAL.patch @@ -1,4 +1,4 @@ -From ca5c3616a3c77b234e35ef953569b0da71084347 Mon Sep 17 00:00:00 2001 +From 808f74da665bb932664b4950fe86e05910c77537 Mon Sep 17 00:00:00 2001 From: Dorian Stoll <dorian.stoll@tmsp.io> Date: Sat, 27 Jun 2020 18:21:11 +0200 Subject: [PATCH 01/16] Add support for BUS_VIRTUAL @@ -20,10 +20,10 @@ Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io> 5 files changed, 12 insertions(+) diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c -index 804ac3d..96aaa5e 100644 +index 2c17e0d..090d5aa 100644 --- a/libwacom/libwacom-database.c +++ b/libwacom/libwacom-database.c -@@ -128,6 +128,8 @@ bus_from_str (const char *str) +@@ -130,6 +130,8 @@ bus_from_str (const char *str) return WBUSTYPE_BLUETOOTH; if (g_str_equal(str, "i2c")) return WBUSTYPE_I2C; @@ -32,7 +32,7 @@ index 804ac3d..96aaa5e 100644 return WBUSTYPE_UNKNOWN; } -@@ -146,6 +148,8 @@ bus_to_str (WacomBusType bus) +@@ -148,6 +150,8 @@ bus_to_str (WacomBusType bus) return "bluetooth"; case WBUSTYPE_I2C: return "i2c"; @@ -42,10 +42,10 @@ index 804ac3d..96aaa5e 100644 g_assert_not_reached (); } diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c -index ccfe43a..d9b8a22 100644 +index d220d14..1ba0740 100644 --- a/libwacom/libwacom.c +++ b/libwacom/libwacom.c -@@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice *device, +@@ -148,6 +148,10 @@ get_bus_vid_pid (GUdevDevice *device, *bus = WBUSTYPE_I2C; retval = TRUE; break; @@ -56,7 +56,7 @@ index ccfe43a..d9b8a22 100644 } out: -@@ -817,6 +821,7 @@ static void print_match(int fd, const WacomMatch *match) +@@ -826,6 +830,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; @@ -65,7 +65,7 @@ index ccfe43a..d9b8a22 100644 default: g_assert_not_reached(); break; } diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h -index cafed64..b184ed7 100644 +index 389681d..040c51e 100644 --- a/libwacom/libwacom.h +++ b/libwacom/libwacom.h @@ -149,6 +149,7 @@ typedef enum { @@ -77,7 +77,7 @@ index cafed64..b184ed7 100644 /** diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c -index 2095089..da5fe07 100644 +index 4b7983d..91e83de 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) @@ -89,7 +89,7 @@ index 2095089..da5fe07 100644 g_assert_cmpint(pid, >, 0); break; diff --git a/test/test_data_files.py b/test/test_data_files.py -index c2db899..476aeca 100755 +index 4cca787..8ab1fea 100755 --- a/test/test_data_files.py +++ b/test/test_data_files.py @@ -46,6 +46,7 @@ def test_device_match(tabletfile): @@ -101,5 +101,5 @@ index c2db899..476aeca 100755 assert re.match( "[0-9a-f]{4}", vid -- -2.42.0 +2.43.0 |