diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-07-03 21:17:38 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-07-03 21:17:38 +0000 |
| commit | 5e10bf74c4e7c19bce1fdeb553092cc9dc259ff0 (patch) | |
| tree | 19a5f271aa6b3ef60a7b06f16bb322d3d15e83a8 /sys | |
| parent | 63cb3a78a801236641b1aac9e956e1eaf9b8efa3 (diff) | |
Get rid of rfact member of 'struct sensor'; pack the struct while we're there.
ok dlg@, deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/sys/sensors.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/sys/sensors.h b/sys/sys/sensors.h index 739193556c2..93c39ae27f6 100644 --- a/sys/sys/sensors.h +++ b/sys/sys/sensors.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sensors.h,v 1.17 2006/04/25 03:14:19 deraadt Exp $ */ +/* $OpenBSD: sensors.h,v 1.18 2006/07/03 21:17:37 kettenis Exp $ */ /* * Copyright (c) 2003, 2004 Alexander Yurchenko <grange@openbsd.org> @@ -70,17 +70,16 @@ enum sensor_status { /* Sensor data */ struct sensor { SLIST_ENTRY(sensor) list; - int num; /* sensor number */ - char device[16]; /* device name */ - enum sensor_type type; /* sensor type */ char desc[32]; /* sensor description */ + char device[16]; /* device name */ + struct timeval tv; /* sensor value last change time */ int64_t value; /* current value */ - u_int rfact; /* resistor factor */ + enum sensor_type type; /* sensor type */ enum sensor_status status; /* sensor status */ + int num; /* sensor number */ int flags; /* sensor flags */ #define SENSOR_FINVALID 0x0001 /* sensor is invalid */ #define SENSOR_FUNKNOWN 0x0002 /* sensor value is unknown */ - struct timeval tv; /* sensor value last change time */ }; #ifdef _KERNEL |