From 54fcbde01eee204faa43c048d485e41b18021075 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Sun, 4 Jun 2023 13:36:33 -0600 Subject: [PATCH] cpu_data.py: Adjust enums --- data/cpu_data.py | 37 +- data/smbios_data.py | 399 +++++++++++------- resources/build/firmware.py | 28 +- resources/build/graphics_audio.py | 4 +- resources/build/misc.py | 6 +- resources/build/networking/wired.py | 6 +- resources/build/smbios.py | 2 +- resources/build/storage.py | 2 +- resources/defaults.py | 6 +- resources/generate_smbios.py | 2 +- resources/sys_patch/sys_patch_detect.py | 2 +- .../wx_gui/gui_macos_installer_download.py | 2 +- resources/wx_gui/gui_settings.py | 4 +- 13 files changed, 287 insertions(+), 213 deletions(-) diff --git a/data/cpu_data.py b/data/cpu_data.py index f49a79a99..49a6766b2 100644 --- a/data/cpu_data.py +++ b/data/cpu_data.py @@ -1,24 +1,21 @@ import enum -class cpu_data(enum.IntEnum): - pentium_4 = 0 - yonah = 1 - conroe = 2 - penryn = 3 - nehalem = 4 # (Westmere included) - sandy_bridge = 5 # 2000 - ivy_bridge = 6 # 3000 - haswell = 7 # 4000 - broadwell = 8 # 5000 - skylake = 9 # 6000 - kaby_lake = 10 # 7000 - coffee_lake = 11 # 8000 - comet_lake = 12 # 9000 - ice_lake = 13 # 10000 +class CPUGen(enum.IntEnum): + pentium_4 = 0 + yonah = 1 + conroe = 2 + penryn = 3 + nehalem = 4 # (Westmere included) + sandy_bridge = 5 # 2000 + ivy_bridge = 6 # 3000 + haswell = 7 # 4000 + broadwell = 8 # 5000 + skylake = 9 # 6000 + kaby_lake = 10 # 7000 + coffee_lake = 11 # 8000/9000 + comet_lake = 12 # 10000 + ice_lake = 13 # 10000 - apple_dtk = 112 # A12 - apple_m1 = 114 # A14 - apple_m1_pro = 115 - apple_m1_max = 116 - apple_m1_ultra = 117 + apple_dtk = 100 # A12 + apple_silicon = 101 # A14 and newer (not tracked beyond this point) \ No newline at end of file diff --git a/data/smbios_data.py b/data/smbios_data.py index a80ea14ae..37331f459 100644 --- a/data/smbios_data.py +++ b/data/smbios_data.py @@ -25,7 +25,7 @@ smbios_dictionary = { "Board ID": "Mac-F4208CC8", "FirmwareFeatures": None, "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.yonah.value, + "CPU Generation": cpu_data.CPUGen.yonah.value, "Max OS Supported": os_data.os_data.snow_leopard, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -45,7 +45,7 @@ smbios_dictionary = { "Board ID": "Mac-F4208CA9", "FirmwareFeatures": None, "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.conroe.value, + "CPU Generation": cpu_data.CPUGen.conroe.value, "Max OS Supported": os_data.os_data.lion, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -65,7 +65,7 @@ smbios_dictionary = { "Board ID": "Mac-F22788C8", "FirmwareFeatures": "0xC0001407", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.conroe.value, + "CPU Generation": cpu_data.CPUGen.conroe.value, "Max OS Supported": os_data.os_data.lion, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -85,7 +85,7 @@ smbios_dictionary = { "Board ID": "Mac-F22788A9", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.lion, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -105,7 +105,7 @@ smbios_dictionary = { "Board ID": "Mac-F42D89C8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -123,7 +123,7 @@ smbios_dictionary = { "Board ID": "Mac-F42D89A9", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -141,7 +141,7 @@ smbios_dictionary = { "Board ID": "Mac-F22788AA", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -160,7 +160,7 @@ smbios_dictionary = { "Board ID": "Mac-F22C8AC8", "FirmwareFeatures": "0xFC0FE13F", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, @@ -178,7 +178,7 @@ smbios_dictionary = { "Board ID": "Mac-F22C89C8", "FirmwareFeatures": "0xFC0FE13F", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, @@ -196,7 +196,7 @@ smbios_dictionary = { "Board ID": "Mac-BE0E8AC46FE800CC", "FirmwareFeatures": "0xFC0FE13F", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.broadwell.value, + "CPU Generation": cpu_data.CPUGen.broadwell.value, "Max OS Supported": os_data.os_data.big_sur, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, @@ -213,7 +213,7 @@ smbios_dictionary = { "Board ID": "Mac-F305150B0C7DEEEF", "FirmwareFeatures": "0xFC0FE13F", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.broadwell.value, + "CPU Generation": cpu_data.CPUGen.broadwell.value, "Max OS Supported": os_data.os_data.big_sur, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, @@ -230,7 +230,7 @@ smbios_dictionary = { "Board ID": "Mac-9AE82516C7C6B903", "FirmwareFeatures": "0x8FC0FE13F", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.skylake.value, + "CPU Generation": cpu_data.CPUGen.skylake.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, @@ -247,7 +247,7 @@ smbios_dictionary = { "Board ID": "Mac-EE2EBD4B90B839A8", "FirmwareFeatures": "0x8FC0FE13F", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.kaby_lake.value, + "CPU Generation": cpu_data.CPUGen.kaby_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, @@ -264,7 +264,7 @@ smbios_dictionary = { "Board ID": "Mac-F42C8CC8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.conroe.value, + "CPU Generation": cpu_data.CPUGen.conroe.value, "Max OS Supported": os_data.os_data.lion, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -281,7 +281,7 @@ smbios_dictionary = { "Board ID": "Mac-F42D88C8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -299,7 +299,7 @@ smbios_dictionary = { "Board ID": "Mac-942452F5819B1C1B", "FirmwareFeatures": "0xD00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -317,7 +317,7 @@ smbios_dictionary = { "Board ID": "Mac-942C5DF58193131B", "FirmwareFeatures": "0xD00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -335,7 +335,7 @@ smbios_dictionary = { "Board ID": "Mac-C08A6BB70A942AC2", "FirmwareFeatures": "0xD00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.sandy_bridge.value, + "CPU Generation": cpu_data.CPUGen.sandy_bridge.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -352,7 +352,7 @@ smbios_dictionary = { "Board ID": "Mac-742912EFDBEE19B3", "FirmwareFeatures": "0xD00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.sandy_bridge.value, + "CPU Generation": cpu_data.CPUGen.sandy_bridge.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -369,7 +369,7 @@ smbios_dictionary = { "Board ID": "Mac-66F35F19FE2A0D05", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.ivy_bridge.value, + "CPU Generation": cpu_data.CPUGen.ivy_bridge.value, "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -386,7 +386,7 @@ smbios_dictionary = { "Board ID": "Mac-2E6FAB96566FE58C", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.ivy_bridge.value, + "CPU Generation": cpu_data.CPUGen.ivy_bridge.value, "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -403,7 +403,7 @@ smbios_dictionary = { "Board ID": "Mac-35C1E88140C3E6CF", "FirmwareFeatures": "0xE00FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.haswell.value, + "CPU Generation": cpu_data.CPUGen.haswell.value, "Max OS Supported": os_data.os_data.big_sur, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -420,7 +420,7 @@ smbios_dictionary = { "Board ID": "Mac-7DF21CB3ED6977E5", "FirmwareFeatures": "0xE00FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.haswell.value, + "CPU Generation": cpu_data.CPUGen.haswell.value, "Max OS Supported": os_data.os_data.big_sur, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -437,7 +437,7 @@ smbios_dictionary = { "Board ID": "Mac-9F18E312C5C2BF0B", "FirmwareFeatures": "0x8FF0FF576", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.broadwell.value, + "CPU Generation": cpu_data.CPUGen.broadwell.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -454,7 +454,7 @@ smbios_dictionary = { "Board ID": "Mac-937CB26E2E02BB01", "FirmwareFeatures": "0x8FF0FF576", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.broadwell.value, + "CPU Generation": cpu_data.CPUGen.broadwell.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -471,7 +471,7 @@ smbios_dictionary = { "Board ID": "Mac-827FAC58A8FDFA22", "FirmwareFeatures": "0x8FD8FF42E", "SecureBootModel": "j140k", - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -488,7 +488,7 @@ smbios_dictionary = { "Board ID": "Mac-112818653D3AABFC", "FirmwareFeatures": "0x8FD8FF42E", "SecureBootModel": "j140k", # TODO: Verify - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -507,7 +507,7 @@ smbios_dictionary = { "Board ID": "Mac-827FAC58A8FDFA22", "FirmwareFeatures": "0x8FD8FF42E", "SecureBootModel": "x589amlu", - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -524,7 +524,7 @@ smbios_dictionary = { "Board ID": "Mac-226CB3C6A851A671", "FirmwareFeatures": "0x8FD8FF42E", "SecureBootModel": "j140a", - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -541,7 +541,7 @@ smbios_dictionary = { "Board ID": "Mac-0CFF9C7C2B63DF8D", "FirmwareFeatures": "0x8FFAFF06E", "SecureBootModel": "j230k", - "CPU Generation": cpu_data.cpu_data.ice_lake.value, + "CPU Generation": cpu_data.CPUGen.ice_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -560,7 +560,7 @@ smbios_dictionary = { "Board ID": "Mac-0CFF9C7C2B63DF8D", "FirmwareFeatures": "0x8FFAFF06E", "SecureBootModel": "x589icly", - "CPU Generation": cpu_data.cpu_data.ice_lake.value, + "CPU Generation": cpu_data.CPUGen.ice_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -577,7 +577,7 @@ smbios_dictionary = { "Board ID": None, "FirmwareFeatures": None, "SecureBootModel": "j313", - "CPU Generation": cpu_data.cpu_data.apple_m1.value, + "CPU Generation": cpu_data.CPUGen.apple_silicon.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, @@ -587,11 +587,25 @@ smbios_dictionary = { "NVMe", ], }, + "MacBookAir10,1": { + "Board ID": None, + "FirmwareFeatures": None, + "SecureBootModel": "j313", + "CPU Generation": cpu_data.CPUGen.apple_silicon.value, + "Max OS Supported": os_data.os_data.max_os, + "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, + "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, + "Ethernet Chipset": None, + "Stock GPUs": [], + "Stock Storage": [ + "NVMe", + ], + }, "MacBookPro1,1": { "Board ID": "Mac-F425BEC8", "FirmwareFeatures": "", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.yonah.value, + "CPU Generation": cpu_data.CPUGen.yonah.value, "Max OS Supported": os_data.os_data.snow_leopard, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -610,7 +624,7 @@ smbios_dictionary = { "Board ID": "Mac-F42DBEC8", "FirmwareFeatures": None, "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.yonah.value, + "CPU Generation": cpu_data.CPUGen.yonah.value, "Max OS Supported": os_data.os_data.snow_leopard, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -629,7 +643,7 @@ smbios_dictionary = { "Board ID": "Mac-F42189C8", "FirmwareFeatures": None, "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.conroe.value, + "CPU Generation": cpu_data.CPUGen.conroe.value, "Max OS Supported": os_data.os_data.lion, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -648,7 +662,7 @@ smbios_dictionary = { "Board ID": "Mac-F42187C8", "FirmwareFeatures": None, "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.conroe.value, + "CPU Generation": cpu_data.CPUGen.conroe.value, "Max OS Supported": os_data.os_data.lion, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -667,7 +681,7 @@ smbios_dictionary = { "Board ID": "Mac-F4238BC8", "FirmwareFeatures": "0xC0001407", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.conroe.value, + "CPU Generation": cpu_data.CPUGen.conroe.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -686,7 +700,7 @@ smbios_dictionary = { "Board ID": "Mac-F42388C8", "FirmwareFeatures": "0xC0001407", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.conroe.value, + "CPU Generation": cpu_data.CPUGen.conroe.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -705,7 +719,7 @@ smbios_dictionary = { "Board ID": "Mac-F42C89C8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -725,7 +739,7 @@ smbios_dictionary = { "Board ID": "Mac-F42C86C8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -745,7 +759,7 @@ smbios_dictionary = { "Board ID": "Mac-F42D86C8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -764,7 +778,7 @@ smbios_dictionary = { "Board ID": "Mac-F42D86A9", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -783,7 +797,7 @@ smbios_dictionary = { "Board ID": "Mac-F2268EC8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -802,7 +816,7 @@ smbios_dictionary = { "Board ID": "Mac-F22587C8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -821,7 +835,7 @@ smbios_dictionary = { "Board ID": "Mac-F22587A1", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -840,7 +854,7 @@ smbios_dictionary = { "Board ID": "Mac-F2268AC8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -858,7 +872,7 @@ smbios_dictionary = { "Board ID": "Mac-F22589C8", "FirmwareFeatures": "0xC00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.nehalem.value, + "CPU Generation": cpu_data.CPUGen.nehalem.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, @@ -877,7 +891,7 @@ smbios_dictionary = { "Board ID": "Mac-F22586C8", "FirmwareFeatures": "0xC00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.nehalem.value, + "CPU Generation": cpu_data.CPUGen.nehalem.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, @@ -896,7 +910,7 @@ smbios_dictionary = { "Board ID": "Mac-F222BEC8", "FirmwareFeatures": "0xC00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -914,7 +928,7 @@ smbios_dictionary = { "Board ID": "Mac-94245B3640C91C81", "FirmwareFeatures": "0xC00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.sandy_bridge.value, + "CPU Generation": cpu_data.CPUGen.sandy_bridge.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, @@ -932,7 +946,7 @@ smbios_dictionary = { "Board ID": "Mac-94245A3940C91C80", "FirmwareFeatures": "0xC00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.sandy_bridge.value, + "CPU Generation": cpu_data.CPUGen.sandy_bridge.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, @@ -951,7 +965,7 @@ smbios_dictionary = { "Board ID": "Mac-942459F5819B171B", "FirmwareFeatures": "0xC00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.sandy_bridge.value, + "CPU Generation": cpu_data.CPUGen.sandy_bridge.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, @@ -972,7 +986,7 @@ smbios_dictionary = { "Board ID": "Mac-94245AF5819B141B", "FirmwareFeatures": "0xC00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.sandy_bridge.value, + "CPU Generation": cpu_data.CPUGen.sandy_bridge.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, @@ -991,7 +1005,7 @@ smbios_dictionary = { "Board ID": "Mac-4B7AC7E43945597E", "FirmwareFeatures": "0xC00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.ivy_bridge.value, + "CPU Generation": cpu_data.CPUGen.ivy_bridge.value, "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -1010,7 +1024,7 @@ smbios_dictionary = { "Board ID": "Mac-6F01561E16C75D06", "FirmwareFeatures": "0xC10DF577", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.ivy_bridge.value, + "CPU Generation": cpu_data.CPUGen.ivy_bridge.value, "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -1027,7 +1041,7 @@ smbios_dictionary = { "Board ID": "Mac-C3EC7CD22292981F", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.ivy_bridge.value, + "CPU Generation": cpu_data.CPUGen.ivy_bridge.value, "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -1046,7 +1060,7 @@ smbios_dictionary = { "Board ID": "Mac-AFD8A9D944EA4843", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.ivy_bridge.value, + "CPU Generation": cpu_data.CPUGen.ivy_bridge.value, "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -1063,7 +1077,7 @@ smbios_dictionary = { "Board ID": "Mac-189A3D4F975D5FFC", "FirmwareFeatures": "0xEB0FF577", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.haswell.value, + "CPU Generation": cpu_data.CPUGen.haswell.value, "Max OS Supported": os_data.os_data.big_sur, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -1080,7 +1094,7 @@ smbios_dictionary = { "Board ID": "Mac-3CBD00234E554E41", "FirmwareFeatures": "0xEB0FF577", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.haswell.value, + "CPU Generation": cpu_data.CPUGen.haswell.value, "Max OS Supported": os_data.os_data.big_sur, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -1097,7 +1111,7 @@ smbios_dictionary = { "Board ID": "Mac-2BD1B31983FE1663", "FirmwareFeatures": "0xEB0FF577", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.haswell.value, + "CPU Generation": cpu_data.CPUGen.haswell.value, "Max OS Supported": os_data.os_data.big_sur, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -1116,7 +1130,7 @@ smbios_dictionary = { "Board ID": "Mac-06F11FD93F0323C5", "FirmwareFeatures": "0x8EB0FF577", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.haswell.value, + "CPU Generation": cpu_data.CPUGen.haswell.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -1133,7 +1147,7 @@ smbios_dictionary = { "Board ID": "Mac-06F11F11946D27C5", "FirmwareFeatures": "0x8EB0FF577", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.haswell.value, + "CPU Generation": cpu_data.CPUGen.haswell.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -1152,7 +1166,7 @@ smbios_dictionary = { "Board ID": "Mac-E43C1C25D4880AD6", "FirmwareFeatures": "0x8FD0FF576", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.broadwell.value, + "CPU Generation": cpu_data.CPUGen.broadwell.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -1169,7 +1183,7 @@ smbios_dictionary = { "Board ID": "Mac-473D31EABEB93F9B", "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.skylake.value, + "CPU Generation": cpu_data.CPUGen.skylake.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, @@ -1186,7 +1200,7 @@ smbios_dictionary = { "Board ID": "Mac-66E35819EE2D0D05", "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.skylake.value, + "CPU Generation": cpu_data.CPUGen.skylake.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, @@ -1203,7 +1217,7 @@ smbios_dictionary = { "Board ID": "Mac-A5C67F76ED83108C", "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.skylake.value, + "CPU Generation": cpu_data.CPUGen.skylake.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, @@ -1222,7 +1236,7 @@ smbios_dictionary = { "Board ID": "Mac-B4831CEBD52A0C4C", "FirmwareFeatures": "0x8FF0FF57E", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.kaby_lake.value, + "CPU Generation": cpu_data.CPUGen.kaby_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, @@ -1239,7 +1253,7 @@ smbios_dictionary = { "Board ID": "Mac-CAD6701F7CEA0921", "FirmwareFeatures": "0x8FF0FF57E", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.kaby_lake.value, + "CPU Generation": cpu_data.CPUGen.kaby_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, @@ -1256,7 +1270,7 @@ smbios_dictionary = { "Board ID": "Mac-551B86E5744E2388", "FirmwareFeatures": "0x8FF0FF57E", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.kaby_lake.value, + "CPU Generation": cpu_data.CPUGen.kaby_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, @@ -1275,7 +1289,7 @@ smbios_dictionary = { "Board ID": "Mac-937A206F2EE63C01", "FirmwareFeatures": "0x8FD8FF426", "SecureBootModel": "j680", - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -1294,7 +1308,7 @@ smbios_dictionary = { "Board ID": "Mac-827FB448E656EC26", "FirmwareFeatures": "0x8FD8FF426", "SecureBootModel": "j132", - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -1311,7 +1325,7 @@ smbios_dictionary = { "Board ID": "Mac-1E7E29AD0135F9BC", "FirmwareFeatures": "0x8FD8FF426", "SecureBootModel": "j780", - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -1330,7 +1344,7 @@ smbios_dictionary = { "Board ID": "Mac-53FDB3D8DB8CA971", "FirmwareFeatures": "0x8FD8FF426", "SecureBootModel": "j213", - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -1347,7 +1361,7 @@ smbios_dictionary = { "Board ID": "Mac-E1008331FDC96864", "FirmwareFeatures": "0x8FDAFF066", "SecureBootModel": "j152f", - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -1366,7 +1380,7 @@ smbios_dictionary = { "Board ID": "Mac-5F9802EFE386AA28", "FirmwareFeatures": "0x8FFFFFF7F", "SecureBootModel": "j214k", - "CPU Generation": cpu_data.cpu_data.ice_lake.value, + "CPU Generation": cpu_data.CPUGen.ice_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -1383,7 +1397,7 @@ smbios_dictionary = { "Board ID": "Mac-E7203C0F68AA0004", "FirmwareFeatures": "0x8FDAFF066", "SecureBootModel": "j223", - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -1400,7 +1414,7 @@ smbios_dictionary = { "Board ID": "Mac-A61BADE1FDAD7B05", "FirmwareFeatures": "0x8FDAFF066", "SecureBootModel": "j215", - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -1419,7 +1433,7 @@ smbios_dictionary = { "Board ID": None, "FirmwareFeatures": None, "SecureBootModel": "j293", - "CPU Generation": cpu_data.cpu_data.apple_m1.value, + "CPU Generation": cpu_data.CPUGen.apple_silicon.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, @@ -1434,7 +1448,7 @@ smbios_dictionary = { "Board ID": None, "FirmwareFeatures": None, "SecureBootModel": "j316s", - "CPU Generation": cpu_data.cpu_data.apple_m1_pro.value, + "CPU Generation": cpu_data.CPUGen.apple_silicon.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, @@ -1449,7 +1463,7 @@ smbios_dictionary = { "Board ID": None, "FirmwareFeatures": None, "SecureBootModel": "j316c", - "CPU Generation": cpu_data.cpu_data.apple_m1_max.value, + "CPU Generation": cpu_data.CPUGen.apple_silicon.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, @@ -1464,7 +1478,7 @@ smbios_dictionary = { "Board ID": None, "FirmwareFeatures": None, "SecureBootModel": "j314s", - "CPU Generation": cpu_data.cpu_data.apple_m1_pro.value, + "CPU Generation": cpu_data.CPUGen.apple_silicon.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, @@ -1479,7 +1493,22 @@ smbios_dictionary = { "Board ID": None, "FirmwareFeatures": None, "SecureBootModel": "j314c", - "CPU Generation": cpu_data.cpu_data.apple_m1_max.value, + "CPU Generation": cpu_data.CPUGen.apple_silicon.value, + "Max OS Supported": os_data.os_data.max_os, + "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, + "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, + "Screen Size": 14, + "Ethernet Chipset": None, + "Stock GPUs": [], + "Stock Storage": [ + "NVMe", + ], + }, + "Mac14,7": { + "Board ID": None, + "FirmwareFeatures": None, + "SecureBootModel": "J493AP", + "CPU Generation": cpu_data.CPUGen.apple_silicon.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, @@ -1494,7 +1523,7 @@ smbios_dictionary = { "Board ID": "Mac-F4208EC8", "FirmwareFeatures": None, "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.yonah.value, + "CPU Generation": cpu_data.CPUGen.yonah.value, "Max OS Supported": os_data.os_data.snow_leopard, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -1511,7 +1540,7 @@ smbios_dictionary = { "Board ID": "Mac-F4208EAA", "FirmwareFeatures": None, "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.conroe.value, + "CPU Generation": cpu_data.CPUGen.conroe.value, "Max OS Supported": os_data.os_data.lion, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -1528,7 +1557,7 @@ smbios_dictionary = { "Board ID": "Mac-F22C86C8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -1545,7 +1574,7 @@ smbios_dictionary = { "Board ID": "Mac-F2208EC8", "FirmwareFeatures": "0xC00C9423", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, @@ -1562,7 +1591,7 @@ smbios_dictionary = { "Board ID": "Mac-8ED6AF5B48C039E1", "FirmwareFeatures": "0xD00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.sandy_bridge.value, + "CPU Generation": cpu_data.CPUGen.sandy_bridge.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -1578,7 +1607,7 @@ smbios_dictionary = { "Board ID": "Mac-4BC72D62AD45599E", "FirmwareFeatures": "0xD00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.sandy_bridge.value, + "CPU Generation": cpu_data.CPUGen.sandy_bridge.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -1595,7 +1624,7 @@ smbios_dictionary = { "Board ID": "Mac-7BA5B2794B2CDB12", "FirmwareFeatures": "0xD00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.sandy_bridge.value, + "CPU Generation": cpu_data.CPUGen.sandy_bridge.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -1611,7 +1640,7 @@ smbios_dictionary = { "Board ID": "Mac-031AEE4D24BFF0B1", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.ivy_bridge.value, + "CPU Generation": cpu_data.CPUGen.ivy_bridge.value, "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -1627,7 +1656,7 @@ smbios_dictionary = { "Board ID": "Mac-F65AE981FFA204ED", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.ivy_bridge.value, + "CPU Generation": cpu_data.CPUGen.ivy_bridge.value, "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -1643,7 +1672,7 @@ smbios_dictionary = { "Board ID": "Mac-35C5E08120C7EEAF", "FirmwareFeatures": "0x8E00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.haswell.value, + "CPU Generation": cpu_data.CPUGen.haswell.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -1660,7 +1689,7 @@ smbios_dictionary = { "Board ID": "Mac-7BA5B2DFE22DDD8C", "FirmwareFeatures": "0x8FD8FF466", "SecureBootModel": "j174", - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -1676,7 +1705,7 @@ smbios_dictionary = { "Board ID": None, "FirmwareFeatures": None, "SecureBootModel": "j274", - "CPU Generation": cpu_data.cpu_data.apple_m1.value, + "CPU Generation": cpu_data.CPUGen.apple_silicon.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, @@ -1690,7 +1719,7 @@ smbios_dictionary = { "Board ID": "Mac-F42786C8", "FirmwareFeatures": None, "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.yonah.value, + "CPU Generation": cpu_data.CPUGen.yonah.value, "Max OS Supported": os_data.os_data.snow_leopard, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -1709,7 +1738,7 @@ smbios_dictionary = { "Board ID": "Mac-F4218EC8", "FirmwareFeatures": None, "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.yonah.value, + "CPU Generation": cpu_data.CPUGen.yonah.value, "Max OS Supported": os_data.os_data.snow_leopard, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -1728,7 +1757,7 @@ smbios_dictionary = { "Board ID": "Mac-F4228EC8", "FirmwareFeatures": None, "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.conroe.value, + "CPU Generation": cpu_data.CPUGen.conroe.value, "Max OS Supported": os_data.os_data.lion, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -1747,7 +1776,7 @@ smbios_dictionary = { "Board ID": "Mac-F4218EC8", "FirmwareFeatures": None, "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.conroe.value, + "CPU Generation": cpu_data.CPUGen.conroe.value, "Max OS Supported": os_data.os_data.lion, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -1766,7 +1795,7 @@ smbios_dictionary = { "Board ID": "Mac-F4218FC8", "FirmwareFeatures": None, "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.conroe.value, + "CPU Generation": cpu_data.CPUGen.conroe.value, "Max OS Supported": os_data.os_data.lion, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -1786,7 +1815,7 @@ smbios_dictionary = { "Board ID": "Mac-F42386C8", "FirmwareFeatures": "0xC0001407", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn, # Stock models shipped with Conroe + "CPU Generation": cpu_data.CPUGen.penryn, # Stock models shipped with Conroe "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -1806,7 +1835,7 @@ smbios_dictionary = { "Board ID": "Mac-F4238CC8", "FirmwareFeatures": "0xC0001407", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn, # Stock models shipped with Conroe + "CPU Generation": cpu_data.CPUGen.penryn, # Stock models shipped with Conroe "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -1826,7 +1855,7 @@ smbios_dictionary = { "Board ID": "Mac-F227BEC8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -1846,7 +1875,7 @@ smbios_dictionary = { "Board ID": "Mac-F226BEC8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -1866,7 +1895,7 @@ smbios_dictionary = { "Board ID": "Mac-F2218FA9", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -1885,7 +1914,7 @@ smbios_dictionary = { "Board ID": "Mac-F2218EA9", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -1902,7 +1931,7 @@ smbios_dictionary = { "Board ID": "Mac-F2218EC8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -1919,7 +1948,7 @@ smbios_dictionary = { "Board ID": "Mac-F2218FC8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -1937,7 +1966,7 @@ smbios_dictionary = { # "Board ID": "Mac-F2268CC8", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -1955,7 +1984,7 @@ smbios_dictionary = { "Board ID": "Mac-F2268CC8", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -1973,7 +2002,7 @@ smbios_dictionary = { "Board ID": "Mac-F2268DC8", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -1991,7 +2020,7 @@ smbios_dictionary = { "Board ID": "Mac-F2268DAE", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.nehalem.value, + "CPU Generation": cpu_data.CPUGen.nehalem.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -2008,7 +2037,7 @@ smbios_dictionary = { "Board ID": "Mac-F2238AC8", "FirmwareFeatures": "0xC00C9423", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.nehalem.value, + "CPU Generation": cpu_data.CPUGen.nehalem.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -2026,7 +2055,7 @@ smbios_dictionary = { "Board ID": "Mac-F2238BAE", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.nehalem.value, + "CPU Generation": cpu_data.CPUGen.nehalem.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -2044,7 +2073,7 @@ smbios_dictionary = { "Board ID": "Mac-942B5BF58194151B", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.sandy_bridge.value, + "CPU Generation": cpu_data.CPUGen.sandy_bridge.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -2062,7 +2091,7 @@ smbios_dictionary = { "Board ID": "Mac-942B59F58194171B", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.sandy_bridge.value, + "CPU Generation": cpu_data.CPUGen.sandy_bridge.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -2082,7 +2111,7 @@ smbios_dictionary = { "Board ID": "Mac-942B5B3A40C91381", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.sandy_bridge.value, + "CPU Generation": cpu_data.CPUGen.sandy_bridge.value, "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -2100,7 +2129,7 @@ smbios_dictionary = { "Board ID": "Mac-00BE6ED71E35EB86", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.ivy_bridge.value, + "CPU Generation": cpu_data.CPUGen.ivy_bridge.value, "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -2118,7 +2147,7 @@ smbios_dictionary = { "Board ID": "Mac-FC02E91DDD3FA6A4", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.ivy_bridge.value, + "CPU Generation": cpu_data.CPUGen.ivy_bridge.value, "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -2136,7 +2165,7 @@ smbios_dictionary = { "Board ID": "Mac-7DF2A3B5E5D671ED", "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.ivy_bridge.value, + "CPU Generation": cpu_data.CPUGen.ivy_bridge.value, "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, @@ -2153,7 +2182,7 @@ smbios_dictionary = { "Board ID": "Mac-031B6874CF7F642A", "FirmwareFeatures": "0xFB0FF577", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.haswell.value, + "CPU Generation": cpu_data.CPUGen.haswell.value, "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -2170,7 +2199,7 @@ smbios_dictionary = { "Board ID": "Mac-27ADBB7B4CEE8E61", "FirmwareFeatures": "0xE00FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.haswell.value, + "CPU Generation": cpu_data.CPUGen.haswell.value, "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -2188,7 +2217,7 @@ smbios_dictionary = { "Board ID": "Mac-77EB7D7DAF985301", "FirmwareFeatures": "0xE00FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.haswell.value, + "CPU Generation": cpu_data.CPUGen.haswell.value, "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -2206,7 +2235,7 @@ smbios_dictionary = { "Board ID": "Mac-81E3E92DD6088272", "FirmwareFeatures": "0xF00FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.haswell.value, + "CPU Generation": cpu_data.CPUGen.haswell.value, "Max OS Supported": os_data.os_data.big_sur, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -2223,7 +2252,7 @@ smbios_dictionary = { "Board ID": "Mac-42FD25EABCABB274", "FirmwareFeatures": "0xF80FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.haswell.value, + "CPU Generation": cpu_data.CPUGen.haswell.value, "Max OS Supported": os_data.os_data.big_sur, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -2242,7 +2271,7 @@ smbios_dictionary = { "Board ID": "Mac-FA842E06C61E91C5", "FirmwareFeatures": "0xF80FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.haswell.value, + "CPU Generation": cpu_data.CPUGen.haswell.value, "Max OS Supported": os_data.os_data.big_sur, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -2261,7 +2290,7 @@ smbios_dictionary = { "Board ID": "Mac-A369DDC4E67F1C45", "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.broadwell.value, + "CPU Generation": cpu_data.CPUGen.broadwell.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -2278,7 +2307,7 @@ smbios_dictionary = { "Board ID": "Mac-FFE5EF870D7BA81A", "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.broadwell.value, + "CPU Generation": cpu_data.CPUGen.broadwell.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -2295,7 +2324,7 @@ smbios_dictionary = { "Board ID": "Mac-DB15BD556843C820", "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.skylake.value, + "CPU Generation": cpu_data.CPUGen.skylake.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -2315,7 +2344,7 @@ smbios_dictionary = { "Board ID": "Mac-65CE76090165799A", "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.skylake.value, + "CPU Generation": cpu_data.CPUGen.skylake.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -2335,7 +2364,7 @@ smbios_dictionary = { "Board ID": "Mac-B809C3757DA9BB8D", "FirmwareFeatures": "0x8FC0FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.skylake.value, + "CPU Generation": cpu_data.CPUGen.skylake.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -2355,7 +2384,7 @@ smbios_dictionary = { "Board ID": "Mac-4B682C642B45593E", "FirmwareFeatures": "0x8FD0FF576", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.kaby_lake.value, + "CPU Generation": cpu_data.CPUGen.kaby_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703, @@ -2372,7 +2401,7 @@ smbios_dictionary = { "Board ID": "Mac-77F17D7DA9285301", "FirmwareFeatures": "0x8FD0FF576", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.kaby_lake.value, + "CPU Generation": cpu_data.CPUGen.kaby_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703, @@ -2390,7 +2419,7 @@ smbios_dictionary = { "Board ID": "Mac-BE088AF8C5EB4FA2", "FirmwareFeatures": "0x8FD0FF576", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.kaby_lake.value, + "CPU Generation": cpu_data.CPUGen.kaby_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703, @@ -2409,7 +2438,7 @@ smbios_dictionary = { "Board ID": "Mac-AA95B1DDAB278B95", "FirmwareFeatures": "0x8FD8FF576", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -2430,7 +2459,7 @@ smbios_dictionary = { "Board ID": "Mac-CF21D135A7D34AA6", "FirmwareFeatures": "0x8FD8FF576", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -2450,7 +2479,7 @@ smbios_dictionary = { "Board ID": "Mac-63001698E7A34814", "FirmwareFeatures": "0x8FD8FF576", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -2469,7 +2498,7 @@ smbios_dictionary = { "Board ID": "Mac-CFF7D910A743CAAF", "FirmwareFeatures": "0x8FFB3F066", "SecureBootModel": "j185", - "CPU Generation": cpu_data.cpu_data.comet_lake.value, + "CPU Generation": cpu_data.CPUGen.comet_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -2487,7 +2516,7 @@ smbios_dictionary = { "Board ID": "Mac-AF89B6D9451A490B", "FirmwareFeatures": "0x8FFB3F066", "SecureBootModel": "j185f", - "CPU Generation": cpu_data.cpu_data.comet_lake.value, + "CPU Generation": cpu_data.CPUGen.comet_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -2505,7 +2534,7 @@ smbios_dictionary = { "Board ID": None, "FirmwareFeatures": None, "SecureBootModel": "j456", - "CPU Generation": cpu_data.cpu_data.apple_m1.value, + "CPU Generation": cpu_data.CPUGen.apple_silicon.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, @@ -2519,7 +2548,7 @@ smbios_dictionary = { "Board ID": None, "FirmwareFeatures": None, "SecureBootModel": "j457", - "CPU Generation": cpu_data.cpu_data.apple_m1.value, + "CPU Generation": cpu_data.CPUGen.apple_silicon.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, @@ -2533,7 +2562,7 @@ smbios_dictionary = { "Board ID": "Mac-7BA5B2D9E42DDD94", "FirmwareFeatures": "0xFD8FF53E", "SecureBootModel": "j137", - "CPU Generation": cpu_data.cpu_data.skylake.value, + "CPU Generation": cpu_data.CPUGen.skylake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -2550,7 +2579,7 @@ smbios_dictionary = { "Board ID": "Mac-F4208DC8", "FirmwareFeatures": "0x80000015", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.conroe.value, + "CPU Generation": cpu_data.CPUGen.conroe.value, "Max OS Supported": os_data.os_data.lion, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -2569,7 +2598,7 @@ smbios_dictionary = { "Board ID": "Mac-F4208DA9", "FirmwareFeatures": "0xC0000015", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.conroe.value, + "CPU Generation": cpu_data.CPUGen.conroe.value, "Max OS Supported": os_data.os_data.lion, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -2588,7 +2617,7 @@ smbios_dictionary = { "Board ID": "Mac-F42C88C8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.APPLE_CSR, @@ -2609,7 +2638,7 @@ smbios_dictionary = { "Board ID": "Mac-F221BEC8", "FirmwareFeatures": "0xE001F537", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.nehalem.value, + "CPU Generation": cpu_data.CPUGen.nehalem.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -2627,7 +2656,7 @@ smbios_dictionary = { "Board ID": "Mac-F221BEC8", "FirmwareFeatures": "0xE80FE137", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.nehalem.value, + "CPU Generation": cpu_data.CPUGen.nehalem.value, "Max OS Supported": os_data.os_data.mojave, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, @@ -2645,7 +2674,7 @@ smbios_dictionary = { "Board ID": "Mac-F60DEB81FF30ACF6", "FirmwareFeatures": "0x8E90FF576", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.ivy_bridge.value, + "CPU Generation": cpu_data.CPUGen.ivy_bridge.value, "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -2661,7 +2690,7 @@ smbios_dictionary = { "Board ID": "Mac-27AD2F918AE68F61", "FirmwareFeatures": "0x8FDAFF066", "SecureBootModel": "j160", - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.CPUGen.coffee_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, @@ -2681,7 +2710,7 @@ smbios_dictionary = { "Board ID": "Mac-F4208AC8", "FirmwareFeatures": None, "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.conroe.value, + "CPU Generation": cpu_data.CPUGen.conroe.value, "Max OS Supported": os_data.os_data.lion, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, @@ -2700,7 +2729,7 @@ smbios_dictionary = { "Board ID": "Mac-F42289C8", "FirmwareFeatures": "0xC0001403", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.lion, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, @@ -2719,7 +2748,7 @@ smbios_dictionary = { "Board ID": "Mac-F223BEC8", "FirmwareFeatures": "0xE001F537", "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.nehalem.value, + "CPU Generation": cpu_data.CPUGen.nehalem.value, "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, @@ -2737,7 +2766,7 @@ smbios_dictionary = { "Board ID": None, "FirmwareFeatures": None, "SecureBootModel": "j375c", - "CPU Generation": cpu_data.cpu_data.apple_m1_max.value, + "CPU Generation": cpu_data.CPUGen.apple_silicon.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, @@ -2752,7 +2781,7 @@ smbios_dictionary = { "Board ID": None, "FirmwareFeatures": None, "SecureBootModel": "j375d", - "CPU Generation": cpu_data.cpu_data.apple_m1_ultra.value, + "CPU Generation": cpu_data.CPUGen.apple_silicon.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, @@ -2766,7 +2795,7 @@ smbios_dictionary = { "Board ID": None, "FirmwareFeatures": None, "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.pentium_4.value, + "CPU Generation": cpu_data.CPUGen.pentium_4.value, "Max OS Supported": os_data.os_data.leopard, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, @@ -2783,7 +2812,7 @@ smbios_dictionary = { "Board ID": None, "FirmwareFeatures": None, "SecureBootModel": "j273a", - "CPU Generation": cpu_data.cpu_data.apple_dtk.value, + "CPU Generation": cpu_data.CPUGen.apple_dtk.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, @@ -2798,7 +2827,7 @@ smbios_dictionary = { "Board ID": "Mac-C08A65A66A9A3BA2", "FirmwareFeatures": None, "SecureBootModel": None, - "CPU Generation": cpu_data.cpu_data.haswell.value, + "CPU Generation": cpu_data.CPUGen.haswell.value, "Max OS Supported": os_data.os_data.mavericks, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, @@ -2814,7 +2843,7 @@ smbios_dictionary = { "Board ID": "VMM-x86_64", "FirmwareFeatures": None, "SecureBootModel": "x86legacy", - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, @@ -2826,7 +2855,7 @@ smbios_dictionary = { "Board ID": None, "FirmwareFeatures": None, "SecureBootModel": "vma1", - "CPU Generation": cpu_data.cpu_data.apple_m1.value, + "CPU Generation": cpu_data.CPUGen.apple_silicon.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, @@ -2838,7 +2867,7 @@ smbios_dictionary = { "Board ID": None, "FirmwareFeatures": None, "SecureBootModel": "vma2macos", - "CPU Generation": cpu_data.cpu_data.apple_m1.value, + "CPU Generation": cpu_data.CPUGen.apple_silicon.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, @@ -2850,7 +2879,7 @@ smbios_dictionary = { "Board ID": "440BX Desktop Reference Platform", "FirmwareFeatures": None, "SecureBootModel": "x86legacy", - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, @@ -2862,7 +2891,7 @@ smbios_dictionary = { "Board ID": "Parallels Virtual Platform", "FirmwareFeatures": None, "SecureBootModel": "x86legacy", - "CPU Generation": cpu_data.cpu_data.penryn.value, + "CPU Generation": cpu_data.CPUGen.penryn.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, @@ -3015,4 +3044,52 @@ smbios_dictionary = { "Stock GPUs": [], "Stock Storage": [], }, + "APPL_UNKNOWN_MODEL_8": { + # Unknown, only mentioned in supported models for IAs + "Board ID": "Mac-C6F71043CEAA02A6", + "FirmwareFeatures": None, + "SecureBootModel": None, + "CPU Generation": None, + "Max OS Supported": os_data.os_data.big_sur, + "Wireless Model": None, + "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, + "Stock GPUs": [], + "Stock Storage": [], + }, + "APPL_UNKNOWN_MODEL_9": { + # Unknown, only mentioned in supported models for IAs + "Board ID": "Mac-90BE64C3CB5A9AEB", + "FirmwareFeatures": None, + "SecureBootModel": None, + "CPU Generation": None, + "Max OS Supported": os_data.os_data.big_sur, + "Wireless Model": None, + "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, + "Stock GPUs": [], + "Stock Storage": [], + }, + "APPL_UNKNOWN_MODEL_10": { + # Unknown, only mentioned in supported models for IAs + "Board ID": "Mac-36B6B6DA9CFCD881", + "FirmwareFeatures": None, + "SecureBootModel": None, + "CPU Generation": None, + "Max OS Supported": os_data.os_data.big_sur, + "Wireless Model": None, + "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, + "Stock GPUs": [], + "Stock Storage": [], + }, + "APPL_UNKNOWN_MODEL_11": { + # Unknown, only mentioned in supported models for IAs + "Board ID": "Mac-5A49A77366F81C72", + "FirmwareFeatures": None, + "SecureBootModel": None, + "CPU Generation": None, + "Max OS Supported": os_data.os_data.big_sur, + "Wireless Model": None, + "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, + "Stock GPUs": [], + "Stock Storage": [], + }, } diff --git a/resources/build/firmware.py b/resources/build/firmware.py index 17281e10a..87a0c2003 100644 --- a/resources/build/firmware.py +++ b/resources/build/firmware.py @@ -50,7 +50,7 @@ class BuildFirmware: if not "CPU Generation" in smbios_data.smbios_dictionary[self.model]: return - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.ivy_bridge.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.ivy_bridge.value: # In macOS Ventura, Apple dropped AppleIntelCPUPowerManagement* kexts as they're unused on Haswell+ # However re-injecting the AICPUPM kexts is not enough, as Ventura changed how 'intel_cpupm_matching' is set: # macOS 12.5: https://github.com/apple-oss-distributions/xnu/blob/xnu-8020.140.41/osfmk/i386/pal_routines.h#L153-L163 @@ -73,7 +73,7 @@ class BuildFirmware: support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleIntelCPUPowerManagement.kext", self.constants.aicpupm_version, self.constants.aicpupm_path) support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleIntelCPUPowerManagementClient.kext", self.constants.aicpupm_version, self.constants.aicpupm_client_path) - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.sandy_bridge.value or self.constants.disable_fw_throttle is True: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.sandy_bridge.value or self.constants.disable_fw_throttle is True: # With macOS 12.3 Beta 1, Apple dropped the 'plugin-type' check within X86PlatformPlugin # Because of this, X86PP will match onto the CPU instead of ACPI_SMC_PlatformPlugin # This causes power management to break on pre-Ivy Bridge CPUs as they don't have correct @@ -85,7 +85,7 @@ class BuildFirmware: # Only inject on older OSes if user requests support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Add"], "BundlePath", "ASPP-Override.kext")["MinKernel"] = "" - if self.constants.disable_fw_throttle is True and smbios_data.smbios_dictionary[self.model]["CPU Generation"] >= cpu_data.cpu_data.nehalem.value: + if self.constants.disable_fw_throttle is True and smbios_data.smbios_dictionary[self.model]["CPU Generation"] >= cpu_data.CPUGen.nehalem.value: logging.info("- Disabling Firmware Throttling") # Nehalem and newer systems force firmware throttling via MSR_POWER_CTL support.BuildSupport(self.model, self.constants, self.config).enable_kext("SimpleMSR.kext", self.constants.simplemsr_version, self.constants.simplemsr_path) @@ -104,12 +104,12 @@ class BuildFirmware: # Resolves Big Sur support for consumer Nehalem # CPBG device in ACPI is a Co-Processor Bridge Device, which is not actually physically present # IOPCIFamily will error when enumerating this device, thus we'll power it off via _STA (has no effect in older OSes) - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] == cpu_data.cpu_data.nehalem.value and not (self.model.startswith("MacPro") or self.model.startswith("Xserve")): + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] == cpu_data.CPUGen.nehalem.value and not (self.model.startswith("MacPro") or self.model.startswith("Xserve")): logging.info("- Adding SSDT-CPBG.aml") support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["ACPI"]["Add"], "Path", "SSDT-CPBG.aml")["Enabled"] = True shutil.copy(self.constants.pci_ssdt_path, self.constants.acpi_path) - if cpu_data.cpu_data.sandy_bridge <= smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.ivy_bridge.value and self.model != "MacPro6,1": + if cpu_data.CPUGen.sandy_bridge <= smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.ivy_bridge.value and self.model != "MacPro6,1": # Based on: https://egpu.io/forums/pc-setup/fix-dsdt-override-to-correct-error-12/ # Applicable for Sandy and Ivy Bridge Macs logging.info("- Enabling Windows 10 UEFI Audio support") @@ -130,20 +130,20 @@ class BuildFirmware: # SSE4,1 support (ie. Penryn) # Required for macOS Mojave and newer - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.penryn.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.penryn.value: support.BuildSupport(self.model, self.constants, self.config).enable_kext("AAAMouSSE.kext", self.constants.mousse_version, self.constants.mousse_path) support.BuildSupport(self.model, self.constants, self.config).enable_kext("telemetrap.kext", self.constants.telemetrap_version, self.constants.telemetrap_path) # Force Rosetta Cryptex installation in macOS Ventura # Restores support for CPUs lacking AVX2.0 support - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.ivy_bridge.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.ivy_bridge.value: logging.info("- Enabling Rosetta Cryptex support in Ventura") support.BuildSupport(self.model, self.constants, self.config).enable_kext("CryptexFixup.kext", self.constants.cryptexfixup_version, self.constants.cryptexfixup_path) # i3 Ivy Bridge iMacs don't support RDRAND # However for prebuilt, assume they do if (not self.constants.custom_model and "RDRAND" not in self.computer.cpu.flags) or \ - (smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.sandy_bridge.value): + (smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.sandy_bridge.value): # Ref: https://github.com/reenigneorcim/SurPlus # Enable for all systems missing RDRAND support logging.info("- Adding SurPlus Patch for Race Condition") @@ -164,12 +164,12 @@ class BuildFirmware: # https://forums.macrumors.com/threads/monterand-probably-the-start-of-an-ongoing-saga.2320479/post-31123553 # To verify the non-AVX kext is used, check IOService for 'com_apple_AppleFSCompression_NoAVXCompressionTypeZlib' - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.cpu_data.sandy_bridge.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.CPUGen.sandy_bridge.value: support.BuildSupport(self.model, self.constants, self.config).enable_kext("NoAVXFSCompressionTypeZlib.kext", self.constants.apfs_zlib_version, self.constants.apfs_zlib_path) support.BuildSupport(self.model, self.constants, self.config).enable_kext("NoAVXFSCompressionTypeZlib-AVXpel.kext", self.constants.apfs_zlib_v2_version, self.constants.apfs_zlib_v2_path) # HID patches - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.penryn.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.penryn.value: logging.info("- Adding IOHIDFamily patch") support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Patch"], "Identifier", "com.apple.iokit.IOHIDFamily")["Enabled"] = True @@ -185,7 +185,7 @@ class BuildFirmware: return # Exfat check - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.cpu_data.sandy_bridge.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.CPUGen.sandy_bridge.value: # Sandy Bridge and newer Macs natively support ExFat logging.info("- Adding ExFatDxeLegacy.efi") shutil.copy(self.constants.exfat_legacy_driver_path, self.constants.drivers_path) @@ -231,7 +231,7 @@ class BuildFirmware: if ( self.model in ["MacPro6,1", "MacBookPro4,1"] or ( - smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.cpu_data.sandy_bridge.value and \ + smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.CPUGen.sandy_bridge.value and \ not self.model.startswith("MacBook") ) ): @@ -246,8 +246,8 @@ class BuildFirmware: if ( self.model.startswith("MacBook") and ( - smbios_data.smbios_dictionary[self.model]["CPU Generation"] == cpu_data.cpu_data.haswell.value or - smbios_data.smbios_dictionary[self.model]["CPU Generation"] == cpu_data.cpu_data.broadwell.value + smbios_data.smbios_dictionary[self.model]["CPU Generation"] == cpu_data.CPUGen.haswell.value or + smbios_data.smbios_dictionary[self.model]["CPU Generation"] == cpu_data.CPUGen.broadwell.value ) ): # Fix Virtual Machine support for non-macOS OSes diff --git a/resources/build/graphics_audio.py b/resources/build/graphics_audio.py index df0adf263..c16cdcb6b 100644 --- a/resources/build/graphics_audio.py +++ b/resources/build/graphics_audio.py @@ -546,7 +546,7 @@ class BuildGraphicsAudio: ]: if ( self.model == "MacBookPro13,3" or - smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.ivy_bridge.value + smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.ivy_bridge.value ): # MacBookPro13,3 has AVX2.0 however the GPU has an unsupported framebuffer has_kdk_gpu = True @@ -558,7 +558,7 @@ class BuildGraphicsAudio: # KDKlessWorkaround supports disabling native AMD stack on Ventura for pre-AVX2.0 CPUs # Applicable for Polaris, Vega, Navi GPUs - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] > cpu_data.cpu_data.ivy_bridge.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] > cpu_data.CPUGen.ivy_bridge.value: return for gpu in gpu_dict: if not self.constants.custom_model: diff --git a/resources/build/misc.py b/resources/build/misc.py index a39f15080..917bc4409 100644 --- a/resources/build/misc.py +++ b/resources/build/misc.py @@ -126,7 +126,7 @@ class BuildMiscellaneous: # Resolve CoreGraphics.framework crashing on Ivy Bridge in macOS 13.3+ # Ref: https://github.com/acidanthera/RestrictEvents/pull/12 - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] == cpu_data.cpu_data.ivy_bridge.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] == cpu_data.CPUGen.ivy_bridge.value: logging.info("- Fixing CoreGraphics support on Ivy Bridge") re_patch_args.append("f16c") @@ -176,7 +176,7 @@ class BuildMiscellaneous: """ # Pre-Force Touch trackpad & keyboard support for macOS Ventura - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.cpu_data.skylake.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.CPUGen.skylake.value: if self.model.startswith("MacBook"): # These units got force touch & the new keyboard mapping early, so ignore them if self.model not in ["MacBookPro11,4", "MacBookPro11,5", "MacBookPro12,1", "MacBook8,1"]: @@ -248,7 +248,7 @@ class BuildMiscellaneous: # # To be paired for sys_patch_dict.py's 'Legacy USB 1.1' patchset if ( - smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.penryn.value or \ + smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.penryn.value or \ self.model in ["MacPro4,1", "MacPro5,1"] ): logging.info("- Adding UHCI/OHCI USB support") diff --git a/resources/build/networking/wired.py b/resources/build/networking/wired.py index 314907492..63daf0522 100644 --- a/resources/build/networking/wired.py +++ b/resources/build/networking/wired.py @@ -43,14 +43,14 @@ class BuildWiredNetworking: if isinstance(controller, device_probe.BroadcomEthernet) and controller.chipset == device_probe.BroadcomEthernet.Chipsets.AppleBCM5701Ethernet: if not self.model in smbios_data.smbios_dictionary: continue - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.cpu_data.ivy_bridge.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.CPUGen.ivy_bridge.value: # Required due to Big Sur's BCM5701 requiring VT-D support # Applicable for pre-Ivy Bridge models support.BuildSupport(self.model, self.constants, self.config).enable_kext("CatalinaBCM5701Ethernet.kext", self.constants.bcm570_version, self.constants.bcm570_path) elif isinstance(controller, device_probe.IntelEthernet): if not self.model in smbios_data.smbios_dictionary: continue - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.cpu_data.ivy_bridge.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.CPUGen.ivy_bridge.value: # Apple's IOSkywalkFamily in DriverKit requires VT-D support # Applicable for pre-Ivy Bridge models if controller.chipset == device_probe.IntelEthernet.Chipsets.AppleIntelI210Ethernet: @@ -76,7 +76,7 @@ class BuildWiredNetworking: return if smbios_data.smbios_dictionary[self.model]["Ethernet Chipset"] == "Broadcom": - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.cpu_data.ivy_bridge.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.CPUGen.ivy_bridge.value: # Required due to Big Sur's BCM5701 requiring VT-D support # Applicable for pre-Ivy Bridge models support.BuildSupport(self.model, self.constants, self.config).enable_kext("CatalinaBCM5701Ethernet.kext", self.constants.bcm570_version, self.constants.bcm570_path) diff --git a/resources/build/smbios.py b/resources/build/smbios.py index ad8357e8a..8a1bf46de 100644 --- a/resources/build/smbios.py +++ b/resources/build/smbios.py @@ -109,7 +109,7 @@ class BuildSMBIOS: # Note 1: Only apply if system is UEFI 1.2, this is generally Ivy Bridge and older # Note 2: Flipping 'UEFI -> ProtocolOverrides -> DataHub' will break hibernation - if (smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.ivy_bridge.value and self.model): + if (smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.ivy_bridge.value and self.model): logging.info("- Detected UEFI 1.2 or older Mac, updating BoardProduct") self.config["PlatformInfo"]["DataHub"]["BoardProduct"] = self.spoofed_board self.config["PlatformInfo"]["UpdateDataHub"] = True diff --git a/resources/build/storage.py b/resources/build/storage.py index a8eb951a2..71cc18b54 100644 --- a/resources/build/storage.py +++ b/resources/build/storage.py @@ -155,7 +155,7 @@ class BuildStorage: # With macOS Monterey, Apple's SDXC driver requires the system to support VT-D # However pre-Ivy Bridge don't support this feature - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.sandy_bridge.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.sandy_bridge.value: if (self.constants.computer.sdxc_controller and not self.constants.custom_model) or (self.model.startswith("MacBookPro8") or self.model.startswith("Macmini5")): support.BuildSupport(self.model, self.constants, self.config).enable_kext("BigSurSDXC.kext", self.constants.bigsursdxc_version, self.constants.bigsursdxc_path) diff --git a/resources/defaults.py b/resources/defaults.py index af7603a13..ce85e72da 100644 --- a/resources/defaults.py +++ b/resources/defaults.py @@ -80,7 +80,7 @@ class GenerateDefaults: self.constants.disable_cat_colorsync = False if self.model in smbios_data.smbios_dictionary: - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] >= cpu_data.cpu_data.skylake.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] >= cpu_data.CPUGen.skylake.value: # On 2016-2017 MacBook Pros, 15" devices used a stock Samsung SSD with IONVMeController # Technically this should be patched based on NVMeFix.kext logic, # however Apple deemed the SSD unsupported for enhanced performance @@ -204,7 +204,7 @@ class GenerateDefaults: if self.host_is_target: if self.constants.computer.usb_controllers: if self.model in smbios_data.smbios_dictionary: - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.cpu_data.ivy_bridge.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.CPUGen.ivy_bridge.value: # Pre-Ivy do not natively support XHCI boot support # If we detect XHCI on older model, enable for controller in self.constants.computer.usb_controllers: @@ -286,7 +286,7 @@ class GenerateDefaults: continue else: if self.model in smbios_data.smbios_dictionary: - if smbios_data.smbios_dictionary[self.model]["CPU Generation"] >= cpu_data.cpu_data.haswell.value: + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] >= cpu_data.CPUGen.haswell.value: continue self.constants.sip_status = False diff --git a/resources/generate_smbios.py b/resources/generate_smbios.py index 64001fbb3..ad541b9cf 100644 --- a/resources/generate_smbios.py +++ b/resources/generate_smbios.py @@ -109,7 +109,7 @@ def check_firewire(model): if model.startswith("MacBookPro"): return True elif model.startswith("MacBookAir"): - if smbios_data.smbios_dictionary[model]["CPU Generation"] < cpu_data.cpu_data.sandy_bridge.value: + if smbios_data.smbios_dictionary[model]["CPU Generation"] < cpu_data.CPUGen.sandy_bridge.value: return False elif model.startswith("MacBook"): return False diff --git a/resources/sys_patch/sys_patch_detect.py b/resources/sys_patch/sys_patch_detect.py index 379ac756a..f2518a481 100644 --- a/resources/sys_patch/sys_patch_detect.py +++ b/resources/sys_patch/sys_patch_detect.py @@ -494,7 +494,7 @@ class DetectRootPatch: # This is due to Apple implementing an internal USB hub on post-Penryn (excluding MacPro4,1 and MacPro5,1) # Ref: https://techcommunity.microsoft.com/t5/microsoft-usb-blog/reasons-to-avoid-companion-controllers/ba-p/270710 if ( - smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.penryn.value or \ + smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.penryn.value or \ self.model in ["MacPro4,1", "MacPro5,1"] ): return True diff --git a/resources/wx_gui/gui_macos_installer_download.py b/resources/wx_gui/gui_macos_installer_download.py index bed39c95d..483b7f9ac 100644 --- a/resources/wx_gui/gui_macos_installer_download.py +++ b/resources/wx_gui/gui_macos_installer_download.py @@ -188,7 +188,7 @@ class macOSInstallerDownloadFrame(wx.Frame): model = self.constants.custom_model or self.constants.computer.real_model if model in smbios_data.smbios_dictionary: if app["OS"] >= os_data.os_data.ventura: - if smbios_data.smbios_dictionary[model]["CPU Generation"] <= cpu_data.cpu_data.penryn or model in ["MacPro4,1", "MacPro5,1", "Xserve3,1"]: + if smbios_data.smbios_dictionary[model]["CPU Generation"] <= cpu_data.CPUGen.penryn or model in ["MacPro4,1", "MacPro5,1", "Xserve3,1"]: if model.startswith("MacBook"): problems.append("Lack of internal Keyboard/Trackpad in macOS installer.") else: diff --git a/resources/wx_gui/gui_settings.py b/resources/wx_gui/gui_settings.py index 21dd8a6e1..ad1b292cd 100644 --- a/resources/wx_gui/gui_settings.py +++ b/resources/wx_gui/gui_settings.py @@ -257,7 +257,7 @@ class SettingsFrame(wx.Frame): "USB 3.0 expansion cards on systems", "without native support.", ], - "condition": not gui_support.CheckProperties(self.constants).host_has_cpu_gen(cpu_data.cpu_data.ivy_bridge) # Sandy Bridge and older do not natively support XHCI booting + "condition": not gui_support.CheckProperties(self.constants).host_has_cpu_gen(cpu_data.CPUGen.ivy_bridge) # Sandy Bridge and older do not natively support XHCI booting }, "NVMe Booting": { "type": "checkbox", @@ -270,7 +270,7 @@ class SettingsFrame(wx.Frame): "Note: Requires Firmware support", "for OpenCore to load from NVMe.", ], - "condition": not gui_support.CheckProperties(self.constants).host_has_cpu_gen(cpu_data.cpu_data.ivy_bridge) # Sandy Bridge and older do not natively support NVMe booting + "condition": not gui_support.CheckProperties(self.constants).host_has_cpu_gen(cpu_data.CPUGen.ivy_bridge) # Sandy Bridge and older do not natively support NVMe booting }, "wrap_around 2": { "type": "wrap_around",