diff options
Diffstat (limited to 'sys/dev/isa')
| -rw-r--r-- | sys/dev/isa/it.c | 7 | ||||
| -rw-r--r-- | sys/dev/isa/nsclpcsio_isa.c | 8 |
2 files changed, 4 insertions, 11 deletions
diff --git a/sys/dev/isa/it.c b/sys/dev/isa/it.c index 2997649bfcd..21093327eac 100644 --- a/sys/dev/isa/it.c +++ b/sys/dev/isa/it.c @@ -1,4 +1,4 @@ -/* $OpenBSD: it.c,v 1.4 2003/11/05 20:57:10 grange Exp $ */ +/* $OpenBSD: it.c,v 1.5 2004/01/12 14:10:53 grange Exp $ */ /* * Copyright (c) 2003 Julien Bordet <zejames@greyhats.org> @@ -122,8 +122,6 @@ it_attach(struct device *parent, struct device *self, void *aux) struct isa_attach_args *ia = aux; int i; u_int8_t cr; - extern int nsensors; - extern struct sensors_head sensors; iobase = ia->ipa_io[0].base; iot = sc->it_iot = ia->ia_iot; @@ -161,8 +159,7 @@ it_attach(struct device *parent, struct device *self, void *aux) for (i = 0; i < sc->numsensors; ++i) { strlcpy(sc->sensors[i].device, sc->sc_dev.dv_xname, sizeof(sc->sensors[i].device)); - sc->sensors[i].num = nsensors++; - SLIST_INSERT_HEAD(&sensors, &sc->sensors[i], list); + SENSOR_ADD(&sc->sensors[i]); } timeout_set(&it_timeout, it_refresh, sc); diff --git a/sys/dev/isa/nsclpcsio_isa.c b/sys/dev/isa/nsclpcsio_isa.c index 710ce8b8a36..43cd6a54ba0 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.1 2004/01/05 17:27:29 markus Exp $ */ +/* $OpenBSD: nsclpcsio_isa.c,v 1.2 2004/01/12 14:10:53 grange Exp $ */ /* $NetBSD: nsclpcsio_isa.c,v 1.5 2002/10/22 16:18:26 drochner Exp $ */ /* @@ -226,9 +226,6 @@ nsclpcsio_isa_attach(parent, self, aux) int iobase; int i; - extern int nsensors; - extern struct sensors_head sensors; - iobase = ia->ipa_io[0].base; sc->sc_iot = iot = ia->ia_iot; if (bus_space_map(ia->ia_iot, iobase, 2, 0, &sc->sc_ioh)) { @@ -250,8 +247,7 @@ nsclpcsio_isa_attach(parent, self, aux) continue; strlcpy(sc->sensors[i].device, sc->sc_dev.dv_xname, sizeof(sc->sensors[i].device)); - sc->sensors[i].num = nsensors++; - SLIST_INSERT_HEAD(&sensors, &sc->sensors[i], list); + SENSOR_ADD(&sc->sensors[i]); } if (sc->sc_tms || sc->sc_vlm) { timeout_set(&nsclpcsio_timeout, nsclpcsio_refresh, sc); |