ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12469 from CTCaer/unix-sysfs-battery-fix 

plat: unix: get better battery stats on sysfs nodes
This commit is contained in:
Autechre 2021-06-03 20:06:44 +02:00 committed by GitHub
parent 4ed88ec68a 86f8670d0b
commit f0c9c542a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
frontend/drivers/platform_unix.c
View File

@ -818,8 +818,8 @@ end:
buf_info = NULL; buf_info = NULL;
} }
static void check_proc_acpi_sysfs_battery(const char *node, static void check_proc_acpi_sysfs_battery(const char *node,
bool *have_battery, bool *charging, bool *have_battery, bool *charging, int *seconds,
int *seconds, int *percent) int *percent, int *valid_pct_idx)
{ {
char path[1024]; char path[1024];
const char *base = proc_acpi_sysfs_battery_path; const char *base = proc_acpi_sysfs_battery_path;
@ -838,6 +838,22 @@ static void check_proc_acpi_sysfs_battery(const char *node,
path[0] = '\0'; path[0] = '\0';
/* Stat type. Avoid unknown or device supplies. Missing is considered System. */
snprintf(path, sizeof(path), "%s/%s/%s", base, node, "scope");
if (filestream_exists(path) != 0)
{
if (filestream_read_file(path, (void**)&buf, &length) == 1 && buf)
{
if (strstr((char*)buf, "Unknown"))
goto end;
else if (strstr((char*)buf, "Device"))
goto end;
free(buf);
buf = NULL;
}
}
snprintf(path, sizeof(path), "%s/%s/%s", base, node, "status"); snprintf(path, sizeof(path), "%s/%s/%s", base, node, "status");
if (!filestream_exists(path)) if (!filestream_exists(path))
@ -858,17 +874,21 @@ static void check_proc_acpi_sysfs_battery(const char *node,
else if (strstr((char*)buf, "Full")) else if (strstr((char*)buf, "Full"))
*have_battery = true; *have_battery = true;
free(buf); free(buf);
buf = NULL;
} }
buf = NULL;
snprintf(path, sizeof(path), "%s/%s/%s", base, node, "capacity"); snprintf(path, sizeof(path), "%s/%s/%s", base, node, "capacity");
if (filestream_read_file(path, (void**)&buf, &length) != 1) if (filestream_read_file(path, (void**)&buf, &length) != 1)
goto end; goto end;
capacity = atoi(buf); capacity = atoi(buf);
*percent = capacity; /*
* Keep record of valid capacities for calculating an average
* on systems with backup battery supplies.
*/
(*valid_pct_idx)++;
(*percent) += capacity;
end: end:
free(buf); free(buf);
@ -1103,6 +1123,7 @@ static bool frontend_unix_powerstate_check_acpi_sysfs(
bool have_battery = false; bool have_battery = false;
bool have_ac = false; bool have_ac = false;
bool charging = false; bool charging = false;
int valid_pct_idx = 0;
struct RDIR *entry = retro_opendir(proc_acpi_sysfs_battery_path); struct RDIR *entry = retro_opendir(proc_acpi_sysfs_battery_path);
if (!entry) if (!entry)
goto error; goto error;
@ -1116,9 +1137,13 @@ static bool frontend_unix_powerstate_check_acpi_sysfs(
if (node && (strstr(node, "BAT") || strstr(node, "battery"))) if (node && (strstr(node, "BAT") || strstr(node, "battery")))
check_proc_acpi_sysfs_battery(node, check_proc_acpi_sysfs_battery(node,
&have_battery, &charging, seconds, percent); &have_battery, &charging, seconds, percent, &valid_pct_idx);
} }
/* Get average percentage */
if (valid_pct_idx)
(*percent) /= valid_pct_idx;
retro_closedir(entry); retro_closedir(entry);
entry = retro_opendir(proc_acpi_sysfs_ac_adapter_path); entry = retro_opendir(proc_acpi_sysfs_ac_adapter_path);