From a5c139bf916374c6fb70f96efdb910c3cfa20a15 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <me@hydev.org>
Date: Fri, 20 Aug 2021 20:14:14 -0400
Subject: [PATCH] [+] Fix USB for >11.3

---
 .../Contents/Info.plist                       | 154 +++++++++++++-----
 1 file changed, 114 insertions(+), 40 deletions(-)

diff --git a/EFI/OC/Kexts/USBPorts-MSI-Z390i.kext/Contents/Info.plist b/EFI/OC/Kexts/USBPorts-MSI-Z390i.kext/Contents/Info.plist
index a11c943..2a6a95e 100644
--- a/EFI/OC/Kexts/USBPorts-MSI-Z390i.kext/Contents/Info.plist
+++ b/EFI/OC/Kexts/USBPorts-MSI-Z390i.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.0 Copyright © 2018 Headsoft. All rights reserved.</string>
+	<string>1.0 Copyright © 2018-2020 Headsoft. All rights reserved.</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.Headsoft.USBPorts</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -22,7 +22,7 @@
 	<string>1.0</string>
 	<key>IOKitPersonalities</key>
 	<dict>
-		<key>iMac19,1-XHC</key>
+		<key>iMac19,2-XHC</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.apple.driver.AppleUSBMergeNub</string>
@@ -30,125 +30,199 @@
 			<string>AppleUSBMergeNub</string>
 			<key>IONameMatch</key>
 			<string>XHC</string>
+			<key>IOPCIPrimaryMatch</key>
+			<string>0xa36d8086</string>
 			<key>IOProbeScore</key>
 			<integer>5000</integer>
 			<key>IOProviderClass</key>
-			<string>AppleUSBXHCIPCI</string>
+			<string>AppleIntelCNLUSBXHCI</string>
 			<key>IOProviderMergeProperties</key>
 			<dict>
+				<key>kUSBSleepPortCurrentLimit</key>
+				<integer>2100</integer>
+				<key>kUSBSleepPowerSupply</key>
+				<integer>5100</integer>
+				<key>kUSBWakePortCurrentLimit</key>
+				<integer>2100</integer>
+				<key>kUSBWakePowerSupply</key>
+				<integer>5100</integer>
 				<key>port-count</key>
-				<data>FgAAAA==</data>
+				<data>
+				FQAAAA==
+				</data>
 				<key>ports</key>
 				<dict>
 					<key>HS01</key>
 					<dict>
+						<key>Comment</key>
+						<string>Back 3.1 in 2.0 Mode</string>
 						<key>UsbConnector</key>
-						<integer>0</integer>
+						<integer>3</integer>
+						<key>name</key>
+						<string>HS01</string>
 						<key>port</key>
-						<data>AQAAAA==</data>
+						<data>
+						AQAAAA==
+						</data>
 					</dict>
 					<key>HS02</key>
 					<dict>
+						<key>Comment</key>
+						<string>Back 3.1 in 2.0 Mode</string>
 						<key>UsbConnector</key>
-						<integer>0</integer>
+						<integer>3</integer>
+						<key>name</key>
+						<string>HS02</string>
 						<key>port</key>
-						<data>AgAAAA==</data>
+						<data>
+						AgAAAA==
+						</data>
 					</dict>
 					<key>HS03</key>
 					<dict>
+						<key>Comment</key>
+						<string>Back 3.1 in 2.0 Mode</string>
 						<key>UsbConnector</key>
-						<integer>0</integer>
+						<integer>3</integer>
+						<key>name</key>
+						<string>HS03</string>
 						<key>port</key>
-						<data>AwAAAA==</data>
+						<data>
+						AwAAAA==
+						</data>
 					</dict>
 					<key>HS04</key>
 					<dict>
+						<key>Comment</key>
+						<string>Back 3.1 in 2.0 Mode</string>
 						<key>UsbConnector</key>
-						<integer>0</integer>
+						<integer>3</integer>
+						<key>name</key>
+						<string>HS04</string>
 						<key>port</key>
-						<data>BAAAAA==</data>
+						<data>
+						BAAAAA==
+						</data>
 					</dict>
 					<key>HS05</key>
 					<dict>
+						<key>Comment</key>
+						<string>Front 3.1 in 2.0 Mode</string>
 						<key>UsbConnector</key>
-						<integer>0</integer>
+						<integer>3</integer>
+						<key>name</key>
+						<string>HS05</string>
 						<key>port</key>
-						<data>BQAAAA==</data>
-					</dict>
-					<key>HS06</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>0</integer>
-						<key>port</key>
-						<data>BgAAAA==</data>
+						<data>
+						BQAAAA==
+						</data>
 					</dict>
 					<key>HS07</key>
 					<dict>
+						<key>Comment</key>
+						<string>Back 2.0</string>
 						<key>UsbConnector</key>
-						<integer>255</integer>
+						<integer>0</integer>
+						<key>name</key>
+						<string>HS07</string>
 						<key>port</key>
-						<data>BwAAAA==</data>
+						<data>
+						BwAAAA==
+						</data>
 					</dict>
 					<key>HS08</key>
 					<dict>
+						<key>Comment</key>
+						<string>Back 2.0</string>
 						<key>UsbConnector</key>
-						<integer>255</integer>
+						<integer>0</integer>
+						<key>name</key>
+						<string>HS08</string>
 						<key>port</key>
-						<data>CAAAAA==</data>
+						<data>
+						CAAAAA==
+						</data>
 					</dict>
-					<key>HS09</key>
+					<key>HS14</key>
 					<dict>
 						<key>UsbConnector</key>
 						<integer>255</integer>
+						<key>name</key>
+						<string>HS14</string>
 						<key>port</key>
-						<data>CQAAAA==</data>
+						<data>
+						DgAAAA==
+						</data>
 					</dict>
 					<key>SS01</key>
 					<dict>
+						<key>Comment</key>
+						<string>Back 3.1</string>
 						<key>UsbConnector</key>
 						<integer>3</integer>
+						<key>name</key>
+						<string>SS01</string>
 						<key>port</key>
-						<data>EQAAAA==</data>
+						<data>
+						EQAAAA==
+						</data>
 					</dict>
 					<key>SS02</key>
 					<dict>
+						<key>Comment</key>
+						<string>Back 3.1</string>
 						<key>UsbConnector</key>
 						<integer>3</integer>
+						<key>name</key>
+						<string>SS02</string>
 						<key>port</key>
-						<data>EgAAAA==</data>
+						<data>
+						EgAAAA==
+						</data>
 					</dict>
 					<key>SS03</key>
 					<dict>
+						<key>Comment</key>
+						<string>Back 3.1</string>
 						<key>UsbConnector</key>
 						<integer>3</integer>
+						<key>name</key>
+						<string>SS03</string>
 						<key>port</key>
-						<data>EwAAAA==</data>
+						<data>
+						EwAAAA==
+						</data>
 					</dict>
 					<key>SS04</key>
 					<dict>
+						<key>Comment</key>
+						<string>Back 3.1</string>
 						<key>UsbConnector</key>
 						<integer>3</integer>
+						<key>name</key>
+						<string>SS04</string>
 						<key>port</key>
-						<data>FAAAAA==</data>
+						<data>
+						FAAAAA==
+						</data>
 					</dict>
 					<key>SS05</key>
 					<dict>
+						<key>Comment</key>
+						<string>Front 3.1</string>
 						<key>UsbConnector</key>
 						<integer>3</integer>
+						<key>name</key>
+						<string>SS05</string>
 						<key>port</key>
-						<data>FQAAAA==</data>
-					</dict>
-					<key>SS06</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>3</integer>
-						<key>port</key>
-						<data>FgAAAA==</data>
+						<data>
+						FQAAAA==
+						</data>
 					</dict>
 				</dict>
 			</dict>
 			<key>model</key>
-			<string>iMac19,1</string>
+			<string>iMac19,2</string>
 		</dict>
 	</dict>
 	<key>OSBundleRequired</key>