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

2 files changed, 7 insertions, 7 deletions

diff --git a/sys/arch/macppc/dev/asms.c b/sys/arch/macppc/dev/asms.c
index 5c71f5219ec..9937a890483 100644
--- a/sys/arch/macppc/dev/asms.c
+++ b/sys/arch/macppc/dev/asms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asms.c,v 1.4 2006/12/23 17:46:39 deraadt Exp $	*/
+/*	$OpenBSD: asms.c,v 1.5 2007/03/22 16:55:31 deraadt Exp $	*/
 /*
  * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
  *
@@ -61,8 +61,8 @@ struct asms_softc {
 	i2c_tag_t	sc_tag;
 	i2c_addr_t	sc_addr;
 
-	struct sensor	sc_sensor[ASMS_NUM_SENSORS];
-	struct sensordev sc_sensordev;
+	struct ksensor	sc_sensor[ASMS_NUM_SENSORS];
+	struct ksensordev sc_sensordev;
 };
 
 int	asms_match(struct device *, void *, void *);
diff --git a/sys/arch/macppc/dev/smu.c b/sys/arch/macppc/dev/smu.c
index bea7c2e0f29..87c6a481be2 100644
--- a/sys/arch/macppc/dev/smu.c
+++ b/sys/arch/macppc/dev/smu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smu.c,v 1.16 2007/03/14 22:49:00 kettenis Exp $	*/
+/*	$OpenBSD: smu.c,v 1.17 2007/03/22 16:55:31 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -43,14 +43,14 @@ struct smu_fan {
 	u_int16_t	min_rpm;
 	u_int16_t	max_rpm;
 	u_int16_t	unmanaged_rpm;
-	struct sensor	sensor;
+	struct ksensor	sensor;
 };
 
 #define SMU_MAXSENSORS	3
 
 struct smu_sensor {
 	u_int8_t	reg;
-	struct sensor	sensor;
+	struct ksensor	sensor;
 };
 
 struct smu_softc {
@@ -75,7 +75,7 @@ struct smu_softc {
 	struct smu_sensor sc_sensors[SMU_MAXSENSORS];
 	int		sc_num_sensors;
 
-	struct sensordev sc_sensordev;
+	struct ksensordev sc_sensordev;
 
 	u_int16_t	sc_cpu_diode_scale;
 	int16_t		sc_cpu_diode_offset;