Merge pull request #13 from kreizlie/0.6.7b

0.6.7b
kreizlie · Mar 13, 2021 · 0882a7f · 0882a7f
2 parents 3b58f4f + 05c4e90
commit 0882a7f
Show file tree

Hide file tree

Showing 60 changed files with 1,476 additions and 225 deletions.
diff --git a/ACPI/DSDT.aml b/ACPI/DSDT.aml
diff --git a/ACPI/DSDT.dsl b/ACPI/DSDT.dsl
diff --git a/ACPI/origin/BGRT.aml b/ACPI/origin/BGRT.aml
diff --git a/ACPI/origin/DBGP.aml b/ACPI/origin/DBGP.aml
diff --git a/ACPI/origin/DSDT.aml b/ACPI/origin/DSDT.aml
diff --git a/ACPI/origin/DumpLog.txt b/ACPI/origin/DumpLog.txt
diff --git a/ACPI/origin/FACP.aml b/ACPI/origin/FACP.aml
diff --git a/ACPI/origin/FACS.aml b/ACPI/origin/FACS.aml
diff --git a/ACPI/origin/FPDT.aml b/ACPI/origin/FPDT.aml
diff --git a/ACPI/origin/RSDP.aml b/ACPI/origin/RSDP.aml
diff --git a/ACPI/origin/RSDT.aml b/ACPI/origin/RSDT.aml
diff --git a/ACPI/origin/SSDT-12-AMLY4ISH.aml b/ACPI/origin/SSDT-12-AMLY4ISH.aml
diff --git a/ACPI/origin/SSDT-12-Wwan.aml b/ACPI/origin/SSDT-12-Wwan.aml
diff --git a/ACPI/origin/SSDT-13-Wwan.aml b/ACPI/origin/SSDT-13-Wwan.aml
diff --git a/ACPI/origin/SSDT-13-HPINNBWL.aml → ACPI/origin/SSDT-14-HPINNBWL.aml b/ACPI/origin/SSDT-13-HPINNBWL.aml → ACPI/origin/SSDT-14-HPINNBWL.aml
diff --git a/ACPI/origin/SSDT-14-HPCONDEV.aml → ACPI/origin/SSDT-15-HPCONDEV.aml b/ACPI/origin/SSDT-14-HPCONDEV.aml → ACPI/origin/SSDT-15-HPCONDEV.aml
diff --git a/ACPI/origin/SSDT-15-HPCAHWID.aml → ACPI/origin/SSDT-16-HPCAHWID.aml b/ACPI/origin/SSDT-15-HPCAHWID.aml → ACPI/origin/SSDT-16-HPCAHWID.aml
diff --git a/ACPI/origin/SSDT-16-PwrCtlEv.aml → ACPI/origin/SSDT-17-PwrCtlEv.aml b/ACPI/origin/SSDT-16-PwrCtlEv.aml → ACPI/origin/SSDT-17-PwrCtlEv.aml
diff --git a/ACPI/origin/SSDT-2-SaSsdt.aml b/ACPI/origin/SSDT-2-SaSsdt.aml
diff --git a/ACPI/origin/SSDT-5-DptfTabl.aml b/ACPI/origin/SSDT-5-DptfTabl.aml
diff --git a/ACPI/origin/SSDT-7-CpuSsdt.aml b/ACPI/origin/SSDT-7-CpuSsdt.aml
diff --git a/ACPI/origin/XSDT.aml b/ACPI/origin/XSDT.aml
diff --git a/BIOS/HP/DEVFW/firmware.bin b/BIOS/HP/DEVFW/firmware.bin
diff --git a/CLOVER/EFI/BOOT/BOOTX64.efi b/CLOVER/EFI/BOOT/BOOTX64.efi
diff --git a/CLOVER/EFI/CLOVER/CLOVERX64.efi b/CLOVER/EFI/CLOVER/CLOVERX64.efi
diff --git a/CLOVER/EFI/CLOVER/config.plist b/CLOVER/EFI/CLOVER/config.plist
diff --git a/CLOVER/EFI/CLOVER/drivers/BIOS/AudioDxe.efi b/CLOVER/EFI/CLOVER/drivers/BIOS/AudioDxe.efi
diff --git a/CLOVER/EFI/CLOVER/drivers/BIOS/FSInject.efi b/CLOVER/EFI/CLOVER/drivers/BIOS/FSInject.efi
diff --git a/CLOVER/EFI/CLOVER/drivers/BIOS/SMCHelper.efi b/CLOVER/EFI/CLOVER/drivers/BIOS/SMCHelper.efi
diff --git a/CLOVER/EFI/CLOVER/drivers/BIOS/XhciDxe.efi b/CLOVER/EFI/CLOVER/drivers/BIOS/XhciDxe.efi
diff --git a/CLOVER/EFI/CLOVER/drivers/UEFI/AudioDxe.efi b/CLOVER/EFI/CLOVER/drivers/UEFI/AudioDxe.efi
diff --git a/CLOVER/EFI/CLOVER/drivers/UEFI/FSInject.efi b/CLOVER/EFI/CLOVER/drivers/UEFI/FSInject.efi
diff --git a/CLOVER/EFI/CLOVER/drivers/UEFI/SMCHelper.efi b/CLOVER/EFI/CLOVER/drivers/UEFI/SMCHelper.efi
diff --git a/CLOVER/EFI/CLOVER/themes/embedded/screenshot.png b/CLOVER/EFI/CLOVER/themes/embedded/screenshot.png
diff --git a/CLOVER/EFI/CLOVER/themes/embedded/theme.plist b/CLOVER/EFI/CLOVER/themes/embedded/theme.plist
diff --git a/CLOVER/EFI/CLOVER/themes/logo_main.png b/CLOVER/EFI/CLOVER/themes/logo_main.png
diff --git a/CLOVER/EFI/CLOVER/themes/pointer-metal.png b/CLOVER/EFI/CLOVER/themes/pointer-metal.png
diff --git a/CLOVER/EFI/CLOVER/themes/random/theme.plist b/CLOVER/EFI/CLOVER/themes/random/theme.plist
diff --git a/CLOVER/EFI/CLOVER/tools/Shell32.efi b/CLOVER/EFI/CLOVER/tools/Shell32.efi
diff --git a/CLOVER/EFI/CLOVER/tools/Shell64.efi b/CLOVER/EFI/CLOVER/tools/Shell64.efi
diff --git a/CLOVER/EFI/CLOVER/tools/Shell64U.efi b/CLOVER/EFI/CLOVER/tools/Shell64U.efi
diff --git a/CLOVER/EFI/CLOVER/tools/bdmesg.efi b/CLOVER/EFI/CLOVER/tools/bdmesg.efi
diff --git a/Kexts/OpenCore-0.6.7-RELEASE/Docs/AcpiSamples/Binaries/SSDT-EC-USBX.aml b/Kexts/OpenCore-0.6.7-RELEASE/Docs/AcpiSamples/Binaries/SSDT-EC-USBX.aml
diff --git a/USB-patching/SSDT-UIAC.dsl b/USB-patching/SSDT-UIAC.dsl
@@ -4,7 +4,6 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "UIAC", 0x00000000)
     Device (UIAC)
     {
         Name (_HID, "UIA00000")  // _HID: Hardware ID
-
         Name (RMCF, Package (0x02)
         {
             "XHC", 

diff --git a/chime/OCEFIAudio_VoiceOver_Boot.mp3 b/chime/OCEFIAudio_VoiceOver_Boot.mp3
diff --git a/hotpatch/SSDT-BAT.aml b/hotpatch/SSDT-BAT.aml
diff --git a/hotpatch/SSDT-BAT.dsl b/hotpatch/SSDT-BAT.dsl
@@ -1,9 +1,7 @@
 // SSDT-BAT
+// For battery status
 DefinitionBlock ("", "SSDT", 2, "ACDT", "BAT", 0x00001000)
 {
-    External (_SB.NBST, PkgObj)
-    External (_SB.NBTI, PkgObj)
-    External (_SB.NDBS, PkgObj)
     External (_SB.PCI0.LPCB.EC0, DeviceObj)
     External (_SB.PCI0.LPCB.EC0.BSEL, FieldUnitObj)
     External (_SB.PCI0.LPCB.EC0.BST, FieldUnitObj)
@@ -14,42 +12,60 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "BAT", 0x00001000)
     External (_SB.PCI0.LPCB.EC0.ECRG, IntObj)
     External (_SB.PCI0.LPCB.EC0.GACS, MethodObj)    // 0 Arguments
     External (_SB.PCI0.LPCB.EC0.GBSS, MethodObj)    // 2 Arguments
+    External (_SB.PCI0.LPCB.EC0.NBGX, IntObj)
     External (_SB.PCI0.LPCB.EC0.NDCB, IntObj)
     External (_SB.PCI0.LPCB.EC0.NGBF, IntObj)
     External (_SB.PCI0.LPCB.EC0.NGBT, IntObj)
     External (_SB.PCI0.LPCB.EC0.NLB1, IntObj)
-    External (_SB.PCI0.LPCB.EC0.NLB2, IntObj)
     External (_SB.PCI0.LPCB.EC0.NLO2, IntObj)
 
-    // Renamed methods in config.plist
-    External (_SB.PCI0.LPCB.EC0.XTIF, MethodObj)    // 1 Arguments
-    External (_SB.PCI0.LPCB.EC0.XTST, MethodObj)    // 2 Arguments
+    External (_SB.NBST, PkgObj)
+    External (_SB.NBTE, PkgObj)
+    External (_SB.NBTI, PkgObj)
+    External (_SB.NDBS, PkgObj)
 
     External (BST, IntObj)
     External (ECRG, IntObj)
+    External (NBGX, IntObj)
     External (NDBS, IntObj)
     External (NGBF, IntObj)
     External (NGBT, IntObj)
 
+    // Renamed methods in config.plist
+    External (_SB.PCI0.LPCB.EC0.XTIF, MethodObj)    // 1 Arguments
+    External (_SB.PCI0.LPCB.EC0.XTST, MethodObj)    // 2 Arguments
+    External (_SB.PCI0.LPCB.EC0.ZTIX, MethodObj)    // 1 Arguments
+
     Scope (_SB.PCI0.LPCB.EC0)
     {
-        // Replaces > 8 bits registers
+        // Replace >= 8 bits registers
         OperationRegion (ECRR, EmbeddedControl, Zero, 0xFF)
         Field (ECRR, ByteAcc, NoLock, Preserve)
         {
-            Offset (0x8D),
-            BFC1,   8, BFC2,   8,     // BFC
-            Offset (0x95),
-            BDV1,   8, BDV2,   8,     // BDV
-            Offset (0x9D),
-            BPR1,   8, BPR2,   8,     // BPR
-            Offset (0xA1),
-            BRC1,   8, BRC2,   8,     // BCR
-            Offset (0xA5),
-            BPV1,   8, BPV2,   8,     // BPV
-            Offset (0xC9),
-            BSN1,   8, BSN2,   8,     // BSN
-            BDA1,   8, BDA2,   8,     // BDAT
+            Offset (0x89), 
+            BDC1,   8, // BDC
+            BDC2,   8, 
+            Offset (0x8D), 
+            BFC1,   8, // BFC
+            BFC2,   8, 
+            Offset (0x95), 
+            BDV1,   8, // BDV
+            BDV2,   8, 
+            Offset (0x9D), 
+            BPR1,   8, // BPR
+            BPR2,   8, 
+            Offset (0xA1), 
+            BRC1,   8, // BRC
+            BRC2,   8, 
+            BCC1,   8, // BCC
+            BCC2,   8, 
+            BPV1,   8, // BPV
+            BPV2,   8, 
+            Offset (0xC9), 
+            BSN1,   8, // BSN
+            BSN2,   8, 
+            BDA1,   8, // BDAT
+            BDA2,   8, 
             Offset (0xFF)
         }
 
@@ -80,9 +96,8 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "BAT", 0x00001000)
                 If (ECRG)
                 {
                     BSEL = Arg0
-                    Local0 = B1B2 (BFC1, BFC2)
-                    DerefOf (NBTI [Arg0]) [One] = Local0
-                    DerefOf (NBTI [Arg0]) [0x02] = Local0
+                    DerefOf (NBTI [Arg0]) [One] = B1B2 (BDC1, BDC2)
+                    DerefOf (NBTI [Arg0]) [0x02] = B1B2 (BFC1, BFC2)
                     DerefOf (NBTI [Arg0]) [0x04] = B1B2 (BDV1, BDV2)
                     Local0 = (B1B2 (BFC1, BFC2) * NLB1) /* External reference */
                     Local4 = (Local0 / 0x64)
@@ -108,6 +123,61 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "BAT", 0x00001000)
             }
         }
 
+        Method (BTIX, 1, Serialized)
+        {
+            If (_OSI ("Darwin"))
+            {
+                Local7 = (One << Arg0)
+                BTDR (One)
+                If ((BSTA (Local7) == 0x0F))
+                {
+                    Return (0xFF)
+                }
+
+                Acquire (BTMX, 0xFFFF)
+                Local0 = NBGX /* External reference */
+                Release (BTMX)
+                If (((Local0 & Local7) == Zero))
+                {
+                    Return (Zero)
+                }
+
+                NBST [Arg0] = NDBS /* External reference */
+                Acquire (BTMX, 0xFFFF)
+                NGBT |= Local7
+                Release (BTMX)
+                Acquire (ECMX, 0xFFFF)
+                If (ECRG)
+                {
+                    BSEL = Arg0
+                    DerefOf (NBTE [Arg0]) [0x02] = B1B2 (BDC1, BDC2)
+                    DerefOf (NBTE [Arg0]) [0x03] = B1B2 (BFC1, BFC2)
+                    DerefOf (NBTE [Arg0]) [0x05] = B1B2 (BDV1, BDV2)
+                    Local0 = (B1B2 (BFC1, BFC2) * NLB1) /* External reference */
+                    Local4 = (Local0 / 0x64)
+                    DerefOf (NBTE [Arg0]) [0x06] = Local4
+                    Local0 = (B1B2 (BFC1, BFC2) * NLO2) /* External reference */
+                    Local4 = (Local0 / 0x64)
+                    DerefOf (NBTE [Arg0]) [0x07] = Local4
+                    DerefOf (NBTE [Arg0]) [0x08] = B1B2 (BCC1, BCC2)
+                    Local0 = B1B2 (BSN1, BSN2)
+                    Local1 = B1B2 (BDA1, BDA2)
+                }
+
+                Release (ECMX)
+                Local2 = GBSS (Local0, Local1)
+                DerefOf (NBTE [Arg0]) [0x11] = Local2
+                Acquire (BTMX, 0xFFFF)
+                NBGX &= ~Local7
+                Release (BTMX)
+                Return (Zero)
+            }
+            Else
+            {
+                Return (\_SB.PCI0.LPCB.EC0.ZTIX (Arg0))
+            }
+        }
+
         Method (BTST, 2, Serialized)
         {
             If (_OSI ("Darwin"))
@@ -209,3 +279,4 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "BAT", 0x00001000)
         Return (Local0)
     }
 }
+
diff --git a/hotpatch/SSDT-CPU.aml b/hotpatch/SSDT-CPU.aml
diff --git a/hotpatch/SSDT-EC.aml b/hotpatch/SSDT-EC.aml
diff --git a/hotpatch/SSDT-EC.dsl b/hotpatch/SSDT-EC.dsl
@@ -1,5 +1,5 @@
 // SSDT-EC
-// Fake EC device
+// Create fake EC device, leave EC0 as is
 DefinitionBlock ("", "SSDT", 2, "ACDT", "EC", 0x00001000)
 {
     External (_SB.PCI0.LPCB, DeviceObj)
@@ -9,7 +9,6 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "EC", 0x00001000)
         Device (EC)
         {
             Name (_HID, "ACID0001")  // _HID: Hardware ID
-
             Method (_STA, 0, NotSerialized)  // _STA: Status
             {
                 If (_OSI ("Darwin"))

diff --git a/hotpatch/SSDT-XPRW.aml → hotpatch/SSDT-GPRW.aml b/hotpatch/SSDT-XPRW.aml → hotpatch/SSDT-GPRW.aml
diff --git a/hotpatch/SSDT-XPRW.dsl → hotpatch/SSDT-GPRW.dsl b/hotpatch/SSDT-XPRW.dsl → hotpatch/SSDT-GPRW.dsl
@@ -1,8 +1,9 @@
-// SSDT-XPRW
-// Fixes instant-wake issue
-DefinitionBlock ("", "SSDT", 2, "ACDT", "XPRW", 0x00000000)
+// SSDT-GPRW
+// Fixes instant wake issue
+DefinitionBlock ("", "SSDT", 2, "ACDT", "GPRW", 0x00000000)
 {
-    External (XPRW, MethodObj)
+    // Renamed method in config.plist
+    External (XPRW, MethodObj)    // 2 Arguments
 
     Method (GPRW, 2, NotSerialized)
     {

diff --git a/hotpatch/SSDT-KBD.aml b/hotpatch/SSDT-KBD.aml
diff --git a/hotpatch/SSDT-KBD.dsl b/hotpatch/SSDT-KBD.dsl
@@ -1,5 +1,5 @@
 // SSDT-KBD
-// Swaps Command and Option buttons on laptop keyboard
+// Swaps Command and Option keys on laptop keyboard
 DefinitionBlock ("", "SSDT", 2, "ACDT", "KBD", 0x00000000)
 {
     External (_SB.PCI0.LPCB.PS2K, DeviceObj)

diff --git a/hotpatch/SSDT-PNLF.aml b/hotpatch/SSDT-PNLF.aml
diff --git a/hotpatch/SSDT-RTC0.aml b/hotpatch/SSDT-RTC0.aml
diff --git a/hotpatch/SSDT-RTC0.dsl b/hotpatch/SSDT-RTC0.dsl
@@ -0,0 +1,36 @@
+// SSDT-RTC0
+DefinitionBlock ("", "SSDT", 2, "ACDT", "RTC0", 0x00000000)
+{
+    External (_SB.PCI0.LPCB, DeviceObj)
+
+    Scope (_SB.PCI0.LPCB)
+    {
+        Device (RTC0)
+        {
+            Name (_HID, EisaId ("PNP0B00") /* AT Real-Time Clock */)  // _HID: Hardware ID
+            Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
+            {
+                IO (Decode16,
+                    0x0070,             // Range Minimum
+                    0x0070,             // Range Maximum
+                    0x01,               // Alignment
+                    0x08,               // Length
+                    )
+                IRQNoFlags ()
+                    {8}
+            })
+
+            Method (_STA, 0, NotSerialized)  // _STA: Status
+            {
+                If (_OSI ("Darwin"))
+                {
+                    Return (0x0F)
+                }
+                Else
+                {
+                    Return (Zero)
+                }
+            }
+        }
+    }
+}
diff --git a/hotpatch/SSDT-XOSI.aml b/hotpatch/SSDT-XOSI.aml
diff --git a/hotpatch/SSDT-ZPTS.aml b/hotpatch/SSDT-ZPTS.aml
diff --git a/hotpatch/SSDT-ZPTS.dsl b/hotpatch/SSDT-ZPTS.dsl
@@ -2,8 +2,8 @@
 // Simulates S5 call for proper shutdown
 DefinitionBlock ("", "SSDT", 2, "ACDT", "ZPTS", 0x00000000)
 {
-    External (_SB.PCI0.XHC_.PMEE, FieldUnitObj)
-    External (ZPTS, MethodObj)
+    External (_SB.PCI0.XHC.PMEE, FieldUnitObj)
+    External (ZPTS, MethodObj)    // 1 Arguments
 
     Method (_PTS, 1, NotSerialized)  // _PTS: Prepare To Sleep
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "UIAC", 0x00000000) @@
         Device (UIAC)
         {
             Name (_HID, "UIA00000")  // _HID: Hardware ID
             Name (RMCF, Package (0x02)
             {
                 "XHC",
@@ Expand Down @@