diff --git a/Changelog.md b/Changelog.md index 92d32b6e..8dceda16 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,8 @@ Lilu Changelog ============== +#### v1.4.5 +- Fixed newer CPU generation detection + #### v1.4.4 - Added new CFL connector-less framebuffers: 0x9BC80003, 0x9BC50003, 0x9BC40003 - Fixed KDK support disrespecting file suffixes diff --git a/Lilu.xcodeproj/project.pbxproj b/Lilu.xcodeproj/project.pbxproj index 95fe7926..08ad6cdd 100644 --- a/Lilu.xcodeproj/project.pbxproj +++ b/Lilu.xcodeproj/project.pbxproj @@ -673,7 +673,7 @@ 1C748C1E1C21952C0024EED2 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1140; + LastUpgradeCheck = 1150; ORGANIZATIONNAME = vit9696; TargetAttributes = { 1C748C261C21952C0024EED2 = { @@ -905,7 +905,7 @@ MODULE_NAME = as.vit9696.Lilu; MODULE_START = "$(PRODUCT_NAME)_kern_start"; MODULE_STOP = "$(PRODUCT_NAME)_kern_stop"; - MODULE_VERSION = 1.4.4; + MODULE_VERSION = 1.4.5; OTHER_CFLAGS = ( "-mmmx", "-msse", @@ -969,7 +969,7 @@ MODULE_NAME = as.vit9696.Lilu; MODULE_START = "$(PRODUCT_NAME)_kern_start"; MODULE_STOP = "$(PRODUCT_NAME)_kern_stop"; - MODULE_VERSION = 1.4.4; + MODULE_VERSION = 1.4.5; OTHER_CFLAGS = ( "-mmmx", "-msse", @@ -1083,7 +1083,7 @@ MODULE_NAME = as.vit9696.Lilu; MODULE_START = "$(PRODUCT_NAME)_kern_start"; MODULE_STOP = "$(PRODUCT_NAME)_kern_stop"; - MODULE_VERSION = 1.4.4; + MODULE_VERSION = 1.4.5; OTHER_CFLAGS = ( "-mmmx", "-msse", diff --git a/Lilu/Headers/kern_cpu.hpp b/Lilu/Headers/kern_cpu.hpp index 88d6df62..84b05b1f 100644 --- a/Lilu/Headers/kern_cpu.hpp +++ b/Lilu/Headers/kern_cpu.hpp @@ -83,10 +83,11 @@ namespace CPUInfo { CPU_MODEL_KABYLAKE_ULT = 0x8E, CPU_MODEL_KABYLAKE_ULX = 0x8E, CPU_MODEL_KABYLAKE_DT = 0x9E, - CPU_MODEL_COMETLAKE_S = 0x9F, /* desktop Comet Lake */ CPU_MODEL_CANNONLAKE = 0x66, CPU_MODEL_ICELAKE_Y = 0x7D, CPU_MODEL_ICELAKE_U = 0x7E, + CPU_MODEL_ICELAKE_SP = 0x9F, /* Some variation of Ice Lake */ + CPU_MODEL_COMETLAKE_S = 0xA5, /* desktop CometLake */ CPU_MODEL_COMETLAKE_Y = 0xA5, /* aka 10th generation Amber Lake Y */ CPU_MODEL_COMETLAKE_U = 0xA6, }; diff --git a/Lilu/Sources/kern_cpu.cpp b/Lilu/Sources/kern_cpu.cpp index 8a1580bc..61ea4912 100644 --- a/Lilu/Sources/kern_cpu.cpp +++ b/Lilu/Sources/kern_cpu.cpp @@ -116,11 +116,11 @@ void CPUInfo::init() { break; case CPU_MODEL_ICELAKE_Y: case CPU_MODEL_ICELAKE_U: + case CPU_MODEL_ICELAKE_SP: bdi.cpuGeneration = CpuGeneration::IceLake; break; case CPU_MODEL_COMETLAKE_Y: case CPU_MODEL_COMETLAKE_U: - case CPU_MODEL_COMETLAKE_S: bdi.cpuGeneration = CpuGeneration::CometLake; break; default: