[src/trunk]: src/sys/dev/acpi * s/misformed/malformed/;

[cnst <cnst%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3618373ae3bc
branches:  trunk
changeset: 751937:3618373ae3bc
user:      cnst <cnst%NetBSD.org@localhost>
date:      Tue Feb 09 03:32:57 2010 +0000

description:
* s/misformed/malformed/;

* don't change .status to anything other than SVALID and SINVALID in refresh();

suggested by <pgoyette>

diffstat:

 sys/dev/acpi/atk0110.c |  44 +++++++-------------------------------------
 1 files changed, 7 insertions(+), 37 deletions(-)

diffs (98 lines):

diff -r b104fe567744 -r 3618373ae3bc sys/dev/acpi/atk0110.c
--- a/sys/dev/acpi/atk0110.c    Tue Feb 09 03:26:44 2010 +0000
+++ b/sys/dev/acpi/atk0110.c    Tue Feb 09 03:32:57 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atk0110.c,v 1.2 2010/02/09 03:26:44 cnst Exp $ */
+/*     $NetBSD: atk0110.c,v 1.3 2010/02/09 03:32:57 cnst Exp $ */
 /*     $OpenBSD: atk0110.c,v 1.1 2009/07/23 01:38:16 cnst Exp $        */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.2 2010/02/09 03:26:44 cnst Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.3 2010/02/09 03:32:57 cnst Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -188,7 +188,7 @@
 #ifdef AIBS_MORE_SENSORS
                n = bp->Package.Count - 1;
 #endif
-               aprint_error_dev(self, "%s: misformed package: %i/%i"
+               aprint_error_dev(self, "%s: malformed package: %i/%i"
                    ", assume %i\n", name, on, bp->Package.Count - 1, n);
        }
        if (n < 1) {
@@ -296,7 +296,6 @@
        const char              *name;
        struct aibs_sensor      *as;
        ACPI_INTEGER            v;
-       ACPI_INTEGER            l, h;
 
        switch (st) {
        case ENVSYS_STEMP:
@@ -318,9 +317,6 @@
                return;
        for (i = 0; as[i].s.sensor != s->sensor; i++)
                ;
-       l = as[i].l;
-       h = as[i].h;
-
        p.Type = ACPI_TYPE_INTEGER;
        p.Integer.Value = as[i].i;
        mp.Count = 1;
@@ -346,48 +342,22 @@
                if (v == 0) {
                        s->state = ENVSYS_SINVALID;
                        s->flags |= ENVSYS_FMONNOTSUPP;
-               } else {
-                       if (v > h)
-                               s->state = ENVSYS_SCRITOVER;
-                       else if (v > l)
-                               s->state = ENVSYS_SWARNOVER;
-                       else
-                               s->state = ENVSYS_SVALID;
-                       s->flags &= ~ENVSYS_FMONNOTSUPP;
+                       return;
                }
                break;
        case ENVSYS_SFANRPM:
                s->value_cur = v;
-               /* some boards have strange limits for fans */
-               if (l == 0) {
-                       if (v < h)
-                               s->state = ENVSYS_SWARNUNDER;
-                       else
-                               s->state = ENVSYS_SVALID;
-               } else {
-                       if (l > v)
-                               s->state = ENVSYS_SWARNUNDER;
-                       else if (v > h)
-                               s->state = ENVSYS_SWARNOVER;
-                       else
-                               s->state = ENVSYS_SVALID;
-               }
-               s->flags &= ~ENVSYS_FMONNOTSUPP;
                break;
        case ENVSYS_SVOLTS_DC:
                s->value_cur = v * 1000;
-               if (l > v)
-                       s->state = ENVSYS_SCRITUNDER;
-               else if (v > h)
-                       s->state = ENVSYS_SCRITOVER;
-               else
-                       s->state = ENVSYS_SVALID;
-               s->flags &= ~ENVSYS_FMONNOTSUPP;
                break;
        default:
                /* NOTREACHED */
                break;
        }
+       if (s->state == 0 || s->state == ENVSYS_SINVALID)
+               s->state = ENVSYS_SVALID;
+       s->flags &= ~ENVSYS_FMONNOTSUPP;
 }
 
 #ifdef AIBS_MONLIMITS