optimize usb port

tctien342 · Mar 24, 2020 · d91e293 · d91e293
1 parent 5b9c918
commit d91e293
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 113 deletions.
diff --git a/ACPI/SSDT-USB.dsl b/ACPI/SSDT-USB.dsl
@@ -2,6 +2,12 @@
 // Patch: Rename RP17.PXSX._RMV to XRMV
 // Find: UlAxN1BYU1gUM19STVY=
 // Replace: UlAxN1BYU1gUM1hSTVY=
+// Patch: Rename XHC to XHC2 on TBDU
+// Find: WEhDXwhfQURSAA==
+// Replace: WEhDMghfQURSAA==
+// Patch: Rename TBDU.XHC to TBDU.XHC2
+// Find: VEJEVVhIQ18=
+// Replace: VEJEVVhIQzI=
 // References:
 // [1] https://www.insanelymac.com/forum/topic/324366-dell-xps-15-9560-4k-touch-1tb-ssd-32gb-ram-100-adobergb%E2%80%8B/
 // [2] https://www.tonymacx86.com/threads/usb-c-hotplug-questions.211313/
@@ -97,13 +103,17 @@ DefinitionBlock ("", "SSDT", 2, "hack", "USB", 0x00000000)
 	                })
 	            }
 
-	            Return (Package (0x04)
-	            {
-	                "kUSBSleepPortCurrentLimit", 
-	                0x0BB8, 
-	                "kUSBWakePortCurrentLimit", 
-	                0x0BB8
-	            })
+	            Return (Package (0x08)
+                {
+                    "kUSBSleepPortCurrentLimit", 
+                    0x0834, 
+                    "kUSBSleepPowerSupply", 
+                    0x0A28, 
+                    "kUSBWakePortCurrentLimit", 
+                    0x0834, 
+                    "kUSBWakePowerSupply", 
+                    0x0C80
+                })
 	        }
 	    }
     }

diff --git a/CLOVER/config.plist b/CLOVER/config.plist
@@ -40,6 +40,34 @@
 					UlAxN1BYU1gUM1hSTVY=
 					</data>
 				</dict>
+				<dict>
+					<key>Comment</key>
+					<string>Rename XHC to XHC2 on TBDU</string>
+					<key>Disabled</key>
+					<false/>
+					<key>Find</key>
+					<data>
+					WEhDXwhfQURSAA==
+					</data>
+					<key>Replace</key>
+					<data>
+					WEhDMghfQURSAA==
+					</data>
+				</dict>
+				<dict>
+					<key>Comment</key>
+					<string>Rename TBDU.XHC to TBDU.XHC2</string>
+					<key>Disabled</key>
+					<false/>
+					<key>Find</key>
+					<data>
+					VEJEVVhIQ18=
+					</data>
+					<key>Replace</key>
+					<data>
+					VEJEVVhIQzI=
+					</data>
+				</dict>
 				<dict>
 					<key>Comment</key>
 					<string>Rename _WAK to ZWAK</string>

diff --git a/Kexts/USBPorts.kext/Contents/Info.plist b/Kexts/USBPorts.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,28 +22,22 @@
 	<string>1.0</string>
 	<key>IOKitPersonalities</key>
 	<dict>
-		<key>MacBookPro15,2-XHC</key>
+		<key>MacBookPro15,3-XHC</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.apple.driver.AppleUSBMergeNub</string>
 			<key>IOClass</key>
 			<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>2600</integer>
-				<key>kUSBWakePortCurrentLimit</key>
-				<integer>2100</integer>
-				<key>kUSBWakePowerSupply</key>
-				<integer>3200</integer>
 				<key>port-count</key>
 				<data>
 				EwAAAA==
@@ -53,7 +47,9 @@
 					<key>HS01</key>
 					<dict>
 						<key>UsbConnector</key>
-						<integer>3</integer>
+						<integer>0</integer>
+						<key>name</key>
+						<string>HS01</string>
 						<key>port</key>
 						<data>
 						AQAAAA==
@@ -62,7 +58,9 @@
 					<key>HS02</key>
 					<dict>
 						<key>UsbConnector</key>
-						<integer>3</integer>
+						<integer>0</integer>
+						<key>name</key>
+						<string>HS02</string>
 						<key>port</key>
 						<data>
 						AgAAAA==
@@ -71,7 +69,9 @@
 					<key>HS03</key>
 					<dict>
 						<key>UsbConnector</key>
-						<integer>3</integer>
+						<integer>0</integer>
+						<key>name</key>
+						<string>HS03</string>
 						<key>port</key>
 						<data>
 						AwAAAA==
@@ -80,7 +80,9 @@
 					<key>HS04</key>
 					<dict>
 						<key>UsbConnector</key>
-						<integer>10</integer>
+						<integer>9</integer>
+						<key>name</key>
+						<string>HS04</string>
 						<key>port</key>
 						<data>
 						BAAAAA==
@@ -90,6 +92,8 @@
 					<dict>
 						<key>UsbConnector</key>
 						<integer>255</integer>
+						<key>name</key>
+						<string>HS05</string>
 						<key>port</key>
 						<data>
 						BQAAAA==
@@ -99,6 +103,8 @@
 					<dict>
 						<key>UsbConnector</key>
 						<integer>255</integer>
+						<key>name</key>
+						<string>HS06</string>
 						<key>port</key>
 						<data>
 						BgAAAA==
@@ -108,6 +114,8 @@
 					<dict>
 						<key>UsbConnector</key>
 						<integer>255</integer>
+						<key>name</key>
+						<string>HS14</string>
 						<key>port</key>
 						<data>
 						DgAAAA==
@@ -116,7 +124,9 @@
 					<key>SS01</key>
 					<dict>
 						<key>UsbConnector</key>
-						<integer>10</integer>
+						<integer>3</integer>
+						<key>name</key>
+						<string>SS01</string>
 						<key>port</key>
 						<data>
 						EQAAAA==
@@ -125,7 +135,9 @@
 					<key>SS02</key>
 					<dict>
 						<key>UsbConnector</key>
-						<integer>10</integer>
+						<integer>3</integer>
+						<key>name</key>
+						<string>SS02</string>
 						<key>port</key>
 						<data>
 						EgAAAA==
@@ -134,7 +146,9 @@
 					<key>SS03</key>
 					<dict>
 						<key>UsbConnector</key>
-						<integer>10</integer>
+						<integer>3</integer>
+						<key>name</key>
+						<string>SS03</string>
 						<key>port</key>
 						<data>
 						EwAAAA==
@@ -143,116 +157,39 @@
 				</dict>
 			</dict>
 			<key>model</key>
-			<string>MacBookPro15,2</string>
+			<string>MacBookPro15,3</string>
 		</dict>
-		<key>MacBookPro15,3-XHC</key>
+		<key>MacBookPro15,3-XHC2-8086_15db</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.apple.driver.AppleUSBMergeNub</string>
 			<key>IOClass</key>
 			<string>AppleUSBMergeNub</string>
 			<key>IONameMatch</key>
-			<string>XHC</string>
+			<string>XHC2</string>
+			<key>IOPCIPrimaryMatch</key>
+			<string>0x15db8086</string>
 			<key>IOProbeScore</key>
 			<integer>5000</integer>
 			<key>IOProviderClass</key>
-			<string>AppleUSBXHCIPCI</string>
+			<string>AppleUSBXHCIAR</string>
 			<key>IOProviderMergeProperties</key>
 			<dict>
 				<key>port-count</key>
 				<data>
-				EwAAAA==
+				AwAAAA==
 				</data>
 				<key>ports</key>
 				<dict>
-					<key>HS01</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>0</integer>
-						<key>port</key>
-						<data>
-						AQAAAA==
-						</data>
-					</dict>
-					<key>HS02</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>0</integer>
-						<key>port</key>
-						<data>
-						AgAAAA==
-						</data>
-					</dict>
-					<key>HS03</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>0</integer>
-						<key>port</key>
-						<data>
-						AwAAAA==
-						</data>
-					</dict>
-					<key>HS04</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>9</integer>
-						<key>port</key>
-						<data>
-						BAAAAA==
-						</data>
-					</dict>
-					<key>HS05</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>255</integer>
-						<key>port</key>
-						<data>
-						BQAAAA==
-						</data>
-					</dict>
-					<key>HS06</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>255</integer>
-						<key>port</key>
-						<data>
-						BgAAAA==
-						</data>
-					</dict>
-					<key>HS14</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>255</integer>
-						<key>port</key>
-						<data>
-						DgAAAA==
-						</data>
-					</dict>
 					<key>SS01</key>
 					<dict>
 						<key>UsbConnector</key>
-						<integer>3</integer>
-						<key>port</key>
-						<data>
-						EQAAAA==
-						</data>
-					</dict>
-					<key>SS02</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>3</integer>
-						<key>port</key>
-						<data>
-						EgAAAA==
-						</data>
-					</dict>
-					<key>SS03</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>3</integer>
+						<integer>9</integer>
+						<key>name</key>
+						<string>SS01</string>
 						<key>port</key>
 						<data>
-						EwAAAA==
+						AwAAAA==
 						</data>
 					</dict>
 				</dict>

diff --git a/OC/config.plist b/OC/config.plist
@@ -100,6 +100,34 @@
 				UlAxN1BYU1gUM1hSTVY=
 				</data>
 			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>Rename XHC to XHC2 on TBDU</string>
+				<key>Enabled</key>
+				<true/>
+				<key>Find</key>
+				<data>
+				WEhDXwhfQURSAA==
+				</data>
+				<key>Replace</key>
+				<data>
+				WEhDMghfQURSAA==
+				</data>
+			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>Rename TBDU.XHC to TBDU.XHC2</string>
+				<key>Enabled</key>
+				<true/>
+				<key>Find</key>
+				<data>
+				VEJEVVhIQ18=
+				</data>
+				<key>Replace</key>
+				<data>
+				VEJEVVhIQzI=
+				</data>
+			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>Rename _WAK to ZWAK</string>