Changeset 150

Timestamp:

01/08/99 21:21:32 (10 years ago)

Author:

frodo

Message:

GL518SM fixes

* Better VDD internal computation, as described in the data sheet;
* Fixed the config file to reflect the above change;
* The library read the wrong file to get its gl518sm alarm data.

Files:

• lm-sensors/trunk/CHANGES (modified) (1 diff)
• lm-sensors/trunk/doc/progs (modified) (1 diff)
• lm-sensors/trunk/etc/sensors.conf.eg (modified) (1 diff)
• lm-sensors/trunk/kernel/chips/gl518sm.c (modified) (5 diffs)
• lm-sensors/trunk/lib/chips.c (modified) (1 diff)
• lm-sensors/trunk/src/gl518sm.c (modified) (5 diffs)

lm-sensors/trunk/CHANGES

@@ -16 +16 @@
-2.1.2 (199801??)
-  Modules lm80.o, w83781d.o: fan-related Segmentation fault corrected
+  Module gl518sm.o: yet more bug fixes. It should at long last be usable now
-
-2.1.1 (19990107)

lm-sensors/trunk/doc/progs

@@ -8 +8 @@
-  and prints to stdout `bus' statements reflecting the currently detected
-  adapters.
+* prog/dump/isadump (written in C, not installed)
+  This program helps to dump the registers of LM78-like chips, or more
+  exactly, chips which use an I/O-port for its address and one as its
+  data register. Usual syntax: 
+     ./isadump 0x295 0x296
-* prog/eeprom/decode-dimms.pl (written in Perl 5, not installed)
-  This program decodes the information generated by the `eeprom.o' module.

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

@@ -202 +202 @@
-# chips are typically used. Please contact us if you own one.
-  label vdd "+5V"
-  compute vdd @ * 2.5, @ / 2.5
-
-
-
-chip "lm80-*"

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

@@ -64 +64 @@
-#define IN_FROM_REG(val) (((val)*19)/10)
-
+#define VDD_TO_REG(val) ((((val)*10+11)/23) & 0xff)
+#define VDD_FROM_REG(val) (((val)*23)/10)
+
-#define DIV_TO_REG(val) ((val)==8?3:(val)==4?2:(val)==1?0:1)
-#define DIV_FROM_REG(val) (1 << (val))
@@ -85 +88 @@
-#define GL518_INIT_VIN_2 300
-#define GL518_INIT_VIN_3 300
-3
+5
-
-#define GL518_INIT_PERCENTAGE 10
@@ -314 +317 @@
-                      IN_TO_REG(GL518_INIT_VIN_MIN_3));
-    gl518_write_value(new_client,GL518_REG_VDD_LIMIT,
-IN
-IN
+VDD
+VDD
-    /* Clear status register (bit 5=1), start (bit6=1) */
-    gl518_write_value(new_client,GL518_REG_CONF,0x24);
@@ -505 +508 @@
-  else if (operation == SENSORS_PROC_REAL_READ) {
-    gl518_update_client(client);
-
-
+
+
+
+
-    if ((data->revision == 0x00) && (nr != 3))
-      results[2] = 0;
-    else
-
+
+
-    *nrels_mag = 3;
-  } else if (operation == SENSORS_PROC_REAL_WRITE) {
@@ -518 +524 @@
-      old = gl518_read_value(client,regnr) & 0xff00;
-    if (*nrels_mag >= 2) {
-IN
+nr?IN_TO_REG(results[1]):VDD
-      old = data->voltage_max[nr] << 8;
-    }
-    if (*nrels_mag >= 1) {
-IN
+nr?IN_TO_REG(results[0]):VDD
-      old |= data->voltage_min[nr];
-      gl518_write_value(client,regnr,old);

lm-sensors/trunk/lib/chips.c

@@ -435 +435 @@
-    { SENSORS_GL518R80_ALARMS, "alarms", SENSORS_NO_MAPPING,
-                               SENSORS_NO_MAPPING, SENSORS_MODE_R,
-FAN_DIV, VALUE(3
+ALARMS, VALUE(1
-    { SENSORS_GL518R80_BEEP_ENABLE, "beep_enable", SENSORS_GL518R80_ALARMS,
-                               SENSORS_NO_MAPPING, SENSORS_MODE_RW,

lm-sensors/trunk/src/gl518sm.c

@@ -64 +64 @@
-#define IN_FROM_REG(val) (((val)*19)/10)
-
+#define VDD_TO_REG(val) ((((val)*10+11)/23) & 0xff)
+#define VDD_FROM_REG(val) (((val)*23)/10)
+
-#define DIV_TO_REG(val) ((val)==8?3:(val)==4?2:(val)==1?0:1)
-#define DIV_FROM_REG(val) (1 << (val))
@@ -85 +88 @@
-#define GL518_INIT_VIN_2 300
-#define GL518_INIT_VIN_3 300
-3
+5
-
-#define GL518_INIT_PERCENTAGE 10
@@ -314 +317 @@
-                      IN_TO_REG(GL518_INIT_VIN_MIN_3));
-    gl518_write_value(new_client,GL518_REG_VDD_LIMIT,
-IN
-IN
+VDD
+VDD
-    /* Clear status register (bit 5=1), start (bit6=1) */
-    gl518_write_value(new_client,GL518_REG_CONF,0x24);
@@ -505 +508 @@
-  else if (operation == SENSORS_PROC_REAL_READ) {
-    gl518_update_client(client);
-
-
+
+
+
+
-    if ((data->revision == 0x00) && (nr != 3))
-      results[2] = 0;
-    else
-
+
+
-    *nrels_mag = 3;
-  } else if (operation == SENSORS_PROC_REAL_WRITE) {
@@ -518 +524 @@
-      old = gl518_read_value(client,regnr) & 0xff00;
-    if (*nrels_mag >= 2) {
-IN
+nr?IN_TO_REG(results[1]):VDD
-      old = data->voltage_max[nr] << 8;
-    }
-    if (*nrels_mag >= 1) {
-IN
+nr?IN_TO_REG(results[0]):VDD
-      old |= data->voltage_min[nr];
-      gl518_write_value(client,regnr,old);