Module Name: src
Committed By: jruoho
Date: Fri Dec 31 08:17:55 UTC 2010
Modified Files:
src/sys/dev/acpi: thinkpad_acpi.c
Log Message:
Use "temperature #" and "fan speed #" rather than "TMP#" and "FAN#" for the
sensor names. Remove white space. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/acpi/thinkpad_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.31 src/sys/dev/acpi/thinkpad_acpi.c:1.32
--- src/sys/dev/acpi/thinkpad_acpi.c:1.31 Mon Oct 25 07:48:03 2010
+++ src/sys/dev/acpi/thinkpad_acpi.c Fri Dec 31 08:17:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.31 2010/10/25 07:48:03 jruoho Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.32 2010/12/31 08:17:54 jruoho Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.31 2010/10/25 07:48:03 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.32 2010/12/31 08:17:54 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -315,7 +315,7 @@
ACPI_STATUS rv;
ACPI_INTEGER val;
int type, event;
-
+
for (;;) {
rv = acpi_eval_integer(sc->sc_node->ad_handle, "MHKP", &val);
if (ACPI_FAILURE(rv)) {
@@ -470,7 +470,7 @@
sc->sc_sensor[i].units = ENVSYS_STEMP;
(void)snprintf(sc->sc_sensor[i].desc,
- sizeof(sc->sc_sensor[i].desc), "TMP%d", i);
+ sizeof(sc->sc_sensor[i].desc), "temperature %d", i);
if (sysmon_envsys_sensor_attach(sc->sc_sme,
&sc->sc_sensor[i]) != 0)
@@ -482,7 +482,7 @@
sc->sc_sensor[i].units = ENVSYS_SFANRPM;
(void)snprintf(sc->sc_sensor[i].desc,
- sizeof(sc->sc_sensor[i].desc), "FAN%d", j);
+ sizeof(sc->sc_sensor[i].desc), "fan speed %d", j);
if (sysmon_envsys_sensor_attach(sc->sc_sme,
&sc->sc_sensor[i]) != 0)
@@ -631,7 +631,7 @@
if (sc->sc_cmoshdl_valid == false)
return;
-
+
rv = acpi_eval_set_integer(sc->sc_cmoshdl, NULL, cmd);
if (ACPI_FAILURE(rv))
aprint_error_dev(sc->sc_dev, "couldn't evalute CMOS: %s\n",
