Fix MacPro5,1 wifi logic

Resources/ModelArray.py

@@ -202,6 +202,7 @@ WifiBCM94322 = [
     "MacBookPro7,1",
     "Macmini3,1",
     "iMac9,1",
+    "MacPro5,1",
     "Dortania1,1"
 ]
 
@@ -230,7 +231,6 @@ WifiBCM94331 = [
     "iMac13,1",      # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)
     "iMac13,2",      # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)
     "iMac13,3",      # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)
-    "MacPro5,1",     # PciRoot(0x0)/Pci(0x1C,0x5)/Pci(0x0,0x0)
     "Dortania1,1"
 ]
 

docs/MODELS.md

@@ -25,8 +25,8 @@ Note: In this patcher, Brightness Control is tied to GPU acceleration
 | MacBook1,1 | Mid-2006 | <span style="color:red"> NO </span>  | 32-Bit CPU limitation |
 | MacBook2,1 | Late 2006 | ^^ | 32-Bit Firmware limitation |
 | MacBook3,1 | Late 2007 | ^^ | ^^ |
-| MacBook4,1 | Early 2008 | ^^ | <span style="color:#30BCD5"> YES </span> | - No GPU Acceleration in Mavericks and newer<br/>- No [DELTA](./TERMS.md) updates when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>- Trackpad Issues<br/>- No Wifi Patches implemented([#102](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/102)) |
+| MacBook4,1 | Early 2008 | <span style="color:#30BCD5"> YES </span> | - No GPU Acceleration in Mavericks and newer<br/>- No [DELTA](./TERMS.md) updates when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>- Trackpad Issues<br/>- No Wifi Patches implemented([#102](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/102)) |
-| MacBook5,1 | Late 2008 | <span style="color:#30BCD5"> YES </span> | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>- Trackpad Issues |
+| MacBook5,1 | Late 2008 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>- Trackpad Issues |
 | MacBook5,2 | Early 2009 | ^^ | ^^ |
 | MacBook6,1 | Late 2009 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/> |
 | MacBook7,1 | Mid-2010 | ^^ | ^^ |

docs/PATCHEXPLAIN.md

@@ -2,6 +2,8 @@
 
 In our patcher, there are numerous patches used to ensure a stable system. Here we're going to go over what patches are used and why we recommend or even require them.
 
+* [OpenCore Settings](#opencore-settings)
+
 ## OpenCore Settings
 
 ### ACPI -> Patch
@@ -27,7 +29,7 @@ In our patcher, there are numerous patches used to ensure a stable system. Here
 * `PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)`
   * Reason: Required to ensure Wifi works with full, native support
   * Logic: Tricks AirPortBrcmNIC.kext into thinking our device is a BCM94360 (`14e4,43ba`)
-  * Models: [Machines with BCM943224 and BCM94331 chipsets](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/79ab028b0a039e97a528e0b99c876d95d9c2d41d/Resources/ModelArray.py#L199-L225)
+  * Models: Machines with BCM943224 and BCM94331 chipsets
 * `PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)`
 * `PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)`
   * Reason: Required to ensure Brightness Control works on upgraded iMacs
@@ -95,7 +97,7 @@ In our patcher, there are numerous patches used to ensure a stable system. Here
 * GopPassThrough
   * Reason: Used for proper output on machines with UGA firmware but GOP GPU
   * Logic: Provide GOP protocol instances on top of UGA protocol instances 
-  * Models: MacPro3,1
+  * Models: MacPro3,1, MacBook4,1 iMac7,1-8,1
 
 ## Injected Kext
 
@@ -122,11 +124,19 @@ In our patcher, there are numerous patches used to ensure a stable system. Here
 * VoodooHDA
   * Reason: Attempts to add audio support for pre-2012 hardware
   * Models: 2011 and older
+
 ### Ethernet
 
 * nForceEthernet
+  * Reason: Inject old Nvidia Ethernet kext to resolve networking in Catalina and newer
+  * Models: 2010 and older Nvidia Ethernet require
 * MarvelYukonEthernet
+  * Reason: Inject old Marvel Ethernet kext to resolve networking in Catalina and newer
+  * Models: 2008 and older Marvel Ethernet require
 * CatalinaBCM5701Ethernet
+  * Reason: Inject old Broadcom Ethernet kext to resolve networking in Big Sur
+  * Logic: Patch out conflicting symbols to not colide existing BCM5701Ethernet
+  * Models: 2011 and older Broadcom Ethernet require
 
 ### Maps
 
@@ -147,10 +157,12 @@ In our patcher, there are numerous patches used to ensure a stable system. Here
 
 * IO80211HighSierra
   * Reason: Re-inject Atheros wifi drivers from High Sierra
+  * Logic: Patch out conflicting symbols to not colide existing IO80211Family
   * Models: Atheros cards
 * IO80211Mojave
   * Reason: Re-inject Broadcom wifi drivers from Mojave
-  * Models: BCm94322
+  * Logic: Patch out conflicting symbols to not colide existing IO80211Family
+  * Models: BCM94322
 
 ### Misc
 
@@ -169,7 +181,3 @@ In our patcher, there are numerous patches used to ensure a stable system. Here
 * SMC-Spoof
   * Reason: Spoofs SMC version to 9.9999
   * Models: All models require
-
-
-
-

payloads/Kexts/Plists/AppleUSBMaps/Info.plist

@@ -7850,8 +7850,8 @@
 					</dict>
 				</dict>
 			</dict>
-			<key>board-id</key>
+			<key>model</key>
-			<string>Mac-F60DEB81FF30ACF6</string>
+			<string>XacPro6,1</string>
 			<key>locationID</key>
 			<integer>487587840</integer>
 		</dict>
@@ -10467,8 +10467,8 @@
 					</dict>
 				</dict>
 			</dict>
-			<key>board-id</key>
+			<key>model</key>
-			<string>Mac-7BA5B2D9E42DDD94</string>
+			<string>iXacPro1,1</string>
 		</dict>
 		<key>Dortania1,1</key>
 		<dict>