diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-03-22 16:55:32 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-03-22 16:55:32 +0000 |
| commit | bfcfcc95f91a9ef756b3184426381561b7f4dc23 (patch) | |
| tree | 86156fd65b4c74f4b929cb5bcd06ed881f46f591 /sys/dev/i2c/w83l784r.c | |
| parent | d0617786c492a05d286defedc41f1cac5a22411d (diff) | |
split userland & kernel struct sensor/sensordev so that the addition
of new fields in the future is less disruptive. This is done similar
to how struct proc is handled for ps(1). ok jmc (man page changes)
tested fkr simon, and more suggestions from millert
Diffstat (limited to 'sys/dev/i2c/w83l784r.c')
| -rw-r--r-- | sys/dev/i2c/w83l784r.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/i2c/w83l784r.c b/sys/dev/i2c/w83l784r.c index ee4c7cac726..9795bab4aef 100644 --- a/sys/dev/i2c/w83l784r.c +++ b/sys/dev/i2c/w83l784r.c @@ -1,4 +1,4 @@ -/* $OpenBSD: w83l784r.c,v 1.10 2006/12/23 17:46:39 deraadt Exp $ */ +/* $OpenBSD: w83l784r.c,v 1.11 2007/03/22 16:55:31 deraadt Exp $ */ /* * Copyright (c) 2006 Mark Kettenis @@ -78,8 +78,8 @@ struct wbenv_softc { i2c_addr_t sc_addr[3]; u_int8_t sc_chip_id; - struct sensor sc_sensors[WBENV_MAX_SENSORS]; - struct sensordev sc_sensordev; + struct ksensor sc_sensors[WBENV_MAX_SENSORS]; + struct ksensordev sc_sensordev; struct wbenv_sensor *sc_wbenv_sensors; int sc_numsensors; }; @@ -269,7 +269,7 @@ wbenv_refresh(void *arg) void w83l784r_refresh_volt(struct wbenv_softc *sc, int n) { - struct sensor *sensor = &sc->sc_sensors[n]; + struct ksensor *sensor = &sc->sc_sensors[n]; int data, reg = sc->sc_wbenv_sensors[n].reg; data = wbenv_readreg(sc, reg); @@ -281,7 +281,7 @@ w83l784r_refresh_volt(struct wbenv_softc *sc, int n) void w83l785r_refresh_volt(struct wbenv_softc *sc, int n) { - struct sensor *sensor = &sc->sc_sensors[n]; + struct ksensor *sensor = &sc->sc_sensors[n]; int data, reg = sc->sc_wbenv_sensors[n].reg; data = wbenv_readreg(sc, reg); @@ -293,7 +293,7 @@ w83l785r_refresh_volt(struct wbenv_softc *sc, int n) void wbenv_refresh_temp(struct wbenv_softc *sc, int n) { - struct sensor *sensor = &sc->sc_sensors[n]; + struct ksensor *sensor = &sc->sc_sensors[n]; int sdata; sdata = wbenv_readreg(sc, sc->sc_wbenv_sensors[n].reg); @@ -305,7 +305,7 @@ wbenv_refresh_temp(struct wbenv_softc *sc, int n) void w83l784r_refresh_temp(struct wbenv_softc *sc, int n) { - struct sensor *sensor = &sc->sc_sensors[n]; + struct ksensor *sensor = &sc->sc_sensors[n]; int16_t sdata; u_int8_t cmd = 0; @@ -318,7 +318,7 @@ w83l784r_refresh_temp(struct wbenv_softc *sc, int n) void w83l784r_refresh_fanrpm(struct wbenv_softc *sc, int n) { - struct sensor *sensor = &sc->sc_sensors[n]; + struct ksensor *sensor = &sc->sc_sensors[n]; int data, divisor; data = wbenv_readreg(sc, W83L784R_FANDIV); @@ -340,7 +340,7 @@ w83l784r_refresh_fanrpm(struct wbenv_softc *sc, int n) void w83l785r_refresh_fanrpm(struct wbenv_softc *sc, int n) { - struct sensor *sensor = &sc->sc_sensors[n]; + struct ksensor *sensor = &sc->sc_sensors[n]; int data, divisor; data = wbenv_readreg(sc, W83L785R_FANDIV); |