diff --git a/EFI/OC/Kexts/RealtekCardReader.kext/Contents/Info.plist b/EFI/OC/Kexts/RealtekCardReader.kext/Contents/Info.plist new file mode 100755 index 0000000..ed8d615 --- /dev/null +++ b/EFI/OC/Kexts/RealtekCardReader.kext/Contents/Info.plist @@ -0,0 +1,377 @@ + + + + + BuildMachineOSBuild + 22A380 + CFBundleDevelopmentRegion + en + CFBundleExecutable + RealtekCardReader + CFBundleIdentifier + science.firewolf.rtsx + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + RealtekCardReader + CFBundlePackageType + KEXT + CFBundleShortVersionString + 0.9.7 + CFBundleSupportedPlatforms + + MacOSX + + CFBundleVersion + 0.9.7 + DTCompiler + com.apple.compilers.llvm.clang.1_0 + DTPlatformBuild + 14A400 + DTPlatformName + macosx + DTPlatformVersion + 12.3 + DTSDKBuild + 21E226 + DTSDKName + macosx12.3 + DTXcode + 1401 + DTXcodeBuild + 14A400 + IOKitPersonalities + + IOSDBlockStorageDevice + + CFBundleIdentifier + science.firewolf.rtsx + Device Characteristics + + Product Name + Built In SDXC Reader + Vendor Name + Realtek + + IOClass + IOSDBlockStorageDevice + IOMediaIcon + + CFBundleIdentifier + com.apple.iokit.IOSCSIArchitectureModelFamily + IOBundleResourceFile + SD.icns + + IOProbeScore + 1000 + IOProviderClass + IOSDHostDriver + + RealtekRTS5129Controller + + CFBundleIdentifier + science.firewolf.rtsx + IOClass + RealtekUSBCardReaderController + IOProbeScore + 1000 + IOProviderClass + IOUSBHostDevice + Protocol Characteristics + + Physical Interconnect + Secure Digital + Physical Interconnect Location + Internal + + idProduct + 297 + idVendor + 3034 + + RealtekRTS5139Controller + + CFBundleIdentifier + science.firewolf.rtsx + IOClass + RealtekUSBCardReaderController + IOProbeScore + 1000 + IOProviderClass + IOUSBHostDevice + Protocol Characteristics + + Physical Interconnect + Secure Digital + Physical Interconnect Location + Internal + + idProduct + 313 + idVendor + 3034 + + RealtekRTS5179Controller + + CFBundleIdentifier + science.firewolf.rtsx + IOClass + RealtekUSBCardReaderController + IOProbeScore + 1000 + IOProviderClass + IOUSBHostDevice + Protocol Characteristics + + Physical Interconnect + Secure Digital + Physical Interconnect Location + Internal + + idProduct + 320 + idVendor + 3034 + + RealtekRTS5209Controller + + CFBundleIdentifier + science.firewolf.rtsx + IOClass + RealtekRTS5209Controller + IOPCIMatch + 0x520910EC + IOProbeScore + 1000 + IOProviderClass + IOPCIDevice + Protocol Characteristics + + Physical Interconnect + Secure Digital + Physical Interconnect Location + Internal + + + RealtekRTS5227Controller + + CFBundleIdentifier + science.firewolf.rtsx + IOClass + RealtekRTS5227Controller + IOPCIMatch + 0x522710EC + IOProbeScore + 1000 + IOProviderClass + IOPCIDevice + Protocol Characteristics + + Physical Interconnect + Secure Digital + Physical Interconnect Location + Internal + + + RealtekRTS5229Controller + + CFBundleIdentifier + science.firewolf.rtsx + IOClass + RealtekRTS5229Controller + IOPCIMatch + 0x522910EC + IOProbeScore + 1000 + IOProviderClass + IOPCIDevice + Protocol Characteristics + + Physical Interconnect + Secure Digital + Physical Interconnect Location + Internal + + + RealtekRTS522AController + + CFBundleIdentifier + science.firewolf.rtsx + IOClass + RealtekRTS522AController + IOPCIMatch + 0x522A10EC + IOProbeScore + 1000 + IOProviderClass + IOPCIDevice + Protocol Characteristics + + Physical Interconnect + Secure Digital + Physical Interconnect Location + Internal + + + RealtekRTS5249Controller + + CFBundleIdentifier + science.firewolf.rtsx + IOClass + RealtekRTS5249Controller + IOPCIMatch + 0x524910EC + IOProbeScore + 1000 + IOProviderClass + IOPCIDevice + Protocol Characteristics + + Physical Interconnect + Secure Digital + Physical Interconnect Location + Internal + + + RealtekRTS524AController + + CFBundleIdentifier + science.firewolf.rtsx + IOClass + RealtekRTS524AController + IOPCIMatch + 0x524A10EC + IOProbeScore + 1000 + IOProviderClass + IOPCIDevice + Protocol Characteristics + + Physical Interconnect + Secure Digital + Physical Interconnect Location + Internal + + + RealtekRTS525AController + + CFBundleIdentifier + science.firewolf.rtsx + IOClass + RealtekRTS525AController + IOPCIMatch + 0x525A10EC + IOProbeScore + 1000 + IOProviderClass + IOPCIDevice + Protocol Characteristics + + Physical Interconnect + Secure Digital + Physical Interconnect Location + Internal + + + RealtekRTS5260Controller + + CFBundleIdentifier + science.firewolf.rtsx + IOClass + RealtekRTS5260Controller + IOPCIMatch + 0x526010EC + IOProbeScore + 1000 + IOProviderClass + IOPCIDevice + Protocol Characteristics + + Physical Interconnect + Secure Digital + Physical Interconnect Location + Internal + + + RealtekRTS5286Controller + + CFBundleIdentifier + science.firewolf.rtsx + IOClass + RealtekRTS5286Controller + IOPCIMatch + 0x528610EC + IOProbeScore + 1000 + IOProviderClass + IOPCIDevice + Protocol Characteristics + + Physical Interconnect + Secure Digital + Physical Interconnect Location + Internal + + + RealtekRTS5287Controller + + CFBundleIdentifier + science.firewolf.rtsx + IOClass + RealtekRTS5287Controller + IOPCIMatch + 0x528710EC + IOProbeScore + 1000 + IOProviderClass + IOPCIDevice + Protocol Characteristics + + Physical Interconnect + Secure Digital + Physical Interconnect Location + Internal + + + RealtekRTS5289Controller + + CFBundleIdentifier + science.firewolf.rtsx + IOClass + RealtekRTS5289Controller + IOPCIMatch + 0x528910EC + IOProbeScore + 1000 + IOProviderClass + IOPCIDevice + Protocol Characteristics + + Physical Interconnect + Secure Digital + Physical Interconnect Location + Internal + + + + LSMinimumSystemVersion + 10.14 + NSHumanReadableCopyright + Copyright © 2021 FireWolf. All rights reserved. + OSBundleLibraries + + com.apple.iokit.IOPCIFamily + 2.9 + com.apple.iokit.IOStorageFamily + 2.1 + com.apple.iokit.IOUSBHostFamily + 1.2 + com.apple.kpi.iokit + 16.4 + com.apple.kpi.libkern + 16.4 + + OSBundleRequired + Root + + diff --git a/EFI/OC/Kexts/RealtekCardReader.kext/Contents/MacOS/RealtekCardReader b/EFI/OC/Kexts/RealtekCardReader.kext/Contents/MacOS/RealtekCardReader new file mode 100755 index 0000000..2dfd0e4 Binary files /dev/null and b/EFI/OC/Kexts/RealtekCardReader.kext/Contents/MacOS/RealtekCardReader differ diff --git a/EFI/OC/Kexts/RealtekCardReader.kext/Contents/Resources/LICENSE b/EFI/OC/Kexts/RealtekCardReader.kext/Contents/Resources/LICENSE new file mode 100755 index 0000000..9860be2 --- /dev/null +++ b/EFI/OC/Kexts/RealtekCardReader.kext/Contents/Resources/LICENSE @@ -0,0 +1,29 @@ +BSD 3-Clause License + +Copyright (c) 2021, FireWolf @ FireWolf Pl. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/EFI/OC/Kexts/RealtekCardReaderFriend.kext/Contents/Info.plist b/EFI/OC/Kexts/RealtekCardReaderFriend.kext/Contents/Info.plist new file mode 100755 index 0000000..d262386 --- /dev/null +++ b/EFI/OC/Kexts/RealtekCardReaderFriend.kext/Contents/Info.plist @@ -0,0 +1,81 @@ + + + + + BuildMachineOSBuild + 22A380 + CFBundleDevelopmentRegion + en + CFBundleExecutable + RealtekCardReaderFriend + CFBundleIdentifier + science.firewolf.rtsf + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + RealtekCardReaderFriend + CFBundlePackageType + KEXT + CFBundleShortVersionString + 1.0.4 + CFBundleSupportedPlatforms + + MacOSX + + CFBundleVersion + 1.0.4 + DTCompiler + com.apple.compilers.llvm.clang.1_0 + DTPlatformBuild + 14A400 + DTPlatformName + macosx + DTPlatformVersion + 12.3 + DTSDKBuild + 21E226 + DTSDKName + macosx12.3 + DTXcode + 1401 + DTXcodeBuild + 14A400 + IOKitPersonalities + + RealtekCardReaderFriend + + CFBundleIdentifier + science.firewolf.rtsf + IOClass + RealtekCardReaderFriend + IOMatchCategory + RealtekCardReaderFriend + IOProviderClass + IOResources + IOResourceMatch + IOKit + + + LSMinimumSystemVersion + 10.14 + OSBundleLibraries + + as.vit9696.Lilu + 1.4.7 + com.apple.kpi.bsd + 12.0.0 + com.apple.kpi.dsep + 12.0.0 + com.apple.kpi.iokit + 12.0.0 + com.apple.kpi.libkern + 12.0.0 + com.apple.kpi.mach + 12.0.0 + com.apple.kpi.unsupported + 12.0.0 + + OSBundleRequired + Root + + diff --git a/EFI/OC/Kexts/RealtekCardReaderFriend.kext/Contents/MacOS/RealtekCardReaderFriend b/EFI/OC/Kexts/RealtekCardReaderFriend.kext/Contents/MacOS/RealtekCardReaderFriend new file mode 100755 index 0000000..d898fba Binary files /dev/null and b/EFI/OC/Kexts/RealtekCardReaderFriend.kext/Contents/MacOS/RealtekCardReaderFriend differ diff --git a/EFI/OC/Kexts/RealtekCardReaderFriend.kext/Contents/Resources/LICENSE b/EFI/OC/Kexts/RealtekCardReaderFriend.kext/Contents/Resources/LICENSE new file mode 100755 index 0000000..9860be2 --- /dev/null +++ b/EFI/OC/Kexts/RealtekCardReaderFriend.kext/Contents/Resources/LICENSE @@ -0,0 +1,29 @@ +BSD 3-Clause License + +Copyright (c) 2021, FireWolf @ FireWolf Pl. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/Info.plist b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/Info.plist index fea4be0..29c9b59 100755 --- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/Info.plist +++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/Info.plist @@ -3,11 +3,11 @@ BuildMachineOSBuild - 20G730 + 20G817 CFBundleExecutable VoodooPS2Controller CFBundleGetInfoString - 2.3.0, Copyright Apple Computer, Inc. 2000-2003, David Elliot 2007, RehabMan 2012-2013 + 2.3.1, Copyright Apple Computer, Inc. 2000-2003, David Elliot 2007, RehabMan 2012-2013 CFBundleIdentifier as.acidanthera.voodoo.driver.PS2Controller CFBundleInfoDictionaryVersion @@ -17,7 +17,7 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 2.3.0 + 2.3.1 CFBundleSignature ???? CFBundleSupportedPlatforms @@ -25,7 +25,7 @@ MacOSX CFBundleVersion - 2.3.0 + 2.3.1 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild @@ -139,7 +139,7 @@ LSMinimumSystemVersion 10.11 OSBundleCompatibleVersion - 2.3.0 + 2.3.1 OSBundleLibraries com.apple.iokit.IOACPIFamily diff --git a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/MacOS/VoodooPS2Controller b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/MacOS/VoodooPS2Controller index 53a8c13..aedd2a8 100755 Binary files a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/MacOS/VoodooPS2Controller and b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/MacOS/VoodooPS2Controller differ diff --git 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 index 751c3d6..91cdfbc 100755 --- 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 @@ BuildMachineOSBuild - 20G730 + 20G817 CFBundleDevelopmentRegion en CFBundleExecutable diff --git 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 index 1a95ff1..7f07ee1 100755 Binary files a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/MacOS/VoodooInput and b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext/Contents/MacOS/VoodooInput differ diff --git 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 new file mode 100755 index 0000000..4ce965b --- /dev/null +++ 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 diff --git 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 new file mode 100755 index 0000000..7deb637 --- /dev/null +++ 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 +// + +#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 */ diff --git 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 new file mode 100755 index 0000000..9d5e330 --- /dev/null +++ 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 */ diff --git 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 new file mode 100755 index 0000000..12a2c0b --- /dev/null +++ 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 diff --git 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 index d5d0fd7..a2378fd 100755 --- 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 @@ files - + + Resources/VoodooInputMultitouch/MultitouchHelpers.h + + 2Dn/wSPXmisHoAia4HckRfPF9VY= + + Resources/VoodooInputMultitouch/VoodooInputEvent.h + + LVVOLVLLeDSl0es2UZAP5Wd3xss= + + Resources/VoodooInputMultitouch/VoodooInputMessages.h + + iSPhwCK99EAr0ct5MYAo9Dv7oeM= + + Resources/VoodooInputMultitouch/VoodooInputTransducer.h + + gkk9BaVsQ4gUmaqO8llP7dOHjhE= + + files2 - + + Resources/VoodooInputMultitouch/MultitouchHelpers.h + + hash + + 2Dn/wSPXmisHoAia4HckRfPF9VY= + + hash2 + + Sfb8D4oD0U3eU/uN3tJWzilbqnn/x967cYacLl0mbZc= + + + Resources/VoodooInputMultitouch/VoodooInputEvent.h + + hash + + LVVOLVLLeDSl0es2UZAP5Wd3xss= + + hash2 + + LSrNk7vKlahtj4vBQ/dUJ9a3UPMpFM+YD+oyEXfWTz0= + + + Resources/VoodooInputMultitouch/VoodooInputMessages.h + + hash + + iSPhwCK99EAr0ct5MYAo9Dv7oeM= + + hash2 + + 640sRwT0JLrGPHVtidfjxMz1rW9LFzG6rRc0E2g32Ss= + + + Resources/VoodooInputMultitouch/VoodooInputTransducer.h + + hash + + gkk9BaVsQ4gUmaqO8llP7dOHjhE= + + hash2 + + K17G+d04Tw396K/qurHzQZc/0cTgWwEESFtu6sfMd0w= + + + rules ^Resources/ diff --git 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 index 4388f48..e063f11 100755 --- 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 @@ BuildMachineOSBuild - 20G730 + 20G817 CFBundleExecutable VoodooPS2Keyboard CFBundleGetInfoString - 2.3.0, Copyright Apple Computer, Inc. 2000-2003, RehabMan 2012-2013 + 2.3.1, Copyright Apple Computer, Inc. 2000-2003, RehabMan 2012-2013 CFBundleIdentifier as.acidanthera.voodoo.driver.PS2Keyboard CFBundleInfoDictionaryVersion @@ -17,7 +17,7 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 2.3.0 + 2.3.1 CFBundleSignature ???? CFBundleSupportedPlatforms @@ -25,7 +25,7 @@ MacOSX CFBundleVersion - 2.3.0 + 2.3.1 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild @@ -600,7 +600,7 @@ OSBundleLibraries as.acidanthera.voodoo.driver.PS2Controller - 2.3.0 + 2.3.1 com.apple.iokit.IOHIDFamily 1.0.0b1 com.apple.kpi.bsd diff --git 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 index e826283..9355fd5 100755 Binary files a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/MacOS/VoodooPS2Keyboard and b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/MacOS/VoodooPS2Keyboard differ diff --git 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 index bd21915..f0a9cbd 100755 --- 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 @@ BuildMachineOSBuild - 20G730 + 20G817 CFBundleExecutable VoodooPS2Mouse CFBundleGetInfoString - 2.3.0, Copyright Apple Computer, Inc. 2000-2004, Slice 2010, RehabMan 2012-2013 + 2.3.1, Copyright Apple Computer, Inc. 2000-2004, Slice 2010, RehabMan 2012-2013 CFBundleIdentifier as.acidanthera.voodoo.driver.PS2Mouse CFBundleInfoDictionaryVersion @@ -17,7 +17,7 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 2.3.0 + 2.3.1 CFBundleSignature ???? CFBundleSupportedPlatforms @@ -25,7 +25,7 @@ MacOSX CFBundleVersion - 2.3.0 + 2.3.1 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild @@ -182,7 +182,7 @@ OSBundleLibraries as.acidanthera.voodoo.driver.PS2Controller - 2.3.0 + 2.3.1 com.apple.iokit.IOHIDFamily 1.0.0b1 com.apple.kpi.iokit diff --git 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 index 246550d..01cf752 100755 Binary files a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/MacOS/VoodooPS2Mouse and b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/MacOS/VoodooPS2Mouse differ diff --git 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 index 6014775..cedd395 100755 --- 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 @@ BuildMachineOSBuild - 20G730 + 20G817 CFBundleExecutable VoodooPS2Trackpad CFBundleGetInfoString - 2.3.0, Copyright Apple Computer, Inc. 2002-2003, mackerintel 2008, RehabMan 2012-2013 + 2.3.1, Copyright Apple Computer, Inc. 2002-2003, mackerintel 2008, RehabMan 2012-2013 CFBundleIdentifier as.acidanthera.voodoo.driver.PS2Trackpad CFBundleInfoDictionaryVersion @@ -17,7 +17,7 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 2.3.0 + 2.3.1 CFBundleSignature ???? CFBundleSupportedPlatforms @@ -25,7 +25,7 @@ MacOSX CFBundleVersion - 2.3.0 + 2.3.1 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild @@ -314,62 +314,6 @@ CFBundleIdentifier as.acidanthera.voodoo.driver.PS2Trackpad - HIDPointerAccelerationTable - - AACAAFVTQioABwAAAAAAAgAEAAAABAAAABAAAAAQAAAAACAAAA0A - AIAAAACAAAABQAAAAYAAAAIAAAAC4AAAAwAAAATgAAAEAAAAB0AA - AAUAAAAKAAAABgAAAA1AAAAIAAAAFgAAAArAAAAjAAAADQAAAC8A - AAAOwAAAOMAAABBAAABBAAAAEcAAAEjAAAAAUAAADwAAgAAAAIAA - AAEAAAABQAAAAYAAAAJAAAACAAAAA4AAAAKAAAAE4AAAAwAAAAZg - AAAEAAAACgAAAAUAAAAOQAAABgAAABNAAAAIAAAAHsAAAArAAAAu - wAAADQAAADyAAAAOwAAARwAAABBAAABPwAAAEcAAAFiAAAAAgAAA - DwAAgAAAAIAAAAEAAAABYAAAAYAAAAKgAAACAAAABEAAAAKAAAAG - AAAAAwAAAAgAAAAEAAAADQAAAAUAAAASwAAABgAAABkAAAAIAAAA - KAAAAArAAAA7wAAADQAAAEuAAAAOwAAAV0AAABBAAABgQAAAEcAA - AGkAAAAAsAAADwAAgAAAAIAAAAEAAAABoAAAAYAAAAMAAAACAAAA - BQAAAAKAAAAHQAAAAwAAAAnAAAAEAAAAEEAAAAUAAAAXgAAABgAA - AB/AAAAIAAAAMgAAAArAAABKAAAADQAAAFyAAAAOwAAAaQAAABBA - AABywAAAEcAAAHrAAAAA4AAADwAAgAAAAKAAAAEAAAABwAAAAYAA - AANgAAACAAAABeAAAAKAAAAIoAAAAwAAAAvAAAAEAAAAE8AAAAUA - AAAdQAAABgAAACfAAAAIAAAAPcAAAArAAABZAAAADQAAAG3AAAAO - wAAAe0AAABBAAACFQAAAEcAAAIxAAAABAAAADwAAgAAAAMAAAAEA - AAACAAAAAYAAAAPgAAACAAAABsAAAAKAAAAKQAAAAwAAAA5gAAAE - AAAAGMAAAAUAAAAkwAAABgAAADLAAAAIAAAATUAAAArAAABugAAA - DQAAAIMAAAAOwAAAj0AAABBAAACXAAAAEcAAAJxAAA== - - HIDPointerAccelerationType - HIDTrackpadAcceleration - HIDScrollAccelerationTable - - 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= - - HIDScrollAccelerationType - HIDTrackpadScrollAcceleration IOClass ApplePS2SynapticsTouchPad IOProbeScore @@ -380,65 +324,30 @@ Default - ButtonCount - 3 - Darwin 16+ - - ApplePreferenceCapability - - ApplePreferenceIdentifier - com.apple.AppleMultitouchTrackpad - MT Built-in - - MTHIDDevice - - SupportsGestureScrolling - - TrackpadEmbedded - - TrackpadFourFingerGestures - - TrackpadSecondaryClickCorners - - TrackpadThreeFingerDrag - - DisableDevice DisableLEDUpdating - FakeMiddleButton - ForceTouchCustomDownThreshold 90 ForceTouchCustomPower 8 ForceTouchCustomUpThreshold 20 - ForceTouchMode - 1 ForceTouchPressureThreshold 100 - MiddleClickTime - 100000000 - MouseMiddleScroll - ProcessBluetoothMouseStopsTrackpad ProcessUSBMouseStopsTrackpad QuietTimeAfterTyping 500000000 - Resolution - 400 - ScrollResolution - 400 SkipPassThrough + TrackpointDeadzone + 1 USBMouseStopsTrackpad 0 - UseHighRate - WakeDelay 1000 @@ -496,39 +405,25 @@ Thinkpad_ClickPad Thinkpad_ClickPad - FakeMiddleButton - FingerZ 30 HWResetOnStart - MouseMultiplierX - 2 - MouseMultiplierY - 2 - MouseScrollMultiplierX - 2 - MouseScrollMultiplierY - 2 - ScrollResolution - 800 - Thinkpad - + TrackpointMultiplierX + 128 + TrackpointMultiplierY + 128 + TrackpointScrollMultiplierX + 128 + TrackpointScrollMultiplierY + 128 Thinkpad_TrackPad - FakeMiddleButton - FingerZ 47 HWResetOnStart - Resolution - 3200 - ScrollResolution - 800 - Thinkpad - X1CG3 Thinkpad_ClickPad @@ -547,7 +442,7 @@ OSBundleLibraries as.acidanthera.voodoo.driver.PS2Controller - 2.3.0 + 2.3.1 com.apple.iokit.IOHIDFamily 1.0.0b1 com.apple.kpi.iokit diff --git 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 index 14f45e5..3c0b5c0 100755 Binary files a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/MacOS/VoodooPS2Trackpad and b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/MacOS/VoodooPS2Trackpad differ diff --git a/EFI/OC/config.plist b/EFI/OC/config.plist old mode 100755 new mode 100644 index 8ad71d7..de2c119 --- a/EFI/OC/config.plist +++ b/EFI/OC/config.plist @@ -948,6 +948,42 @@ PlistPath Contents/Info.plist + + Arch + Any + BundlePath + RealtekCardReader.kext + Comment + RealtekCardReader.kext + Enabled + + ExecutablePath + Contents/MacOS/RealtekCardReader + MaxKernel + + MinKernel + + PlistPath + Contents/Info.plist + + + Arch + Any + BundlePath + RealtekCardReaderFriend.kext + Comment + RealtekCardReader.kext + Enabled + + ExecutablePath + Contents/MacOS/RealtekCardReaderFriend + MaxKernel + + MinKernel + + PlistPath + Contents/Info.plist + Block @@ -1481,4 +1517,4 @@ - \ No newline at end of file +