diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2007-01-05 06:36:38 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2007-01-05 06:36:38 +0000 |
| commit | d3581b22131e5d008f9e4d4c0cd38cd762bdc448 (patch) | |
| tree | 7f87adf1129f9e030ea23fd81d6b214f77653f3b /sys/dev | |
| parent | 699b25605611774ab2cc47d4b3bbd3a8279bda69 (diff) | |
Remove unknown sensor that seems to always be fixed at 7
on all ThinkPad models.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isa/aps.c | 8 | ||||
| -rw-r--r-- | sys/dev/isa/apsvar.h | 5 |
2 files changed, 3 insertions, 10 deletions
diff --git a/sys/dev/isa/aps.c b/sys/dev/isa/aps.c index 6d3959196f1..15109f281d6 100644 --- a/sys/dev/isa/aps.c +++ b/sys/dev/isa/aps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aps.c,v 1.11 2007/01/05 06:26:44 jsg Exp $ */ +/* $OpenBSD: aps.c,v 1.12 2007/01/05 06:36:37 jsg Exp $ */ /* * Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org> * @@ -165,10 +165,6 @@ aps_attach(struct device *parent, struct device *self, void *aux) snprintf(sc->sensors[APS_SENSOR_YVAR].desc, sizeof(sc->sensors[APS_SENSOR_YVAR].desc), "Y_VAR"); - sc->sensors[APS_SENSOR_UNK].type = SENSOR_INTEGER; - snprintf(sc->sensors[APS_SENSOR_UNK].desc, - sizeof(sc->sensors[APS_SENSOR_UNK].desc), "unknown"); - sc->sensors[APS_SENSOR_KBACT].type = SENSOR_INDICATOR; snprintf(sc->sensors[APS_SENSOR_KBACT].desc, sizeof(sc->sensors[APS_SENSOR_KBACT].desc), "Keyboard Active"); @@ -267,7 +263,6 @@ aps_read_data(struct aps_softc *sc) sc->aps_data.x_var = bus_space_read_2(iot, ioh, APS_XVAR); sc->aps_data.y_var = bus_space_read_2(iot, ioh, APS_YVAR); sc->aps_data.temp2 = bus_space_read_1(iot, ioh, APS_TEMP2); - sc->aps_data.unk = bus_space_read_1(iot, ioh, APS_UNKNOWN); sc->aps_data.input = bus_space_read_1(iot, ioh, APS_INPUT); return (1); @@ -315,7 +310,6 @@ aps_refresh_sensor_data(struct aps_softc *sc) sc->sensors[APS_SENSOR_XVAR].value = sc->aps_data.x_var; sc->sensors[APS_SENSOR_YVAR].value = sc->aps_data.y_var; - sc->sensors[APS_SENSOR_UNK].value = sc->aps_data.unk; sc->sensors[APS_SENSOR_KBACT].value = (sc->aps_data.input & APS_INPUT_KB) ? 1 : 0; sc->sensors[APS_SENSOR_MSACT].value = diff --git a/sys/dev/isa/apsvar.h b/sys/dev/isa/apsvar.h index 474b8a80d87..84277282926 100644 --- a/sys/dev/isa/apsvar.h +++ b/sys/dev/isa/apsvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apsvar.h,v 1.3 2007/01/05 06:00:25 jsg Exp $ */ +/* $OpenBSD: apsvar.h,v 1.4 2007/01/05 06:36:37 jsg Exp $ */ /* * Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org> * @@ -15,7 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define APS_NUM_SENSORS 10 +#define APS_NUM_SENSORS 9 #define APS_SENSOR_XACCEL 0 #define APS_SENSOR_YACCEL 1 @@ -26,7 +26,6 @@ #define APS_SENSOR_KBACT 6 #define APS_SENSOR_MSACT 7 #define APS_SENSOR_LIDOPEN 8 -#define APS_SENSOR_UNK 9 struct aps_softc { struct device sc_dev; |