diff options
| author | Constantine A. Murenin <cnst@cvs.openbsd.org> | 2007-06-01 21:30:32 +0000 |
|---|---|---|
| committer | Constantine A. Murenin <cnst@cvs.openbsd.org> | 2007-06-01 21:30:32 +0000 |
| commit | 1ab5e6dfa0cec86140f26efdcdafefef2ca79267 (patch) | |
| tree | 2b17429202fea20436659d1077f3088c454b2896 /sys/dev | |
| parent | 84668a0a773b86a10f0d0b9604d0f0e2a89d9713 (diff) | |
remove strings from sensor.desc which are now present in sysctl variable names; ok grange@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isa/nsclpcsio_isa.c | 12 | ||||
| -rw-r--r-- | sys/dev/onewire/owid.c | 3 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sys/dev/isa/nsclpcsio_isa.c b/sys/dev/isa/nsclpcsio_isa.c index 1f6e7c8bd9c..10772768660 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.11 2007/03/22 16:55:31 deraadt Exp $ */ +/* $OpenBSD: nsclpcsio_isa.c,v 1.12 2007/06/01 21:30:31 cnst Exp $ */ /* $NetBSD: nsclpcsio_isa.c,v 1.5 2002/10/22 16:18:26 drochner Exp $ */ /* @@ -386,9 +386,9 @@ nsclpcsio_tms_init(struct nsclpcsio_softc *sc) sc->sensors[i].type = SENSOR_TEMP; } - 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)); + strlcpy(sc->sensors[0].desc, "Remote", sizeof(sc->sensors[0].desc)); + strlcpy(sc->sensors[1].desc, "Remote", sizeof(sc->sensors[1].desc)); + strlcpy(sc->sensors[2].desc, "Local", sizeof(sc->sensors[2].desc)); nsclpcsio_tms_update(sc); } @@ -453,12 +453,10 @@ nsclpcsio_vlm_init(struct nsclpcsio_softc *sc) desc = "TS3"; break; } + /* only init .desc if we have something meaningful to say */ if (desc != NULL) strlcpy(sc->sensors[SIO_VLM_OFF + i].desc, desc, sizeof(sc->sensors[SIO_VLM_OFF + i].desc)); - else - snprintf(sc->sensors[SIO_VLM_OFF + i].desc, - sizeof(sc->sensors[SIO_VLM_OFF].desc), "VSENS%d", i); sc->sensors[SIO_VLM_OFF + i].type = SENSOR_VOLTS_DC; } diff --git a/sys/dev/onewire/owid.c b/sys/dev/onewire/owid.c index 55639a19b56..2470f48b263 100644 --- a/sys/dev/onewire/owid.c +++ b/sys/dev/onewire/owid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: owid.c,v 1.4 2007/03/22 16:55:31 deraadt Exp $ */ +/* $OpenBSD: owid.c,v 1.5 2007/06/01 21:30:31 cnst Exp $ */ /* * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> @@ -84,7 +84,6 @@ owid_attach(struct device *parent, struct device *self, void *aux) strlcpy(sc->sc_sensordev.xname, sc->sc_dev.dv_xname, sizeof(sc->sc_sensordev.xname)); sc->sc_sensor.type = SENSOR_INTEGER; - strlcpy(sc->sc_sensor.desc, "ID", sizeof(sc->sc_sensor.desc)); sc->sc_sensor.value = ONEWIRE_ROM_SN(sc->sc_rom); sensor_attach(&sc->sc_sensordev, &sc->sc_sensor); sensordev_install(&sc->sc_sensordev); |