Refactor Synaptics driver (#54)

acidanthera · Dec 27, 2022 · f76cb96 · f76cb96
1 parent dec58cc
commit f76cb96
Show file tree

Hide file tree

Showing 11 changed files with 730 additions and 1,092 deletions.
diff --git a/Docs/ACPI/SSDT-Thinkpad_Clickpad.dsl b/Docs/ACPI/SSDT-Thinkpad_Clickpad.dsl
@@ -20,28 +20,19 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "ps2", 0)
         {
             "Synaptics TouchPad", Package()
             {
-                "BogusDeltaThreshX", 800,
-                "BogusDeltaThreshY", 800,
-                "Clicking", ">y",
-                "DragLockTempMask", 0x40004,
-                "FakeMiddleButton", ">n",
                 "HWResetOnStart", ">y",
-                //"ForcePassThrough", ">y",
-                //"SkipPassThrough", ">y",
-                "PalmNoAction When Typing", ">y",
-                "ScrollResolution", 800,
-                "SmoothInput", ">y",
-                "UnsmoothInput", ">y",
-                "Thinkpad", ">y",
-                "EdgeBottom", 0,
+                "QuietTimeAfterTyping", 500000000,
                 "FingerZ", 30,
-                "MaxTapTime", 100000000,
                 "MouseMultiplierX", 2,
                 "MouseMultiplierY", 2,
-                "MouseScrollMultiplierX", 2,
-                "MouseScrollMultiplierY", 2,
-                //"TrackpointScrollYMultiplier", 1, //Change this value to 0xFFFF in order to inverse the vertical scroll direction of the Trackpoint when holding the middle mouse button.
-                //"TrackpointScrollXMultiplier", 1, //Change this value to 0xFFFF in order to inverse the horizontal scroll direction of the Trackpoint when holding the middle mouse button.
+                "MouseDivisorX", 1,
+                "MouseDivisorY", 1,
+                // Change multipliers to 0xFFFE in order to inverse the scroll direction
+                // of the Trackpoint when holding the middle mouse button.
+                "TrackpointScrollXMultiplier", 2,
+                "TrackpointScrollYMultiplier", 2,
+                "TrackpointScrollXDivisor", 1,
+                "TrackpointScrollYDivisor", 1
             },
         })
     }

diff --git a/Docs/ACPI/SSDT-Thinkpad_Trackpad.dsl b/Docs/ACPI/SSDT-Thinkpad_Trackpad.dsl
@@ -21,35 +21,19 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "ps2", 0)
         {
             "Synaptics TouchPad", Package()
             {
-                "BogusDeltaThreshX", 100,
-                "BogusDeltaThreshY", 100,
-                "Clicking", ">y",
-                "DragLockTempMask", 0x40004,
-                "FakeMiddleButton", ">n",
                 "HWResetOnStart", ">y",
-                //"ForcePassThrough", ">y",
-                //"SkipPassThrough", ">y",
                 "PalmNoAction When Typing", ">y",
-                "ScrollResolution", 800,
-                "SmoothInput", ">y",
-                "UnsmoothInput", ">y",
-                "Thinkpad", ">y",
-                "DivisorX", 1,
-                "DivisorY", 1,
                 "FingerZ", 47,
-                "MaxTapTime", 100000000,
-                "MomentumScrollThreshY", 16,
                 "MouseMultiplierX", 8,
                 "MouseMultiplierY", 8,
-                "MouseScrollMultiplierX", 2,
-                "MouseScrollMultiplierY", 2,
-                "MultiFingerHorizontalDivisor", 4,
-                "MultiFingerVerticalDivisor", 4,
-                "Resolution", 3200,
-                "ScrollDeltaThreshX", 10,
-                "ScrollDeltaThreshY", 10,
-                //"TrackpointScrollYMultiplier", 1, //Change this value to 0xFFFF in order to inverse the vertical scroll direction of the Trackpoint when holding the middle mouse button.
-                //"TrackpointScrollXMultiplier", 1, //Change this value to 0xFFFF in order to inverse the horizontal scroll direction of the Trackpoint when holding the middle mouse button.
+                "MouseDivisorX", 1,
+                "MouseDivisorY", 1,
+                // Change multipliers to 0xFFFE in order to inverse the scroll direction
+                // of the Trackpoint when holding the middle mouse button.
+                "TrackpointScrollXMultiplier", 2,
+                "TrackpointScrollYMultiplier", 2,
+                "TrackpointScrollXDivisor", 1,
+                "TrackpointScrollYDivisor", 1
             },
         })
     }

diff --git a/VoodooPS2Controller.xcodeproj/project.pbxproj b/VoodooPS2Controller.xcodeproj/project.pbxproj
@@ -494,7 +494,7 @@
 		84167808161B55B2002C60E6 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1320;
 				ORGANIZATIONNAME = Acidanthera;
 			};
 			buildConfigurationList = 8416780B161B55B2002C60E6 /* Build configuration list for PBXProject "VoodooPS2Controller" */;
@@ -834,6 +834,9 @@
 		84167825161B55B2002C60E6 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ANALYZER_DEADCODE_DEADSTORES = YES;
+				CLANG_ANALYZER_DIVIDE_BY_ZERO = YES;
+				CLANG_ANALYZER_NULL_DEREFERENCE = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -846,6 +849,7 @@
 				OTHER_CFLAGS = "-fno-stack-protector";
 				PRODUCT_BUNDLE_IDENTIFIER = as.acidanthera.voodoo.driver.PS2Controller;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				RUN_CLANG_STATIC_ANALYZER = YES;
 				STRIP_INSTALLED_PRODUCT = YES;
 				STRIP_STYLE = "non-global";
 			};
@@ -874,6 +878,9 @@
 		84167839161B5613002C60E6 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ANALYZER_DEADCODE_DEADSTORES = YES;
+				CLANG_ANALYZER_DIVIDE_BY_ZERO = YES;
+				CLANG_ANALYZER_NULL_DEREFERENCE = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/VoodooPS2Controller.kext/Contents/PlugIns";
@@ -887,6 +894,7 @@
 				OTHER_CFLAGS = "-fno-stack-protector";
 				PRODUCT_BUNDLE_IDENTIFIER = as.acidanthera.voodoo.driver.PS2Keyboard;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				RUN_CLANG_STATIC_ANALYZER = YES;
 				STRIP_INSTALLED_PRODUCT = YES;
 				STRIP_STYLE = "non-global";
 			};
@@ -916,6 +924,9 @@
 		8416784D161B56A2002C60E6 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ANALYZER_DEADCODE_DEADSTORES = YES;
+				CLANG_ANALYZER_DIVIDE_BY_ZERO = YES;
+				CLANG_ANALYZER_NULL_DEREFERENCE = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/VoodooPS2Controller.kext/Contents/PlugIns";
@@ -929,6 +940,7 @@
 				OTHER_CFLAGS = "-fno-stack-protector";
 				PRODUCT_BUNDLE_IDENTIFIER = as.acidanthera.voodoo.driver.PS2Mouse;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				RUN_CLANG_STATIC_ANALYZER = YES;
 				STRIP_INSTALLED_PRODUCT = YES;
 				STRIP_STYLE = "non-global";
 			};
@@ -958,6 +970,9 @@
 		84167861161B56C4002C60E6 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ANALYZER_DEADCODE_DEADSTORES = YES;
+				CLANG_ANALYZER_DIVIDE_BY_ZERO = YES;
+				CLANG_ANALYZER_NULL_DEREFERENCE = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/VoodooPS2Controller.kext/Contents/PlugIns";
@@ -972,6 +987,7 @@
 				OTHER_CFLAGS = "-fno-stack-protector";
 				PRODUCT_BUNDLE_IDENTIFIER = as.acidanthera.voodoo.driver.PS2Trackpad;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				RUN_CLANG_STATIC_ANALYZER = YES;
 				STRIP_INSTALLED_PRODUCT = YES;
 				STRIP_STYLE = "non-global";
 			};

diff --git a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Controller.xcscheme b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Controller.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1320"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Keyboard.xcscheme b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Keyboard.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1320"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Mouse.xcscheme b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Mouse.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1320"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Trackpad.xcscheme b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Trackpad.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1320"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"