From 59f43e0ea0c4be3fd4e233438b1681ceb2e746a6 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com> Date: Thu, 29 Jul 2021 17:25:29 -0600 Subject: [PATCH] Add more Model dumps --- OCLP-CLI.command | 3 ++ Resources/ModelExample.py | 100 +++++++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 2 deletions(-) diff --git a/OCLP-CLI.command b/OCLP-CLI.command index b0e79fb48..1cfd0a74a 100755 --- a/OCLP-CLI.command +++ b/OCLP-CLI.command @@ -216,11 +216,14 @@ If you plan to create the USB for another machine, please select the "Change Mod valid_dumps = [ ModelExample.MacBookPro.MacBookPro92_Stock, #ModelExample.MacBookPro.MacBookPro171_Stock, + #ModelExample.Macmini.Macmini91_Stock, ModelExample.iMac.iMac81_Stock, ModelExample.iMac.iMac112_Stock, + ModelExample.iMac.iMac122_Upgraded, ModelExample.MacPro.MacPro31_Stock, ModelExample.MacPro.MacPro31_Upgrade, ModelExample.MacPro.MacPro31_Modern_AMD, + ModelExample.MacPro.MacPro31_Modern_Kepler, ] self.constants.validate = True diff --git a/Resources/ModelExample.py b/Resources/ModelExample.py index d81a79f5e..bf69b6900 100644 --- a/Resources/ModelExample.py +++ b/Resources/ModelExample.py @@ -2,6 +2,30 @@ # To be used when running validation tests from Resources import device_probe +class MacBook: + + MacBook71 = device_probe.Computer( + real_model="MacBook7,1", + real_board_id="Mac-F22C89C8", + reported_model="MacBook7,1", + reported_board_id="Mac-F22C89C8", + gpus=[ + device_probe.NVIDIA(vendor_id=4318, device_id=2208, class_code=196608, name="IGPU", model="NVIDIA GeForce 320M", pci_path="PciRoot(0x0)/Pci(0x2,0x0)"), + ], + igpu=device_probe.NVIDIA(vendor_id=4318, device_id=2208, class_code=196608, name="IGPU", model="NVIDIA GeForce 320M", pci_path="PciRoot(0x0)/Pci(0x2,0x0)"), + dgpu=None, + storage=[ + device_probe.SATAController(vendor_id=4318, device_id=3464, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0xa,0x0)"), + ], + wifi=device_probe.Broadcom(vendor_id=5348, device_id=17235, class_code=163840, name="ARPT", model=None, pci_path="PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)"), + cpu=device_probe.CPU( + name="Intel(R) Core(TM)2 Duo CPU P8600 @ 2.40GHz", + flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "SMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1"], + ), + oclp_version=None, + opencore_version=None, + ) + class MacBookPro: MacBookPro92_Stock = device_probe.Computer( @@ -9,7 +33,9 @@ class MacBookPro: real_board_id="Mac-6F01561E16C75D06", reported_model="MacBookPro9,2", reported_board_id="Mac-6F01561E16C75D06", - gpus=[device_probe.Intel(vendor_id=32902, device_id=358, class_code=196608, name="IGPU", model="Intel HD Graphics 4000", pci_path="PciRoot(0x0)/Pci(0x2,0x0)")], + gpus=[ + device_probe.Intel(vendor_id=32902, device_id=358, class_code=196608, name="IGPU", model="Intel HD Graphics 4000", pci_path="PciRoot(0x0)/Pci(0x2,0x0)") + ], igpu=device_probe.Intel(vendor_id=32902, device_id=358, class_code=196608, name="IGPU", model="Intel HD Graphics 4000", pci_path="PciRoot(0x0)/Pci(0x2,0x0)"), dgpu=None, storage=[device_probe.SATAController(vendor_id=32902, device_id=7683, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)")], @@ -23,6 +49,7 @@ class MacBookPro: ) MacBookPro171_Stock = device_probe.Computer( + # Run under Rosetta real_model="MacBookPro17,1", real_board_id="J293", reported_model="MacBookPro17,1", @@ -40,6 +67,29 @@ class MacBookPro: opencore_version=None, ) +class Macmini: + + Macmini91_Stock = device_probe.Computer( + # Run under Rosetta + real_model="Macmini9,1", + real_board_id="J274", + reported_model="Macmini9,1", + reported_board_id="J274", + gpus=[ + device_probe.AMD(vendor_id=4098, device_id=26640, class_code=196608, name="display", model="Unknown Unknown", pci_path="", ) + ], + igpu=None, + dgpu=None, + storage=[], + wifi=device_probe.Broadcom(vendor_id=5348, device_id=17445, class_code=163840, name="wlan", model=None, pci_path=""), + cpu=device_probe.CPU( + name="Apple M1", + flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "PCLMULQDQ", "DTSE64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "AES", "SEGLIM64"] + ), + oclp_version=None, + opencore_version=None + ) + class iMac: iMac81_Stock = device_probe.Computer( @@ -85,7 +135,30 @@ class iMac: flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "POPCNT", "PCID"] ), oclp_version=None, - opencore_version=None + opencore_version=None, + ) + + iMac122_Upgraded = device_probe.Computer( + real_model="iMac12,2", + real_board_id="Mac-942B59F58194171B", + reported_model="iMac12,2", + reported_board_id="Mac-942B59F58194171B", + gpus=[ + device_probe.Intel(vendor_id=32902, device_id=258, class_code=196608, name="HD Graphics 3000", model=None, pci_path="PciRoot(0x0)/Pci(0x2,0x0)"), + device_probe.AMD(vendor_id=4098, device_id=26600, class_code=196608, name="GFX0", model="Radeon Pro WX4130", pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"), + ], + igpu=device_probe.Intel(vendor_id=32902, device_id=258, class_code=196608, name="HD Graphics 3000", model=None, pci_path="PciRoot(0x0)/Pci(0x2,0x0)"), + dgpu=device_probe.AMD(vendor_id=4098, device_id=26600, class_code=196608, name="GFX0", model="Radeon Pro WX4130", pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"), + storage=[ + device_probe.SATAController(vendor_id=32902, device_id=7170, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)") + ], + wifi=device_probe.Broadcom(vendor_id=5348, device_id=17338, class_code=163840, name="ARPT", model=None, pci_path="PciRoot(0x0)/Pci(0x1c,0x1)/Pci(0x0,0x0)"), + cpu=device_probe.CPU( + name="Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz", + flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "PCLMULQDQ", "DTES64", "MON", "DSCPL", "VMX", "SMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "xAPIC", "POPCNT", "AES", "PCID", "XSAVE", "OSXSAVE", "TSCTMR", "AVX1.0"] + ), + oclp_version=None, + opencore_version=None, ) class MacPro: @@ -162,3 +235,26 @@ class MacPro: oclp_version=None, opencore_version=None, ) + + MacPro31_Modern_Kepler = device_probe.Computer( + # Upgraded Model, Kepler GPU and BCM94360CD + real_model="MacPro3,1", + real_board_id="Mac-F42C88C8", + reported_model="MacPro3,1", + reported_board_id="Mac-F42C88C8", + gpus=[device_probe.NVIDIA(vendor_id=4318, device_id=4737, class_code=196608, name="GFX0", model="NVIDIA GeForce GT 710", pci_path="PciRoot(0x0)/Pci(0x5,0x0)/Pci(0x0,0x0)")], + igpu=None, + dgpu=device_probe.NVIDIA(vendor_id=4318, device_id=4737, class_code=196608, name="GFX0", model="NVIDIA GeForce GT 710", pci_path="PciRoot(0x0)/Pci(0x5,0x0)/Pci(0x0,0x0)"), + storage=[ + device_probe.SATAController(vendor_id=32902, device_id=9857, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)") + ], + wifi=device_probe.Broadcom( + vendor_id=5348, device_id=17312, class_code=163840, name="ARPT", model=None, pci_path="PciRoot(0x0)/Pci(0x1c,0x3)/Pci(0x0,0x0)" + ), + cpu=device_probe.CPU( + name="Intel(R) Xeon(R) CPU X5482 @ 3.20GHz", + flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1"], + ), + oclp_version=None, + opencore_version=None, + )