summaryrefslogtreecommitdiff
path: root/sys/dev/i2c
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/i2c
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/i2c')
-rw-r--r--sys/dev/i2c/ad741x.c8
-rw-r--r--sys/dev/i2c/adm1021.c4
-rw-r--r--sys/dev/i2c/adm1024.c4
-rw-r--r--sys/dev/i2c/adm1025.c4
-rw-r--r--sys/dev/i2c/adm1026.c4
-rw-r--r--sys/dev/i2c/adm1030.c4
-rw-r--r--sys/dev/i2c/adm1031.c4
-rw-r--r--sys/dev/i2c/adt7460.c4
-rw-r--r--sys/dev/i2c/asb100.c4
-rw-r--r--sys/dev/i2c/ds1631.c4
-rw-r--r--sys/dev/i2c/fcu.c4
-rw-r--r--sys/dev/i2c/lm75.c4
-rw-r--r--sys/dev/i2c/lm87.c4
-rw-r--r--sys/dev/i2c/maxim6690.c4
-rw-r--r--sys/dev/i2c/pca9554.c4
-rw-r--r--sys/dev/i2c/tsl2560.c4
-rw-r--r--sys/dev/i2c/w83l784r.c4
17 files changed, 36 insertions, 36 deletions
diff --git a/sys/dev/i2c/ad741x.c b/sys/dev/i2c/ad741x.c
index a6748d9edb0..6cb5106f019 100644
--- a/sys/dev/i2c/ad741x.c
+++ b/sys/dev/i2c/ad741x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ad741x.c,v 1.6 2005/12/31 04:31:27 deraadt Exp $ */
+/* $OpenBSD: ad741x.c,v 1.7 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2005 Theo de Raadt
@@ -152,12 +152,12 @@ adc_attach(struct device *parent, struct device *self, void *aux)
return;
}
- SENSOR_ADD(&sc->sc_sensor[0]);
+ sensor_add(&sc->sc_sensor[0]);
if (sc->sc_chip == 7417 || sc->sc_chip == 7418)
- SENSOR_ADD(&sc->sc_sensor[1]);
+ sensor_add(&sc->sc_sensor[1]);
if (sc->sc_chip == 7417)
for (i = 2; i < nsens; i++)
- SENSOR_ADD(&sc->sc_sensor[i]);
+ sensor_add(&sc->sc_sensor[i]);
printf("\n");
}
diff --git a/sys/dev/i2c/adm1021.c b/sys/dev/i2c/adm1021.c
index 45a5149e56b..f5541ae0ba6 100644
--- a/sys/dev/i2c/adm1021.c
+++ b/sys/dev/i2c/adm1021.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adm1021.c,v 1.20 2006/01/03 07:55:47 kettenis Exp $ */
+/* $OpenBSD: adm1021.c,v 1.21 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2005 Theo de Raadt
@@ -153,7 +153,7 @@ admtemp_attach(struct device *parent, struct device *self, void *aux)
}
for (i = 0; i < (sc->sc_noexternal ? 1 : ADMTEMP_NUM_SENSORS); i++)
- SENSOR_ADD(&sc->sc_sensor[i]);
+ sensor_add(&sc->sc_sensor[i]);
printf("\n");
}
diff --git a/sys/dev/i2c/adm1024.c b/sys/dev/i2c/adm1024.c
index 8a72ff2e529..fb43c6b56ac 100644
--- a/sys/dev/i2c/adm1024.c
+++ b/sys/dev/i2c/adm1024.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adm1024.c,v 1.9 2005/12/31 04:31:27 deraadt Exp $ */
+/* $OpenBSD: adm1024.c,v 1.10 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2005 Theo de Raadt
@@ -181,7 +181,7 @@ admlc_attach(struct device *parent, struct device *self, void *aux)
}
for (i = 0; i < ADMLC_NUM_SENSORS; i++)
- SENSOR_ADD(&sc->sc_sensor[i]);
+ sensor_add(&sc->sc_sensor[i]);
printf("\n");
}
diff --git a/sys/dev/i2c/adm1025.c b/sys/dev/i2c/adm1025.c
index 96d1b138e53..81fb2b172d3 100644
--- a/sys/dev/i2c/adm1025.c
+++ b/sys/dev/i2c/adm1025.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adm1025.c,v 1.20 2006/01/06 03:44:35 deraadt Exp $ */
+/* $OpenBSD: adm1025.c,v 1.21 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2005 Theo de Raadt
@@ -185,7 +185,7 @@ admtm_attach(struct device *parent, struct device *self, void *aux)
}
for (i = 0; i < sc->sc_nsensors; i++)
- SENSOR_ADD(&sc->sc_sensor[i]);
+ sensor_add(&sc->sc_sensor[i]);
printf("\n");
}
diff --git a/sys/dev/i2c/adm1026.c b/sys/dev/i2c/adm1026.c
index 1e2478e68e4..d356794231e 100644
--- a/sys/dev/i2c/adm1026.c
+++ b/sys/dev/i2c/adm1026.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adm1026.c,v 1.5 2005/12/31 04:31:27 deraadt Exp $ */
+/* $OpenBSD: adm1026.c,v 1.6 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2005 Theo de Raadt
@@ -243,7 +243,7 @@ admcts_attach(struct device *parent, struct device *self, void *aux)
}
for (i = 0; i < ADMCTS_NUM_SENSORS; i++)
- SENSOR_ADD(&sc->sc_sensor[i]);
+ sensor_add(&sc->sc_sensor[i]);
printf("\n");
}
diff --git a/sys/dev/i2c/adm1030.c b/sys/dev/i2c/adm1030.c
index 593fbae3c67..dba434b18e3 100644
--- a/sys/dev/i2c/adm1030.c
+++ b/sys/dev/i2c/adm1030.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adm1030.c,v 1.3 2005/12/27 17:18:18 deraadt Exp $ */
+/* $OpenBSD: adm1030.c,v 1.4 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2005 Theo de Raadt
@@ -110,7 +110,7 @@ admtmp_attach(struct device *parent, struct device *self, void *aux)
}
for (i = 0; i < ADMTMP_NUM_SENSORS; i++)
- SENSOR_ADD(&sc->sc_sensor[i]);
+ sensor_add(&sc->sc_sensor[i]);
printf("\n");
}
diff --git a/sys/dev/i2c/adm1031.c b/sys/dev/i2c/adm1031.c
index d5f3975ad93..2beb7bd3b78 100644
--- a/sys/dev/i2c/adm1031.c
+++ b/sys/dev/i2c/adm1031.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adm1031.c,v 1.3 2005/12/28 20:35:24 deraadt Exp $ */
+/* $OpenBSD: adm1031.c,v 1.4 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2005 Theo de Raadt
@@ -122,7 +122,7 @@ admtt_attach(struct device *parent, struct device *self, void *aux)
}
for (i = 0; i < ADMTT_NUM_SENSORS; i++)
- SENSOR_ADD(&sc->sc_sensor[i]);
+ sensor_add(&sc->sc_sensor[i]);
printf("\n");
}
diff --git a/sys/dev/i2c/adt7460.c b/sys/dev/i2c/adt7460.c
index 11aeaafc0f5..248c05a4db9 100644
--- a/sys/dev/i2c/adt7460.c
+++ b/sys/dev/i2c/adt7460.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adt7460.c,v 1.5 2005/12/28 00:42:14 deraadt Exp $ */
+/* $OpenBSD: adt7460.c,v 1.6 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2005 Mark Kettenis
@@ -178,7 +178,7 @@ adt_attach(struct device *parent, struct device *self, void *aux)
}
for (i = 0; i < ADT_NUM_SENSORS; i++)
- SENSOR_ADD(&sc->sc_sensor[i]);
+ sensor_add(&sc->sc_sensor[i]);
printf("\n");
}
diff --git a/sys/dev/i2c/asb100.c b/sys/dev/i2c/asb100.c
index 4dc9d8f0792..9205ee6a517 100644
--- a/sys/dev/i2c/asb100.c
+++ b/sys/dev/i2c/asb100.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asb100.c,v 1.3 2006/01/01 22:27:46 djm Exp $ */
+/* $OpenBSD: asb100.c,v 1.4 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2005 Damien Miller
@@ -292,7 +292,7 @@ asbtm_attach(struct device *parent, struct device *self, void *aux)
}
for (i = 0; i < ASB100_NUM_SENSORS; i++)
- SENSOR_ADD(&sc->sc_sensor[i]);
+ sensor_add(&sc->sc_sensor[i]);
printf("\n");
}
diff --git a/sys/dev/i2c/ds1631.c b/sys/dev/i2c/ds1631.c
index 13bcc30d9e8..2eb38c59d18 100644
--- a/sys/dev/i2c/ds1631.c
+++ b/sys/dev/i2c/ds1631.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ds1631.c,v 1.4 2006/01/13 21:41:40 deraadt Exp $ */
+/* $OpenBSD: ds1631.c,v 1.5 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2005 Theo de Raadt
@@ -126,7 +126,7 @@ dostart:
}
for (i = 0; i < MAXDS_NUM_SENSORS; i++)
- SENSOR_ADD(&sc->sc_sensor[i]);
+ sensor_add(&sc->sc_sensor[i]);
printf("\n");
}
diff --git a/sys/dev/i2c/fcu.c b/sys/dev/i2c/fcu.c
index e2a01910d7a..13a0413aa18 100644
--- a/sys/dev/i2c/fcu.c
+++ b/sys/dev/i2c/fcu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fcu.c,v 1.2 2005/12/27 17:18:18 deraadt Exp $ */
+/* $OpenBSD: fcu.c,v 1.3 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2005 Mark Kettenis
@@ -108,7 +108,7 @@ fcu_attach(struct device *parent, struct device *self, void *aux)
}
for (i = 0; i < FCU_NUM_SENSORS; i++)
- SENSOR_ADD(&sc->sc_sensor[i]);
+ sensor_add(&sc->sc_sensor[i]);
printf("\n");
}
diff --git a/sys/dev/i2c/lm75.c b/sys/dev/i2c/lm75.c
index 9a9d054d720..caf0ea97a77 100644
--- a/sys/dev/i2c/lm75.c
+++ b/sys/dev/i2c/lm75.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lm75.c,v 1.10 2006/01/10 23:02:32 deraadt Exp $ */
+/* $OpenBSD: lm75.c,v 1.11 2006/01/19 17:08:39 grange Exp $ */
/* $NetBSD: lm75.c,v 1.1 2003/09/30 00:35:31 thorpej Exp $ */
/*
* Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org>
@@ -180,7 +180,7 @@ lmtemp_attach(struct device *parent, struct device *self, void *aux)
strlcpy(sc->sc_sensor.desc, "TEMP", sizeof(sc->sc_sensor.desc));
/* Hook into the hw.sensors sysctl */
- SENSOR_ADD(&sc->sc_sensor);
+ sensor_add(&sc->sc_sensor);
sensor_task_register(sc, lmtemp_refresh_sensor_data, LM_POLLTIME);
}
diff --git a/sys/dev/i2c/lm87.c b/sys/dev/i2c/lm87.c
index 27026ef6dda..3a76ca5eaa1 100644
--- a/sys/dev/i2c/lm87.c
+++ b/sys/dev/i2c/lm87.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lm87.c,v 1.14 2005/12/31 04:31:27 deraadt Exp $ */
+/* $OpenBSD: lm87.c,v 1.15 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2005 Mark Kettenis
@@ -233,7 +233,7 @@ lmenv_attach(struct device *parent, struct device *self, void *aux)
}
for (i = 0; i < LMENV_NUM_SENSORS; i++)
- SENSOR_ADD(&sc->sc_sensor[i]);
+ sensor_add(&sc->sc_sensor[i]);
printf("\n");
}
diff --git a/sys/dev/i2c/maxim6690.c b/sys/dev/i2c/maxim6690.c
index 67a558b0ee9..5363693e7e9 100644
--- a/sys/dev/i2c/maxim6690.c
+++ b/sys/dev/i2c/maxim6690.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: maxim6690.c,v 1.5 2005/12/31 04:31:27 deraadt Exp $ */
+/* $OpenBSD: maxim6690.c,v 1.6 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2005 Theo de Raadt
@@ -126,7 +126,7 @@ maxtmp_attach(struct device *parent, struct device *self, void *aux)
}
for (i = 0; i < MAXTMP_NUM_SENSORS; i++)
- SENSOR_ADD(&sc->sc_sensor[i]);
+ sensor_add(&sc->sc_sensor[i]);
printf("\n");
}
diff --git a/sys/dev/i2c/pca9554.c b/sys/dev/i2c/pca9554.c
index 48b336198ff..5cc443b2536 100644
--- a/sys/dev/i2c/pca9554.c
+++ b/sys/dev/i2c/pca9554.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pca9554.c,v 1.6 2005/12/27 17:18:18 deraadt Exp $ */
+/* $OpenBSD: pca9554.c,v 1.7 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2005 Theo de Raadt
@@ -135,7 +135,7 @@ pcagpio_attach(struct device *parent, struct device *self, void *aux)
#if 0
for (i = 0; i < PCAGPIO_NPINS; i++)
- SENSOR_ADD(&sc->sc_sensor[i]);
+ sensor_add(&sc->sc_sensor[i]);
#endif
printf(":");
diff --git a/sys/dev/i2c/tsl2560.c b/sys/dev/i2c/tsl2560.c
index 974dfbe30ca..28ea49cd4a9 100644
--- a/sys/dev/i2c/tsl2560.c
+++ b/sys/dev/i2c/tsl2560.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsl2560.c,v 1.2 2005/12/27 17:18:18 deraadt Exp $ */
+/* $OpenBSD: tsl2560.c,v 1.3 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2005 Mark Kettenis
@@ -125,7 +125,7 @@ tsl_attach(struct device *parent, struct device *self, void *aux)
return;
}
- SENSOR_ADD(&sc->sc_sensor);
+ sensor_add(&sc->sc_sensor);
printf("\n");
}
diff --git a/sys/dev/i2c/w83l784r.c b/sys/dev/i2c/w83l784r.c
index d161504006e..48bca0c5a16 100644
--- a/sys/dev/i2c/w83l784r.c
+++ b/sys/dev/i2c/w83l784r.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: w83l784r.c,v 1.1 2006/01/15 12:20:14 kettenis Exp $ */
+/* $OpenBSD: w83l784r.c,v 1.2 2006/01/19 17:08:39 grange Exp $ */
/*
* Copyright (c) 2006 Mark Kettenis
@@ -216,7 +216,7 @@ wbenv_attach(struct device *parent, struct device *self, void *aux)
/* Add sensors */
for (i = 0; i < sc->sc_numsensors; ++i)
- SENSOR_ADD(&sc->sc_sensors[i]);
+ sensor_add(&sc->sc_sensors[i]);
}
void
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 17:47:19 +0000