diff options
| author |   deraadt <deraadt@openbsd.org> | 2006-04-10 00:57:54 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2006-04-10 00:57:54 +0000 |
| commit | aafcf214b1e2e310987794d92cd829bbca535c23 (patch) | |
| tree | dad79686a2d4f12a6b6c00eeaf230ebf1681a7e4 | |
| parent | make this match our code standards (diff) | |
| download | wireguard-openbsd-aafcf214b1e2e310987794d92cd829bbca535c23.tar.xz wireguard-openbsd-aafcf214b1e2e310987794d92cd829bbca535c23.zip | |
unify temperature sensor names much more
| -rw-r--r-- | sys/dev/isa/aps.c | 12 | ||||
| -rw-r--r-- | sys/dev/isa/it.c | 4 | ||||
| -rw-r--r-- | sys/dev/isa/nsclpcsio_isa.c | 8 | ||||
| -rw-r--r-- | sys/dev/isa/viasio.c | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/isa/aps.c b/sys/dev/isa/aps.c index 26e621c0a75..99e0b40fcea 100644 --- a/sys/dev/isa/aps.c +++ b/sys/dev/isa/aps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aps.c,v 1.6 2006/01/19 17:08:40 grange Exp $ */ +/* $OpenBSD: aps.c,v 1.7 2006/04/10 00:57:54 deraadt Exp $ */ /* * Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org> * @@ -160,11 +160,11 @@ aps_attach(struct device *parent, struct device *self, void *aux) sc->sensors[APS_SENSOR_TEMP1].type = SENSOR_TEMP; snprintf(sc->sensors[APS_SENSOR_TEMP1].desc, - sizeof(sc->sensors[APS_SENSOR_TEMP1].desc), "Temp1"); + sizeof(sc->sensors[APS_SENSOR_TEMP1].desc), "Temp 1"); sc->sensors[APS_SENSOR_TEMP2].type = SENSOR_TEMP; snprintf(sc->sensors[APS_SENSOR_TEMP2].desc, - sizeof(sc->sensors[APS_SENSOR_TEMP2].desc), "Temp2"); + sizeof(sc->sensors[APS_SENSOR_TEMP2].desc), "Temp 2"); sc->sensors[APS_SENSOR_XVAR].type = SENSOR_INTEGER; snprintf(sc->sensors[APS_SENSOR_XVAR].desc, @@ -183,17 +183,17 @@ aps_attach(struct device *parent, struct device *self, void *aux) sc->sensors[APS_SENSOR_KBACT].type = SENSOR_INTEGER; snprintf(sc->sensors[APS_SENSOR_KBACT].desc, - sizeof(sc->sensors[APS_SENSOR_KBACT].desc), "KBD_ACT"); + sizeof(sc->sensors[APS_SENSOR_KBACT].desc), "Keyboard Active"); sc->sensors[APS_SENSOR_KBACT].rfact = 1; sc->sensors[APS_SENSOR_MSACT].type = SENSOR_INTEGER; snprintf(sc->sensors[APS_SENSOR_MSACT].desc, - sizeof(sc->sensors[APS_SENSOR_MSACT].desc), "MS_ACT"); + sizeof(sc->sensors[APS_SENSOR_MSACT].desc), "Mouse Active"); sc->sensors[APS_SENSOR_MSACT].rfact = 1; sc->sensors[APS_SENSOR_LIDOPEN].type = SENSOR_INTEGER; snprintf(sc->sensors[APS_SENSOR_LIDOPEN].desc, - sizeof(sc->sensors[APS_SENSOR_LIDOPEN].desc), "LID_OPEN"); + sizeof(sc->sensors[APS_SENSOR_LIDOPEN].desc), "Lid Open"); sc->sensors[APS_SENSOR_LIDOPEN].rfact = 1; /* stop hiding and report to the authorities */ diff --git a/sys/dev/isa/it.c b/sys/dev/isa/it.c index 57923689211..6e181fd4c37 100644 --- a/sys/dev/isa/it.c +++ b/sys/dev/isa/it.c @@ -1,4 +1,4 @@ -/* $OpenBSD: it.c,v 1.18 2006/01/23 18:43:22 kettenis Exp $ */ +/* $OpenBSD: it.c,v 1.19 2006/04/10 00:57:54 deraadt Exp $ */ /* * Copyright (c) 2003 Julien Bordet <zejames@greyhats.org> @@ -213,7 +213,7 @@ it_setup_temp(struct it_softc *sc, int start, int n) sc->sensors[start + i].type = SENSOR_TEMP; snprintf(sc->sensors[start + i].desc, sizeof(sc->sensors[start + i].desc), - "Temp%d", i + 1); + "Temp %d", i + 1); } } diff --git a/sys/dev/isa/nsclpcsio_isa.c b/sys/dev/isa/nsclpcsio_isa.c index 1a61ff1da23..f6533f53b04 100644 --- a/sys/dev/isa/nsclpcsio_isa.c +++ b/sys/dev/isa/nsclpcsio_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nsclpcsio_isa.c,v 1.7 2006/01/19 17:08:40 grange Exp $ */ +/* $OpenBSD: nsclpcsio_isa.c,v 1.8 2006/04/10 00:57:54 deraadt Exp $ */ /* $NetBSD: nsclpcsio_isa.c,v 1.5 2002/10/22 16:18:26 drochner Exp $ */ /* @@ -384,9 +384,9 @@ nsclpcsio_tms_init(struct nsclpcsio_softc *sc) sc->sensors[i].type = SENSOR_TEMP; } - strlcpy(sc->sensors[0].desc, "TSENS1", sizeof(sc->sensors[0].desc)); - strlcpy(sc->sensors[1].desc, "TSENS2", sizeof(sc->sensors[0].desc)); - strlcpy(sc->sensors[2].desc, "TNSC", sizeof(sc->sensors[0].desc)); + strlcpy(sc->sensors[0].desc, "Remote Temp 1", sizeof(sc->sensors[0].desc)); + strlcpy(sc->sensors[1].desc, "Remote Temp 2", sizeof(sc->sensors[0].desc)); + strlcpy(sc->sensors[2].desc, "Local Temp", sizeof(sc->sensors[0].desc)); nsclpcsio_tms_update(sc); } diff --git a/sys/dev/isa/viasio.c b/sys/dev/isa/viasio.c index fb04f69882e..a58b7db9fca 100644 --- a/sys/dev/isa/viasio.c +++ b/sys/dev/isa/viasio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: viasio.c,v 1.5 2006/01/19 17:08:40 grange Exp $ */ +/* $OpenBSD: viasio.c,v 1.6 2006/04/10 00:57:54 deraadt Exp $ */ /* * Copyright (c) 2005 Alexander Yurchenko <grange@openbsd.org> * @@ -282,7 +282,7 @@ viasio_hm_init(struct viasio_softc *sc) /* Temperature reading 1 */ sc->sc_hm_sensors[VT1211_HMS_TEMP1].type = SENSOR_TEMP; - strlcpy(sc->sc_hm_sensors[VT1211_HMS_TEMP1].desc, "TEMP1", + strlcpy(sc->sc_hm_sensors[VT1211_HMS_TEMP1].desc, "Temp", sizeof(sc->sc_hm_sensors[VT1211_HMS_TEMP1].desc)); /* Universal channels (UCH) 1-5 */ |