Changeset 921

Timestamp:

11/01/00 17:48:18 (13 years ago)

Author:

rock

Message:

(stephen) Updated cache time to 1 second to be compliant with National spec
read times. Updated voltage calculations for AIN1/2 and VCCP1/2. Fixed
VID calculation.

Files:

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

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

@@ -62 +62 @@
 #define LM87_REG_IN(nr) (0x20 + (nr))
 
+#define AIN1     0
+#define VCCP1    1
+#define VCCP2    5
+
+/* Initial limits */
 
 /*
@@ -167 +172 @@
 #define DIV_TO_REG(val) ((val)==1?0:((val)==8?3:((val)==4?2:1)))
 
+#if 0
 #define VID_FROM_REG(val) ((val)==0x1f?0:(val)>=0x10?510-(val)*10:\
                            205-(val)*5)
-
-/* Initial limits */
+#endif
+
 #define LM87_INIT_IN_0 190
 #define LM87_INIT_IN_1 190
@@ -216 +222 @@
         (LM87_INIT_IN_5 + ((LM87_INIT_IN_5 * LM87_INIT_IN_PERCENTAGE) / 100))
 
-#define LM87_INIT_FAN_MIN 4000
-
-#define LM87_INIT_EXT_TEMP_MAX 800
+#define LM87_INIT_FAN_MIN 3000
+
+#define LM87_INIT_EXT_TEMP_MAX 600
 #define LM87_INIT_EXT_TEMP_MIN 50
-#define LM87_INIT_INT_TEMP_MAX 700
+#define LM87_INIT_INT_TEMP_MAX 600
 #define LM87_INIT_INT_TEMP_MIN 50
 
@@ -571 +577 @@
         down(&data->update_lock);
 
-        if (
-            (jiffies - data->last_updated >
-             (data->type == LM87 ? HZ / 2 : HZ * 2))
-            || (jiffies < data->last_updated) || !data->valid) {
+        if ((jiffies - data->last_updated > HZ) ||  /* 1 sec cache */
+            (jiffies < data->last_updated)      || 
+             !data->valid) {
 
 #ifdef DEBUG
@@ -674 +679 @@
          *   against 1.25V value.
          ************************************************************/
-        int scales[6] = { 260, 260, 344, 520, 1250, 260 };
+        int scales[6] = { 260, 200, 344, 520, 1250, 260 };
 
         struct LM87_data *data = client->data;
@@ -683 +688 @@
         else if (operation == SENSORS_PROC_REAL_READ) {
                 LM87_update_client(client);
+
                 results[0] =
                     IN_FROM_REG(data->in_min[nr], nr) * scales[nr] / 192;
                 results[1] =
                     IN_FROM_REG(data->in_max[nr], nr) * scales[nr] / 192;
-                results[2] =
-                    IN_FROM_REG(data->in[nr], nr) * scales[nr] / 192;
+ 
+                if (nr == AIN1) {
+                   results[2] = ((data->in[nr] * 10) * 98) / 1000;
+                }
+                else if (nr == VCCP1 || nr == VCCP2) {
+                   results[2] = ((data->in[nr] * 10) * 141) / 1000;
+                }
+                else {
+                   results[2] =
+                       IN_FROM_REG(data->in[nr], nr) * scales[nr] / 192;
+                }
+
                 *nrels_mag = 3;
         } else if (operation == SENSORS_PROC_REAL_WRITE) {
@@ -866 +882 @@
         struct LM87_data *data = client->data;
 
+
         if (operation == SENSORS_PROC_REAL_INFO)
                 *nrels_mag = 2;
         else if (operation == SENSORS_PROC_REAL_READ) {
+
                 LM87_update_client(client);
-                results[0] = VID_FROM_REG(data->vid);
-                *nrels_mag = 1;
+                if ((data->vid == 0x1f) || (data->vid == 0x0f)) {
+                   results[0] = 0;
+                }
+                else if (data->vid > 0x0f) {
+                   results[0] = (1275 - (((data->vid - 0x10) * 1000) * 0.025))/10;
+                }
+                else {
+                   results[0] = 200 - ((data->vid * 100) * 0.05);
+                }
+                 
+              *nrels_mag = 1;
         }
 }
@@ -914 +941 @@
     ("Frodo Looijaard <frodol@dds.nl>, Philip Edelbrock <phil@netroedge.com>, 
       and Stephen Rousset <stephen.rousset@rocketlogix.com>");
+
 MODULE_DESCRIPTION("LM87 driver");