Module Name: src
Committed By: mlelstv
Date: Sat Oct 4 13:18:34 UTC 2014
Modified Files:
src/sys/arch/evbarm/rpi: rpi_vcmbox.c
Log Message:
be verbose about sysmon error.
enable monitoring.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/rpi/rpi_vcmbox.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/arch/evbarm/rpi/rpi_vcmbox.c
diff -u src/sys/arch/evbarm/rpi/rpi_vcmbox.c:1.3 src/sys/arch/evbarm/rpi/rpi_vcmbox.c:1.4
--- src/sys/arch/evbarm/rpi/rpi_vcmbox.c:1.3 Tue Apr 1 06:55:29 2014
+++ src/sys/arch/evbarm/rpi/rpi_vcmbox.c Sat Oct 4 13:18:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_vcmbox.c,v 1.3 2014/04/01 06:55:29 skrll Exp $ */
+/* $NetBSD: rpi_vcmbox.c,v 1.4 2014/10/04 13:18:34 mlelstv Exp $ */
/*-
* Copyright (c) 2013 Jared D. McNeill <[email protected]>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rpi_vcmbox.c,v 1.3 2014/04/01 06:55:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_vcmbox.c,v 1.4 2014/10/04 13:18:34 mlelstv Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -152,7 +152,11 @@ vcmbox_attach(device_t parent, device_t
sc->sc_sme->sme_refresh = vcmbox_sensor_refresh;
sc->sc_sme->sme_get_limits = vcmbox_sensor_get_limits;
vcmbox_create_sensors(sc);
- sysmon_envsys_register(sc->sc_sme);
+ if (sysmon_envsys_register(sc->sc_sme) == 0)
+ return;
+
+ aprint_error_dev(self, "unable to register with sysmon\n");
+ sysmon_envsys_destroy(sc->sc_sme);
}
static int
@@ -355,7 +359,8 @@ vcmbox_create_sensors(struct vcmbox_soft
sc->sc_sensor[VCMBOX_SENSOR_TEMP].sensor = VCMBOX_SENSOR_TEMP;
sc->sc_sensor[VCMBOX_SENSOR_TEMP].units = ENVSYS_STEMP;
sc->sc_sensor[VCMBOX_SENSOR_TEMP].state = ENVSYS_SINVALID;
- sc->sc_sensor[VCMBOX_SENSOR_TEMP].flags = ENVSYS_FHAS_ENTROPY;
+ sc->sc_sensor[VCMBOX_SENSOR_TEMP].flags = ENVSYS_FMONLIMITS |
+ ENVSYS_FHAS_ENTROPY;
strlcpy(sc->sc_sensor[VCMBOX_SENSOR_TEMP].desc,
vcmbox_sensor_name[VCMBOX_SENSOR_TEMP],
sizeof(sc->sc_sensor[VCMBOX_SENSOR_TEMP].desc));
