diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-12-23 17:46:40 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-12-23 17:46:40 +0000 |
| commit | 456453067d1414c6f4097d6aeaf996624183d72b (patch) | |
| tree | b3a5f4f9a05a1aba0dd603c6eb3a6ff0cd86ee9f /sys/dev/i2c/pca9554.c | |
| parent | 2da4a587cf08c4fd33f160fe0f40ff89d9d3a3c3 (diff) | |
adapt to new two-level sensor api; Constantine A. Murenin
Diffstat (limited to 'sys/dev/i2c/pca9554.c')
| -rw-r--r-- | sys/dev/i2c/pca9554.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/i2c/pca9554.c b/sys/dev/i2c/pca9554.c index 52f00312cbe..237c78d97ef 100644 --- a/sys/dev/i2c/pca9554.c +++ b/sys/dev/i2c/pca9554.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pca9554.c,v 1.8 2006/06/27 20:29:48 deraadt Exp $ */ +/* $OpenBSD: pca9554.c,v 1.9 2006/12/23 17:46:39 deraadt Exp $ */ /* * Copyright (c) 2005 Theo de Raadt @@ -46,6 +46,7 @@ struct pcagpio_softc { gpio_pin_t sc_gpio_pins[PCAGPIO_NPINS]; struct sensor sc_sensor[PCAGPIO_NPINS]; + struct sensordev sc_sensordev; }; int pcagpio_match(struct device *, void *, void *); @@ -113,9 +114,8 @@ pcagpio_attach(struct device *parent, struct device *self, void *aux) } /* Initialize sensor data. */ - for (i = 0; i < PCAGPIO_NPINS; i++) - strlcpy(sc->sc_sensor[i].device, sc->sc_dev.dv_xname, - sizeof(sc->sc_sensor[i].device)); + strlcpy(sc->sc_sensordev.xname, sc->sc_dev.dv_xname, + sizeof(sc->sc_sensordev.xname)); for (i = 0; i < PCAGPIO_NPINS; i++) { sc->sc_sensor[i].type = SENSOR_INTEGER; @@ -136,7 +136,8 @@ 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_attach(&sc->sc_sensordev, &sc->sc_sensor[i]); + sensordev_install(&sc->sc_sensordev); #endif printf(":"); |