show two-level sensor framework in action; Constantine A. Murenin

3 files changed, 26 insertions, 24 deletions

diff --git a/share/man/man4/ami.4 b/share/man/man4/ami.4
index cd084f07336..a96cc639184 100644
--- a/share/man/man4/ami.4
+++ b/share/man/man4/ami.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ami.4,v 1.39 2006/11/28 11:56:03 deraadt Exp $
+.\"	$OpenBSD: ami.4,v 1.40 2006/12/23 17:50:20 deraadt Exp $
 .\"
 .\" Michael Shalayeff, 2001. Public Domain.
 .\"
@@ -122,10 +122,10 @@ and can be monitored using
 .Xr sensorsd 8 .
 For example:
 .Bd -literal -offset indent
-$ sysctl hw.sensors
-hw.sensors.0=ami0, sd0, drive online, OK
-hw.sensors.1=ami0, sd1, drive degraded, WARNING
-hw.sensors.2=ami0, sd2, drive failed, CRITICAL
+$ sysctl hw.sensors.ami0
+hw.sensors.ami0.drive0=online (sd0), OK
+hw.sensors.ami0.drive1=degraded (sd1), WARNING
+hw.sensors.ami0.drive2=failed (sd2), CRITICAL
 .Ed
 .Sh SEE ALSO
 .Xr bio 4 ,
diff --git a/share/man/man4/fintek.4 b/share/man/man4/fintek.4
index 7e8b926c1a7..7374c615448 100644
--- a/share/man/man4/fintek.4
+++ b/share/man/man4/fintek.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fintek.4,v 1.3 2006/08/26 10:43:31 kettenis Exp $
+.\"	$OpenBSD: fintek.4,v 1.4 2006/12/23 17:50:20 deraadt Exp $
 .\"
 .\" Copyright (c) 2005 Theo de Raadt <deraadt@openbsd.org>
 .\"
@@ -32,14 +32,15 @@ made available through the
 .Xr sysctl 8
 interface:
 .Bd -literal -offset indent
-hw.sensors.0=fintek0, VCC, 1.72 V DC
-hw.sensors.1=fintek0, Volt 1, 1.34 V DC
-hw.sensors.2=fintek0, Volt 2, 1.73 V DC
-hw.sensors.3=fintek0, Volt 3, 0.90 V DC
-hw.sensors.4=fintek0, Temp 1, 31.00 degC
-hw.sensors.5=fintek0, Temp 2, 29.00 degC
-hw.sensors.6=fintek0, FAN1, 0 RPM
-hw.sensors.7=fintek0, FAN1, 0 RPM
+$ sysctl hw.sensors.fintek0
+hw.sensors.fintek0.temp0=31.00 degC
+hw.sensors.fintek0.temp1=29.00 degC
+hw.sensors.fintek0.fan0=0 RPM
+hw.sensors.fintek0.fan1=0 RPM
+hw.sensors.fintek0.volt0=1.72 V DC (VCC)
+hw.sensors.fintek0.volt1=1.34 V DC
+hw.sensors.fintek0.volt2=1.73 V DC
+hw.sensors.fintek0.volt3=0.90 V DC
 .Ed
 .Pp
 On some machines the fans will not function properly with the chip in
diff --git a/share/man/man4/lmenv.4 b/share/man/man4/lmenv.4
index 69a49662e0c..f10e7e31f68 100644
--- a/share/man/man4/lmenv.4
+++ b/share/man/man4/lmenv.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lmenv.4,v 1.9 2006/11/09 02:24:19 brad Exp $
+.\"	$OpenBSD: lmenv.4,v 1.10 2006/12/23 17:50:20 deraadt Exp $
 .\"
 .\" Copyright (c) 2005 Theo de Raadt <deraadt@openbsd.org>
 .\"
@@ -33,15 +33,16 @@ made available through the
 .Xr sysctl 8
 interface:
 .Bd -literal -offset indent
-hw.sensors.0=lmenv0, +2.5Vin, 2.62 V DC
-hw.sensors.1=lmenv0, Vccp1, 1.49 V DC
-hw.sensors.2=lmenv0, +Vcc, 3.28 V DC
-hw.sensors.3=lmenv0, +5Vin/Vcc, 5.03 V DC
-hw.sensors.4=lmenv0, +12Vin, 12.00 V DC
-hw.sensors.5=lmenv0, Vccp2, 1.20 V DC
-hw.sensors.6=lmenv0, External Temp, -128.00 degC
-hw.sensors.7=lmenv0, Internal Temp, 29.00 degC
-hw.sensors.8=lmenv0, FAN1, 3220 RPM
+$ sysctl hw.sensors.lmenv0
+hw.sensors.lmenv0.temp0=-128.00 degC (External)
+hw.sensors.lmenv0.temp1=29.00 degC (Internal)
+hw.sensors.lmenv0.fan0=3220 RPM
+hw.sensors.lmenv0.volt0=2.62 V DC (+2.5Vin)
+hw.sensors.lmenv0.volt1=1.49 V DC (Vccp)
+hw.sensors.lmenv0.volt2=3.28 V DC (+Vcc)
+hw.sensors.lmenv0.volt3=5.03 V DC (+5Vin/Vcc)
+hw.sensors.lmenv0.volt4=12.00 V DC (+12Vin)
+hw.sensors.lmenv0.volt5=1.20 V DC (Vccp)
 .Ed
 .Sh SEE ALSO
 .Xr iic 4 ,