thelilfrog/cpufetch
1
0
Fork 0
mirror of https://github.com/Dr-Noob/cpufetch.git synced 2026-03-25 16:00:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

[v1.03] Try detecting SoC with nvmem in last place (avoids usless work in Android)

Browse Source
This commit is contained in:
Dr-Noob
2023-04-13 17:41:32 +02:00
parent f28f3ef70d
commit 99fd108d0f
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/arm/soc.c
View File

@@ -799,19 +799,23 @@ struct system_on_chip* get_soc(void) {
soc = guess_soc_from_cpuinfo(soc); soc = guess_soc_from_cpuinfo(soc);
if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) { if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) {
if(soc->raw_name != NULL) if(soc->raw_name != NULL) {
printWarn("SoC detection failed using /proc/cpuinfo: Found '%s' string", soc->raw_name); printWarn("SoC detection failed using /proc/cpuinfo: Found '%s' string", soc->raw_name);
else }
else {
printWarn("SoC detection failed using /proc/cpuinfo: No string found"); printWarn("SoC detection failed using /proc/cpuinfo: No string found");
// If cpufinfo detection fails, try with nvmem }
soc = guess_soc_from_nvmem(soc);
#ifdef __ANDROID__ #ifdef __ANDROID__
soc = guess_soc_from_android(soc); soc = guess_soc_from_android(soc);
if(soc->raw_name == NULL) if(soc->raw_name == NULL) {
printWarn("SoC detection failed using Android: No string found"); printWarn("SoC detection failed using Android: No string found");
else if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) }
else if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) {
printWarn("SoC detection failed using Android: Found '%s' string", soc->raw_name); printWarn("SoC detection failed using Android: Found '%s' string", soc->raw_name);
}
#endif // ifdef __ANDROID__ #endif // ifdef __ANDROID__
// If cpufinfo detection fails, try with nvmem
soc = guess_soc_from_nvmem(soc);
} }
#elif defined __APPLE__ || __MACH__ #elif defined __APPLE__ || __MACH__
soc = guess_soc_apple(soc); soc = guess_soc_apple(soc);