Use 'Cores' instead of 'Threads' for ARM.

This commit is contained in:
Sacha 2013-10-15 15:28:19 +10:00
parent 2d7b58d64a
commit be47964ff2
3 changed files with 8 additions and 4 deletions

View File

@ -208,9 +208,9 @@ void CPUInfo::Detect()
continue;
if (strncmp(buf + sizeof(marker) - 1, qcCPU, sizeof(qcCPU) - 1) == 0) {
isVFP4 = true;
strcpy(brand_string, "Qualcomm\n");
strcpy(brand_string, "Qualcomm ");
} else {
strcpy(brand_string, "TI\n");
strcpy(brand_string, "TI ");
}
strncat(brand_string, buf + sizeof(marker) - 1, strlen(buf) - sizeof(marker));
break;
@ -218,7 +218,7 @@ void CPUInfo::Detect()
fclose(fp);
}
#elif defined(SYMBIAN)
strcpy(brand_string, "Samsung\nARMv6");
strcpy(brand_string, "Samsung ARMv6");
#endif
// Hardcode this for now
bSwp = true;

View File

@ -149,7 +149,11 @@ void SystemInfoScreen::CreateViews() {
deviceSpecs->Add(new InfoItem("Lang/Region", System_GetProperty(SYSPROP_LANGREGION)));
deviceSpecs->Add(new ItemHeader("CPU Information"));
deviceSpecs->Add(new InfoItem("Name", cpu_info.brand_string));
#ifdef ARM
deviceSpecs->Add(new InfoItem("Cores", StringFromInt(cpu_info.num_cores)));
#else
deviceSpecs->Add(new InfoItem("Threads", StringFromInt(cpu_info.num_cores)));
#endif
deviceSpecs->Add(new ItemHeader("GPU Information"));
deviceSpecs->Add(new InfoItem("Vendor", (char *)glGetString(GL_VENDOR)));
deviceSpecs->Add(new InfoItem("Model", (char *)glGetString(GL_RENDERER)));

2
native

@ -1 +1 @@
Subproject commit e72a6d405849c01de6e55b340a416c1b104101b9
Subproject commit 5e1a52a84146f17e010dfbe8191f14eaf2d99dab