preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-11 07:03:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use Android system props for CPU info fallback.

Browse Source 
Some devices don't provide any useful information at all, such as the
Galaxy S7.
This commit is contained in:
Unknown W. Brackets
2016-05-23 21:18:57 -07:00
parent 8d87a5b7a2
commit 70c78effb0
1 changed files with 54 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/ArmCPUDetect.cpp
+54 -32
View File
@@ -23,6 +23,9 @@
#ifdef BLACKBERRY
#include <bps/deviceinfo.h>
#endif
#ifdef ANDROID
#include <sys/system_properties.h>
#endif
// Only Linux platforms have /proc/cpuinfo
#if defined(__linux__)
@@ -30,51 +33,70 @@ const char procfile[] = "/proc/cpuinfo";
// https://www.kernel.org/doc/Documentation/ABI/testing/sysfs-devices-system-cpu
const char syscpupresentfile[] = "/sys/devices/system/cpu/present";
std::string GetCPUString()
{
std::string line, marker = "Hardware\t: ";
std::string cpu_string = "Unknown";
std::string GetCPUString() {
std::string cpu_string;
std::fstream file;
if (!File::OpenCPPFile(file, procfile, std::ios::in))
return cpu_string;
while (std::getline(file, line))
{
if (line.find(marker) != std::string::npos)
{
cpu_string = line.substr(marker.length());
if (cpu_string.back() == '\n')
cpu_string.pop_back(); // Drop the new-line character
if (File::OpenCPPFile(file, procfile, std::ios::in)) {
std::string line, marker = "Hardware\t: ";
while (std::getline(file, line)) {
if (line.find(marker) != std::string::npos) {
cpu_string = line.substr(marker.length());
}
}
}
#ifdef ANDROID
if (cpu_string.empty()) {
char temp[PROP_VALUE_MAX];
if (__system_property_get("ro.product.board", temp) != 0) {
cpu_string = temp;
} else if (__system_property_get("ro.product.name", temp) != 0) {
cpu_string = temp;
}
}
#endif
if (cpu_string.empty())
cpu_string = "Unknown";
else if (cpu_string.back() == '\n')
cpu_string.pop_back(); // Drop the new-line character
return cpu_string;
}
std::string GetCPUBrandString()
{
std::string line, marker = "Processor\t: ";
std::string brand_string = "Unknown";
std::string GetCPUBrandString() {
std::string brand_string;
std::fstream file;
if (!File::OpenCPPFile(file, procfile, std::ios::in))
return brand_string;
while (std::getline(file, line))
{
if (line.find(marker) != std::string::npos)
{
brand_string = line.substr(marker.length());
if (brand_string.back() == '\n')
brand_string.pop_back(); // Drop the new-line character
if (brand_string.length() == 0 || isdigit(brand_string[0])) {
brand_string = "Unknown";
continue;
if (File::OpenCPPFile(file, procfile, std::ios::in)) {
std::string line, marker = "Processor\t: ";
while (std::getline(file, line)) {
if (line.find(marker) != std::string::npos) {
brand_string = line.substr(marker.length());
if (brand_string.length() != 0 && !isdigit(brand_string[0])) {
break;
}
}
break;
}
}
#ifdef ANDROID
if (brand_string.empty()) {
char temp[PROP_VALUE_MAX];
if (__system_property_get("ro.product.model", temp) != 0) {
brand_string = temp;
} else if (__system_property_get("ro.product.name", temp) != 0) {
brand_string = temp;
}
}
#endif
if (brand_string.empty())
brand_string = "Unknown";
else if (brand_string.back() == '\n')
brand_string.pop_back(); // Drop the new-line character
return brand_string;
}