This commit is contained in:
Mykola Grymalyuk
2021-09-16 19:25:42 -06:00
parent 438ae23ee7
commit 18805c8e78
2 changed files with 6 additions and 6 deletions

View File

@@ -583,12 +583,12 @@ class BuildOpenCore:
self.config["DeviceProperties"]["Add"][tb_device_path] = {"class-code": binascii.unhexlify("FFFFFFFF"), "device-id": binascii.unhexlify("FFFF0000")} self.config["DeviceProperties"]["Add"][tb_device_path] = {"class-code": binascii.unhexlify("FFFFFFFF"), "device-id": binascii.unhexlify("FFFF0000")}
# Bluetooth Detection # Bluetooth Detection
if not self.constants.custom_model and self.computer.bluetooth: if not self.constants.custom_model and self.computer.bluetooth_chipset:
if self.computer.bluetooth == "BRCM2070 Hub": if self.computer.bluetooth_chipset == "BRCM2070 Hub":
print("- Enabling Bluetooth BRCM2070 for macOS Monterey") print("- Enabling Bluetooth BRCM2070 for macOS Monterey")
self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -brcm2070_patch" self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -brcm2070_patch"
self.enable_kext("BlueToolFixup.kext", self.constants.bluetool_version, self.constants.bluetool_path) self.enable_kext("BlueToolFixup.kext", self.constants.bluetool_version, self.constants.bluetool_path)
elif self.computer.bluetooth == "BRCM2046 Hub": elif self.computer.bluetooth_chipset == "BRCM2046 Hub":
print("- Enabling Bluetooth BRCM2046 for macOS Monterey") print("- Enabling Bluetooth BRCM2046 for macOS Monterey")
self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -brcm2046_patch" self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -brcm2046_patch"
self.enable_kext("BlueToolFixup.kext", self.constants.bluetool_version, self.constants.bluetool_path) self.enable_kext("BlueToolFixup.kext", self.constants.bluetool_version, self.constants.bluetool_path)

View File

@@ -325,7 +325,7 @@ class Computer:
computer.storage_probe() computer.storage_probe()
computer.smbios_probe() computer.smbios_probe()
computer.cpu_probe() computer.cpu_probe()
computer.bluetooth() computer.bluetooth_probe()
return computer return computer
def gpu_probe(self): def gpu_probe(self):
@@ -440,7 +440,7 @@ class Computer:
subprocess.run("sysctl machdep.cpu.features".split(), stdout=subprocess.PIPE).stdout.decode().partition(": ")[2].strip().split(" "), subprocess.run("sysctl machdep.cpu.features".split(), stdout=subprocess.PIPE).stdout.decode().partition(": ")[2].strip().split(" "),
) )
def bluetooth(self): def bluetooth_probe(self):
usb_data: str = subprocess.run("system_profiler SPUSBDataType".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode() usb_data: str = subprocess.run("system_profiler SPUSBDataType".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
if "BRCM2070 Hub" in usb_data: if "BRCM2070 Hub" in usb_data:
self.bluetooth_chipset = "BRCM2070 Hub" self.bluetooth_chipset = "BRCM2070 Hub"