Changeset 149

Timestamp:

01/08/99 15:48:46 (14 years ago)

Author:

frodo

Message:

Resolved old fan_div related bug in lm80 and w83781 modules.

When computing the fan rotation speed, the register value of the dividers
was used, instead of the value it represents. I'ev fixed this ages ago
for the LM80 driver, but it seems I had forgotten to fix it at other places.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• kernel/chips/lm80.c (modified) (1 diff)
• kernel/chips/w83781d.c (modified) (1 diff)
• src/lm80.c (modified) (1 diff)
• src/w83781d.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -14 +14 @@
       cvs diff -r V2-0-0 -r V2-0-1 -u
 
+2.1.2 (199801??)
+  Modules lm80.o, w83781d.o: fan-related Segmentation fault corrected
+
 2.1.1 (19990107)
   Module i2c-proc.o: Hack to make /proc/bus/ possible for kernels 2.0.35
                      and older
   Module gl518sm.o: Miscelaneous bugs and problems solved
+  Program isadump: NEW
 
 2.1.0 (19981230)
   Library: Completely NEW
   Program sensors: NEW
+  Program grab_busses: NEW
   Program decode-dimms: More information
   Module bit-mb.o: Removed spurious semicolon; now runs on more VIA chipsets

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

@@ -549 +549 @@
   else if (operation == SENSORS_PROC_REAL_READ) {
     lm80_update_client(client);
-    results[0] = FAN_FROM_REG(data->fan_min[nr-1],data->fan_div[nr-1]);
-    results[1] = FAN_FROM_REG(data->fan[nr-1],data->fan_div[nr-1]);
+    results[0] = FAN_FROM_REG(data->fan_min[nr-1],
+                              DIV_FROM_REG(data->fan_div[nr-1]));
+    results[1] = FAN_FROM_REG(data->fan[nr-1],
+                              DIV_FROM_REG(data->fan_div[nr-1]));
     *nrels_mag = 2;
   } else if (operation == SENSORS_PROC_REAL_WRITE) {
     if (*nrels_mag >= 1) {
-      data->fan_min[nr-1] = FAN_TO_REG(results[0],data->fan_div[nr-1]);
+      data->fan_min[nr-1] = FAN_TO_REG(results[0],
+                            DIV_FROM_REG(data->fan_div[nr-1]));
       lm80_write_value(client,nr==1?LM80_REG_FAN1_MIN:LM80_REG_FAN2_MIN,
                        data->fan_min[nr-1]);

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

@@ -916 +916 @@
   else if (operation == SENSORS_PROC_REAL_READ) {
     w83781d_update_client(client);
-    results[0] = FAN_FROM_REG(data->fan_min[nr-1],data->fan_div[nr-1]);
-    results[1] = FAN_FROM_REG(data->fan[nr-1],data->fan_div[nr-1]);
+    results[0] = FAN_FROM_REG(data->fan_min[nr-1],
+                              FAN_DIV_FROM_REG(data->fan_div[nr-1]));
+    results[1] = FAN_FROM_REG(data->fan[nr-1],
+                              FAN_DIV_FROM_REG(data->fan_div[nr-1]));
     *nrels_mag = 2;
   } else if (operation == SENSORS_PROC_REAL_WRITE) {
     if (*nrels_mag >= 1) {
-      data->fan_min[nr-1] = FAN_TO_REG(results[0],data->fan_div[nr-1]);
+      data->fan_min[nr-1] = FAN_TO_REG(results[0],
+                                       FAN_DIV_FROM_REG(data->fan_div[nr-1]));
       w83781d_write_value(client,W83781D_REG_FAN_MIN(nr),data->fan_min[nr-1]);
     }

lm-sensors/trunk/src/lm80.c

@@ -549 +549 @@
   else if (operation == SENSORS_PROC_REAL_READ) {
     lm80_update_client(client);
-    results[0] = FAN_FROM_REG(data->fan_min[nr-1],data->fan_div[nr-1]);
-    results[1] = FAN_FROM_REG(data->fan[nr-1],data->fan_div[nr-1]);
+    results[0] = FAN_FROM_REG(data->fan_min[nr-1],
+                              DIV_FROM_REG(data->fan_div[nr-1]));
+    results[1] = FAN_FROM_REG(data->fan[nr-1],
+                              DIV_FROM_REG(data->fan_div[nr-1]));
     *nrels_mag = 2;
   } else if (operation == SENSORS_PROC_REAL_WRITE) {
     if (*nrels_mag >= 1) {
-      data->fan_min[nr-1] = FAN_TO_REG(results[0],data->fan_div[nr-1]);
+      data->fan_min[nr-1] = FAN_TO_REG(results[0],
+                            DIV_FROM_REG(data->fan_div[nr-1]));
       lm80_write_value(client,nr==1?LM80_REG_FAN1_MIN:LM80_REG_FAN2_MIN,
                        data->fan_min[nr-1]);

lm-sensors/trunk/src/w83781d.c

@@ -916 +916 @@
   else if (operation == SENSORS_PROC_REAL_READ) {
     w83781d_update_client(client);
-    results[0] = FAN_FROM_REG(data->fan_min[nr-1],data->fan_div[nr-1]);
-    results[1] = FAN_FROM_REG(data->fan[nr-1],data->fan_div[nr-1]);
+    results[0] = FAN_FROM_REG(data->fan_min[nr-1],
+                              FAN_DIV_FROM_REG(data->fan_div[nr-1]));
+    results[1] = FAN_FROM_REG(data->fan[nr-1],
+                              FAN_DIV_FROM_REG(data->fan_div[nr-1]));
     *nrels_mag = 2;
   } else if (operation == SENSORS_PROC_REAL_WRITE) {
     if (*nrels_mag >= 1) {
-      data->fan_min[nr-1] = FAN_TO_REG(results[0],data->fan_div[nr-1]);
+      data->fan_min[nr-1] = FAN_TO_REG(results[0],
+                                       FAN_DIV_FROM_REG(data->fan_div[nr-1]));
       w83781d_write_value(client,W83781D_REG_FAN_MIN(nr),data->fan_min[nr-1]);
     }