Add a suffix descriptor for the acpi thermal values as a hint for the userland
sysctl tool to print a more readable value for temperatures.
This commit is contained in:
parent
edcf2d2891
commit
c591d41f7c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=134541
@ -563,7 +563,12 @@ show_var(int *oid, int nlen)
|
|||||||
fputs(val, stdout);
|
fputs(val, stdout);
|
||||||
if(*fmt == 'U')
|
if(*fmt == 'U')
|
||||||
printf(hflag ? "%'u" : "%u", *(unsigned int *)p);
|
printf(hflag ? "%'u" : "%u", *(unsigned int *)p);
|
||||||
else
|
else if (*fmt == 'K') {
|
||||||
|
if (*(int *)p < 0)
|
||||||
|
printf("%d", *(int *)p);
|
||||||
|
else
|
||||||
|
printf("%d.%dC", (*(int *)p - 2732) / 10, (*(int *)p - 2732) % 10);
|
||||||
|
} else
|
||||||
printf(hflag ? "%'d" : "%d", *(int *)p);
|
printf(hflag ? "%'d" : "%d", *(int *)p);
|
||||||
val = " ";
|
val = " ";
|
||||||
len -= sizeof(int);
|
len -= sizeof(int);
|
||||||
@ -580,7 +585,12 @@ show_var(int *oid, int nlen)
|
|||||||
fputs(val, stdout);
|
fputs(val, stdout);
|
||||||
if(*fmt == 'U')
|
if(*fmt == 'U')
|
||||||
printf(hflag ? "%'lu" : "%lu", *(unsigned long *)p);
|
printf(hflag ? "%'lu" : "%lu", *(unsigned long *)p);
|
||||||
else
|
else if (*fmt == 'K') {
|
||||||
|
if (*(long *)p < 0)
|
||||||
|
printf("%ld", *(long *)p);
|
||||||
|
else
|
||||||
|
printf("%ld.%ldC", (*(long *)p - 2732) / 10, (*(long *)p - 2732) % 10);
|
||||||
|
} else
|
||||||
printf(hflag ? "%'ld" : "%ld", *(long *)p);
|
printf(hflag ? "%'ld" : "%ld", *(long *)p);
|
||||||
val = " ";
|
val = " ";
|
||||||
len -= sizeof(long);
|
len -= sizeof(long);
|
||||||
|
@ -223,9 +223,9 @@ acpi_tz_attach(device_t dev)
|
|||||||
sc->tz_sysctl_tree = SYSCTL_ADD_NODE(&sc->tz_sysctl_ctx,
|
sc->tz_sysctl_tree = SYSCTL_ADD_NODE(&sc->tz_sysctl_ctx,
|
||||||
SYSCTL_CHILDREN(acpi_tz_sysctl_tree),
|
SYSCTL_CHILDREN(acpi_tz_sysctl_tree),
|
||||||
OID_AUTO, oidname, CTLFLAG_RD, 0, "");
|
OID_AUTO, oidname, CTLFLAG_RD, 0, "");
|
||||||
SYSCTL_ADD_INT(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree),
|
SYSCTL_ADD_OPAQUE(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree),
|
||||||
OID_AUTO, "temperature", CTLFLAG_RD,
|
OID_AUTO, "temperature", CTLFLAG_RD, &sc->tz_temperature,
|
||||||
&sc->tz_temperature, 0, "current thermal zone temperature");
|
sizeof(sc->tz_temperature), "IK", "current thermal zone temperature");
|
||||||
SYSCTL_ADD_PROC(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree),
|
SYSCTL_ADD_PROC(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree),
|
||||||
OID_AUTO, "active", CTLTYPE_INT | CTLFLAG_RW,
|
OID_AUTO, "active", CTLTYPE_INT | CTLFLAG_RW,
|
||||||
sc, 0, acpi_tz_active_sysctl, "I", "");
|
sc, 0, acpi_tz_active_sysctl, "I", "");
|
||||||
@ -236,15 +236,15 @@ acpi_tz_attach(device_t dev)
|
|||||||
SYSCTL_ADD_INT(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree),
|
SYSCTL_ADD_INT(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree),
|
||||||
OID_AUTO, "_PSV", CTLFLAG_RD,
|
OID_AUTO, "_PSV", CTLFLAG_RD,
|
||||||
&sc->tz_zone.psv, 0, "");
|
&sc->tz_zone.psv, 0, "");
|
||||||
SYSCTL_ADD_INT(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree),
|
SYSCTL_ADD_OPAQUE(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree),
|
||||||
OID_AUTO, "_HOT", CTLFLAG_RD,
|
OID_AUTO, "_HOT", CTLFLAG_RD, &sc->tz_zone.hot,
|
||||||
&sc->tz_zone.hot, 0, "");
|
sizeof(sc->tz_zone.hot), "IK", "");
|
||||||
SYSCTL_ADD_INT(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree),
|
SYSCTL_ADD_OPAQUE(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree),
|
||||||
OID_AUTO, "_CRT", CTLFLAG_RD,
|
OID_AUTO, "_CRT", CTLFLAG_RD, &sc->tz_zone.crt,
|
||||||
&sc->tz_zone.crt, 0, "");
|
sizeof(sc->tz_zone.crt), "IK", "");
|
||||||
SYSCTL_ADD_OPAQUE(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree),
|
SYSCTL_ADD_OPAQUE(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree),
|
||||||
OID_AUTO, "_ACx", CTLFLAG_RD, &sc->tz_zone.ac,
|
OID_AUTO, "_ACx", CTLFLAG_RD, &sc->tz_zone.ac,
|
||||||
sizeof(sc->tz_zone.ac), "I", "");
|
sizeof(sc->tz_zone.ac), "IK", "");
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Create our thread; we only need one, it will service all of the
|
* Create our thread; we only need one, it will service all of the
|
||||||
|
Loading…
Reference in New Issue
Block a user