Changeset 2477

Timestamp:

04/25/04 17:23:32 (9 years ago)

Author:

khali

Message:

Add some debug output.

Show more status bits (voltages and temperatures).
Fix incorrect use of const.
Clear status bits on update.
Fix temperature reads (min, crit and current).
Fix temperature writes (min).

Files:

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

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

@@ -123 +123 @@
 #define IN_TO_REG(val)                  ((val)<0?0:(val)>297?255: \
                                          ((val) * 255 + 148) / 297)
-#define IN_STATUS_FROM_REG(val)         ((val) & 0x86)
+#define IN_STATUS_FROM_REG(val)         ((val) & 0x97)
 
 /*
@@ -142 +142 @@
 #define TEMP_TO_REG(val)                ((val)<-128?0x80:(val)>127?0x7F: \
                                          (val)<0?(val)+0x80:(val))
-#define TEMP_STATUS_FROM_REG(val)       ((val) & 0xCE)
+#define TEMP_STATUS_FROM_REG(val)       ((val) & 0xFF)
 
 struct pc87360_data {
@@ -437 +437 @@
 
                 address[i] = val;
+
+#ifdef DEBUG
+                if (i==0) { /* Fans */
+                        val = superio_inb(0x70)
+                            | (superio_inb(0x71) << 8);
+                        
+                        printk(KERN_DEBUG "pc87360.o: Fan 1: mon=%d "
+                               "ctrl=%d inv=%d\n", (val>>2)&1, (val>>3)&1,
+                               (val>>4)&1);
+                        printk(KERN_DEBUG "pc87360.o: Fan 2: mon=%d "
+                               "ctrl=%d inv=%d\n", (val>>5)&1, (val>>6)&1,
+                               (val>>7)&1);
+                        printk(KERN_DEBUG "pc87360.o: Fan 3: mon=%d "
+                               "ctrl=%d inv=%d\n", (val>>8)&1, (val>>9)&1,
+                               (val>>10)&1);
+                }
+#endif
         }
 
@@ -454 +471 @@
         const char *type_name = "pc87360";
         const char *client_name = "PC8736x chip";
-        const ctl_table *template = pc87360_dir_table_template;
+        ctl_table *template = pc87360_dir_table_template;
 
         if (!i2c_is_isa_adapter(adapter)) {
@@ -597 +614 @@
         down(&data->update_lock);
 
-        if ((jiffies - data->last_updated > HZ + HZ / 2) ||
+        if ((jiffies - data->last_updated > HZ * 2) ||
             (jiffies < data->last_updated) || !data->valid) {
+#ifdef DEBUG
+                printk(KERN_DEBUG "pc87360.o: Data update\n");
+#endif
+
+                /* Fans */
                 for (i = 0; i < data->fannr; i++) {
                         data->fan[i] = pc87360_read_value(data, 0,
@@ -610 +632 @@
                 }
 
+                /* Voltages */
                 for (i = 0; i < data->innr; i++) {
                         pc87360_write_value(data, 1, PC87365_REG_IN_BANK, i);
                         data->in_status[i] = pc87360_read_value(data, 1,
                                              PC87365_REG_IN_STATUS);
+                        /* Clear bits */
+                        pc87360_write_value(data, 1, PC87365_REG_IN_STATUS,
+                                            data->in_status[i] | 0x86);
                         if (data->in_status[i] & 0x01) {
                                 data->in[i] = pc87360_read_value(data, 1,
@@ -628 +654 @@
                 }
 
+                /* Temperatures */
                 for (i = 0; i < data->tempnr; i++) {
                         pc87360_write_value(data, 2, PC87365_REG_TEMP_BANK, i);
                         data->temp_status[i] = pc87360_read_value(data, 2,
                                                PC87365_REG_TEMP_STATUS);
+                        /* Clear bits */
+                        pc87360_write_value(data, 2, PC87365_REG_TEMP_STATUS,
+                                            data->temp_status[i] | 0xCE);
                         if (data->temp_status[i] & 0x01) {
                                 data->temp[i] = pc87360_read_value(data, 2,
@@ -826 +856 @@
                 results[0] = TEMP_FROM_REG(data->temp_max[nr]);
                 results[1] = TEMP_FROM_REG(data->temp_min[nr]);
-                results[1] = TEMP_FROM_REG(data->temp_crit[nr]);
-                results[2] = TEMP_FROM_REG(data->temp[nr]);
+                results[2] = TEMP_FROM_REG(data->temp_crit[nr]);
+                results[3] = TEMP_FROM_REG(data->temp[nr]);
                 *nrels_mag = 4;
         }
@@ -841 +871 @@
                 if (*nrels_mag >= 2) {
                         data->temp_min[nr] = TEMP_TO_REG(results[1]);
-                        pc87360_write_value(data, 2, PC87365_REG_TEMP_MAX,
-                                            data->temp_max[nr]);
+                        pc87360_write_value(data, 2, PC87365_REG_TEMP_MIN,
+                                            data->temp_min[nr]);
                 }
                 if (*nrels_mag >= 3) {