diff --git a/EFI/OC/ACPI/SSDT-EXT4.aml b/EFI/OC/ACPI/SSDT-EXT4.aml index 3b64549..e393070 100755 Binary files a/EFI/OC/ACPI/SSDT-EXT4.aml and b/EFI/OC/ACPI/SSDT-EXT4.aml differ diff --git a/EFI/OC/ACPI/SSDT-KBD.aml b/EFI/OC/ACPI/SSDT-KBD.aml index b39748e..3cf2058 100755 Binary files a/EFI/OC/ACPI/SSDT-KBD.aml and b/EFI/OC/ACPI/SSDT-KBD.aml differ diff --git a/EFI/OC/ACPI/SSDT-LID.aml b/EFI/OC/ACPI/SSDT-LID.aml new file mode 100755 index 0000000..2230928 Binary files /dev/null and b/EFI/OC/ACPI/SSDT-LID.aml differ diff --git a/EFI/OC/Config.plist b/EFI/OC/Config.plist index 60cdb42..7f17c71 100755 --- a/EFI/OC/Config.plist +++ b/EFI/OC/Config.plist @@ -72,6 +72,12 @@ Path SSDT-EXT5.aml + + Enabled + + Path + SSDT-LID.aml + Enabled @@ -288,7 +294,7 @@ Comment - HPET (\WNTF\!WXPF to _OSI("Darwin")) + HPET (\WNTF\!WXPF to _OSI("Darwin")) Enabled Find @@ -296,6 +302,26 @@ Replace oA9fT1NJDURhcndpbgA= + + Comment + _LID to XLID + Enabled + + Find + X0xJRAA= + Replace + WExJRAA= + + + Comment + _Q13 to XQ13 + Enabled + + Find + X1ExMw== + Replace + WFExMw== + Comment _Q14 to XQ14 @@ -497,21 +523,21 @@ BundlePath - VoodooInput.kext + VoodooPS2Controller.kext Enabled ExecutablePath - Contents/MacOS/VoodooInput + Contents/MacOS/VoodooPS2Controller PlistPath Contents/Info.plist BundlePath - VoodooPS2Controller.kext + VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext Enabled ExecutablePath - Contents/MacOS/VoodooPS2Controller + Contents/MacOS/VoodooInput PlistPath Contents/Info.plist @@ -694,9 +720,7 @@ 7C436110-AB2A-4BBB-A880-FE41995C9F82 boot-args - -v - csr-active-config - AAAAAA== + run-efi-updater No prev-lang:kbd @@ -925,4 +949,4 @@ - \ No newline at end of file + diff --git a/EFI/OC/Kexts/VoodooInput.kext/Contents/Info.plist b/EFI/OC/Kexts/VoodooInput.kext/Contents/Info.plist deleted file mode 100755 index d6469a2..0000000 --- a/EFI/OC/Kexts/VoodooInput.kext/Contents/Info.plist +++ /dev/null @@ -1,76 +0,0 @@ - - - - - BuildMachineOSBuild - 18E226 - CFBundleDevelopmentRegion - en - CFBundleExecutable - VoodooInput - CFBundleIdentifier - me.kishorprins.VoodooInput - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - VoodooInput - CFBundlePackageType - KEXT - CFBundleShortVersionString - 1.0.7 - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - 1.0.7 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 10E1001 - DTPlatformVersion - GM - DTSDKBuild - 18E219 - DTSDKName - macosx10.14 - DTXcode - 1020 - DTXcodeBuild - 10E1001 - IOKitPersonalities - - Voodoo Input - - CFBundleIdentifier - me.kishorprins.VoodooInput - IOClass - VoodooInput - IOProbeScore - 200 - IOPropertyMatch - - VoodooInputSupported - - - IOProviderClass - IOService - - - NSHumanReadableCopyright - Copyright © 2019 Kishor Prins. All rights reserved. - OSBundleLibraries - - com.apple.iokit.IOHIDFamily - 2.0 - com.apple.kpi.iokit - 14 - com.apple.kpi.libkern - 14 - com.apple.kpi.mach - 13.0 - - OSBundleRequired - Root - - diff --git a/EFI/OC/Kexts/VoodooInput.kext/Contents/MacOS/VoodooInput b/EFI/OC/Kexts/VoodooInput.kext/Contents/MacOS/VoodooInput deleted file mode 100755 index 16d12fd..0000000 Binary files a/EFI/OC/Kexts/VoodooInput.kext/Contents/MacOS/VoodooInput and /dev/null differ diff --git a/OTHER/ACPI/SSDT-LID.dsl b/OTHER/ACPI/SSDT-LID.dsl new file mode 100644 index 0000000..6c5aeaf --- /dev/null +++ b/OTHER/ACPI/SSDT-LID.dsl @@ -0,0 +1,28 @@ +DefinitionBlock ("", "SSDT", 2, "X230", "LID", 0) +{ + External (_SB.LID, DeviceObj) + External (_SB.LID.XLID, MethodObj) + External (_SB.PCI9.FNOK, IntObj) + + Scope (_SB.LID) + { + Method (_LID, 0, NotSerialized) + { + If (_OSI ("Darwin")) + { + If (\_SB.PCI9.FNOK == 1) + { + Return (Zero) + } + Else + { + Return (\_SB.LID.XLID()) + } + } + Else + { + Return (\_SB.LID.XLID()) + } + } + } +} \ No newline at end of file diff --git a/Other/ACPI/README.md b/Other/ACPI/README.md index 09d5673..b1db338 100644 --- a/Other/ACPI/README.md +++ b/Other/ACPI/README.md @@ -12,6 +12,7 @@ | SSDT-GPRW | Fix immediate wake after sleep | | SSDT-HRTF | Fix HPET, RTC amd TIMR | | SSDT-KBD | Fix Keyboard Map, Trackpoint and Trackpad | +| SSDT-LID | PNP0C0E forced sleep | | SSDT-MCHC-SBUS | Add missing SBUS, MCHC | | SSDT-PMCR | Add PMCR | | SSDT-PNLF | Fix backlight | diff --git a/Other/ACPI/SSDT-KBD.dsl b/Other/ACPI/SSDT-KBD.dsl index 5506c2e..b233b1a 100755 --- a/Other/ACPI/SSDT-KBD.dsl +++ b/Other/ACPI/SSDT-KBD.dsl @@ -1,12 +1,44 @@ DefinitionBlock ("", "SSDT", 2, "X230", "KBD", 0) { + External (_SB.PCI9.FNOK, IntObj) + External (_SB.PCI9.MODE, IntObj) + External (_SB.LID, DeviceObj) External (_SB.PCI0.LPC.EC, DeviceObj) External (_SB.PCI0.LPC.KBD, DeviceObj) + External (_SB.PCI0.LPC.EC.XQ13, MethodObj) External (_SB.PCI0.LPC.EC.XQ14, MethodObj) External (_SB.PCI0.LPC.EC.XQ15, MethodObj) Scope (_SB.PCI0.LPC.EC) { + Method (_Q13, 0, NotSerialized) + { + If (_OSI ("Darwin")) + { + If (\_SB.PCI9.MODE == 1) + { + \_SB.PCI9.FNOK = 1 + \_SB.PCI0.LPC.EC.XQ13() + } + Else + { + If (\_SB.PCI9.FNOK != 1) + { + \_SB.PCI9.FNOK = 1 + } + Else + { + \_SB.PCI9.FNOK = 0 + } + Notify (\_SB.LID, 0x80) + } + } + Else + { + \_SB.PCI0.LPC.EC.XQ13() + } + } + Method (_Q14, 0, NotSerialized) { If (_OSI ("Darwin")) @@ -78,7 +110,6 @@ DefinitionBlock ("", "SSDT", 2, "X230", "KBD", 0) "Resolution", 3200, "ScrollDeltaThreshX", 10, "ScrollDeltaThreshY", 10, - "WakeDelay", 1500, }, }) } diff --git a/Other/ACPI/SSDT-PTSWAK.dsl b/Other/ACPI/SSDT-PTSWAK.dsl old mode 100644 new mode 100755 diff --git a/Other/WIRELESS/DW1510/Config.plist b/Other/WIRELESS/DW1510/Config.plist index 1020255..12e03b8 100755 --- a/Other/WIRELESS/DW1510/Config.plist +++ b/Other/WIRELESS/DW1510/Config.plist @@ -20,7 +20,7 @@ Enabled - + Path SSDT-PM.aml @@ -72,6 +72,12 @@ Path SSDT-EXT5.aml + + Enabled + + Path + SSDT-LID.aml + Enabled @@ -302,6 +308,26 @@ Replace oA9fT1NJDURhcndpbgA= + + Comment + _LID to XLID + Enabled + + Find + X0xJRAA= + Replace + WExJRAA= + + + Comment + _Q13 to XQ13 + Enabled + + Find + X1ExMw== + Replace + WFExMw== + Comment _Q14 to XQ14 @@ -503,21 +529,21 @@ BundlePath - VoodooInput.kext + VoodooPS2Controller.kext Enabled ExecutablePath - Contents/MacOS/VoodooInput + Contents/MacOS/VoodooPS2Controller PlistPath Contents/Info.plist BundlePath - VoodooPS2Controller.kext + VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext Enabled ExecutablePath - Contents/MacOS/VoodooPS2Controller + Contents/MacOS/VoodooInput PlistPath Contents/Info.plist @@ -700,9 +726,7 @@ 7C436110-AB2A-4BBB-A880-FE41995C9F82 boot-args - -v - csr-active-config - AAAAAA== + run-efi-updater No prev-lang:kbd @@ -767,7 +791,7 @@ AdviseWindows MLB - C02241306J9F16P1F + ROM SpoofVendor @@ -775,9 +799,9 @@ SystemProductName MacBookPro10,2 SystemSerialNumber - C02JJ9Y1DR53 + SystemUUID - 2288A2CA-AE35-4782-A532-AD45578B9717 + UpdateDataHub diff --git a/Other/WIRELESS/DW1550/Config.plist b/Other/WIRELESS/DW1550/Config.plist index 068dee2..1011afa 100755 --- a/Other/WIRELESS/DW1550/Config.plist +++ b/Other/WIRELESS/DW1550/Config.plist @@ -72,6 +72,12 @@ Path SSDT-EXT5.aml + + Enabled + + Path + SSDT-LID.aml + Enabled @@ -296,6 +302,26 @@ Replace oA9fT1NJDURhcndpbgA= + + Comment + _LID to XLID + Enabled + + Find + X0xJRAA= + Replace + WExJRAA= + + + Comment + _Q13 to XQ13 + Enabled + + Find + X1ExMw== + Replace + WFExMw== + Comment _Q14 to XQ14 @@ -497,21 +523,21 @@ BundlePath - VoodooInput.kext + VoodooPS2Controller.kext Enabled ExecutablePath - Contents/MacOS/VoodooInput + Contents/MacOS/VoodooPS2Controller PlistPath Contents/Info.plist BundlePath - VoodooPS2Controller.kext + VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext Enabled ExecutablePath - Contents/MacOS/VoodooPS2Controller + Contents/MacOS/VoodooInput PlistPath Contents/Info.plist @@ -553,6 +579,14 @@ PlistPath Contents/Info.plist + + BundlePath + Bluetooth_Broadcom.kext + Enabled + + PlistPath + Contents/Info.plist + BundlePath AirportBrcmFixup.kext @@ -724,9 +758,7 @@ 7C436110-AB2A-4BBB-A880-FE41995C9F82 boot-args - -v - csr-active-config - AAAAAA== + run-efi-updater No prev-lang:kbd @@ -791,7 +823,7 @@ AdviseWindows MLB - C02241306J9F16P1F + ROM SpoofVendor @@ -799,9 +831,9 @@ SystemProductName MacBookPro10,2 SystemSerialNumber - C02JJ9Y1DR53 + SystemUUID - 2288A2CA-AE35-4782-A532-AD45578B9717 + UpdateDataHub diff --git a/Other/WIRELESS/README.md b/Other/WIRELESS/README.md index 807cd37..9e88169 100644 --- a/Other/WIRELESS/README.md +++ b/Other/WIRELESS/README.md @@ -1,6 +1,6 @@ ## DW1510 -+ Copy `Config.plist` and ACPI/SSDT-WIFI.aml in **DW1510** folder to **EFI/OC/** ++ Copy `Config.plist` and `SSDT-WIFI.aml` in **DW1510** folder to **EFI/OC/** + Download file `10.14.6_IO80211Family.kext.zip`, extract and replace IO80211Family kext in **/S/L/E** diff --git a/README.md b/README.md index 83e7546..1a07b6c 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,6 @@ macOS (Currently Catalina `10.15.6`) for ThinkPad X230 | Lilu | 1.4.6 | | USBInjectAll | 0.7.5 | | VirtualSMC | 1.1.5 | -| VoodooInput | 1.0.7 | | VoodooPS2Controller | 2.1.6 | | WhateverGreen | 1.4.1 |