diff options
| author |   deraadt <deraadt@openbsd.org> | 2006-12-23 17:46:38 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2006-12-23 17:46:38 +0000 |
| commit | 27515a6bd43f8acf6292de84750e6df173b374da (patch) | |
| tree | 0b42e5f3a4fd7f50e388a1e5e4bb3728f07d3383 /sys/dev/isa/it.c | |
| parent | kernel code implimemting the new two-level sensor api; written by (diff) | |
| download | wireguard-openbsd-27515a6bd43f8acf6292de84750e6df173b374da.tar.xz wireguard-openbsd-27515a6bd43f8acf6292de84750e6df173b374da.zip | |
adapt to new two-level sensor api; Constantine A. Murenin
Diffstat (limited to 'sys/dev/isa/it.c')
| -rw-r--r-- | sys/dev/isa/it.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/sys/dev/isa/it.c b/sys/dev/isa/it.c index 00e17c9b911..578c0cd0488 100644 --- a/sys/dev/isa/it.c +++ b/sys/dev/isa/it.c @@ -1,4 +1,4 @@ -/* $OpenBSD: it.c,v 1.20 2006/06/24 13:42:45 kettenis Exp $ */ +/* $OpenBSD: it.c,v 1.21 2006/12/23 17:46:39 deraadt Exp $ */ /* * Copyright (c) 2003 Julien Bordet <zejames@greyhats.org> @@ -167,11 +167,11 @@ it_attach(struct device *parent, struct device *self, void *aux) it_writereg(sc, ITD_CONFIG, cr); /* Initialize sensors */ - for (i = 0; i < sc->numsensors; ++i) { - strlcpy(sc->sensors[i].device, sc->sc_dev.dv_xname, - sizeof(sc->sensors[i].device)); - sensor_add(&sc->sensors[i]); - } + strlcpy(sc->sensordev.xname, sc->sc_dev.dv_xname, + sizeof(sc->sensordev.xname)); + for (i = 0; i < sc->numsensors; ++i) + sensor_attach(&sc->sensordev, &sc->sensors[i]); + sensordev_install(&sc->sensordev); } u_int8_t @@ -222,12 +222,8 @@ it_setup_temp(struct it_softc *sc, int start, int n) { int i; - for (i = 0; i < n; ++i) { + for (i = 0; i < n; ++i) sc->sensors[start + i].type = SENSOR_TEMP; - snprintf(sc->sensors[start + i].desc, - sizeof(sc->sensors[start + i].desc), - "Temp %d", i + 1); - } } void @@ -235,12 +231,8 @@ it_setup_fan(struct it_softc *sc, int start, int n) { int i; - for (i = 0; i < n; ++i) { + for (i = 0; i < n; ++i) sc->sensors[start + i].type = SENSOR_FANRPM; - snprintf(sc->sensors[start + i].desc, - sizeof(sc->sensors[start + i].desc), - "Fan%d", i + 1); - } } void |