Changeset 957

Timestamp:

12/16/00 18:58:58 (13 years ago)

Author:

mds

Message:

(mds) stub out two-fan support. Driver currently sets chip for single

fan input (fan2), with fan1 input set for analog in, so fan1 entry
in /proc won't work.

Files:

• lm-sensors/trunk/kernel/chips/lm87.c (modified) (6 diffs)

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

@@ -248 +248 @@
         u8  in_max[6];          /* Register value */
         u8  in_min[6];          /* Register value */
-        u8  fan;                /* Register value */
-        u8  fan_min;            /* Register value */
-        u8  fan_div;            /* Register encoding, shifted right */
+        u8  fan[2];             /* Register value */
+        u8  fan_min[2];         /* Register value */
+        u8  fan_div[2];         /* Register encoding, shifted right */
         int front_amb_temp;     /* Temp, shifted right */
         int cpu_temp;           /* Temp, shifted right */
@@ -615 +615 @@
                 }
 
-                data->fan =
+                data->fan[0] =
+                    lm87_read_value(client, LM87_REG_FAN1_AIN1);
+                data->fan_min[0] =
+                    lm87_read_value(client, LM87_REG_FAN1_AIN1_LIMIT);
+                data->fan[1] =
                     lm87_read_value(client, LM87_REG_FAN2_AIN2);
-                data->fan_min =
+                data->fan_min[1] =
                     lm87_read_value(client, LM87_REG_FAN2_AIN2_LIMIT);
 
@@ -643 +647 @@
 
                 i = lm87_read_value(client, LM87_REG_VID_FAN_DIV);
-                data->fan_div = (i >> 4) & 0x03;
+                data->fan_div[0] = (i >> 4) & 0x03;
+                data->fan_div[1] = (i >> 6) & 0x03;
                 data->vid = i & 0x0f;
                 data->vid |=
@@ -733 +738 @@
 {
         struct lm87_data *data = client->data;
-/*
-  need to fix this function to handle both fans
-        int nr = ctl_name - LM87_SYSCTL_FAN + 1;
-*/
+        int nr = ctl_name - LM87_SYSCTL_FAN1 + 1;
 
         if (operation == SENSORS_PROC_REAL_INFO)
@@ -742 +744 @@
         else if (operation == SENSORS_PROC_REAL_READ) {
                 lm87_update_client(client);
-                results[0] = FAN_FROM_REG(data->fan_min,
-                                          DIV_FROM_REG(data->fan_div));
-                results[1] = FAN_FROM_REG(data->fan, 
-                                         DIV_FROM_REG(data->fan_div));
+                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 >= 0) {
-                        data->fan_min = FAN_TO_REG(results[0],
+                        data->fan_min[nr-1] = FAN_TO_REG(results[0],
                                                    DIV_FROM_REG
-                                                   (data->fan_div));
+                                                   (data->fan_div[nr-1]));
                         lm87_write_value(client, LM87_REG_FAN2_AIN2_LIMIT,
-                                            data->fan_min);
+                                            data->fan_min[nr-1]);
                 }
         }
@@ -853 +855 @@
         else if (operation == SENSORS_PROC_REAL_READ) {
                 lm87_update_client(client);
-                results[0] = DIV_FROM_REG(data->fan_div);
-                *nrels_mag = 1;
+                results[0] = DIV_FROM_REG(data->fan_div[0]);
+                results[1] = DIV_FROM_REG(data->fan_div[1]);
+                *nrels_mag = 2;
         } else if (operation == SENSORS_PROC_REAL_WRITE) {
                 old = lm87_read_value(client, LM87_REG_VID_FAN_DIV);
                 if (*nrels_mag >= 2) {
-                        data->fan_div = DIV_TO_REG(results[1]);
-                        old = (old & 0x3f) | (data->fan_div << 6);
+                        data->fan_div[1] = DIV_TO_REG(results[1]);
+                        old = (old & 0x3f) | (data->fan_div[1] << 6);
                 }
                 if (*nrels_mag >= 1) {
-                        data->fan_div = DIV_TO_REG(results[0]);
-                        old = (old & 0xcf) | (data->fan_div << 4);
+                        data->fan_div[0] = DIV_TO_REG(results[0]);
+                        old = (old & 0xcf) | (data->fan_div[0] << 4);
                         lm87_write_value(client, LM87_REG_VID_FAN_DIV, old);
                 }