diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-03-22 16:55:32 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-03-22 16:55:32 +0000 |
| commit | bfcfcc95f91a9ef756b3184426381561b7f4dc23 (patch) | |
| tree | 86156fd65b4c74f4b929cb5bcd06ed881f46f591 /sys/dev/onewire | |
| parent | d0617786c492a05d286defedc41f1cac5a22411d (diff) | |
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
Diffstat (limited to 'sys/dev/onewire')
| -rw-r--r-- | sys/dev/onewire/owid.c | 6 | ||||
| -rw-r--r-- | sys/dev/onewire/owsbm.c | 12 | ||||
| -rw-r--r-- | sys/dev/onewire/owtemp.c | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/onewire/owid.c b/sys/dev/onewire/owid.c index 26711ee23a9..55639a19b56 100644 --- a/sys/dev/onewire/owid.c +++ b/sys/dev/onewire/owid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: owid.c,v 1.3 2006/12/23 17:46:39 deraadt Exp $ */ +/* $OpenBSD: owid.c,v 1.4 2007/03/22 16:55:31 deraadt Exp $ */ /* * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> @@ -37,8 +37,8 @@ struct owid_softc { void * sc_onewire; u_int64_t sc_rom; - struct sensor sc_sensor; - struct sensordev sc_sensordev; + struct ksensor sc_sensor; + struct ksensordev sc_sensordev; int sc_dying; }; diff --git a/sys/dev/onewire/owsbm.c b/sys/dev/onewire/owsbm.c index 663ddc185f0..e67d7b8506a 100644 --- a/sys/dev/onewire/owsbm.c +++ b/sys/dev/onewire/owsbm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: owsbm.c,v 1.1 2007/02/28 21:54:43 grange Exp $ */ +/* $OpenBSD: owsbm.c,v 1.2 2007/03/22 16:55:31 deraadt Exp $ */ /* * Copyright (c) 2007 Aaron Linville <aaron@linville.org> @@ -62,12 +62,12 @@ struct owsbm_softc { void * sc_onewire; u_int64_t sc_rom; - struct sensordev sc_sensordev; + struct ksensordev sc_sensordev; - struct sensor sc_temp; - struct sensor sc_voltage_vdd; /* Battery, AD = 1*/ - struct sensor sc_voltage_vad; /* General purpose, AD = 0 */ - struct sensor sc_voltage_cr; /* Current Register */ + struct ksensor sc_temp; + struct ksensor sc_voltage_vdd; /* Battery, AD = 1*/ + struct ksensor sc_voltage_vad; /* General purpose, AD = 0 */ + struct ksensor sc_voltage_cr; /* Current Register */ struct rwlock sc_lock; }; diff --git a/sys/dev/onewire/owtemp.c b/sys/dev/onewire/owtemp.c index a470b841279..47f78c67612 100644 --- a/sys/dev/onewire/owtemp.c +++ b/sys/dev/onewire/owtemp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: owtemp.c,v 1.6 2006/12/23 17:46:39 deraadt Exp $ */ +/* $OpenBSD: owtemp.c,v 1.7 2007/03/22 16:55:31 deraadt Exp $ */ /* * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> @@ -51,8 +51,8 @@ struct owtemp_softc { void * sc_onewire; u_int64_t sc_rom; - struct sensor sc_sensor; - struct sensordev sc_sensordev; + struct ksensor sc_sensor; + struct ksensordev sc_sensordev; struct rwlock sc_lock; }; |