cpu_type: cleanup Intel CPU strings some more

- 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

headers/private/shared/cpu_type.h

@@ -70,8 +70,14 @@ parse_intel(const char* name)
 				sizeof(buffer) - outIndex);
 			index += 3;
 		} else if (!strncmp(&name[index], " CPU", 4)) {
-			// Cut out the CPU string
+			// Cut out the "CPU" string
 			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)) {
 			// Cut off the remainder
 			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
 		brandIdName = get_intel_brand_id_string(get_intel_brand_id(), cpuModel);
 		if (brandIdName != NULL)
-			return brandIdName;
+			return parse_intel(brandIdName);
 
 		// Even older CPUs do not return a Brand ID or a Brand String, so we
 		// need to look at Model and Family