From ed0b72db8f592709275d03722747829ee52ae030 Mon Sep 17 00:00:00 2001
From: groo <groo@NetBSD.org>
Date: Thu, 9 Mar 2000 04:13:58 +0000
Subject: [PATCH] Add rfact multiplication factor for DC voltage sources Clean
 up formatting (fit in 80 columns)

---
 sys/sys/envsys.h | 51 ++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/sys/sys/envsys.h b/sys/sys/envsys.h
index 2fb211d100fc..a45029c2b0c6 100644
--- a/sys/sys/envsys.h
+++ b/sys/sys/envsys.h
@@ -1,4 +1,4 @@
-/* $NetBSD: envsys.h,v 1.3 2000/02/27 04:10:30 groo Exp $ */
+/* $NetBSD: envsys.h,v 1.4 2000/03/09 04:13:58 groo Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
 struct envsys_range {
 	u_int low;
 	u_int high;
-	u_int units;				/* see GTREDATA */
+	u_int units;			/* see GTREDATA */
 };
 typedef struct envsys_range envsys_range_t;
 
@@ -58,15 +58,15 @@ typedef struct envsys_range envsys_range_t;
 
 struct envsys_tre_data {
 	u_int sensor;
-	union {					/* all data is given */
-		u_int32_t data_us;		/* in microKelvins, */
-		int32_t data_s;			/* rpms, volts, amps, */
-	} cur, min, max, avg;			/* ohms, watts, etc */
-						/* see units below */
+	union {				/* all data is given */
+		u_int32_t data_us;	/* in microKelvins, */
+		int32_t data_s;		/* rpms, volts, amps, */
+	} cur, min, max, avg;		/* ohms, watts, etc */
+					/* see units below */
 
-	u_int32_t	warnflags;		/* warning flags */
-	u_int32_t	validflags;		/* sensor valid flags */
-	u_int		units;			/* type of sensor */
+	u_int32_t	warnflags;	/* warning flags */
+	u_int32_t	validflags;	/* sensor valid flags */
+	u_int		units;		/* type of sensor */
 };
 typedef struct envsys_tre_data envsys_temp_data_t;
 typedef struct envsys_tre_data envsys_rpm_data_t;
@@ -74,11 +74,11 @@ typedef struct envsys_tre_data envsys_electrical_data_t;
 typedef struct envsys_tre_data envsys_tre_data_t;
 
 /* flags for warnflags */
-#define ENVSYS_WARN_OK		0x00000000	/* All is well */
-#define ENVSYS_WARN_UNDER	0x00000001	/* an under condition */
-#define ENVSYS_WARN_CRITUNDER	0x00000002	/* a critical under condition */
-#define ENVSYS_WARN_OVER	0x00000004	/* an over condition */
-#define ENVSYS_WARN_CRITOVER	0x00000008	/* a critical over condition */
+#define ENVSYS_WARN_OK		0x00000000  /* All is well */
+#define ENVSYS_WARN_UNDER	0x00000001  /* an under condition */
+#define ENVSYS_WARN_CRITUNDER	0x00000002  /* a critical under condition */
+#define ENVSYS_WARN_OVER	0x00000004  /* an over condition */
+#define ENVSYS_WARN_CRITOVER	0x00000008  /* a critical over condition */
 
 /* type of sensor for units */
 enum envsys_units {
@@ -87,22 +87,23 @@ enum envsys_units {
 };
 
 /* flags for validflags */
-#define ENVSYS_FVALID		0x00000001	/* sensor is valid */
-#define ENVSYS_FCURVALID	0x00000002	/* cur for this sens is valid */
-#define ENVSYS_FMINVALID	0x00000004	/* min for this sens is valid */
-#define ENVSYS_FMAXVALID	0x00000008	/* max for this sens is valid */
-#define ENVSYS_FAVGVALID	0x00000010	/* avg for this sens is valid */
+#define ENVSYS_FVALID		0x00000001  /* sensor is valid */
+#define ENVSYS_FCURVALID	0x00000002  /* cur for this sens is valid */
+#define ENVSYS_FMINVALID	0x00000004  /* min for this sens is valid */
+#define ENVSYS_FMAXVALID	0x00000008  /* max for this sens is valid */
+#define ENVSYS_FAVGVALID	0x00000010  /* avg for this sens is valid */
 
 #define ENVSYS_GTREDATA _IOWR('E', 2, envsys_temp_data_t)
 
 /* set and check sensor info */
 
 struct envsys_basic_info {
-	u_int		sensor;			/* sensor number */
-	u_int		units;			/* type of sensor */
-	char		desc[33];		/* sensor description */
-	u_int		rpms;			/* for fans, set nominal RPMs */
-	u_int32_t	validflags;		/* sensor valid flags */
+	u_int	sensor;		/* sensor number */
+	u_int	units;		/* type of sensor */
+	char	desc[33];	/* sensor description */
+	u_int	rfact;		/* for volts, (int)(factor x 10^4) */
+	u_int	rpms;		/* for fans, set nominal RPMs */
+	u_int32_t validflags;	/* sensor valid flags */
 };
 typedef struct envsys_basic_info envsys_temp_info_t;
 typedef struct envsys_basic_info envsys_rpm_info_t;