0.2 RELEASE

banhbaoxamlan · Aug 24, 2020 · 5c6f354 · 5c6f354
1 parent c7cca40
commit 5c6f354
Show file tree

Hide file tree

Showing 14 changed files with 172 additions and 109 deletions.
diff --git a/EFI/OC/ACPI/SSDT-EXT4.aml b/EFI/OC/ACPI/SSDT-EXT4.aml
diff --git a/EFI/OC/ACPI/SSDT-KBD.aml b/EFI/OC/ACPI/SSDT-KBD.aml
diff --git a/EFI/OC/ACPI/SSDT-LID.aml b/EFI/OC/ACPI/SSDT-LID.aml
diff --git a/EFI/OC/Config.plist b/EFI/OC/Config.plist
@@ -72,6 +72,12 @@
 				<key>Path</key>
 				<string>SSDT-EXT5.aml</string>
 			</dict>
+			<dict>
+				<key>Enabled</key>
+				<true/>
+				<key>Path</key>
+				<string>SSDT-LID.aml</string>
+			</dict>
 			<dict>
 				<key>Enabled</key>
 				<true/>
@@ -288,14 +294,34 @@
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string>HPET (\WNTF\!WXPF to _OSI("Darwin"))</string>
+				<string>HPET (\WNTF\!WXPF to _OSI(&quot;Darwin&quot;))</string>
 				<key>Enabled</key>
 				<true/>
 				<key>Find</key>
 				<data>oBCQXFdOVEaSXFdYUEY=</data>
 				<key>Replace</key>
 				<data>oA9fT1NJDURhcndpbgA=</data>
 			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>_LID to XLID</string>
+				<key>Enabled</key>
+				<true/>
+				<key>Find</key>
+				<data>X0xJRAA=</data>
+				<key>Replace</key>
+				<data>WExJRAA=</data>
+			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>_Q13 to XQ13</string>
+				<key>Enabled</key>
+				<true/>
+				<key>Find</key>
+				<data>X1ExMw==</data>
+				<key>Replace</key>
+				<data>WFExMw==</data>
+			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>_Q14 to XQ14</string>
@@ -497,21 +523,21 @@
 			</dict>
 			<dict>
 				<key>BundlePath</key>
-				<string>VoodooInput.kext</string>
+				<string>VoodooPS2Controller.kext</string>
 				<key>Enabled</key>
 				<true/>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/VoodooInput</string>
+				<string>Contents/MacOS/VoodooPS2Controller</string>
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
 			<dict>
 				<key>BundlePath</key>
-				<string>VoodooPS2Controller.kext</string>
+				<string>VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext</string>
 				<key>Enabled</key>
 				<true/>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/VoodooPS2Controller</string>
+				<string>Contents/MacOS/VoodooInput</string>
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
@@ -694,9 +720,7 @@
 			<key>7C436110-AB2A-4BBB-A880-FE41995C9F82</key>
 			<dict>
 				<key>boot-args</key>
-				<string>-v</string>
-				<key>csr-active-config</key>
-				<data>AAAAAA==</data>
+				<string></string>
 				<key>run-efi-updater</key>
 				<string>No</string>
 				<key>prev-lang:kbd</key>
@@ -925,4 +949,4 @@
 		<array/>
 	</dict>
 </dict>
-</plist>
+</plist>
diff --git a/EFI/OC/Kexts/VoodooInput.kext/Contents/Info.plist b/EFI/OC/Kexts/VoodooInput.kext/Contents/Info.plist
diff --git a/EFI/OC/Kexts/VoodooInput.kext/Contents/MacOS/VoodooInput b/EFI/OC/Kexts/VoodooInput.kext/Contents/MacOS/VoodooInput
diff --git a/OTHER/ACPI/SSDT-LID.dsl 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())
+            }
+        }
+    }
+}
diff --git 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
@@ -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
diff --git a/Other/WIRELESS/DW1510/Config.plist b/Other/WIRELESS/DW1510/Config.plist
@@ -20,7 +20,7 @@
 			</dict>
 			<dict>
 				<key>Enabled</key>
-				<true/>
+				<false/>
 				<key>Path</key>
 				<string>SSDT-PM.aml</string>
 			</dict>
@@ -72,6 +72,12 @@
 				<key>Path</key>
 				<string>SSDT-EXT5.aml</string>
 			</dict>
+			<dict>
+				<key>Enabled</key>
+				<true/>
+				<key>Path</key>
+				<string>SSDT-LID.aml</string>
+			</dict>
 			<dict>
 				<key>Enabled</key>
 				<true/>
@@ -302,6 +308,26 @@
 				<key>Replace</key>
 				<data>oA9fT1NJDURhcndpbgA=</data>
 			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>_LID to XLID</string>
+				<key>Enabled</key>
+				<true/>
+				<key>Find</key>
+				<data>X0xJRAA=</data>
+				<key>Replace</key>
+				<data>WExJRAA=</data>
+			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>_Q13 to XQ13</string>
+				<key>Enabled</key>
+				<true/>
+				<key>Find</key>
+				<data>X1ExMw==</data>
+				<key>Replace</key>
+				<data>WFExMw==</data>
+			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>_Q14 to XQ14</string>
@@ -503,21 +529,21 @@
 			</dict>
 			<dict>
 				<key>BundlePath</key>
-				<string>VoodooInput.kext</string>
+				<string>VoodooPS2Controller.kext</string>
 				<key>Enabled</key>
 				<true/>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/VoodooInput</string>
+				<string>Contents/MacOS/VoodooPS2Controller</string>
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
 			<dict>
 				<key>BundlePath</key>
-				<string>VoodooPS2Controller.kext</string>
+				<string>VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext</string>
 				<key>Enabled</key>
 				<true/>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/VoodooPS2Controller</string>
+				<string>Contents/MacOS/VoodooInput</string>
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
@@ -700,9 +726,7 @@
 			<key>7C436110-AB2A-4BBB-A880-FE41995C9F82</key>
 			<dict>
 				<key>boot-args</key>
-				<string>-v</string>
-				<key>csr-active-config</key>
-				<data>AAAAAA==</data>
+				<string></string>
 				<key>run-efi-updater</key>
 				<string>No</string>
 				<key>prev-lang:kbd</key>
@@ -767,17 +791,17 @@
 			<key>AdviseWindows</key>
 			<false/>
 			<key>MLB</key>
-			<string>C02241306J9F16P1F</string>
+			<string></string>
 			<key>ROM</key>
 			<data></data>
 			<key>SpoofVendor</key>
 			<false/>
 			<key>SystemProductName</key>
 			<string>MacBookPro10,2</string>
 			<key>SystemSerialNumber</key>
-			<string>C02JJ9Y1DR53</string>
+			<string></string>
 			<key>SystemUUID</key>
-			<string>2288A2CA-AE35-4782-A532-AD45578B9717</string>
+			<string></string>
 		</dict>
 		<key>UpdateDataHub</key>
 		<true/>