vtorri
/
evisum
forked from enlightenment/evisum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

OpenBSD: Detect thermal zones properly.

This commit is contained in:
Alastair Poole 2020-06-16 15:21:06 +01:00
parent ab66aa95e8
commit 7dd5077692
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/system/machine.c
View File

@ -642,13 +642,13 @@ _sensors_thermal_get(Sys_Info *sysinfo)
{
sensor_t **sensors = sysinfo->sensors;
#if defined(__OpenBSD__) || defined(__NetBSD__)
sensor_t *sensor;
int mibs[5] = { CTL_HW, HW_SENSORS, 0, 0, 0 };
int devn, n;
struct sensor snsr;
size_t slen = sizeof(struct sensor);
struct sensordev snsrdev;
size_t sdlen = sizeof(struct sensordev);
sensor_t *sensor;
for (devn = 0;; devn++)
{
@ -660,16 +660,6 @@ _sensors_thermal_get(Sys_Info *sysinfo)
continue;
}
if ((strcmp("cpu0", snsrdev.xname)) && (strcmp("kmo", snsrdev.xname)) &&
(strcmp("acpitz0", snsrdev.xname)) && (strncmp("bcmt", snsrdev.xname, 4)))
{
continue;
}
sensors = realloc(sensors, 1 + sysinfo->snsr_count * sizeof(sensor_t *));
sensors[sysinfo->snsr_count++] = sensor = calloc(1, sizeof(sensor_t));
sensor->name = strdup(snsrdev.xname);
for (n = 0; n < snsrdev.maxnumt[SENSOR_TEMP]; n++)
{
mibs[4] = n;
@ -681,10 +671,15 @@ _sensors_thermal_get(Sys_Info *sysinfo)
break;
}
if (sysctl(mibs, 5, &snsr, &slen, NULL, 0) != -1)
sensor->value = (snsr.value - 273150000) / 1000000.0;
else
sensor->invalid = true;
if (sysctl(mibs, 5, &snsr, &slen, NULL, 0) == -1)
continue;
if (snsr.type != SENSOR_TEMP)
continue;
sensors = realloc(sensors, 1 + sysinfo->snsr_count * sizeof(sensor_t *));
sensors[sysinfo->snsr_count++] = sensor = calloc(1, sizeof(sensor_t));
sensor->name = strdup(snsrdev.xname);
sensor->value = (snsr.value - 273150000) / 1000000.0; // (uK -> C)
}
#elif defined(__FreeBSD__) || defined(__DragonFly__)
unsigned int value;