Fix incorrect DeviceProperty formatting

This commit is contained in:
Mykola Grymalyuk
2020-12-01 17:43:34 -07:00
parent 89d434e708
commit 8756a2daa3
4 changed files with 53 additions and 53 deletions

View File

@@ -153,34 +153,34 @@ def BuildEFI():
if current_model in ModelArray.EthernetNvidia: if current_model in ModelArray.EthernetNvidia:
# Nvidia chipsets all have the same path to ARPT # Nvidia chipsets all have the same path to ARPT
Versions.plist_data = Versions.plist_data.replace( Versions.plist_data = Versions.plist_data.replace(
"#PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)", "#PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)",
"PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0)" "PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)"
) )
if current_model in ("MacBookAir2,1", "MacBookAir3,1", "MacBookAir3,2" ): if current_model in ("MacBookAir2,1", "MacBookAir3,1", "MacBookAir3,2" ):
Versions.plist_data = Versions.plist_data.replace( Versions.plist_data = Versions.plist_data.replace(
"#PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)", "#PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)",
"PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0)" "PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)"
) )
elif current_model in ("iMac7,1", "iMac8,1" ): elif current_model in ("iMac7,1", "iMac8,1" ):
Versions.plist_data = Versions.plist_data.replace( Versions.plist_data = Versions.plist_data.replace(
"#PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)", "#PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)",
"PciRoot(0x0)/Pci(0x1C,0x4)Pci(0x0,0x0)" "PciRoot(0x0)/Pci(0x1C,0x4)/Pci(0x0,0x0)"
) )
elif current_model in ("iMac13,1", "iMac13,2"): elif current_model in ("iMac13,1", "iMac13,2"):
Versions.plist_data = Versions.plist_data.replace( Versions.plist_data = Versions.plist_data.replace(
"#PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)", "#PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)",
"PciRoot(0x0)/Pci(0x1C,0x3)Pci(0x0,0x0)" "PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)"
) )
elif current_model in ("MacPro5,1"): elif current_model in ("MacPro5,1"):
Versions.plist_data = Versions.plist_data.replace( Versions.plist_data = Versions.plist_data.replace(
"#PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)", "#PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)",
"PciRoot(0x0)/Pci(0x1C,0x5)Pci(0x0,0x0)" "PciRoot(0x0)/Pci(0x1C,0x5)/Pci(0x0,0x0)"
) )
else: else:
# Assumes we have a laptop with Intel chipset # Assumes we have a laptop with Intel chipset
Versions.plist_data = Versions.plist_data.replace( Versions.plist_data = Versions.plist_data.replace(
"#PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)", "#PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)",
"PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)" "PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)"
) )
if current_model in ModelArray.LegacyHID: if current_model in ModelArray.LegacyHID:
Versions.plist_data = Versions.plist_data.replace( Versions.plist_data = Versions.plist_data.replace(

View File

@@ -198,45 +198,45 @@ WifiBCM943224 = [
] ]
WifiBCM94331 = [ WifiBCM94331 = [
"MacBook5,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "MacBook5,1", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"MacBook5,2", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "MacBook5,2", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"MacBook6,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "MacBook6,1", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"MacBook7,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "MacBook7,1", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"MacBookAir2,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "MacBookAir2,1", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"MacBookAir3,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "MacBookAir3,1", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"MacBookAir3,2", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "MacBookAir3,2", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"MacBookAir4,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "MacBookAir4,1", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"MacBookAir4,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "MacBookAir4,2", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"MacBookAir5,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "MacBookAir5,1", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"MacBookAir5,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "MacBookAir5,2", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"MacBookPro5,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "MacBookPro5,1", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"MacBookPro5,2", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "MacBookPro5,2", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"MacBookPro5,3", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "MacBookPro5,3", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"MacBookPro5,4", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "MacBookPro5,4", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"MacBookPro5,5", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "MacBookPro5,5", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"MacBookPro6,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "MacBookPro6,1", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"MacBookPro6,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "MacBookPro6,2", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"MacBookPro7,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "MacBookPro7,1", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"MacBookPro8,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "MacBookPro8,1", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"MacBookPro8,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "MacBookPro8,2", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"MacBookPro8,3", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "MacBookPro8,3", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"MacBookPro9,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "MacBookPro9,1", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"MacBookPro9,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "MacBookPro9,2", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"MacBookPro10,1",# PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "MacBookPro10,1",# PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"MacBookPro10,2",# PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "MacBookPro10,2",# PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"Macmini3,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "Macmini3,1", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"Macmini4,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "Macmini4,1", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"Macmini5,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "Macmini5,1", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"Macmini5,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "Macmini5,2", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"Macmini5,3", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "Macmini5,3", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"Macmini6,1", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "Macmini6,1", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"Macmini6,2", # PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0) 1c-01 "Macmini6,2", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
"iMac7,1", # PciRoot(0x0)/Pci(0x1C,0x4)Pci(0x0,0x0) 1c-04 "iMac7,1", # PciRoot(0x0)/Pci(0x1C,0x4)/Pci(0x0,0x0)
"iMac8,1", # PciRoot(0x0)/Pci(0x1C,0x4)Pci(0x0,0x0) 1c-04 "iMac8,1", # PciRoot(0x0)/Pci(0x1C,0x4)/Pci(0x0,0x0)
"iMac9,1", # PciRoot(0x0)/Pci(0x15,0x0)Pci(0x0,0x0) 15-00 "iMac9,1", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
"iMac13,1", # PciRoot(0x0)/Pci(0x1C,0x3)Pci(0x0,0x0) 1c-03 "iMac13,1", # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)
"iMac13,2", # PciRoot(0x0)/Pci(0x1C,0x3)Pci(0x0,0x0) 1c-03 "iMac13,2", # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)
"MacPro5,1" # PciRoot(0x0)/Pci(0x1C,0x5)Pci(0x0,0x0) 1c-05 "MacPro5,1" # PciRoot(0x0)/Pci(0x1C,0x5)/Pci(0x0,0x0)
] ]
## Audio ## Audio

View File

@@ -159,7 +159,7 @@
<dict> <dict>
<key>Add</key> <key>Add</key>
<dict> <dict>
<key>#PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)</key> <key>#PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)</key>
<dict> <dict>
<key>device-id</key> <key>device-id</key>
<data>ukMAAA==</data> <data>ukMAAA==</data>

View File

@@ -161,7 +161,7 @@
<dict> <dict>
<key>Add</key> <key>Add</key>
<dict> <dict>
<key>#PciRoot(0x0)/Pci(0x1C,0x1)Pci(0x0,0x0)</key> <key>#PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)</key>
<dict> <dict>
<key>device-id</key> <key>device-id</key>
<data>ukMAAA==</data> <data>ukMAAA==</data>