change some defaults

Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
SergeySlice 2022-01-30 21:49:31 +03:00
parent 4c040a5eb5
commit 2aa7f5c42e
2 changed files with 17 additions and 9 deletions

View File

@ -1398,10 +1398,6 @@ UINT16 GetAdvancedCpuType()
case CPU_MODEL_KABYLAKE1:
case CPU_MODEL_KABYLAKE2:
case CPU_MODEL_CANNONLAKE:
case CPU_MODEL_ICELAKE_A:
case CPU_MODEL_ICELAKE_C:
case CPU_MODEL_ICELAKE_D:
case CPU_MODEL_ICELAKE:
case CPU_MODEL_COMETLAKE_S:
case CPU_MODEL_COMETLAKE_Y:
case CPU_MODEL_COMETLAKE_U:
@ -1411,15 +1407,17 @@ UINT16 GetAdvancedCpuType()
case CPU_MODEL_ROCKETLAKE:
if ( gCPUStructure.BrandString.contains("Core(TM) i3") )
return 0x905; // Core i3 - Apple doesn't use it
if ( gCPUStructure.BrandString.contains("Core(TM) i5-1") )
return 0x60A; // Core i5 CometLake
if ( gCPUStructure.BrandString.contains("Core(TM) i5") )
return 0x605; // Core i5
if ( gCPUStructure.BrandString.contains("Core(TM) i7-8") )
return 0x709; // Core i7 CoffeeLake
if ( gCPUStructure.BrandString.contains("Core(TM) i7-9") )
return 0x1005; // Core i7 CoffeeLake
if ( gCPUStructure.BrandString.contains("Core(TM) i7-1") )
return 0x070B; // Core i7 IceLake
if ( gCPUStructure.BrandString.contains("Core(TM) i7") )
if ( gCPUStructure.BrandString.contains("Core(TM) i7-1") )
return 0x100A; // Core i7 CometLake
if ( gCPUStructure.BrandString.contains("Core(TM) i7") )
return 0x705; // Core i7
if ( gCPUStructure.BrandString.contains("Core(TM) i9") )
return 0x1009; // Core i7 CoffeeLake
@ -1435,6 +1433,16 @@ UINT16 GetAdvancedCpuType()
return 0x605;
}
return 0x705;
case CPU_MODEL_ICELAKE_A:
case CPU_MODEL_ICELAKE_C:
case CPU_MODEL_ICELAKE_D:
case CPU_MODEL_ICELAKE:
if ( gCPUStructure.BrandString.contains("Core(TM) i5-1") )
return 0x060B; // Core i5 IceLake
if ( gCPUStructure.BrandString.contains("Core(TM) i7-1") )
return 0x070B; // Core i7 IceLake
return 0x705;
}
}
}

View File

@ -71,7 +71,7 @@
/*
MacBookPro 15,1 (J680AP) 15,2 (J132AP) 15,3 (J780AP) & 15,4 (J213AP)
MacBookPro16,1 (J152FAP) 16,3 (J223AP) & 16,4 (J215AP
MacBookPro16,2 (J214KAP)
MacBookPro16,2 (J214kAP) //small k
MacBookAir8,1 (J140KAP) & 8,2 (J140AAP)
MacBookAir9,1 (J230KAP)
Macmini8,1 (J174AP)
@ -544,7 +544,7 @@ UINT64 GetPlatformFeature(MacModel Model)
case MacBookPro153:
case MacBookPro154:
case MacBookPro161:
case MacBookPro162:
case MacBookPro162: //there is also 0x3A
case MacBookPro163:
case MacBookPro164:
return 0x32;