As suggested by Sverre Froyen in a follow-up to PR # 41698, change the

sensor names to real words (e.g. "temperature 1" instead of "TEMP_1").
No functional change; only consistent envstat(8) output with other sensors.
This commit is contained in:
jruoho 2011-02-16 10:08:05 +00:00
parent bfc2d6ad4a
commit ea9b26744b
1 changed files with 11 additions and 11 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: aps.c,v 1.13 2011/01/18 16:45:11 jmcneill Exp $ */
/* $NetBSD: aps.c,v 1.14 2011/02/16 10:08:05 jruoho Exp $ */
/* $OpenBSD: aps.c,v 1.15 2007/05/19 19:14:11 tedu Exp $ */
/* $OpenBSD: aps.c,v 1.17 2008/06/27 06:08:43 canacar Exp $ */
/*
@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: aps.c,v 1.13 2011/01/18 16:45:11 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: aps.c,v 1.14 2011/02/16 10:08:05 jruoho Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -326,15 +326,15 @@ aps_attach(device_t parent, device_t self, void *aux)
strlcpy(sc->sc_sensor[idx].desc, string, \
sizeof(sc->sc_sensor[idx].desc));
INITDATA(APS_SENSOR_XACCEL, ENVSYS_INTEGER, "X_ACCEL");
INITDATA(APS_SENSOR_YACCEL, ENVSYS_INTEGER, "Y_ACCEL");
INITDATA(APS_SENSOR_TEMP1, ENVSYS_STEMP, "TEMP_1");
INITDATA(APS_SENSOR_TEMP2, ENVSYS_STEMP, "TEMP_2");
INITDATA(APS_SENSOR_XVAR, ENVSYS_INTEGER, "X_VAR");
INITDATA(APS_SENSOR_YVAR, ENVSYS_INTEGER, "Y_VAR");
INITDATA(APS_SENSOR_KBACT, ENVSYS_INDICATOR, "Keyboard Active");
INITDATA(APS_SENSOR_MSACT, ENVSYS_INDICATOR, "Mouse Active");
INITDATA(APS_SENSOR_LIDOPEN, ENVSYS_INDICATOR, "Lid Open");
INITDATA(APS_SENSOR_XACCEL, ENVSYS_INTEGER, "x-acceleration");
INITDATA(APS_SENSOR_YACCEL, ENVSYS_INTEGER, "y-acceleration");
INITDATA(APS_SENSOR_TEMP1, ENVSYS_STEMP, "temperature 1");
INITDATA(APS_SENSOR_TEMP2, ENVSYS_STEMP, "temperature 2");
INITDATA(APS_SENSOR_XVAR, ENVSYS_INTEGER, "x-variable");
INITDATA(APS_SENSOR_YVAR, ENVSYS_INTEGER, "y-variable");
INITDATA(APS_SENSOR_KBACT, ENVSYS_INDICATOR, "keyboard active");
INITDATA(APS_SENSOR_MSACT, ENVSYS_INDICATOR, "mouse active");
INITDATA(APS_SENSOR_LIDOPEN, ENVSYS_INDICATOR, "lid open");
sc->sc_sme = sysmon_envsys_create();
for (i = 0; i < APS_NUM_SENSORS; i++) {