diff options
| author | pgoyette <pgoyette@NetBSD.org> | 2011-06-04 13:24:33 +0000 |
|---|---|---|
| committer | pgoyette <pgoyette@NetBSD.org> | 2011-06-04 13:24:33 +0000 |
| commit | 3af45a6e42f50c7d56689fa07d4bb60f1fef894c (patch) | |
| tree | b757692fd0e98c0fe541d7264eb7617bc3fb38a3 /sys/dev/sysmon | |
| parent | 46494798a7c086d048f8f512717fb344e87b3cae (diff) | |
Since nothing actually records or maintains an average sensor value,
remove value_avg from the prop_dict. We can't completely remove it
because there's one driver that uses this field for its own private
purposes, so for now we just rename the member.
Diffstat (limited to 'sys/dev/sysmon')
| -rw-r--r-- | sys/dev/sysmon/sysmon_envsys.c | 27 | ||||
| -rw-r--r-- | sys/dev/sysmon/sysmonvar.h | 6 |
2 files changed, 8 insertions, 25 deletions
diff --git a/sys/dev/sysmon/sysmon_envsys.c b/sys/dev/sysmon/sysmon_envsys.c index 0aa21716f4b..d001e6913b3 100644 --- a/sys/dev/sysmon/sysmon_envsys.c +++ b/sys/dev/sysmon/sysmon_envsys.c @@ -1,4 +1,4 @@ -/* $NetBSD: sysmon_envsys.c,v 1.112 2010/12/30 03:59:59 pgoyette Exp $ */ +/* $NetBSD: sysmon_envsys.c,v 1.113 2011/06/04 13:24:33 pgoyette Exp $ */ /*- * Copyright (c) 2007, 2008 Juan Romero Pardines. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.112 2010/12/30 03:59:59 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.113 2011/06/04 13:24:33 pgoyette Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -372,8 +372,8 @@ sysmonioctl_envsys(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) tred->max.data_s = edata->value_max; tred->min.data_us = edata->value_min; tred->min.data_s = edata->value_min; - tred->avg.data_us = edata->value_avg; - tred->avg.data_s = edata->value_avg; + tred->avg.data_us = 0; + tred->avg.data_s = 0; if (edata->units == ENVSYS_BATTERY_CHARGE) tred->units = ENVSYS_INDICATOR; else @@ -1421,8 +1421,6 @@ sme_add_sensor_dictionary(struct sysmon_envsys *sme, prop_array_t array, * <integer>800</integer> * <key>max-value</integer> * <integer>3000</integer> - * <key>avg-value</integer> - * <integer>1400</integer> * ... */ if (edata->units == ENVSYS_SFANRPM) @@ -1450,13 +1448,6 @@ sme_add_sensor_dictionary(struct sysmon_envsys *sme, prop_array_t array, edata->value_max)) goto out; } - - if (edata->flags & ENVSYS_FVALID_AVG) { - if (sme_sensor_upint32(dict, - "avg-value", - edata->value_avg)) - goto out; - } } /* @@ -1689,7 +1680,7 @@ sme_update_dictionary(struct sysmon_envsys *sme) } /* - * update sensor's {avg,max,min}-value. + * update sensor's {max,min}-value. */ if (edata->flags & ENVSYS_FVALID_MAX) { error = sme_sensor_upint32(dict, @@ -1707,14 +1698,6 @@ sme_update_dictionary(struct sysmon_envsys *sme) break; } - if (edata->flags & ENVSYS_FVALID_AVG) { - error = sme_sensor_upint32(dict, - "avg-value", - edata->value_avg); - if (error) - break; - } - /* * update 'rpms' only for ENVSYS_SFANRPM sensors. */ diff --git a/sys/dev/sysmon/sysmonvar.h b/sys/dev/sysmon/sysmonvar.h index 9fe9ef1f1bc..a43e87c8de0 100644 --- a/sys/dev/sysmon/sysmonvar.h +++ b/sys/dev/sysmon/sysmonvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: sysmonvar.h,v 1.40 2011/01/04 01:51:06 matt Exp $ */ +/* $NetBSD: sysmonvar.h,v 1.41 2011/06/04 13:24:33 pgoyette Exp $ */ /*- * Copyright (c) 2000 Zembu Labs, Inc. @@ -83,7 +83,7 @@ struct envsys_data { int32_t value_cur; /* current value */ int32_t value_max; /* max value */ int32_t value_min; /* min value */ - int32_t value_avg; /* avg value */ + int32_t private; /* private data for drivers */ sysmon_envsys_lim_t limits; /* thresholds for monitoring */ int upropset; /* userland property set? */ char desc[ENVSYS_DESCLEN]; /* sensor description */ @@ -95,7 +95,7 @@ typedef struct envsys_data envsys_data_t; #define ENVSYS_FPERCENT 0x00000001 /* sensor wants a percentage */ #define ENVSYS_FVALID_MAX 0x00000002 /* max value is ok */ #define ENVSYS_FVALID_MIN 0x00000004 /* min value is ok */ -#define ENVSYS_FVALID_AVG 0x00000008 /* avg value is ok */ +#define ENVSYS_F_OBSOLETE 0x00000008 #define ENVSYS_FCHANGERFACT 0x00000010 /* sensor can change rfact */ /* monitoring flags */ |
