Compatibility updates for SDT-EXT1 and SSDT-EXT3

EFI-OpenCore/EFI/OC/config.plist

@@ -333,7 +333,7 @@
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string>GPRW to XRRW</string>
+				<string>GPRW to XPRW</string>
 				<key>Count</key>
 				<integer>0</integer>
 				<key>Enabled</key>

README.md

@@ -43,8 +43,8 @@
 
 | Fully functional                                                                                                                          | Non-functional                                                                | Semi-functional. Additional pulls needed and welcomed.                                                                                      |
 | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
-| WiFi, Bluetooth, Apple Continuity ✅ \*need card replacement                                                                              | Fingerprint Reader (not needed, DISABLED at BIOS) ❌                          | HDMI, currently only outputs at 1080p.Though capable of 4K 4096x2150. ⚠️                                                                    |
-| USB A, USB C, Webcam, Audio Playback/Recording Sleep, Ethernet, Intel Graphics, TrackPoint and Trackpad ✅                                | Wireless WAN (DISABLED at BIOS) \*ENABLED if you have a 2nd drive connected❌ | Thunderbolt 3 Hotplug: partially working [More details](https://github.com/tylernguyen/x1c6-hackintosh/issues/24#issuecomment-603183002) ⚠️ |
+| WiFi, Bluetooth, Apple Continuity ✅ \*need card replacement                                                                              | Fingerprint Reader (not needed, DISABLED at BIOS) ❌                          | Video Output: Currently only output `2560x1440`. Though capable of 4K `4096x2150`. See [Issue #40](https://github.com/tylernguyen/x1c6-hackintosh/issues/40) ⚠️                                                                    |
+| USB A, USB C, Webcam, Audio Playback/Recording Sleep, Ethernet, Intel Graphics, TrackPoint and Trackpad ✅                                | Wireless WAN (DISABLED at BIOS) \*ENABLED if you have a 2nd drive connected❌ | Thunderbolt 3 hotplug partially working. See [Issue #24](https://github.com/tylernguyen/x1c6-hackintosh/issues/24#issuecomment-603183002) ⚠️ |
 | iCloud suite: App Store, iMessage, FaceTime, iCloud Drive, etc... ✅                                                                      | Hibernation ❌                                                                | Power management and optimizations. See [Issue #28](https://github.com/tylernguyen/x1c6-hackintosh/issues/28) ⚠️                            |
 | Multimedia Fn keys ✅ \*need [Karabiner Elements](https://ke-complex-modifications.pqrs.org/) and [BetterTouchTool](https://folivora.ai/) |                                                                               |                                                                                                                                             |
 | MicroSD card reader ✅                                                                                                                    |                                                                               |                                                                                                                                             |

docs/1_README-HARDWAREandBIOS.md

@@ -2,12 +2,14 @@
 
 > ## WiFi and Bluetooth:
 
-Replace factory Intel wifi module with a macOS compatible one. Make sure that the card is of M.2 form factor. I replaced it with the BCM94360CS2 card. This works out of the box without additional kexts and has been stable for me thus far.
+Replace factory Intel WiFi module with a macOS compatible one. Make sure that the card is of M.2 form factor. I replaced it with the BCM94360CS2 card. This works out of the box without additional kexts and has been stable for me thus far.
 
 **If your laptop did not come with WWAN, you can purchase additional antennas to add to your laptop. This is useful when using WiFi/Bluetooth cards that have 3 antennas.**
 
 - The BCM94360CS2 module comes from the 2013 MacBook Air, supports BT 4.0 and 802.11a/g/n/ac. They run on eBay for <\$15.
 - For the BCM94360CS2 to work with the x1c6, you would also need a M.2 NGFF adapter. They run for <\$10 on eBay under "BCM94360CS2 m2 adapter"
+- See my current setup:  
+
 
 However, there exists other alternatives with better WiFi and Bluetooth standards, but require additional kexts to work:
 
@@ -21,16 +23,6 @@ However, there exists other alternatives with better WiFi and Bluetooth standard
 - Lenovo 00JT493 802.11 AC Wireless Network & Bluetooth 4.1 LE NGFF Card.
 - Foxcon T77H649 802.11 AC Wireless Network & Bluetooth 4.1 LE NGFF Card.
 
-> ## M.2 Hard Drive Replacements:
-
-- ~~macOS cannot be installed on the factory installed PM981 drive. Replace macOS-incompatible factory Samsung PM981 with preferably an NVMe M.2 drive.~~
-- NVMeFix](https://github.com/acidanthera/NVMeFix) is still in its early stage. However, it has:
-
-  - Enable support for the PM981, which comes with default with the x1c6.
-  - Dramatically improved NVMe power management. In my personal experience, it is no longer far from SATA power consumption. I now recommend that you go with an NVMe SSD for the faster speed.
-
-- An additional hard drive can be installed in the WAN slot. It can be used for a cleaner dual boot experience, or simply as a backup or storage drive.
-
 > ## BIOS Settings:
 
 At the minimum, these BIOS settings must be made to install and run macOS without any problems:

docs/2_README-installMEDIA.md

@@ -6,7 +6,7 @@
 4. Install CLOVER bootloader onto the installation media. Use its latest daily build from GitHub. [Download](https://github.com/Dids/clover-builder/releases)  
    **Though we will not be using Clover, I've found that using the Clover installer is the most convinient way to create an EFI paritition on the installation drive.**
 5. After Clover has been installed onto the macOS install drive, its EFI parition should be mounted. Proceed to delete the Clover EFI folder and replace with the EFI folder inside my `EFI-install_USB` folder.
-6. Proceed to boot into the installation media.
+6. Boot into the installation media.
 7. Format the intended drive as APFS.
 8. Complete the installation.
 9. Boot into the newly installed Hackintosh partition using the installation media. That is to say, boot into the installtion media for OpenCore to boot into the installed Hackintosh partition.

docs/4_README-ACPIpatching.md

@@ -37,7 +37,7 @@ Should your source DSDT be similar enough (in regards to certain items in these
 
 **Need `OpenCore Patches/ TPbattery.plist`**  
 
-- Single battery system: only `BAT0` in ACPI, no`BAT1`.
+- Single battery system: only `BAT0` in ACPI, no `BAT1`.
 
 > ### SSDT-PLUG-\_PR.PR00 - Enablaing Native Intel Power Managements
 
@@ -67,9 +67,11 @@ Why?: `Processor` search in DSDT, rename `PR` to other variables as needed.
 
 > ### SSDT-PNLF-SKL_KBL - Enabling Brightness Mangement in macOS
 
+iGPU is `PCI0.GFX0`  
 Why?: `Skylake/ KabyLake/ KabyLake-R` CPU.  
 Used in conjuction with `WhateverGreen.kext`
 
+
 > ### SSDT-HPET
 
 - Patch out IRQ conflicts. Credits to [corpnewt/SSDTTime](https://github.com/corpnewt/SSDTTime).  

docs/5_README-other.md

@@ -47,4 +47,4 @@ See `patches/ALCPlugFix/README.md` for more details.
 
 - Repaste the machine with thermal [Grizzly Kryonaut](https://www.thermal-grizzly.com/en/products/16-kryonaut-en).  
 - For those willing to risk permanently damaging your machine for the best thermal, repaste the machine with liquid metal [Grizzly Conductonaut](https://www.thermal-grizzly.com/produkte/25-conductonaut).  For the majority however, I recommend using [Grizzly Kryonaut](https://www.thermal-grizzly.com/en/products/16-kryonaut-en).  
-- Undervolt the machine with [Volta](https://volta.garymathews.com/).  
+- Undervolt the machine with [VoltageShift](https://github.com/sicreative/VoltageShift).  

patches/SSDT-EXT1-FixShutdown.dsl

@@ -1,6 +1,6 @@
 // Fix "restart after shutdown"
 // Credit RehabMan (Laptop-DSDT-Patch)
-DefinitionBlock("", "SSDT", 2, "OCLT", "EXT4", 0)
+DefinitionBlock("", "SSDT", 2, "OCLT", "EXT1", 0)
 {
     External (_SB_.PCI0.XHC_.PMEE, FieldUnitObj)
 

patches/SSDT-EXT3-LedReset-TP.dsl

@@ -3,8 +3,8 @@ DefinitionBlock("", "SSDT", 2, "OCLT", "EXT3", 0)
 {
     External(_SI._SST, MethodObj)
     Method (EXT3, 1, NotSerialized)
-    {   
-        If (3 == Arg0)
+    {
+        If ((3 == Arg0) && CondRefOf (\_SI._SST))
         {
             \_SI._SST (1)
         }