split userland & kernel struct sensor/sensordev so that the addition

of new fields in the future is less disruptive.  This is done similar
to how struct proc is handled for ps(1).  ok jmc (man page changes)
tested fkr simon, and more suggestions from millert

5 files changed, 19 insertions, 19 deletions

diff --git a/sys/dev/isa/aps.c b/sys/dev/isa/aps.c
index dde25c571fc..5ad9cfd94d2 100644
--- a/sys/dev/isa/aps.c
+++ b/sys/dev/isa/aps.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aps.c,v 1.13 2007/01/05 07:00:37 jsg Exp $	*/
+/*	$OpenBSD: aps.c,v 1.14 2007/03/22 16:55:31 deraadt Exp $	*/
 /*
  * Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org>
  *
@@ -90,8 +90,8 @@ struct aps_softc {
 	bus_space_tag_t aps_iot;
 	bus_space_handle_t aps_ioh;
 
-	struct sensor sensors[APS_NUM_SENSORS];
-	struct sensordev sensordev;
+	struct ksensor sensors[APS_NUM_SENSORS];
+	struct ksensordev sensordev;
 	void (*refresh_sensor_data)(struct aps_softc *);
 
 	struct sensor_rec aps_data;
diff --git a/sys/dev/isa/it.c b/sys/dev/isa/it.c
index 578c0cd0488..63583a3ddbf 100644
--- a/sys/dev/isa/it.c
+++ b/sys/dev/isa/it.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: it.c,v 1.21 2006/12/23 17:46:39 deraadt Exp $	*/
+/*	$OpenBSD: it.c,v 1.22 2007/03/22 16:55:31 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2003 Julien Bordet <zejames@greyhats.org>
@@ -61,9 +61,9 @@ void it_setup_volt(struct it_softc *, int, int);
 void it_setup_temp(struct it_softc *, int, int);
 void it_setup_fan(struct it_softc *, int, int);
 
-void it_generic_stemp(struct it_softc *, struct sensor *);
-void it_generic_svolt(struct it_softc *, struct sensor *);
-void it_generic_fanrpm(struct it_softc *, struct sensor *);
+void it_generic_stemp(struct it_softc *, struct ksensor *);
+void it_generic_svolt(struct it_softc *, struct ksensor *);
+void it_generic_fanrpm(struct it_softc *, struct ksensor *);
 
 void it_refresh_sensor_data(struct it_softc *);
 void it_refresh(void *);
@@ -236,7 +236,7 @@ it_setup_fan(struct it_softc *sc, int start, int n)
 }
 
 void
-it_generic_stemp(struct it_softc *sc, struct sensor *sensors)
+it_generic_stemp(struct it_softc *sc, struct ksensor *sensors)
 {
 	int i, sdata;
 
@@ -248,7 +248,7 @@ it_generic_stemp(struct it_softc *sc, struct sensor *sensors)
 }
 
 void
-it_generic_svolt(struct it_softc *sc, struct sensor *sensors)
+it_generic_svolt(struct it_softc *sc, struct ksensor *sensors)
 {
 	int i, sdata;
 
@@ -270,7 +270,7 @@ it_generic_svolt(struct it_softc *sc, struct sensor *sensors)
 }
 
 void
-it_generic_fanrpm(struct it_softc *sc, struct sensor *sensors)
+it_generic_fanrpm(struct it_softc *sc, struct ksensor *sensors)
 {
 	int i, sdata, divisor, odivisor, ndivisor;
 
diff --git a/sys/dev/isa/itvar.h b/sys/dev/isa/itvar.h
index 509c8e23697..4bd39aa4783 100644
--- a/sys/dev/isa/itvar.h
+++ b/sys/dev/isa/itvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: itvar.h,v 1.3 2006/12/23 17:46:39 deraadt Exp $	*/
+/*	$OpenBSD: itvar.h,v 1.4 2007/03/22 16:55:31 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2003 Julien Bordet <zejames@greyhats.org>
@@ -80,8 +80,8 @@ struct it_softc {
 	bus_space_tag_t it_iot;
 	bus_space_handle_t it_ioh;
 
-	struct sensor sensors[IT_NUM_SENSORS];
-	struct sensordev sensordev;
+	struct ksensor sensors[IT_NUM_SENSORS];
+	struct ksensordev sensordev;
 	u_int numsensors;
 	void (*refresh_sensor_data)(struct it_softc *);
 
diff --git a/sys/dev/isa/nsclpcsio_isa.c b/sys/dev/isa/nsclpcsio_isa.c
index 3159c4158e5..1f6e7c8bd9c 100644
--- a/sys/dev/isa/nsclpcsio_isa.c
+++ b/sys/dev/isa/nsclpcsio_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nsclpcsio_isa.c,v 1.10 2006/12/23 17:46:39 deraadt Exp $ */
+/* $OpenBSD: nsclpcsio_isa.c,v 1.11 2007/03/22 16:55:31 deraadt Exp $ */
 /* $NetBSD: nsclpcsio_isa.c,v 1.5 2002/10/22 16:18:26 drochner Exp $ */
 
 /*
@@ -176,8 +176,8 @@ struct nsclpcsio_softc {
 	struct gpio_pin sc_gpio_pins[SIO_GPIO_NPINS];
 
 	/* TMS and VLM */
-	struct sensor sensors[SIO_NUM_SENSORS];
-	struct sensordev sensordev;
+	struct ksensor sensors[SIO_NUM_SENSORS];
+	struct ksensordev sensordev;
 };
 
 #define GPIO_READ(sc, reg) \
diff --git a/sys/dev/isa/viasio.c b/sys/dev/isa/viasio.c
index 6dca69d62d1..00f097b08b4 100644
--- a/sys/dev/isa/viasio.c
+++ b/sys/dev/isa/viasio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: viasio.c,v 1.8 2006/12/23 17:46:39 deraadt Exp $	*/
+/*	$OpenBSD: viasio.c,v 1.9 2007/03/22 16:55:31 deraadt Exp $	*/
 /*
  * Copyright (c) 2005 Alexander Yurchenko <grange@openbsd.org>
  *
@@ -52,8 +52,8 @@ struct viasio_softc {
 	/* Hardware monitor */
 	bus_space_handle_t	sc_hm_ioh;
 	int			sc_hm_clock;
-	struct sensor		sc_hm_sensors[VT1211_HM_NSENSORS];
-	struct sensordev	sc_sensordev;
+	struct ksensor		sc_hm_sensors[VT1211_HM_NSENSORS];
+	struct ksensordev	sc_sensordev;
 	struct timeout		sc_hm_timo;
 
 	/* Watchdog timer */