i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpu_type: cleanup Intel CPU strings some more

Browse Source 
- remove "processor"
- remove repeated spaces
- clean up the "brand" ID as well

Should fix #20191.

Change-Id: Iaadfbf2d3ae6fd2555607e2ed05833ab570079de
Reviewed-on: https://review.haiku-os.org/c/haiku/+/11341
Reviewed-by: waddlesplash <[email protected]>
(cherry picked from commit 8a8ae453bb124a63d33677fb4530d07ad8cd6df7)
Reviewed-on: https://review.haiku-os.org/c/haiku/+/11342
This commit is contained in:
PulkoMandy
2026-07-23 17:22:25 +00:00
committed by waddlesplash
parent 35487c6fba
commit b812cfe777
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/shared/cpu_type.h
+8 -2
View File
@@ -70,8 +70,14 @@ parse_intel(const char* name)
sizeof(buffer) - outIndex); sizeof(buffer) - outIndex);
index += 3; index += 3;
} else if (!strncmp(&name[index], " CPU", 4)) { } else if (!strncmp(&name[index], " CPU", 4)) {
// Cut out the CPU string // Cut out the "CPU" string
index += 3; index += 3;
} else if (!strncmp(&name[index], " processor", 10)) {
// Cut out the "processor" string
index += 9;
} else if (!strncmp(&name[index], " ", 2)) {
// Skip duplicate spaces
index++;
} else if (!strncmp(&name[index], " @", 2)) { } else if (!strncmp(&name[index], " @", 2)) {
// Cut off the remainder // Cut off the remainder
break; break;
@@ -347,7 +353,7 @@ get_cpu_model_string(enum cpu_platform platform, enum cpu_vendor cpuVendor,
// we can use that Brand ID to determine the CPU // we can use that Brand ID to determine the CPU
brandIdName = get_intel_brand_id_string(get_intel_brand_id(), cpuModel); brandIdName = get_intel_brand_id_string(get_intel_brand_id(), cpuModel);
if (brandIdName != NULL) if (brandIdName != NULL)
return brandIdName; return parse_intel(brandIdName);
// Even older CPUs do not return a Brand ID or a Brand String, so we // Even older CPUs do not return a Brand ID or a Brand String, so we
// need to look at Model and Family // need to look at Model and Family