diff --git a/Resources/Constants.py b/Resources/Constants.py index 4b2288071..70898e8cc 100644 --- a/Resources/Constants.py +++ b/Resources/Constants.py @@ -121,6 +121,9 @@ class Constants: self.pci_broadcom = "14E4" self.pci_atheros = "168C" self.pci_apple = "106B" + self.pci_aquantia = "1D6A" + self.pci_marvell = "11AB" + self.pci_syskonnect = "1148" # Class Codes # https://pci-ids.ucw.cz/read/PD @@ -131,6 +134,7 @@ class Constants: self.classcode_gpu = "00000300" self.classcode_gpu_variant = "00800300" self.classcode_xhci = "30030C00" + self.classcode_ethernet = "00000200" # Nvidia GPU Architecture self.arch_tesla = "NV50" diff --git a/Resources/ModelExample.py b/Resources/ModelExample.py index bf69b6900..8638c7a8f 100644 --- a/Resources/ModelExample.py +++ b/Resources/ModelExample.py @@ -69,6 +69,24 @@ class MacBookPro: class Macmini: + Macmini81_Stock = device_probe.Computer( + real_model="Macmini8,1", + real_board_id="Mac-7BA5B2DFE22DDD8C", + reported_model="Macmini8,1", + reported_board_id="Mac-7BA5B2DFE22DDD8C", + gpus=[device_probe.Intel(vendor_id=32902, device_id=16027, class_code=196608, name="IGPU", model="Intel UHD Graphics 630", pci_path="PciRoot(0x0)/Pci(0x2,0x0)")], + igpu=device_probe.Intel(vendor_id=32902, device_id=16027, class_code=196608, name="IGPU", model="Intel UHD Graphics 630", pci_path="PciRoot(0x0)/Pci(0x2,0x0)"), + dgpu=None, + storage=[], + wifi=device_probe.Broadcom(vendor_id=5348, device_id=17508, class_code=163840, name="ARPT", model=None, pci_path="PciRoot(0x0)/Pci(0x1c,0x0)/Pci(0x0,0x0)"), + cpu=device_probe.CPU( + name="Intel(R) Core(TM) i7-8700B CPU @ 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", "PCLMULQDQ", "DTES64", "MON", "DSCPL", "VMX", "SMX", "EST", "TM2", "SSSE3", "FMA", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "x2APIC", "MOVBE", "POPCNT", "AES", "PCID", "XSAVE", "OSXSAVE", "SEGLIM64", "TSCTMR", "AVX1.0", "RDRAND", "F16C"] + ), + oclp_version=None, + opencore_version=None + ) + Macmini91_Stock = device_probe.Computer( # Run under Rosetta real_model="Macmini9,1", diff --git a/Resources/PCIIDArray.py b/Resources/PCIIDArray.py index fa7960415..6974665f4 100644 --- a/Resources/PCIIDArray.py +++ b/Resources/PCIIDArray.py @@ -821,6 +821,33 @@ class intel_ids: 0x8A5B, ] + AppleIntel8254XEthernet = [ + # AppleIntel8254XEthernet IDs + 0x1096, + 0x100F, + 0x105E, + ] + + AppleIntelI210Ethernet = [ + # AppleIntelI210Ethernet IDs + 0x1533, # I210 + 0x15F2, # I225 + 0x15F3, # I225 + 0x3100, # I225 + 0x3101, # I225 + 0x5502, # I225 + 0x0D9F, # I225 + 0x15F8, # I225 + 0x15F7, # I225 + 0x15FD, # I225 + ] + + Intel82574L = [ + # Intel82574L IDs + 0x104B, + 0x10F6, + ] + class broadcom_ids: AirPortBrcmNIC = [ @@ -857,6 +884,82 @@ class broadcom_ids: 0x432D, # BCM4322 - never used by Apple ] + AppleBCM5701Ethernet = [ + # AppleBCM5701Ethernet IDs + 0x1684, + 0x16B0, + 0x16B4, + 0x1682, + 0x1686, + ] + + +class aquantia_ids: + AppleEthernetAquantiaAqtion = [ + # AppleEthernetAquantiaAqtion IDs + 0x0001, # AQC107 + 0xD107, # AQC107 + 0x07B1, # AQC107 + 0x80B1, # AQC107 + 0x87B1, # AQC107 + 0x88B1, # AQC107 + 0x89B1, # AQC107 + 0x91B1, # AQC107 + 0x92B1, # AQC107 + 0x00C0, # AQC113 + 0x04C0, # AQC113 + ] + + +class marvell_ids: + MarvelYukonEthernet = [ + # AppleYukon2.kext IDs + # AppleYukon2 supports 2 vendors (Marvell and SysKonnect) + 0x9E00, + 0x2100, + 0x9E00, + 0x2200, + 0x9E00, + 0x8100, + 0x9E00, + 0x8200, + 0x9E00, + 0x9100, + 0x9E00, + 0x9200, + 0x9000, + 0x2100, + 0x9000, + 0x2200, + 0x9000, + 0x8100, + 0x9000, + 0x8200, + 0x9000, + 0x9100, + 0x9000, + 0x9200, + 0x9E00, + 0x2200, + 0x9E00, + 0x2200, + ] + + +class syskonnect_ids: + MarvelYukonEthernet = [ + # AppleYukon2.kext IDs + # AppleYukon2 supports 2 vendors (Marvell and SysKonnect) + 0x4365, + 0x4360, + 0x435A, + 0x4354, + 0x4362, + 0x4363, + 0x00BA, + 0x436A, + ] + class atheros_ids: AtherosWifi = [