Adjust directory structure and eliminate duplicate files

ouyzc · Dec 20, 2019 · c183113 · c183113
1 parent bcd8e16
commit c183113
Show file tree

Hide file tree

Showing 67 changed files with 29 additions and 21,041 deletions.
diff --git a/EFI/CLOVER/ACPI/patched/SSDT-MCHC.aml b/EFI/CLOVER/ACPI/patched/SSDT-MCHC.aml
diff --git a/EFI/OC/ACPI/SSDT-MCHC.dsl → EFI/CLOVER/ACPI/patched/SSDT-MCHC.dsl b/EFI/OC/ACPI/SSDT-MCHC.dsl → EFI/CLOVER/ACPI/patched/SSDT-MCHC.dsl
@@ -12,6 +12,18 @@ DefinitionBlock ("", "SSDT", 2, "hack", "_MCHC", 0x00000000)
         {
             Name (_ADR, Zero)  // _ADR: Address
         }
+
+        Method (_STA, 0, NotSerialized)  // _STA: Status
+        {
+            If (_OSI ("Darwin"))
+            {
+                Return (0x0F)
+            }
+            Else
+            {
+                Return (Zero)
+            }
+        }
     }
 }
 
diff --git a/EFI/OC/ACPI/SSDT-PNLF.aml → EFI/CLOVER/ACPI/patched/SSDT-PNLF.aml b/EFI/OC/ACPI/SSDT-PNLF.aml → EFI/CLOVER/ACPI/patched/SSDT-PNLF.aml
diff --git a/EFI/OC/ACPI/SSDT-PNLF.dsl → EFI/CLOVER/ACPI/patched/SSDT-PNLF.dsl b/EFI/OC/ACPI/SSDT-PNLF.dsl → EFI/CLOVER/ACPI/patched/SSDT-PNLF.dsl
@@ -23,7 +23,6 @@ DefinitionBlock ("", "SSDT", 2, "hack", "_PNLF", 0x00000000)
         Name (_HID, EisaId ("APP0002"))  // _HID: Hardware ID
         Name (_CID, "backlight")  // _CID: Compatible ID
         Name (_UID, Zero)  // _UID: Unique ID
-        Name (_STA, 0x0B)  // _STA: Status
         Field (^RMP3, AnyAcc, NoLock, Preserve)
         {
             Offset (0x02), 
@@ -269,6 +268,18 @@ DefinitionBlock ("", "SSDT", 2, "hack", "_PNLF", 0x00000000)
                 _UID = 0x63
             }
         }
+
+        Method (_STA, 0, NotSerialized)  // _STA: Status
+        {
+            If (_OSI ("Darwin"))
+            {
+                Return (0x0B)
+            }
+            Else
+            {
+                Return (Zero)
+            }
+        }
     }
 }
 
diff --git a/EFI/OC/ACPI/SSDT-XCPM.aml → EFI/CLOVER/ACPI/patched/SSDT-XCPM.aml b/EFI/OC/ACPI/SSDT-XCPM.aml → EFI/CLOVER/ACPI/patched/SSDT-XCPM.aml
diff --git a/EFI/OC/ACPI/SSDT-XCPM.dsl → EFI/CLOVER/ACPI/patched/SSDT-XCPM.dsl b/EFI/OC/ACPI/SSDT-XCPM.dsl → EFI/CLOVER/ACPI/patched/SSDT-XCPM.dsl
diff --git a/EFI/CLOVER/config.plist b/EFI/CLOVER/config.plist
@@ -12,13 +12,6 @@
 		<dict>
 			<key>DropOEM_DSM</key>
 			<false/>
-			<key>Fixes</key>
-			<dict>
-				<key>AddMCHC</key>
-				<true/>
-				<key>AddPNLF</key>
-				<true/>
-			</dict>
 			<key>Patches</key>
 			<array>
 				<dict>
@@ -80,7 +73,7 @@
 			<key>Generate</key>
 			<dict>
 				<key>PluginType</key>
-				<true/>
+				<false/>
 			</dict>
 			<key>NoOemTableId</key>
 			<false/>

diff --git a/...MCBatteryManager.kext/Contents/Info.plist → ...MCBatteryManager.kext/Contents/Info.plist b/...MCBatteryManager.kext/Contents/Info.plist → ...MCBatteryManager.kext/Contents/Info.plist
diff --git a/...ger.kext/Contents/MacOS/SMCBatteryManager → ...ger.kext/Contents/MacOS/SMCBatteryManager b/...ger.kext/Contents/MacOS/SMCBatteryManager → ...ger.kext/Contents/MacOS/SMCBatteryManager
diff --git a/...Ins/SMCProcessor.kext/Contents/Info.plist → ...her/SMCProcessor.kext/Contents/Info.plist b/...Ins/SMCProcessor.kext/Contents/Info.plist → ...her/SMCProcessor.kext/Contents/Info.plist
diff --git a/...rocessor.kext/Contents/MacOS/SMCProcessor → ...rocessor.kext/Contents/MacOS/SMCProcessor b/...rocessor.kext/Contents/MacOS/SMCProcessor → ...rocessor.kext/Contents/MacOS/SMCProcessor
diff --git a/EFI/OC/ACPI b/EFI/OC/ACPI
@@ -0,0 +1 @@
+../CLOVER/ACPI/patched
diff --git a/EFI/OC/ACPI/SSDT-ALS0.aml b/EFI/OC/ACPI/SSDT-ALS0.aml
diff --git a/EFI/OC/ACPI/SSDT-DDGPU.aml b/EFI/OC/ACPI/SSDT-DDGPU.aml
diff --git a/EFI/OC/ACPI/SSDT-DMAC.aml b/EFI/OC/ACPI/SSDT-DMAC.aml
diff --git a/EFI/OC/ACPI/SSDT-DRP08.aml b/EFI/OC/ACPI/SSDT-DRP08.aml
diff --git a/EFI/OC/ACPI/SSDT-EC.aml b/EFI/OC/ACPI/SSDT-EC.aml
diff --git a/EFI/OC/ACPI/SSDT-GPRW.aml b/EFI/OC/ACPI/SSDT-GPRW.aml
diff --git a/EFI/OC/ACPI/SSDT-HPET.aml b/EFI/OC/ACPI/SSDT-HPET.aml
diff --git a/EFI/OC/ACPI/SSDT-LGPA.aml b/EFI/OC/ACPI/SSDT-LGPA.aml
diff --git a/EFI/OC/ACPI/SSDT-LGPAGTX.aml b/EFI/OC/ACPI/SSDT-LGPAGTX.aml
diff --git a/EFI/OC/ACPI/SSDT-MCHC.aml b/EFI/OC/ACPI/SSDT-MCHC.aml
diff --git a/EFI/OC/ACPI/SSDT-MEM2.aml b/EFI/OC/ACPI/SSDT-MEM2.aml
diff --git a/EFI/OC/ACPI/SSDT-PMCR.aml b/EFI/OC/ACPI/SSDT-PMCR.aml
diff --git a/EFI/OC/ACPI/SSDT-PS2K.aml b/EFI/OC/ACPI/SSDT-PS2K.aml
diff --git a/EFI/OC/ACPI/SSDT-RMNE.aml b/EFI/OC/ACPI/SSDT-RMNE.aml
diff --git a/EFI/OC/ACPI/SSDT-TPD0.aml b/EFI/OC/ACPI/SSDT-TPD0.aml
diff --git a/EFI/OC/ACPI/SSDT-USB.aml b/EFI/OC/ACPI/SSDT-USB.aml
diff --git a/EFI/OC/Drivers/ApfsDriverLoader.efi b/EFI/OC/Drivers/ApfsDriverLoader.efi
diff --git a/EFI/OC/Drivers/ApfsDriverLoader.efi b/EFI/OC/Drivers/ApfsDriverLoader.efi
@@ -0,0 +1 @@
+../../CLOVER/drivers/UEFI/ApfsDriverLoader.efi
diff --git a/EFI/OC/Drivers/HfsPlus.efi b/EFI/OC/Drivers/HfsPlus.efi
diff --git a/EFI/OC/Drivers/HfsPlus.efi b/EFI/OC/Drivers/HfsPlus.efi
@@ -0,0 +1 @@
+../../CLOVER/drivers/UEFI/HfsPlus.efi
diff --git a/EFI/OC/Drivers/VirtualSmc.efi b/EFI/OC/Drivers/VirtualSmc.efi
diff --git a/EFI/OC/Drivers/VirtualSmc.efi b/EFI/OC/Drivers/VirtualSmc.efi
@@ -0,0 +1 @@
+../../CLOVER/drivers/UEFI/VirtualSmc.efi
diff --git a/EFI/OC/Kexts b/EFI/OC/Kexts
@@ -0,0 +1 @@
+../CLOVER/kexts/Other