Fix touchpad buttons by using debug kext from 5996b9b7dd

2025-11-09 15:10:21 +00:00 · 2022-12-12 12:27:17 +01:00
parent ff1282a595
commit 061c06be6f
15 changed files with 280 additions and 138 deletions
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/Info.plist
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/Info.plist
@@ -3,11 +3,11 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>20G730</string>
+	<string>20G817</string>
 	<key>CFBundleExecutable</key>
 	<string>VoodooPS2Controller</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.3.0, Copyright Apple Computer, Inc. 2000-2003, David Elliot 2007, RehabMan 2012-2013</string>
+	<string>2.3.1, Copyright Apple Computer, Inc. 2000-2003, David Elliot 2007, RehabMan 2012-2013</string>
 	<key>CFBundleIdentifier</key>
 	<string>as.acidanthera.voodoo.driver.PS2Controller</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.0</string>
+	<string>2.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,7 +25,7 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.3.0</string>
+	<string>2.3.1</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
@@ -139,7 +139,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>10.11</string>
 	<key>OSBundleCompatibleVersion</key>
-	<string>2.3.0</string>
+	<string>2.3.1</string>
 	<key>OSBundleLibraries</key>
 	<dict>
 		<key>com.apple.iokit.IOACPIFamily</key>
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/MacOS/VoodooPS2Controller
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/MacOS/VoodooPS2Controller
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/Info.plist
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>20G730</string>
+	<string>20G817</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/MacOS/VoodooInput
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/MacOS/VoodooInput
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/Resources/VoodooInputMultitouch/MultitouchHelpers.h
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/Resources/VoodooInputMultitouch/MultitouchHelpers.h
@@ -0,0 +1,39 @@
+//
+//  MultitouchHelpers.hpp
+//  VooodooInput
+//
+//  Copyright © 2019 Alexandre Daoud. All rights reserved.
+//
+
+#ifndef MULTITOUCH_HELPERS_H
+#define MULTITOUCH_HELPERS_H
+
+#define AbsoluteTime_to_scalar(x)    (*(uint64_t *)(x))
+
+#define SUB_ABSOLUTETIME(t1, t2)                \
+    (AbsoluteTime_to_scalar(t1) -=                \
+        AbsoluteTime_to_scalar(t2))
+
+#define kIOPMPowerOff                       0
+#define kIOPMNumberPowerStates     2
+
+enum {
+    // transforms
+    kIOFBRotateFlags                    = 0x0000000f,
+    
+    kIOFBSwapAxes                       = 0x00000001,
+    kIOFBInvertX                        = 0x00000002,
+    kIOFBInvertY                        = 0x00000004,
+    
+    kIOFBRotate0                        = 0x00000000,
+    kIOFBRotate90                       = kIOFBSwapAxes | kIOFBInvertX,
+    kIOFBRotate180                      = kIOFBInvertX  | kIOFBInvertY,
+    kIOFBRotate270                      = kIOFBSwapAxes | kIOFBInvertY
+};
+
+static IOPMPowerState PMPowerStates[kIOPMNumberPowerStates] = {
+    {1, kIOPMPowerOff, kIOPMPowerOff, kIOPMPowerOff, 0, 0, 0, 0, 0, 0, 0, 0},
+    {1, kIOPMPowerOn, kIOPMPowerOn, kIOPMPowerOn, 0, 0, 0, 0, 0, 0, 0, 0}
+};
+
+#endif
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/Resources/VoodooInputMultitouch/VoodooInputEvent.h
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/Resources/VoodooInputMultitouch/VoodooInputEvent.h
@@ -0,0 +1,48 @@
+//
+//  VoodooInputEvent.h
+//  VooodooInput
+//
+//  Copyright © 2019 Kishor Prins. All rights reserved.
+// Copyright (c) 2020 Leonard Kleinhans <leo-labs>
+//
+
+#ifndef VOODOO_INPUT_EVENT_H
+#define VOODOO_INPUT_EVENT_H
+
+#include "VoodooInputTransducer.h"
+
+struct VoodooInputEvent {
+    UInt8 contact_count;
+    AbsoluteTime timestamp;
+    VoodooInputTransducer transducers[VOODOO_INPUT_MAX_TRANSDUCERS];
+};
+
+struct VoodooInputDimensions {
+    SInt32 min_x;
+    SInt32 max_x;
+    SInt32 min_y;
+    SInt32 max_y;
+};
+
+struct RelativePointerEvent {
+    uint64_t timestamp;
+    int dx;
+    int dy;
+    int buttons;
+};
+
+struct ScrollWheelEvent {
+    uint64_t timestamp;
+    short deltaAxis1;
+    short deltaAxis2;
+    short deltaAxis3;
+};
+
+struct TrackpointReport {
+    AbsoluteTime timestamp;
+    SInt32 dx;
+    SInt32 dy;
+    UInt32 buttons;
+};
+
+#endif /* VoodooInputEvent_h */
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/Resources/VoodooInputMultitouch/VoodooInputMessages.h
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/Resources/VoodooInputMultitouch/VoodooInputMessages.h
@@ -0,0 +1,44 @@
+//
+//  VoodooInputMessages.h
+//  VooodooInput
+//
+//  Copyright © 2019 Kishor Prins. All rights reserved.
+//
+
+#ifndef VOODOO_INPUT_MESSAGES_H
+#define VOODOO_INPUT_MESSAGES_H
+
+#define VOODOO_INPUT_IDENTIFIER "VoodooInput Instance"
+
+#define VOODOO_INPUT_TRANSFORM_KEY "IOFBTransform"
+#define VOODOO_INPUT_LOGICAL_MAX_X_KEY "Logical Max X"
+#define VOODOO_INPUT_LOGICAL_MAX_Y_KEY "Logical Max Y"
+#define VOODOO_INPUT_PHYSICAL_MAX_X_KEY "Physical Max X"
+#define VOODOO_INPUT_PHYSICAL_MAX_Y_KEY "Physical Max Y"
+
+#define VOODOO_INPUT_MAX_TRANSDUCERS 10
+#define kIOMessageVoodooInputMessage 12345
+#define kIOMessageVoodooInputUpdateDimensionsMessage 12346
+#define kIOMessageVoodooInputUpdatePropertiesNotification 12347
+#define kIOMessageVoodooTrackpointRelativePointer iokit_vendor_specific_msg(430)
+#define kIOMessageVoodooTrackpointScrollWheel iokit_vendor_specific_msg(431)
+#define kIOMessageVoodooTrackpointMessage iokit_vendor_specific_msg(432)
+#define kIOMessageVoodooTrackpointUpdatePropertiesNotification iokit_vendor_specific_msg(433)
+
+#define kVoodooInputTransducerFingerType 1
+#define kVoodooInputTransducerStylusType 2
+
+#define VOODOO_TRACKPOINT_KEY "VoodooInput Trackpoint"
+#define VOODOO_TRACKPOINT_BTN_CNT "Button Count"
+#define VOODOO_TRACKPOINT_DEADZONE "Deadzone"
+// Note that these multipliers are divided by 64 internally
+// To get a multiplier of one, the multiplier needs to be set 64.
+#define VOODOO_TRACKPOINT_MOUSE_MULT_X "Mouse Multiplier X"
+#define VOODOO_TRACKPOINT_MOUSE_MULT_Y "Mouse Multiplier Y"
+#define VOODOO_TRACKPOINT_SCROLL_MULT_X "Scroll Multiplier X"
+#define VOODOO_TRACKPOINT_SCROLL_MULT_Y "Scroll Multiplier Y"
+
+#include "VoodooInputTransducer.h"
+#include "VoodooInputEvent.h"
+
+#endif /* VoodooInputMessages_h */
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/Resources/VoodooInputMultitouch/VoodooInputTransducer.h
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/Resources/VoodooInputMultitouch/VoodooInputTransducer.h
@@ -0,0 +1,54 @@
+//
+//  VoodooInputTransducer.hpp
+//  VooodooInput
+//
+//  Copyright © 2019 Kishor Prins. All rights reserved.
+//
+
+#ifndef VOODOO_INPUT_TRANSDUCER_H
+#define VOODOO_INPUT_TRANSDUCER_H
+
+#define VOODOO_INPUT_MAX_TRANSDUCERS 10
+
+enum MT2FingerType {
+    kMT2FingerTypeUndefined = 0,
+    kMT2FingerTypeThumb,
+    kMT2FingerTypeIndexFinger,
+    kMT2FingerTypeMiddleFinger,
+    kMT2FingerTypeRingFinger,
+    kMT2FingerTypeLittleFinger,
+    kMT2FingerTypeCount
+};
+
+enum VoodooInputTransducerType {
+    STYLUS,
+    FINGER
+};
+
+struct TouchCoordinates {
+    UInt32 x;
+    UInt32 y;
+    UInt8 pressure;
+    UInt8 width;
+};
+
+struct VoodooInputTransducer {
+    AbsoluteTime timestamp;
+    
+    MT2FingerType fingerType;
+    UInt32 secondaryId;
+    VoodooInputTransducerType type;
+    
+    bool isValid;
+    bool isPhysicalButtonDown;
+    bool isTransducerActive;
+    bool supportsPressure;
+    
+    TouchCoordinates currentCoordinates;
+    TouchCoordinates previousCoordinates;
+    
+    UInt32 maxPressure;
+};
+
+
+#endif
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/_CodeSignature/CodeResources
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/_CodeSignature/CodeResources
@@ -3,9 +3,71 @@
 <plist version="1.0">
 <dict>
 	<key>files</key>
-	<dict/>
+	<dict>
+		<key>Resources/VoodooInputMultitouch/MultitouchHelpers.h</key>
+		<data>
+		2Dn/wSPXmisHoAia4HckRfPF9VY=
+		</data>
+		<key>Resources/VoodooInputMultitouch/VoodooInputEvent.h</key>
+		<data>
+		LVVOLVLLeDSl0es2UZAP5Wd3xss=
+		</data>
+		<key>Resources/VoodooInputMultitouch/VoodooInputMessages.h</key>
+		<data>
+		iSPhwCK99EAr0ct5MYAo9Dv7oeM=
+		</data>
+		<key>Resources/VoodooInputMultitouch/VoodooInputTransducer.h</key>
+		<data>
+		gkk9BaVsQ4gUmaqO8llP7dOHjhE=
+		</data>
+	</dict>
 	<key>files2</key>
-	<dict/>
+	<dict>
+		<key>Resources/VoodooInputMultitouch/MultitouchHelpers.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			2Dn/wSPXmisHoAia4HckRfPF9VY=
+			</data>
+			<key>hash2</key>
+			<data>
+			Sfb8D4oD0U3eU/uN3tJWzilbqnn/x967cYacLl0mbZc=
+			</data>
+		</dict>
+		<key>Resources/VoodooInputMultitouch/VoodooInputEvent.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			LVVOLVLLeDSl0es2UZAP5Wd3xss=
+			</data>
+			<key>hash2</key>
+			<data>
+			LSrNk7vKlahtj4vBQ/dUJ9a3UPMpFM+YD+oyEXfWTz0=
+			</data>
+		</dict>
+		<key>Resources/VoodooInputMultitouch/VoodooInputMessages.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			iSPhwCK99EAr0ct5MYAo9Dv7oeM=
+			</data>
+			<key>hash2</key>
+			<data>
+			640sRwT0JLrGPHVtidfjxMz1rW9LFzG6rRc0E2g32Ss=
+			</data>
+		</dict>
+		<key>Resources/VoodooInputMultitouch/VoodooInputTransducer.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			gkk9BaVsQ4gUmaqO8llP7dOHjhE=
+			</data>
+			<key>hash2</key>
+			<data>
+			K17G+d04Tw396K/qurHzQZc/0cTgWwEESFtu6sfMd0w=
+			</data>
+		</dict>
+	</dict>
 	<key>rules</key>
 	<dict>
 		<key>^Resources/</key>
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/Info.plist
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/Info.plist
@@ -3,11 +3,11 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>20G730</string>
+	<string>20G817</string>
 	<key>CFBundleExecutable</key>
 	<string>VoodooPS2Keyboard</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.3.0, Copyright Apple Computer, Inc. 2000-2003, RehabMan 2012-2013</string>
+	<string>2.3.1, Copyright Apple Computer, Inc. 2000-2003, RehabMan 2012-2013</string>
 	<key>CFBundleIdentifier</key>
 	<string>as.acidanthera.voodoo.driver.PS2Keyboard</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.0</string>
+	<string>2.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,7 +25,7 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.3.0</string>
+	<string>2.3.1</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
@@ -600,7 +600,7 @@
 	<key>OSBundleLibraries</key>
 	<dict>
 		<key>as.acidanthera.voodoo.driver.PS2Controller</key>
-		<string>2.3.0</string>
+		<string>2.3.1</string>
 		<key>com.apple.iokit.IOHIDFamily</key>
 		<string>1.0.0b1</string>
 		<key>com.apple.kpi.bsd</key>
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/MacOS/VoodooPS2Keyboard
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/MacOS/VoodooPS2Keyboard
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/Info.plist
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/Info.plist
@@ -3,11 +3,11 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>20G730</string>
+	<string>20G817</string>
 	<key>CFBundleExecutable</key>
 	<string>VoodooPS2Mouse</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.3.0, Copyright Apple Computer, Inc. 2000-2004, Slice 2010, RehabMan 2012-2013</string>
+	<string>2.3.1, Copyright Apple Computer, Inc. 2000-2004, Slice 2010, RehabMan 2012-2013</string>
 	<key>CFBundleIdentifier</key>
 	<string>as.acidanthera.voodoo.driver.PS2Mouse</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.0</string>
+	<string>2.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,7 +25,7 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.3.0</string>
+	<string>2.3.1</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
@@ -182,7 +182,7 @@
 	<key>OSBundleLibraries</key>
 	<dict>
 		<key>as.acidanthera.voodoo.driver.PS2Controller</key>
-		<string>2.3.0</string>
+		<string>2.3.1</string>
 		<key>com.apple.iokit.IOHIDFamily</key>
 		<string>1.0.0b1</string>
 		<key>com.apple.kpi.iokit</key>
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/MacOS/VoodooPS2Mouse
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/MacOS/VoodooPS2Mouse
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/Info.plist
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/Info.plist
@@ -3,11 +3,11 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>20G730</string>
+	<string>20G817</string>
 	<key>CFBundleExecutable</key>
 	<string>VoodooPS2Trackpad</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.3.0, Copyright Apple Computer, Inc. 2002-2003, mackerintel 2008, RehabMan 2012-2013</string>
+	<string>2.3.1, Copyright Apple Computer, Inc. 2002-2003, mackerintel 2008, RehabMan 2012-2013</string>
 	<key>CFBundleIdentifier</key>
 	<string>as.acidanthera.voodoo.driver.PS2Trackpad</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.0</string>
+	<string>2.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,7 +25,7 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.3.0</string>
+	<string>2.3.1</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
@@ -314,62 +314,6 @@
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>as.acidanthera.voodoo.driver.PS2Trackpad</string>
-			<key>HIDPointerAccelerationTable</key>
-			<data>
-			AACAAFVTQioABwAAAAAAAgAEAAAABAAAABAAAAAQAAAAACAAAA0A
-			AIAAAACAAAABQAAAAYAAAAIAAAAC4AAAAwAAAATgAAAEAAAAB0AA
-			AAUAAAAKAAAABgAAAA1AAAAIAAAAFgAAAArAAAAjAAAADQAAAC8A
-			AAAOwAAAOMAAABBAAABBAAAAEcAAAEjAAAAAUAAADwAAgAAAAIAA
-			AAEAAAABQAAAAYAAAAJAAAACAAAAA4AAAAKAAAAE4AAAAwAAAAZg
-			AAAEAAAACgAAAAUAAAAOQAAABgAAABNAAAAIAAAAHsAAAArAAAAu
-			wAAADQAAADyAAAAOwAAARwAAABBAAABPwAAAEcAAAFiAAAAAgAAA
-			DwAAgAAAAIAAAAEAAAABYAAAAYAAAAKgAAACAAAABEAAAAKAAAAG
-			AAAAAwAAAAgAAAAEAAAADQAAAAUAAAASwAAABgAAABkAAAAIAAAA
-			KAAAAArAAAA7wAAADQAAAEuAAAAOwAAAV0AAABBAAABgQAAAEcAA
-			AGkAAAAAsAAADwAAgAAAAIAAAAEAAAABoAAAAYAAAAMAAAACAAAA
-			BQAAAAKAAAAHQAAAAwAAAAnAAAAEAAAAEEAAAAUAAAAXgAAABgAA
-			AB/AAAAIAAAAMgAAAArAAABKAAAADQAAAFyAAAAOwAAAaQAAABBA
-			AABywAAAEcAAAHrAAAAA4AAADwAAgAAAAKAAAAEAAAABwAAAAYAA
-			AANgAAACAAAABeAAAAKAAAAIoAAAAwAAAAvAAAAEAAAAE8AAAAUA
-			AAAdQAAABgAAACfAAAAIAAAAPcAAAArAAABZAAAADQAAAG3AAAAO
-			wAAAe0AAABBAAACFQAAAEcAAAIxAAAABAAAADwAAgAAAAMAAAAEA
-			AAACAAAAAYAAAAPgAAACAAAABsAAAAKAAAAKQAAAAwAAAA5gAAAE
-			AAAAGMAAAAUAAAAkwAAABgAAADLAAAAIAAAATUAAAArAAABugAAA
-			DQAAAIMAAAAOwAAAj0AAABBAAACXAAAAEcAAAJxAAA==
-			</data>
-			<key>HIDPointerAccelerationType</key>
-			<string>HIDTrackpadAcceleration</string>
-			<key>HIDScrollAccelerationTable</key>
-			<data>
-			AACAAFVTQioABwAAAAAAAQABAAAAAQAAAAAgAAAQAABxOwAATOMA
-			AwAAAAdgAAAEwAAADoAAAAbxSgAX6V4ACVeCACMQWgALZ6EALBF7
-			AA2N1AA03ToAD36aADvQuAASWKAARl01ABUAAABO2dgAF8AAAFXK
-			7QAas+UAW2FQAB2QAABe0qoAIL75AGEgywAkLXsAYnXvACewAABj
-			Rl8AAIAAABMAAHE7AABWfwABAAAAAuAAAAIAAAAJYAAAAwAAABIA
-			AAAEwAAAIMAAAAaAAAAwgAAACGp5AEH9tgAK7bUAV4ZuAA0B2ABr
-			PTkADv1/AIEEcAAQy5gAkdRWABJouQCe3VAAE+c/AKikCgAXAucA
-			tn2SABot3ADARE4AHVjQAMX4OgAg35IAytuYACQ4bgDO7mUAJ6CX
-			ANIwowAAsAAAFAAAcTsAAGFOAADAAAABwAAAAQAAAANgAAACAAAA
-			DCAAAAMAAAAW4AAABMAAACnAAAAGQAAAOsAAAAfOggBP7OcACgWA
-			AGo8rgAL658AhMCkAA2RCwCfR+EADzjIALWDbwAQ/k8AxqbEABLN
-			UQDUeCMAFepmAOTKxwAZoVYA8qFmAB1CvwD7fXwAIQuCAQFpdAAk
-			S20BBVKIACegAAEIK4wAAOAAABQAAHE7AABtdwAAwAAAAeAAAAEA
-			AAAD4AAAAgAAAA6AAAADAAAAHEAAAATAAAA0AAAABgAAAEdAAAAH
-			N4wAXL7hAAkAAACAwAAACoAAAKGAAAALz7IAvU7UAA01yQDadikA
-			DvtPAPKF4gARLu4BCSWiABUlDwEfV8QAGT9oASzRKgAdChkBNQrG
-			ACDz5QE6cR4AJEARAT3XdgAnn1YBQMHWAABQAAATAABxOwAAS7AA
-			AQAAAAJgAAACAAAABuAAAAMAAAAMYAAABMAAABcAAAAGwAAAJAAA
-			AAkAAAAyAAAACz1uAEFngAANcE8AUMGhAA+sTQBgSTMAEagdAG5N
-			TAATT9YAd9WQABTQfgB+26MAF3odAIbYXQAagocAjp+lAB2J6QCT
-			vnkAIN/yAJdcWwAkO0IAmYu9ACegOACacdcAAQAAABUAAHE7AABW
-			fwAAwAAAAiAAAAEAAAAEgAAAAYAAAAqAAAACAAAAEaAAAAMAAAAh
-			gAAABMAAAD6AAAAFwAAAVEAAAAbAAABrAAAACAAAAIxAAAAJAAAA
-			qYAAAApAAADKwAAAC8AAAPTAAAANwAABJAAAABAAAAFEn9IAFEAA
-			AV49zAAZAAABbrsYABzQAAFz78AAIOAAAXhvwAAkIAABem/AACeg
-			AAF8JGg=
-			</data>
-			<key>HIDScrollAccelerationType</key>
-			<string>HIDTrackpadScrollAcceleration</string>
 			<key>IOClass</key>
 			<string>ApplePS2SynapticsTouchPad</string>
 			<key>IOProbeScore</key>
@@ -380,65 +324,30 @@
 			<dict>
 				<key>Default</key>
 				<dict>
-					<key>ButtonCount</key>
-					<integer>3</integer>
-					<key>Darwin 16+</key>
-					<dict>
-						<key>ApplePreferenceCapability</key>
-						<true/>
-						<key>ApplePreferenceIdentifier</key>
-						<string>com.apple.AppleMultitouchTrackpad</string>
-						<key>MT Built-in</key>
-						<true/>
-						<key>MTHIDDevice</key>
-						<true/>
-						<key>SupportsGestureScrolling</key>
-						<true/>
-						<key>TrackpadEmbedded</key>
-						<true/>
-						<key>TrackpadFourFingerGestures</key>
-						<true/>
-						<key>TrackpadSecondaryClickCorners</key>
-						<true/>
-						<key>TrackpadThreeFingerDrag</key>
-						<false/>
-					</dict>
 					<key>DisableDevice</key>
 					<false/>
 					<key>DisableLEDUpdating</key>
 					<false/>
-					<key>FakeMiddleButton</key>
-					<true/>
 					<key>ForceTouchCustomDownThreshold</key>
 					<integer>90</integer>
 					<key>ForceTouchCustomPower</key>
 					<integer>8</integer>
 					<key>ForceTouchCustomUpThreshold</key>
 					<integer>20</integer>
-					<key>ForceTouchMode</key>
-					<integer>1</integer>
 					<key>ForceTouchPressureThreshold</key>
 					<integer>100</integer>
-					<key>MiddleClickTime</key>
-					<integer>100000000</integer>
-					<key>MouseMiddleScroll</key>
-					<true/>
 					<key>ProcessBluetoothMouseStopsTrackpad</key>
 					<true/>
 					<key>ProcessUSBMouseStopsTrackpad</key>
 					<true/>
 					<key>QuietTimeAfterTyping</key>
 					<integer>500000000</integer>
-					<key>Resolution</key>
-					<integer>400</integer>
-					<key>ScrollResolution</key>
-					<integer>400</integer>
 					<key>SkipPassThrough</key>
 					<false/>
+					<key>TrackpointDeadzone</key>
+					<integer>1</integer>
 					<key>USBMouseStopsTrackpad</key>
 					<integer>0</integer>
-					<key>UseHighRate</key>
-					<true/>
 					<key>WakeDelay</key>
 					<integer>1000</integer>
 				</dict>
@@ -496,39 +405,25 @@
 					<string>Thinkpad_ClickPad</string>
 					<key>Thinkpad_ClickPad</key>
 					<dict>
-						<key>FakeMiddleButton</key>
-						<false/>
 						<key>FingerZ</key>
 						<integer>30</integer>
 						<key>HWResetOnStart</key>
 						<true/>
-						<key>MouseMultiplierX</key>
-						<integer>2</integer>
-						<key>MouseMultiplierY</key>
-						<integer>2</integer>
-						<key>MouseScrollMultiplierX</key>
-						<integer>2</integer>
-						<key>MouseScrollMultiplierY</key>
-						<integer>2</integer>
-						<key>ScrollResolution</key>
-						<integer>800</integer>
-						<key>Thinkpad</key>
-						<true/>
+						<key>TrackpointMultiplierX</key>
+						<integer>128</integer>
+						<key>TrackpointMultiplierY</key>
+						<integer>128</integer>
+						<key>TrackpointScrollMultiplierX</key>
+						<integer>128</integer>
+						<key>TrackpointScrollMultiplierY</key>
+						<integer>128</integer>
 					</dict>
 					<key>Thinkpad_TrackPad</key>
 					<dict>
-						<key>FakeMiddleButton</key>
-						<false/>
 						<key>FingerZ</key>
 						<integer>47</integer>
 						<key>HWResetOnStart</key>
 						<true/>
-						<key>Resolution</key>
-						<integer>3200</integer>
-						<key>ScrollResolution</key>
-						<integer>800</integer>
-						<key>Thinkpad</key>
-						<true/>
 					</dict>
 					<key>X1CG3</key>
 					<string>Thinkpad_ClickPad</string>
@@ -547,7 +442,7 @@
 	<key>OSBundleLibraries</key>
 	<dict>
 		<key>as.acidanthera.voodoo.driver.PS2Controller</key>
-		<string>2.3.0</string>
+		<string>2.3.1</string>
 		<key>com.apple.iokit.IOHIDFamily</key>
 		<string>1.0.0b1</string>
 		<key>com.apple.kpi.iokit</key>
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/MacOS/VoodooPS2Trackpad
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/MacOS/VoodooPS2Trackpad