Skip to content

Commit 0e02d45

Browse files
khronokernelkhronokernel
committed
Revamp Airport patches
1 parent 7df675f commit 0e02d45

File tree

2 files changed

+93
-54
lines changed

2 files changed

+93
-54
lines changed

‎Resources/BuildOpenCore.py‎

Lines changed: 54 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -115,31 +115,30 @@ def BuildEFI():
115115
"<false/><!--AirPortAtheros40-->",
116116
"<true/><!--AirPortAtheros40-->"
117117
)
118-
if current_model in ModelArray.WifiBCM94328:
119-
print("- Wifi patches currently unsupported")
120-
# TO-DO: Add El Capitan's IO80211
121-
if current_model in ModelArray.WifiBCM94322:
122-
print("- Adding IO80211Mojave %s" % Versions.io80211mojave_version)
123-
copy(Versions.io80211mojave_path, Versions.kext_path_build)
124-
Versions.plist_data = Versions.plist_data.replace(
125-
"<false/><!--IO80211Mojave-->",
126-
"<true/><!--IO80211Mojave-->"
127-
)
128-
Versions.plist_data = Versions.plist_data.replace(
129-
"<false/><!--AirPortBrcm4331-->",
130-
"<true/><!--AirPortBrcm4331-->"
131-
)
132-
if current_model in ModelArray.WifiBCM943224:
133-
print("- Adding IO80211Mojave %s" % Versions.io80211mojave_version)
134-
copy(Versions.io80211mojave_path, Versions.kext_path_build)
135-
Versions.plist_data = Versions.plist_data.replace(
136-
"<false/><!--IO80211Mojave-->",
137-
"<true/><!--IO80211Mojave-->"
138-
)
139-
Versions.plist_data = Versions.plist_data.replace(
140-
"<false/><!--AirPortBrcm4331-->",
141-
"<true/><!--AirPortBrcm4331-->"
142-
)
118+
#if current_model in ModelArray.WifiBCM94328:
119+
# print("- Wifi patches currently unsupported")
120+
#if current_model in ModelArray.WifiBCM94322:
121+
# print("- Adding IO80211Mojave %s" % Versions.io80211mojave_version)
122+
# copy(Versions.io80211mojave_path, Versions.kext_path_build)
123+
# Versions.plist_data = Versions.plist_data.replace(
124+
# "<false/><!--IO80211Mojave-->",
125+
# "<true/><!--IO80211Mojave-->"
126+
# )
127+
# Versions.plist_data = Versions.plist_data.replace(
128+
# "<false/><!--AirPortBrcm4331-->",
129+
# "<true/><!--AirPortBrcm4331-->"
130+
# )
131+
#if current_model in ModelArray.WifiBCM943224:
132+
# print("- Adding IO80211Mojave %s" % Versions.io80211mojave_version)
133+
# copy(Versions.io80211mojave_path, Versions.kext_path_build)
134+
# Versions.plist_data = Versions.plist_data.replace(
135+
# "<false/><!--IO80211Mojave-->",
136+
# "<true/><!--IO80211Mojave-->"
137+
# )
138+
# Versions.plist_data = Versions.plist_data.replace(
139+
# "<false/><!--AirPortBrcm4331-->",
140+
# "<true/><!--AirPortBrcm4331-->"
141+
# )
143142
if current_model in ModelArray.WifiBCM94331:
144143
print("- Adding AirportBrcmFixup and appling fake ID")
145144
copy(Versions.airportbcrmfixup_path, Versions.kext_path_build)
@@ -151,12 +150,34 @@ def BuildEFI():
151150
"<false/><!--AirPortBrcmNIC_Injector-->",
152151
"<true/><!--AirPortBrcmNIC_Injector-->"
153152
)
154-
if current_model in ("iMac13,1", "iMac13,2"):
153+
if current_model in ModelArray.EthernetNvidia
154+
# Nvidia chipsets all have the same path to ARPT
155+
Versions.plist_data = Versions.plist_data.replace(
156+
"#PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)",
157+
"PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0)"
158+
)
159+
if current_model in ("MacBookAir2,1", "MacBookAir3,1", "MacBookAir3,2" )
160+
Versions.plist_data = Versions.plist_data.replace(
161+
"#PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)",
162+
"PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0)"
163+
)
164+
elif current_model in ("iMac7,1", "iMac8,1" ):
165+
Versions.plist_data = Versions.plist_data.replace(
166+
"#PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)",
167+
"PciRoot(0x0)/Pci(0x1C,0x4)Pci(0x0,0x0)"
168+
)
169+
elif current_model in ("iMac13,1", "iMac13,2"):
155170
Versions.plist_data = Versions.plist_data.replace(
156171
"#PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)",
157172
"PciRoot(0x0)/Pci(0x1C,0x3)Pci(0x0,0x0)"
158173
)
174+
elif current_model in ("MacPro5,1"):
175+
Versions.plist_data = Versions.plist_data.replace(
176+
"#PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)",
177+
"PciRoot(0x0)/Pci(0x1C,0x5)Pci(0x0,0x0)"
178+
)
159179
else:
180+
# Assumes we have a laptop with Intel chipset
160181
Versions.plist_data = Versions.plist_data.replace(
161182
"#PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)",
162183
"PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)"
@@ -192,32 +213,25 @@ def BuildSMBIOS():
192213
if current_model in ModelArray.MacBookAir61:
193214
print("- Spoofing to MacBookAir6,1")
194215
new_model = "MacBookAir6,1"
195-
196-
if current_model in ModelArray.MacBookAir62:
216+
elif current_model in ModelArray.MacBookAir62:
197217
print("- Spoofing to MacBookAir6,2")
198218
new_model = "MacBookAir6,2"
199-
200-
if current_model in ModelArray.MacBookPro111:
219+
elif current_model in ModelArray.MacBookPro111:
201220
print("- Spoofing to MacBookPro11,1")
202221
new_model = "MacBookPro11,1"
203-
204-
if current_model in ModelArray.MacBookPro112:
222+
elif current_model in ModelArray.MacBookPro112:
205223
print("- Spoofing to MacBookPro11,2")
206224
new_model = "MacBookPro11,2"
207-
208-
if current_model in ModelArray.Macmini71:
225+
elif current_model in ModelArray.Macmini71:
209226
print("- Spoofing to Macmini7,1")
210227
new_model = "Macmini7,1"
211-
212-
if current_model in ModelArray.iMac151:
228+
elif current_model in ModelArray.iMac151:
213229
print("- Spoofing to iMac15,1")
214230
new_model = "iMac15,1"
215-
216-
if current_model in ModelArray.iMac144:
231+
elif current_model in ModelArray.iMac144:
217232
print("- Spoofing to iMac14,4")
218233
new_model = "iMac14,4"
219-
220-
if current_model in ModelArray.MacPro71:
234+
elif current_model in ModelArray.MacPro71:
221235
print("- Spoofing to MacPro7,1")
222236
new_model = "MacPro7,1"
223237

‎Resources/ModelArray.py‎

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -198,20 +198,45 @@
198198
]
199199

200200
WifiBCM94331 = [
201-
"MacBookPro8,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)
202-
"MacBookPro8,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)
203-
"MacBookPro8,3", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)
204-
"MacBookPro9,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)
205-
"MacBookPro9,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)
206-
"MacBookPro10,1",# PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)
207-
"MacBookPro10,2",# PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)
208-
"Macmini5,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)
209-
"Macmini5,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)
210-
"Macmini5,3", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)
211-
"Macmini6,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)
212-
"Macmini6,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)
213-
"iMac13,1", # PciRoot(0x0)/Pci(0x1C,0x3)Pci(0x0,0x0)
214-
"iMac13,2" # PciRoot(0x0)/Pci(0x1C,0x3)Pci(0x0,0x0)
201+
"MacBook5,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
202+
"MacBook5,2", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
203+
"MacBook6,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
204+
"MacBook7,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
205+
"MacBookAir2,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
206+
"MacBookAir3,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
207+
"MacBookAir3,2", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
208+
"MacBookAir4,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
209+
"MacBookAir4,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
210+
"MacBookAir5,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
211+
"MacBookAir5,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
212+
"MacBookPro5,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
213+
"MacBookPro5,2", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
214+
"MacBookPro5,3", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
215+
"MacBookPro5,4", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
216+
"MacBookPro5,5", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
217+
"MacBookPro6,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
218+
"MacBookPro6,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
219+
"MacBookPro7,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
220+
"MacBookPro8,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
221+
"MacBookPro8,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
222+
"MacBookPro8,3", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
223+
"MacBookPro9,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
224+
"MacBookPro9,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
225+
"MacBookPro10,1",# PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
226+
"MacBookPro10,2",# PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
227+
"Macmini3,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
228+
"Macmini4,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
229+
"Macmini5,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
230+
"Macmini5,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
231+
"Macmini5,3", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
232+
"Macmini6,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
233+
"Macmini6,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01
234+
"iMac7,1", # PciRoot(0x0)/Pci(0x1C,0x4)Pci(0x0,0x0) 1c-04
235+
"iMac8,1", # PciRoot(0x0)/Pci(0x1C,0x4)Pci(0x0,0x0) 1c-04
236+
"iMac9,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00
237+
"iMac13,1", # PciRoot(0x0)/Pci(0x1C,0x3)Pci(0x0,0x0) 1c-03
238+
"iMac13,2", # PciRoot(0x0)/Pci(0x1C,0x3)Pci(0x0,0x0) 1c-03
239+
"MacPro5,1" # PciRoot(0x0)/Pci(0x1C,0x5)Pci(0x0,0x0) 1c-05
215240
]
216241

217242
## Audio

0 commit comments

Comments
 (0)