use Generate/PluginType=true instead of SSDT-PluginType1; fix for XDC…

…I._STA
pkalaits · Apr 22, 2018 · 6f44588 · 6f44588
1 parent 49b39d9
commit 6f44588
Show file tree

Hide file tree

Showing 13 changed files with 93 additions and 45 deletions.
diff --git a/SSDT-NUC5.dsl b/SSDT-NUC5.dsl
@@ -19,7 +19,6 @@ DefinitionBlock("", "SSDT", 2, "hack", "RM-NUC5", 0)
         Name(FAKH, 1)
     }
 
-    #include "SSDT-PluginType1.dsl"
     #include "SSDT-XOSI.dsl"
     #include "SSDT-IGPU.dsl"
     #include "SSDT-USB.dsl"

diff --git a/SSDT-NUC6-SC.dsl b/SSDT-NUC6-SC.dsl
@@ -19,7 +19,17 @@ DefinitionBlock("", "SSDT", 2, "hack", "RM-NUC6S", 0)
         Name(FAKH, 0)
     }
 
-    #include "SSDT-PluginType1.dsl"
+    // No XDCI, yet it returns "present" for _STA
+    // XDCI also has a _PRW. This can cause "instant wake"
+    // Returning not-present for _STA is the fix
+    // The original implementation of _STA is renamed to XSTA via config.plist
+    //Name(_SB.PCI0.XDCI._STA, 0)
+    External(_SB.PCI0.XDCI.DVID, FieldUnitObj)
+    Method(_SB.PCI0.XDCI._STA)
+    {
+        If (DVID != 0xFFFF) { Return (0xf) } Else { Return (0) }
+    }
+
     #include "SSDT-XOSI.dsl"
     #include "SSDT-IGPU.dsl"
     #include "SSDT-USB.dsl"

diff --git a/SSDT-NUC6.dsl b/SSDT-NUC6.dsl
@@ -19,7 +19,17 @@ DefinitionBlock("", "SSDT", 2, "hack", "RM-NUC6", 0)
         Name(FAKH, 1)
     }
 
-    #include "SSDT-PluginType1.dsl"
+    // No XDCI, yet it returns "present" for _STA
+    // XDCI also has a _PRW. This can cause "instant wake"
+    // Returning not-present for _STA is the fix
+    // The original implementation of _STA is renamed to XSTA via config.plist
+    //Name(_SB.PCI0.XDCI._STA, 0)
+    External(_SB.PCI0.XDCI.DVID, FieldUnitObj)
+    Method(_SB.PCI0.XDCI._STA)
+    {
+        If (DVID != 0xFFFF) { Return (0xf) } Else { Return (0) }
+    }
+
     #include "SSDT-XOSI.dsl"
     #include "SSDT-IGPU.dsl"
     #include "SSDT-USB.dsl"

diff --git a/SSDT-NUC7.dsl b/SSDT-NUC7.dsl
@@ -19,7 +19,17 @@ DefinitionBlock("", "SSDT", 2, "hack", "RM-NUC7", 0)
         Name(FAKH, 1)
     }
 
-    #include "SSDT-PluginType1.dsl"
+    // No XDCI, yet it returns "present" for _STA
+    // XDCI also has a _PRW. This can cause "instant wake"
+    // Returning not-present for _STA is the fix
+    // The original implementation of _STA is renamed to XSTA via config.plist
+    //Name(_SB.PCI0.XDCI._STA, 0)
+    External(_SB.PCI0.XDCI.DVID, FieldUnitObj)
+    Method(_SB.PCI0.XDCI._STA)
+    {
+        If (DVID != 0xFFFF) { Return (0xf) } Else { Return (0) }
+    }
+
     #include "SSDT-XOSI.dsl"
     #include "SSDT-IGPU.dsl"
     #include "SSDT-USB-NUC7.dsl"

diff --git a/SSDT-PluginType1.dsl b/SSDT-PluginType1.dsl
diff --git a/SSDT-STCK6.dsl b/SSDT-STCK6.dsl
@@ -31,7 +31,6 @@ DefinitionBlock("", "SSDT", 2, "hack", "RM-STCK6", 0)
     // (the rename is done in config.plist)
     Name(_SB.PCI0.XDCI._STA, 0)
 
-    #include "SSDT-PluginType1.dsl"
     #include "SSDT-XOSI.dsl"
     #include "SSDT-IGPU.dsl"
     #include "SSDT-USB-STCK.dsl"

diff --git a/config_nuc5.plist b/config_nuc5.plist
@@ -96,7 +96,10 @@
 		<key>SSDT</key>
 		<dict>
 			<key>Generate</key>
-			<false/>
+			<dict>
+				<key>PluginType</key>
+				<true/>
+			</dict>
 		</dict>
 	</dict>
 	<key>Boot</key>

diff --git a/config_nuc6.plist b/config_nuc6.plist
@@ -60,6 +60,16 @@
 					<key>Replace</key>
 					<data>WERTTQ==</data>
 				</dict>
+				<dict>
+					<key>Comment</key>
+					<string>change XDCI._STA to XDCI.XSTA</string>
+					<key>Find</key>
+					<data>X1NUQQ==</data>
+					<key>Replace</key>
+					<data>WFNUQQ==</data>
+					<key>TgtBridge</key>
+					<data>WERDSQ==</data>
+				</dict>
 				<dict>
 					<key>Comment</key>
 					<string>change Method(_PTS,1,N) to ZPTS</string>
@@ -73,7 +83,10 @@
 		<key>SSDT</key>
 		<dict>
 			<key>Generate</key>
-			<false/>
+			<dict>
+				<key>PluginType</key>
+				<true/>
+			</dict>
 		</dict>
 	</dict>
 	<key>Boot</key>

diff --git a/config_nuc6_sc.plist b/config_nuc6_sc.plist
@@ -60,12 +60,25 @@
 					<key>Replace</key>
 					<data>WERTTQ==</data>
 				</dict>
+				<dict>
+					<key>Comment</key>
+					<string>change XDCI._STA to XDCI.XSTA</string>
+					<key>Find</key>
+					<data>X1NUQQ==</data>
+					<key>Replace</key>
+					<data>WFNUQQ==</data>
+					<key>TgtBridge</key>
+					<data>WERDSQ==</data>
+				</dict>
 			</array>
 		</dict>
 		<key>SSDT</key>
 		<dict>
 			<key>Generate</key>
-			<false/>
+			<dict>
+				<key>PluginType</key>
+				<true/>
+			</dict>
 		</dict>
 	</dict>
 	<key>Boot</key>

diff --git a/config_nuc7.plist b/config_nuc7.plist
@@ -68,6 +68,16 @@
 					<key>Replace</key>
 					<data>WERTTQ==</data>
 				</dict>
+				<dict>
+					<key>Comment</key>
+					<string>change XDCI._STA to XDCI.XSTA</string>
+					<key>Find</key>
+					<data>X1NUQQ==</data>
+					<key>Replace</key>
+					<data>WFNUQQ==</data>
+					<key>TgtBridge</key>
+					<data>WERDSQ==</data>
+				</dict>
 				<dict>
 					<key>Comment</key>
 					<string>change Method(_PTS,1,N) to ZPTS</string>
@@ -81,7 +91,10 @@
 		<key>SSDT</key>
 		<dict>
 			<key>Generate</key>
-			<false/>
+			<dict>
+				<key>PluginType</key>
+				<true/>
+			</dict>
 		</dict>
 	</dict>
 	<key>Boot</key>

diff --git a/config_stick6.plist b/config_stick6.plist
@@ -62,18 +62,23 @@
 				</dict>
 				<dict>
 					<key>Comment</key>
-					<string>rename XDCI._STA to XSTA</string>
+					<string>change XDCI._STA to XDCI.XSTA</string>
 					<key>Find</key>
-					<data>X1MwVwCkCgMUGl9TVEE=</data>
+					<data>X1NUQQ==</data>
 					<key>Replace</key>
-					<data>X1MwVwCkCgMUGlhTVEE=</data>
+					<data>WFNUQQ==</data>
+					<key>TgtBridge</key>
+					<data>WERDSQ==</data>
 				</dict>
 			</array>
 		</dict>
 		<key>SSDT</key>
 		<dict>
 			<key>Generate</key>
-			<false/>
+			<dict>
+				<key>PluginType</key>
+				<true/>
+			</dict>
 		</dict>
 	</dict>
 	<key>Boot</key>

diff --git a/makefile b/makefile
@@ -38,15 +38,15 @@ all: $(ALL) $(HDAZML_ALL) #$(HDAINJECT) $(HDAHCDINJECT)
 $(BUILDDIR)/%.aml : %.dsl
 	iasl $(IASLOPTS) -p $@ $<
 
-$(BUILDDIR)/SSDT-NUC5.aml: SSDT-PluginType1.dsl SSDT-XOSI.dsl SSDT-IGPU.dsl SSDT-USB.dsl SSDT-XHC.dsl SSDT-SATA.dsl SSDT-NUCHDA.dsl SSDT-HDEF.dsl SSDT-HDAU.dsl SSDT-LPC.dsl SSDT-Disable_EHCI.dsl SSDT-EC.dsl SSDT-PTS.dsl
+$(BUILDDIR)/SSDT-NUC5.aml: SSDT-XOSI.dsl SSDT-IGPU.dsl SSDT-USB.dsl SSDT-XHC.dsl SSDT-SATA.dsl SSDT-NUCHDA.dsl SSDT-HDEF.dsl SSDT-HDAU.dsl SSDT-LPC.dsl SSDT-Disable_EHCI.dsl SSDT-EC.dsl SSDT-PTS.dsl
 
-$(BUILDDIR)/SSDT-NUC6.aml: SSDT-PluginType1.dsl SSDT-XOSI.dsl SSDT-IGPU.dsl SSDT-USB.dsl SSDT-XHC.dsl SSDT-SATA.dsl SSDT-NUCHDA.dsl SSDT-HDEF.dsl SSDT-EC.dsl SSDT-PTS.dsl
+$(BUILDDIR)/SSDT-NUC6.aml: SSDT-XOSI.dsl SSDT-IGPU.dsl SSDT-USB.dsl SSDT-XHC.dsl SSDT-SATA.dsl SSDT-NUCHDA.dsl SSDT-HDEF.dsl SSDT-EC.dsl SSDT-PTS.dsl
 
-$(BUILDDIR)/SSDT-NUC6-SC.aml: SSDT-PluginType1.dsl SSDT-XOSI.dsl SSDT-IGPU.dsl SSDT-USB.dsl SSDT-XHC.dsl SSDT-SATA.dsl SSDT-NUCHDA.dsl SSDT-HDEF.dsl SSDT-EC.dsl
+$(BUILDDIR)/SSDT-NUC6-SC.aml: SSDT-XOSI.dsl SSDT-IGPU.dsl SSDT-USB.dsl SSDT-XHC.dsl SSDT-SATA.dsl SSDT-NUCHDA.dsl SSDT-HDEF.dsl SSDT-EC.dsl
 
-$(BUILDDIR)/SSDT-NUC7.aml: SSDT-PluginType1.dsl SSDT-XOSI.dsl SSDT-IGPU.dsl SSDT-USB-NUC7.dsl SSDT-XHC.dsl SSDT-SATA.dsl SSDT-NUCHDA.dsl SSDT-HDEF.dsl SSDT-PTS.dsl
+$(BUILDDIR)/SSDT-NUC7.aml: SSDT-XOSI.dsl SSDT-IGPU.dsl SSDT-USB-NUC7.dsl SSDT-XHC.dsl SSDT-SATA.dsl SSDT-NUCHDA.dsl SSDT-HDEF.dsl SSDT-PTS.dsl
 
-$(BUILDDIR)/SSDT-STCK6.aml: SSDT-PluginType1.dsl SSDT-XOSI.dsl SSDT-IGPU.dsl SSDT-USB-STCK.dsl SSDT-XHC.dsl SSDT-HDEF.dsl SSDT-EC.dsl SSDT-PTS.dsl SSDT-RMNE.dsl
+$(BUILDDIR)/SSDT-STCK6.aml: SSDT-XOSI.dsl SSDT-IGPU.dsl SSDT-USB-STCK.dsl SSDT-XHC.dsl SSDT-HDEF.dsl SSDT-EC.dsl SSDT-PTS.dsl SSDT-RMNE.dsl
 
 $(BUILDDIR)/SSDT_NVMe-RP09.aml: SSDT_NVMe-RP09.dsl
 

diff --git a/nuc5.xcodeproj/project.pbxproj b/nuc5.xcodeproj/project.pbxproj
@@ -38,7 +38,6 @@
 		ED7BC9781EBADF2E007AF0D8 /* SSDT-NUC6-SC.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-NUC6-SC.dsl"; sourceTree = "<group>"; };
 		ED7BC9791EBADF2E007AF0D8 /* SSDT-NUC7.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-NUC7.dsl"; sourceTree = "<group>"; };
 		ED7BC97A1EBADF2E007AF0D8 /* SSDT-NUC6.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-NUC6.dsl"; sourceTree = "<group>"; };
-		ED7BC97B1EBAE05E007AF0D8 /* SSDT-PluginType1.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-PluginType1.dsl"; sourceTree = "<group>"; };
 		ED94CBBC1F587026006BD42C /* SSDT-SkylakeSpoof.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-SkylakeSpoof.dsl"; sourceTree = "<group>"; };
 		ED9653F31E9FCDB300E38E76 /* config_nuc7.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = config_nuc7.plist; sourceTree = "<group>"; };
 		ED9653F41E9FCDB300E38E76 /* config_install_nuc7.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = config_install_nuc7.plist; sourceTree = "<group>"; };
@@ -76,7 +75,6 @@
 				ED7BC9781EBADF2E007AF0D8 /* SSDT-NUC6-SC.dsl */,
 				ED7BC9791EBADF2E007AF0D8 /* SSDT-NUC7.dsl */,
 				ED48C0CF1ED3DD7700D66B7A /* SSDT-STCK6.dsl */,
-				ED7BC97B1EBAE05E007AF0D8 /* SSDT-PluginType1.dsl */,
 				ED48DF001B4CCCC800BDDC62 /* SSDT-XOSI.dsl */,
 				ED373E171C0535C1005018E4 /* SSDT-IGPU.dsl */,
 				ED94CBBC1F587026006BD42C /* SSDT-SkylakeSpoof.dsl */,