Backout sensors framework.

Requested by:	phk
Discussed on:	cvs-all

7 files changed, 7 insertions, 453 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 0315508..b8a69c4 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -131,7 +131,6 @@ MAN=	aac.4 \
 	iscsi_initiator.4 \
 	isp.4 \
 	ispfw.4 \
-	${_it.4} \
 	iwi.4 \
 	ixgb.4 \
 	joy.4 \
@@ -144,7 +143,6 @@ MAN=	aac.4 \
 	le.4 \
 	led.4 \
 	lge.4 \
-	lm.4 \
 	lmc.4 \
 	lo.4 \
 	lp.4 \
@@ -550,7 +548,6 @@ _if_nfe.4=	if_nfe.4
 _if_nve.4=	if_nve.4
 _if_nxge.4=	if_nxge.4
 _ipmi.4=	ipmi.4
-_it.4=		it.4
 _nfe.4=		nfe.4
 _nfsmb.4=	nfsmb.4
 _nve.4=		nve.4
diff --git a/share/man/man4/coretemp.4 b/share/man/man4/coretemp.4
index 52f5fd9..ce4eb36 100644
--- a/share/man/man4/coretemp.4
+++ b/share/man/man4/coretemp.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 13, 2007
+.Dd August 23, 2007
 .Dt CORETEMP 4
 .Os
 .Sh NAME
@@ -51,20 +51,12 @@ The
 driver provides support for the on-die digital thermal sensor present
 in Intel Core and newer CPUs.
 .Pp
-The values are exposed through the
-.Dv HW_SENSORS
-.Xr sysctl 3
-tree.
-For example:
-.Bd -literal -offset indent
-%sysctl hw.sensors
-hw.sensors.cpu0.temp0: 28.00 degC
-hw.sensors.cpu1.temp0: 29.00 degC
-.Ed
+The
+.Nm
+driver reports each core's temperature through a sysctl node in the
+corresponding CPU device's sysctl tree, named
+.Va dev.cpu.%d.temperature .
 .Sh SEE ALSO
-.Xr systat 1 ,
-.Xr sysctl 3 ,
-.Xr sensorsd 8 ,
 .Xr sysctl 8
 .Sh HISTORY
 The
diff --git a/share/man/man4/it.4 b/share/man/man4/it.4
deleted file mode 100644
index 9e90aa1..0000000
--- a/share/man/man4/it.4
+++ /dev/null
@@ -1,105 +0,0 @@
-.\"	$OpenBSD: it.4,v 1.8 2006/09/08 15:09:14 jmc Exp $
-.\"
-.\" Copyright (c) 2003 Julien Bordet <zejames@greygats.org>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd September 13, 2007
-.Dt IT 4
-.Os
-.Sh NAME
-.Nm it
-.Nd "ITE IT8705F/12F/16F and SiS SiS950 Super I/O Hardware Monitor"
-.Sh SYNOPSIS
-.Cd "device isa"
-.Cd "device it"
-.Pp
-In
-.Pa /boot/device.hints :
-.Cd hint.it.0.at="isa"
-.Cd hint.it.0.port="0x290"
-.Cd hint.it.1.at="isa"
-.Cd hint.it.1.port="0xc00"
-.Cd hint.it.2.at="isa"
-.Cd hint.it.2.port="0xd00"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for the
-.Tn IT8705F , IT8712F , IT8716F
-and
-.Tn SiS950
-hardware monitors.
-The values are exposed through the
-.Dv HW_SENSORS
-.Xr sysctl 3
-interface.
-.Pp
-Most supported devices possess 15 sensors:
-.Bl -column ".Sy Sensor" ".Sy Units" ".Sy Typical" -offset indent
-.It Sy "Sensor" Ta Sy "Units" Ta Sy "Typical Use"
-.It Li "Fan0" Ta "RPM" Ta "CPU Fan"
-.It Li "Fan1" Ta "RPM" Ta "Fan"
-.It Li "Fan2" Ta "RPM" Ta "Fan"
-.It Li "IN0" Ta "uV DC" Ta "Core voltage"
-.It Li "IN1" Ta "uV DC" Ta "Core voltage"
-.It Li "IN2" Ta "uV DC" Ta "+3.3V"
-.It Li "IN3" Ta "uV DC" Ta "+5V"
-.It Li "IN4" Ta "uV DC" Ta "+12V"
-.It Li "IN5" Ta "uV DC" Ta "Unknown"
-.It Li "IN6" Ta "uV DC" Ta "-12V"
-.It Li "IN7" Ta "uV DC" Ta "-5V"
-.It Li "IN8" Ta "uV DC" Ta "VBAT"
-.It Li "Temp" Ta "uK" Ta "Motherboard Temperature"
-.It Li "Temp" Ta "uK" Ta "Motherboard Temperature"
-.It Li "Temp" Ta "uK" Ta "CPU Temperature"
-.El
-.Pp
-For some devices, sensors' names and numbers will be different.
-.Sh SEE ALSO
-.Xr systat 1 ,
-.Xr sysctl 3 ,
-.Xr sensorsd 8 ,
-.Xr sysctl 8
-.Sh HISTORY
-The
-.Nm
-driver first appeared in
-.Ox 3.4 .
-.Fx
-support was added in
-.Fx 8.0 .
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm
-driver was written by
-.An Julien Bordet Aq zejames@greyhats.org .
-It was ported to
-.Fx
-by
-.An Constantine A. Murenin Aq cnst@FreeBSD.org
-as a part of a Google Summer of Code 2007 project.
-.Sh BUGS
-Interrupt support is unimplemented.
diff --git a/share/man/man4/lm.4 b/share/man/man4/lm.4
deleted file mode 100644
index 462962f..0000000
--- a/share/man/man4/lm.4
+++ /dev/null
@@ -1,139 +0,0 @@
-.\"	$OpenBSD: lm.4,v 1.16 2007/05/26 22:38:55 cnst Exp $
-.\"	$NetBSD: lm.4,v 1.11 2001/09/22 01:22:49 wiz Exp $
-.\"
-.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Bill Squier.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"        This product includes software developed by the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd August 19, 2007
-.Dt LM 4
-.Os
-.Sh NAME
-.Nm lm
-.Nd "NatSemi LM78/79/81 and Winbond Super I/O Hardware Monitor"
-.Sh SYNOPSIS
-.Cd "device isa"
-.Cd "device lm"
-.Pp
-In
-.Pa /boot/device.hints :
-.Cd hint.lm.0.at="isa"
-.Cd hint.lm.0.port="0x290"
-.Cd hint.lm.1.at="isa"
-.Cd hint.lm.1.port="0x280"
-.Cd hint.lm.2.at="isa"
-.Cd hint.lm.2.port="0x310"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for the
-.Tn National Semiconductor
-LM 78/79/81 and
-.Tn Winbond
-Super I/O
-hardware monitors,
-and registers compatible chips under the
-.Dv HW_SENSORS
-.Xr sysctl 3
-tree.
-.Sh HARDWARE
-Chips supported by the
-.Nm
-driver include:
-.Pp
-.Bl -dash -offset indent -compact
-.It
-National Semiconductor LM78 and LM78-J
-.It
-National Semiconductor LM79
-.It
-National Semiconductor LM81
-.It
-Winbond W83627HF, W83627THF, W83637HF and W83697HF
-.It
-Winbond W83627DHG and W83627EHF
-.It
-Winbond W83781D, W83782D and W83783S
-.It
-Winbond W83791D, W83791SD and W83792D
-.It
-ASUS AS99127F
-.El
-.Sh SEE ALSO
-.Xr systat 1 ,
-.Xr sysctl 3 ,
-.Xr sensorsd 8 ,
-.Xr sysctl 8
-.Sh HISTORY
-The
-.Nm
-driver first appeared in
-.Nx 1.5 ;
-.Ox
-support was added in
-.Ox 3.4 ;
-.Fx
-support was added in
-.Fx 8.0 .
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm
-driver was written by
-.An Bill Squier
-and ported to
-.Ox 3.4
-by
-.An Alexander Yurchenko Aq grange@openbsd.org .
-The driver was largely rewritten for
-.Ox 3.9
-by
-.An Mark Kettenis Aq kettenis@openbsd.org .
-The driver was then ported to
-.Fx
-by
-.An Constantine A. Murenin Aq cnst@FreeBSD.org
-as a part of a Google Summer of Code 2007 project.
-.Sh CAVEATS
-Some vendors connect these chips to non-standard thermal diodes and
-resistors.
-This will result in bogus sensor values.
-.Sh BUGS
-Interrupt support is unimplemented.
-.Pp
-There are currently no known pnpbios IDs assigned to LM chips.
-.Pp
-This driver attaches to the Winbond W83791SD chip even though that
-chip does not have any sensors.
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index d6a76df..2fe27c7 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 13, 2007
+.Dd September 3, 2007
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -222,22 +222,6 @@ is set to
 these are the flags to pass to the
 .Xr powerd 8
 daemon.
-.It Va sensorsd_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-Setting this to
-.Dq Li YES
-enables
-.Xr sensorsd 8 ,
-a sensors monitoring and logging daemon.
-.It Va sensorsd_flags
-.Pq Vt str
-Empty by default.
-This variable contains additional flags passed to the
-.Xr sensorsd 8
-program.
 .It Va tmpmfs
 Controls the creation of a
 .Pa /tmp
@@ -3902,7 +3886,6 @@ enable support for sound mixer.
 .Xr rpc.statd 8 ,
 .Xr rwhod 8 ,
 .Xr savecore 8 ,
-.Xr sensorsd 8 ,
 .Xr sshd 8 ,
 .Xr swapon 8 ,
 .Xr sysctl 8 ,
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 68a6ffe..bf6bcad 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -209,7 +209,6 @@ MAN=	accept_filter.9 \
 	securelevel_gt.9 \
 	selrecord.9 \
 	sema.9 \
-	sensor_attach.9 \
 	sf_buf.9 \
 	signal.9 \
 	sleep.9 \
@@ -976,13 +975,6 @@ MLINKS+=sema.9 sema_destroy.9 \
 	sema.9 sema_trywait.9 \
 	sema.9 sema_value.9 \
 	sema.9 sema_wait.9
-MLINKS+=sensor_attach.9 sensordev_install.9 \
-	sensor_attach.9 sensordev_deinstall.9 \
-	sensor_attach.9 sensor_detach.9 \
-	sensor_attach.9 ksensordev.9 \
-	sensor_attach.9 ksensor.9 \
-	sensor_attach.9 sensor_task_register.9 \
-	sensor_attach.9 sensor_task_unregister.9
 MLINKS+=sf_buf.9 sf_buf_alloc.9 \
 	sf_buf.9 sf_buf_free.9 \
 	sf_buf.9 sf_buf_kva.9 \
diff --git a/share/man/man9/sensor_attach.9 b/share/man/man9/sensor_attach.9
deleted file mode 100644
index dea8d4f..0000000
--- a/share/man/man9/sensor_attach.9
+++ /dev/null
@@ -1,166 +0,0 @@
-.\"	$OpenBSD: sensor_attach.9,v 1.4 2007/03/22 16:55:31 deraadt Exp $
-.\"
-.\" Copyright (c) 2006 Michael Knudsen <mk@openbsd.org>
-.\" Copyright (c) 2006 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-.\" THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-.\" EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-.\" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-.\" OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd August 19, 2007
-.Dt SENSOR_ATTACH 9
-.Os
-.Sh NAME
-.Nm sensor_attach ,
-.Nm sensor_detach ,
-.Nm sensordev_install ,
-.Nm sensordev_deinstall ,
-.Nm sensor_task_register ,
-.Nm sensor_task_unregister
-.Nd sensors framework
-.Sh SYNOPSIS
-.In sys/sensors.h
-.Ft void
-.Fn "sensordev_install" "struct ksensordev *sensdev"
-.Ft void
-.Fn "sensordev_deinstall" "struct ksensordev *sensdev"
-.Ft void
-.Fn "sensor_attach" "struct ksensordev *sensdev" "struct ksensor *sens"
-.Ft void
-.Fn "sensor_detach" "struct ksensordev *sensdev" "struct ksensor *sens"
-.Ft int
-.Fn "sensor_task_register" "void *arg" "void (*func)(void *)" "int period"
-.Ft void
-.Fn "sensor_task_unregister" "void *arg"
-.Sh DESCRIPTION
-The
-sensors
-framework API provides a mechanism for manipulation of hardware sensors
-that are available under the
-.Va hw.sensors
-.Xr sysctl 8
-tree.
-.Pp
-The
-.Fn sensor_attach
-function
-adds the sensor specified by the
-.Fa sens
-argument to the sensor device specified by the
-.Fa sensdev
-argument.
-The
-.Fn sensor_detach
-function
-can be used to remove sensors previously added by
-.Fn sensor_attach .
-.Pp
-The
-.Fn sensordev_install
-function
-registers the sensor device specified by the
-.Fa sensdev
-argument so that all sensors that are attached to the device become
-accessible via the sysctl interface.
-The
-.Fn sensordev_deinstall
-function
-can be used to remove sensor devices previously registered by
-.Fn sensordev_install .
-.Pp
-Drivers are responsible for retrieving, interpreting and normalising
-sensor values and updating the sensor struct periodically.
-If the driver needs process context, for example to sleep, it can
-register a task with the sensor framework.
-.Pp
-The
-.Fn sensor_task_register
-function
-is used to register a periodic task to update sensors.
-The
-.Fa func
-argument is a pointer to the function to run with an interval of
-.Fa period
-seconds.
-The
-.Fa arg
-parameter is the argument given to the
-.Fa func
-function.
-The
-.Fn sensor_task_unregister
-function
-removes all tasks previously registered with
-.Fn sensor_task_register
-with an argument of
-.Fa arg .
-.Sh COMPATIBILITY
-.Ss sensor_task
-The
-.Fn sensor_task_register
-and
-.Fn sensor_task_unregister
-functions that are included in
-.Ox 4.2
-and later
-are not compatible with
-.Fx .
-.Fx
-includes an implementation that is similar and compatible
-with an earlier version of
-these
-.Fn sensor_task
-functions that was available from
-.Ox 3.9
-until
-.Ox 4.1 .
-.Pp
-Drivers that only call
-.Fn sensor_task_register
-and do not check its return value are not affected by this
-.Fn sensor_task
-compatibility notice.
-.Sh SEE ALSO
-.Xr systat 1 ,
-.Xr sysctl 3 ,
-.Xr sensorsd 8 ,
-.Xr sysctl 8
-.Sh HISTORY
-.An -nosplit
-The sensor framework was written by
-.An Alexander Yurchenko Aq grange@openbsd.org
-and first appeared in
-.Ox 3.4 .
-.An David Gwynne Aq dlg@openbsd.org
-later extended it for
-.Ox 3.8 .
-.An Constantine A. Murenin Aq cnst+openbsd@bugmail.mojo.ru
-extended it even further by introducing the concept of sensor devices in
-.Ox 4.1 .
-.Pp
-The framework was ported to
-.Fx
-by
-.An Constantine A. Murenin Aq cnst@FreeBSD.org
-as a Google Summer of Code 2007 project,
-and first appeared in
-.Fx 8.0 .