Changeset 2257

Timestamp:

02/01/04 14:20:41 (9 years ago)

Author:

khali

Message:

Move FSC Hermes voltage conversions to sensors.conf. (Reinhard

Nissl)

Location:

lm-sensors/trunk

Files:

• etc/sensors.conf.eg (modified) (3 diffs)
• kernel/chips/fscher.c (modified) (4 diffs)

lm-sensors/trunk/etc/sensors.conf.eg

@@ -1561 +1561 @@
 
 # Temperature
-
     label temp1       "Temp1/CPU"
     label temp2       "Temp2/MB"
@@ -1567 +1566 @@
 
 # Fans
-
     label fan1        "Fan1/CPU"
     label fan2        "Fan2/AUX"
@@ -1573 +1571 @@
 
 # Voltage
-
     label in0         "+12V"
     label in1         "+5V"
     label in2         "Battery"
+
+# Compute Voltages using mainboard dependant MRO-values (see doc/chips/fscher)
+#                           M    R             O               O                  M    R
+    compute in0       (@ * (49 * 33) / 255) + (0 / 100), (@ - (0 / 100)) * 255 / (49 * 33)
+    compute in1       (@ * (20 * 33) / 255) + (0 / 100), (@ - (0 / 100)) * 255 / (20 * 33)
+    compute in2       (@ * (10 * 33) / 255) + (0 / 100), (@ - (0 / 100)) * 255 / (10 * 33)
+
+# Allow fans to turn off
+#    set pwm1          0
+#    set pwm2          0
+#    set pwm3          0
+
+# Min cooling
+#    set pwm1          2
+#    set pwm2          1
+#    set pwm3          1
+
+# Max cooling
+#    set pwm1          255
+#    set pwm2          255
+#    set pwm3          255
 
 

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

@@ -2 +2 @@
   fscher.c - Part of lm_sensors, Linux kernel modules for hardware
   monitoring
-  Copyright (c) 2003 Reinhard Nissl <rnissl@gmx.de>
+  Copyright (C) 2003, 2004 Reinhard Nissl <rnissl@gmx.de>
   
   This program is free software; you can redistribute it and/or modify
@@ -22 +22 @@
    fujitsu siemens hermes chip, 
    module based on fscpos.c 
-   Copyright (c) 2000 Hermann Jung <hej@odn.de>
-   Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl>
+   Copyright (C) 2000 Hermann Jung <hej@odn.de>
+   Copyright (C) 1998, 1999 Frodo Looijaard <frodol@dds.nl>
    and Philip Edelbrock <phil@netroedge.com>
 */
@@ -530 +530 @@
 
 /*
- * Multiplier, ReferenceVoltage and Offset were taken from dmidecode output:
- *
- * Handle 0x0002
- *        DMI type 2, 8 bytes.
- *        Board Information Block
- *                Vendor: FUJITSU SIEMENS
- *                Product: D1562
- *                Version: S26361-D1562
- *                Serial Number: 11732921
- *
- * Handle 0x0045
- *        DMI type 185, 56 bytes.
- *        13
- *        ...
- *           01
- *              14 00
- *                    00 00
- *           02
- *              31 00
- *                    00 00 
- *           03
- *              0a 00
- *                    00 00
- *        ...
- *           07
- *              21 00
- *        ...
+ * The final conversion is specified in sensors.conf, as it depends on
+ * mainboard specific values. We export the registers contents as
+ * pseudo-hundreds-of-Volts (range 0V - 2.55V). Not that it makes much
+ * sense per se, but it minimizes the conversions count and keeps the
+ * values within a usual range.
  */
-
-#define VOLT_FROM_REG(val,mult,ref,off)    (val*mult*ref/255+off)
-
 void fscher_volt(struct i2c_client *client, int operation, int ctl_name,
                  int *nrels_mag, long *results)
@@ -571 +546 @@
     switch(ctl_name) {
     case FSCHER_SYSCTL_VOLT0:
-      results[0] = VOLT_FROM_REG(data->volt[0],0x0031,0x0021,0x0000);
+      results[0] = data->volt[0];
       break;
     case FSCHER_SYSCTL_VOLT1:
-      results[0] = VOLT_FROM_REG(data->volt[1],0x0014,0x0021,0x0000);
+      results[0] = data->volt[1];
       break;
     case FSCHER_SYSCTL_VOLT2:
-      results[0] = VOLT_FROM_REG(data->volt[2],0x000a,0x0021,0x0000);
+      results[0] = data->volt[2];
       break;
     default: