Changeset 2492

Timestamp:

04/29/04 23:34:39 (9 years ago)

Author:

khali

Message:

Ignore fan invert configuration bits.

Do not depend on "new data ready" bit for fan speed update.

Files:

• lm-sensors/trunk/kernel/chips/pc87360.c (modified) (4 diffs)

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

@@ -117 +117 @@
 #define FAN_CONFIG_INVERT(val,nr)       (((val) >> (4 + nr * 3)) & 1)
 
-#define PWM_FROM_REG(val,inv)           ((inv) ? 255 - (val) : (val))
-#define PWM_TO_REG(val,inv)             (((val) < 0) ? ((inv) ? 255 : 0) : \
-                                         ((val) > 255) ? ((inv) ? 0 : 255) : \
-                                         (inv) ? 255 - (val) : (val))
+#define PWM_FROM_REG(val)               (val)
+#define PWM_TO_REG(val)                 (((val) < 0) ? 0 : \
+                                         ((val) > 255) ? 255 : \
+                                         (val))
 
 /*
@@ -654 +654 @@
                                             PC87360_REG_FAN_STATUS(i),
                                             data->fan_status[i] | 0x06);
-                        if (data->fan_status[i] & 0x01) {
-                                data->fan[i] = pc87360_read_value(data, LD_FAN,
-                                               NO_BANK, PC87360_REG_FAN(i));
-                        }
+                        data->fan[i] = pc87360_read_value(data, LD_FAN,
+                                       NO_BANK, PC87360_REG_FAN(i));
                         data->fan_min[i] = pc87360_read_value(data, LD_FAN,
                                            NO_BANK, PC87360_REG_FAN_MIN(i));
@@ -819 +817 @@
         else if (operation == SENSORS_PROC_REAL_READ) {
                 pc87360_update_client(client);
-                results[0] = PWM_FROM_REG(data->pwm[nr],
-                             FAN_CONFIG_INVERT(data->fan_conf[0], nr));
+                results[0] = PWM_FROM_REG(data->pwm[nr]);
                 results[1] = FAN_CONFIG_CONTROL(data->fan_conf[0], nr);
                 *nrels_mag = 2;
@@ -827 +824 @@
                 if (*nrels_mag >= 1)
                 {
-                        data->pwm[nr] = PWM_TO_REG(results[0],
-                                        FAN_CONFIG_INVERT(data->fan_conf[0], nr));
+                        data->pwm[nr] = PWM_TO_REG(results[0]);
                         pc87360_write_value(data, LD_FAN, NO_BANK,
                                             PC87360_REG_PWM(nr),