Changeset 819

Timestamp:

06/17/00 22:33:50 (9 years ago)

Author:

mds

Message:

(mds) Change as99127f fan speed calculation based on actual

measurements with frequency counter. Divisor changed from
1350000 to 810000.

Files:

• lm-sensors/trunk/CHANGES (modified) (1 diff)
• lm-sensors/trunk/doc/chips/w83781d (modified) (1 diff)
• lm-sensors/trunk/kernel/chips/w83781d.c (modified) (3 diffs)

lm-sensors/trunk/CHANGES

@@ -23 +23 @@
-  Module w83781d: Fix sensor2&3 selection, enable VBAT (in8) monitoring
-  Module w83781d: Remove as99127f entries for in7-8, pwm3-4, sensor1-3
+  Module w83781d: Fis as99127f fan speed (was 66% too high)
-  Module w83781d: Improve beep input checking
-  Program i2cdump: Add Winbond-style bank selection

lm-sensors/trunk/doc/chips/w83781d

@@ -149 +149 @@
-The as99127f support was developed without the benefit of a datasheet.
-In most cases it is treated as a w83781d.
-
+
+
-
-Known problems:
-        - Fans read about 30% low.
-        - -12V readings a little high (-9.5V to -10.5V)
-        - Problems with diode/thermistor settings (supported?)

lm-sensors/trunk/kernel/chips/w83781d.c

@@ -168 +168 @@
-                             254);
-}
+extern inline u8 AS_FAN_TO_REG(long rpm, int div)
+{
+        if (rpm == 0)
+                return 255;
+        rpm = SENSORS_LIMIT(rpm, 1, 1000000);
+        return SENSORS_LIMIT((810000 + rpm * div / 2) / (rpm * div), 1,
+                             254);
+}
-
-#define FAN_FROM_REG(val,div) ((val)==0?-1:(val)==255?0:1350000/((val)*(div)))
+#define AS_FAN_FROM_REG(val,div) \
+                              ((val)==0?-1:(val)==255?0:810000/((val)*(div)))
-
-#define TEMP_TO_REG(val) (SENSORS_LIMIT(((val)<0?(((val)-5)/10):\
@@ -1299 +1309 @@
-                    (w83781d_read_value(client, W83781D_REG_VBAT) | 0x01));
-        }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        w83781d_write_value(client, W83781D_REG_TEMP_OVER,
@@ -1522 +1541 @@
-        else if (operation == SENSORS_PROC_REAL_READ) {
-                w83781d_update_client(client);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                *nrels_mag = 2;
-        } else if (operation == SENSORS_PROC_REAL_WRITE) {
-                if (*nrels_mag >= 1) {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                        w83781d_write_value(client,
-                                            W83781D_REG_FAN_MIN(nr),