summaryrefslogtreecommitdiff
path: root/sys/dev/isa
diff options
context:
space:
mode:
authorAlexander Yurchenko <grange@cvs.openbsd.org>2006-01-19 17:08:41 +0000
committerAlexander Yurchenko <grange@cvs.openbsd.org>2006-01-19 17:08:41 +0000
commitae36f2054b5612aa7968cc0b722e6fd9f0446df1 (patch)
tree36f0c710576bef0a2dd796b1b8893ee1c0480afe /sys/dev/isa
parent5ddc9bd0d1112ccc5b376dcad408e01de66a48b8 (diff)
Replace SENSOR_ADD() macro with a pair of functions
sensor_add()/sensor_del() so that sensors can be attached and detached dynamicaly. ok kettenis@ deraadt@ dlg@
Diffstat (limited to 'sys/dev/isa')
-rw-r--r--sys/dev/isa/aps.c4
-rw-r--r--sys/dev/isa/it.c4
-rw-r--r--sys/dev/isa/nsclpcsio_isa.c4
-rw-r--r--sys/dev/isa/viasio.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/isa/aps.c b/sys/dev/isa/aps.c
index 688609ff826..26e621c0a75 100644
--- a/sys/dev/isa/aps.c
+++ b/sys/dev/isa/aps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aps.c,v 1.5 2005/08/28 03:52:37 djm Exp $ */
+/* $OpenBSD: aps.c,v 1.6 2006/01/19 17:08:40 grange Exp $ */
/*
* Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org>
*
@@ -200,7 +200,7 @@ aps_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));
- SENSOR_ADD(&sc->sensors[i]);
+ sensor_add(&sc->sensors[i]);
}
powerhook_establish(aps_power, (void *)sc);
diff --git a/sys/dev/isa/it.c b/sys/dev/isa/it.c
index 7957fc4d1ce..f3ecabdeb32 100644
--- a/sys/dev/isa/it.c
+++ b/sys/dev/isa/it.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: it.c,v 1.16 2005/12/28 15:27:44 grange Exp $ */
+/* $OpenBSD: it.c,v 1.17 2006/01/19 17:08:40 grange Exp $ */
/*
* Copyright (c) 2003 Julien Bordet <zejames@greyhats.org>
@@ -148,7 +148,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));
- SENSOR_ADD(&sc->sensors[i]);
+ sensor_add(&sc->sensors[i]);
}
}
diff --git a/sys/dev/isa/nsclpcsio_isa.c b/sys/dev/isa/nsclpcsio_isa.c
index 13fbf064cae..1a61ff1da23 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.6 2006/01/05 15:32:46 grange Exp $ */
+/* $OpenBSD: nsclpcsio_isa.c,v 1.7 2006/01/19 17:08:40 grange Exp $ */
/* $NetBSD: nsclpcsio_isa.c,v 1.5 2002/10/22 16:18:26 drochner Exp $ */
/*
@@ -331,7 +331,7 @@ nsclpcsio_isa_attach(struct device *parent, struct device *self, void *aux)
continue;
strlcpy(sc->sensors[i].device, sc->sc_dev.dv_xname,
sizeof(sc->sensors[i].device));
- SENSOR_ADD(&sc->sensors[i]);
+ sensor_add(&sc->sensors[i]);
}
if (sc->sc_ld_en[SIO_LDN_TMS] || sc->sc_ld_en[SIO_LDN_VLM]) {
timeout_set(&nsclpcsio_timeout, nsclpcsio_refresh, sc);
diff --git a/sys/dev/isa/viasio.c b/sys/dev/isa/viasio.c
index 9a52544b2f7..fb04f69882e 100644
--- a/sys/dev/isa/viasio.c
+++ b/sys/dev/isa/viasio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: viasio.c,v 1.4 2005/10/08 14:57:27 grange Exp $ */
+/* $OpenBSD: viasio.c,v 1.5 2006/01/19 17:08:40 grange Exp $ */
/*
* Copyright (c) 2005 Alexander Yurchenko <grange@openbsd.org>
*
@@ -320,7 +320,7 @@ viasio_hm_init(struct viasio_softc *sc)
/* Start sensors */
for (i = 0; i < VT1211_HM_NSENSORS; i++)
- SENSOR_ADD(&sc->sc_hm_sensors[i]);
+ sensor_add(&sc->sc_hm_sensors[i]);
timeout_set(&sc->sc_hm_timo, viasio_hm_refresh, sc);
timeout_add(&sc->sc_hm_timo, hz);
}