eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-11-23 03:19:42 +01:00
Code Issues Releases Wiki Activity

onenetbook/4: update stylus patch for 6.1

Browse source
This commit is contained in:
Alexander Sosedkin 2023-03-19 00:10:04 +01:00
parent 994584bb26
commit bde6ca292c
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
onenetbook/4/goodix-stylus-mastykin/6.1.patch.patch Normal file
View file

@ -0,0 +1,18 @@
--- orig/patch1 2023-03-19 00:07:17.419793837 +0100
+++ updated/patch1 2023-03-19 00:08:09.493618699 +0100
@@ -10,11 +10,11 @@
/* quirks to control the device */
#define MT_QUIRK_NOT_SEEN_MEANS_UP BIT(0)
#define MT_QUIRK_SLOT_IS_CONTACTID BIT(1)
-@@ -70,6 +73,7 @@
- #define MT_QUIRK_WIN8_PTP_BUTTONS BIT(18)
- #define MT_QUIRK_SEPARATE_APP_REPORT BIT(19)
+@@ -72,6 +75,7 @@
#define MT_QUIRK_FORCE_MULTI_INPUT BIT(20)
-+#define MT_QUIRK_NON_MT_PEN BIT(21)
+ #define MT_QUIRK_DISABLE_WAKEUP BIT(21)
+ #define MT_QUIRK_ORIENTATION_INVERT BIT(22)
++#define MT_QUIRK_NON_MT_PEN BIT(23)
#define MT_INPUTMODE_TOUCHSCREEN 0x02
#define MT_INPUTMODE_TOUCHPAD 0x03

14
onenetbook/4/goodix-stylus-mastykin/default.nix
View file

@ -12,8 +12,18 @@ let
cat ${patch1_original} > $out cat ${patch1_original} > $out
${patch}/bin/patch $out < ${./5.12.12.patch.patch} ${patch}/bin/patch $out < ${./5.12.12.patch.patch}
''; '';
patch1 = if (lib.versionAtLeast kernel.version "5.12.12") then patch1_updated_6_1 = runCommand
patch1_updated_5_12_12 else patch1_original; "goodix-stylus-mastykin-1-pen-support-6.1.patch" {}
''
cat ${patch1_original} > $out
${patch}/bin/patch $out < ${./6.1.patch.patch}
'';
patch1 =
if (lib.versionAtLeast kernel.version "6.1") then
patch1_updated_6_1
else if (lib.versionAtLeast kernel.version "5.12.12") then
patch1_updated_5_12_12
else patch1_original;
patch2 = fetchpatch { patch2 = fetchpatch {
url = "https://marc.info/?l=linux-input&m=161847127221531&q=p4"; url = "https://marc.info/?l=linux-input&m=161847127221531&q=p4";
name = "goodix-stylus-mastykin-2-buttons.patch"; name = "goodix-stylus-mastykin-2-buttons.patch";