diff options
| author |   oga <oga@openbsd.org> | 2010-04-20 19:44:07 +0000 |
|---|---|---|
| committer | oga <oga@openbsd.org> | 2010-04-20 19:44:07 +0000 |
| commit | 0bb7dfbaadaae5f8a4574667ecacf48f71bf36a9 (patch) | |
| tree | 193006b9d0fa24ecf94541e3cd569bf210153381 | |
| parent | Document ``size'' setting; OK gilles@ (diff) | |
| download | wireguard-openbsd-0bb7dfbaadaae5f8a4574667ecacf48f71bf36a9.tar.xz wireguard-openbsd-0bb7dfbaadaae5f8a4574667ecacf48f71bf36a9.zip | |
Add "frequency" type for sensors. (and teach userland how to print that
type). Measured in Hz.
ok deraadt@
| -rw-r--r-- | sbin/sysctl/sysctl.c | 5 | ||||
| -rw-r--r-- | sys/sys/sensors.h | 4 | ||||
| -rw-r--r-- | usr.bin/systat/sensors.c | 5 | ||||
| -rw-r--r-- | usr.sbin/snmpd/mib.c | 3 |
4 files changed, 13 insertions, 4 deletions
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 51d5b4ccf77..2dfed0da864 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.c,v 1.168 2010/04/15 04:57:29 yuo Exp $ */ +/* $OpenBSD: sysctl.c,v 1.169 2010/04/20 19:44:07 oga Exp $ */ /* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */ /* @@ -2468,6 +2468,9 @@ print_sensor(struct sensor *s) case SENSOR_HUMIDITY: printf("%.2f%%", s->value / 1000.0); break; + case SENSOR_FREQ: + printf("%lld Hz", s->value); + break; default: printf("unknown"); } diff --git a/sys/sys/sensors.h b/sys/sys/sensors.h index 64efee53b4e..9f8aaed5ad8 100644 --- a/sys/sys/sensors.h +++ b/sys/sys/sensors.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sensors.h,v 1.26 2010/04/15 04:57:28 yuo Exp $ */ +/* $OpenBSD: sensors.h,v 1.27 2010/04/20 19:44:07 oga Exp $ */ /* * Copyright (c) 2003, 2004 Alexander Yurchenko <grange@openbsd.org> @@ -47,6 +47,7 @@ enum sensor_type { SENSOR_DRIVE, /* disk */ SENSOR_TIMEDELTA, /* system time error (nSec) */ SENSOR_HUMIDITY, /* humidity (m%RH) */ + SENSOR_FREQ, /* frequency (Hz) */ SENSOR_MAX_TYPES }; @@ -68,6 +69,7 @@ static const char * const sensor_type_s[SENSOR_MAX_TYPES + 1] = { "drive", "timedelta", "humidity", + "frequency", "undefined" }; #endif /* !_KERNEL */ diff --git a/usr.bin/systat/sensors.c b/usr.bin/systat/sensors.c index 5d4c2737a59..e4c9cbe982b 100644 --- a/usr.bin/systat/sensors.c +++ b/usr.bin/systat/sensors.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sensors.c,v 1.19 2010/04/15 04:57:29 yuo Exp $ */ +/* $OpenBSD: sensors.c,v 1.20 2010/04/20 19:44:07 oga Exp $ */ /* * Copyright (c) 2007 Deanna Phillips <deanna@openbsd.org> @@ -264,6 +264,9 @@ showsensor(struct sensinfo *s) case SENSOR_HUMIDITY: tbprintf("%3.2f%%", s->sn_value / 1000.0); break; + case SENSOR_FREQ: + tbprintf("%11lld Hz", s->sn_value); + break; default: tbprintf("%10lld", s->sn_value); break; diff --git a/usr.sbin/snmpd/mib.c b/usr.sbin/snmpd/mib.c index 7af24262200..9a8cdb2dd51 100644 --- a/usr.sbin/snmpd/mib.c +++ b/usr.sbin/snmpd/mib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mib.c,v 1.36 2010/04/15 04:57:29 yuo Exp $ */ +/* $OpenBSD: mib.c,v 1.37 2010/04/20 19:44:07 oga Exp $ */ /* * Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net> @@ -1392,6 +1392,7 @@ mib_sensorvalue(struct sensor *s) /* FALLTHROUGH */ case SENSOR_FANRPM: case SENSOR_INTEGER: + case SENSOR_FREQ: default: ret = asprintf(&v, "%lld", s->value); break; |