Changeset 1090

Timestamp:

05/15/01 05:18:18 (12 years ago)

Author:

mds

Message:

Initial checkin of adm1024 driver and support in libsensors,

sensors, sensors-detect.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (2 diffs)
• CONTRIBUTORS (modified) (1 diff)
• README (modified) (1 diff)
• doc/chips/adm1024 (added)
• etc/sensors.conf.eg (modified) (1 diff)
• kernel/chips/Module.mk (modified) (1 diff)
• kernel/chips/adm1024.c (added)
• kernel/include/sensors.h (modified) (1 diff)
• lib/chips.c (modified) (2 diffs)
• lib/chips.h (modified) (1 diff)
• prog/detect/sensors-detect (modified) (3 diffs)
• prog/sensors/chips.c (modified) (1 diff)
• prog/sensors/chips.h (modified) (1 diff)
• prog/sensors/main.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -34 +34 @@
   Include file sensors.h: Most contents moved to i2c-proc.h in i2c package
   Library: Fix/standardize some lm87 and mtp008 entries; add sis5595 in4;
-           Add support for maxilife-nba.
+           Add support for maxilife-nba and amd1024.
   Chip Modules (all ISA): Remove #include "i2c-isa.h"
   Module adm1021: Fix lm84 and gl523sm support
+  Module adm1024: new
   Module i2c-i801: Chip detection cleanup
   Module i2c-i810: Fixed i2c_i810_init() not found in patched kernel
@@ -61 +62 @@
                    Fix swapped limit and hysteresis on 9240, 5595, 686a;
                    Change mtp008 temps from max/min to limit/hyst;
-                   Add maxilife-nba support.
+                   Add maxilife-nba and adm1024 support.
   Program sensors-detect: Recognize lm78 with chipid=0x20;
                           Recognize SMSC Victory66 South Bridge;
                           Add devfs /dev/i2c/x support;
-                          Add thinkpad warning.
+                          Add adm1024 support; Add thinkpad warning.
   Program tellerstats: new
 

lm-sensors/trunk/CONTRIBUTORS

@@ -57 +57 @@
 * Kris Van Hees <aedil@alchar.org>
   Author of the mtp008 chip driver.
+* Ken Bowley <ken@opnix.com>
+  Author of the adm1024 driver

lm-sensors/trunk/README

@@ -47 +47 @@
 At least the following hardware sensor chips are supported:
   Analog Devices ADM1021, ADM1021A, ADM1022,
-                 ADM1023, ADM1025, and ADM9240
+                 ADM1023, ADM1024, ADM1025, and ADM9240
   Asus AS99127F
   Dallas Semiconductor DS75, DS1621, DS1625, DS1775, and DS1780

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

@@ -925 +925 @@
 #   compute Vccp2 xxx
 #   compute temp xxx
+
+chip "adm1024-*"
+#
+# These settings work for me, adjust for your system
+#
+    label fan1 "CPU1 fan"
+    label fan2 "CPU2 fan"
+    label temp "SYS Temp"
+    label temp1 "CPU2 Temp"
+    label temp2 "CPU1 Temp"
+    ignore "2.5V" # This register is also used for temp2
+    ignore "Vccp1"
+    ignore "Vccp2"

lm-sensors/trunk/kernel/chips/Module.mk

@@ -30 +30 @@
                       $(MODULE_DIR)/ddcmon.o \
                       $(MODULE_DIR)/adm1025.o \
+                      $(MODULE_DIR)/adm1024.o \
                       $(MODULE_DIR)/lm87.o \
                       $(MODULE_DIR)/mtp008.o

lm-sensors/trunk/kernel/include/sensors.h

@@ -210 +210 @@
 #define ADM9240_ALARM_CHAS 0x1000
 
+#define ADM1024_SYSCTL_IN0 1000 /* Volts * 100 */
+#define ADM1024_SYSCTL_IN1 1001
+#define ADM1024_SYSCTL_IN2 1002
+#define ADM1024_SYSCTL_IN3 1003
+#define ADM1024_SYSCTL_IN4 1004
+#define ADM1024_SYSCTL_IN5 1005
+#define ADM1024_SYSCTL_FAN1 1101        /* Rotations/min */
+#define ADM1024_SYSCTL_FAN2 1102
+#define ADM1024_SYSCTL_TEMP 1250        /* Degrees Celcius * 100 */
+#define ADM1024_SYSCTL_TEMP1 1290       /* Degrees Celcius */
+#define ADM1024_SYSCTL_TEMP2 1295       /* Degrees Celcius */
+#define ADM1024_SYSCTL_FAN_DIV 2000     /* 1, 2, 4 or 8 */
+#define ADM1024_SYSCTL_ALARMS 2001      /* bitvector */
+#define ADM1024_SYSCTL_ANALOG_OUT 2002
+#define ADM1024_SYSCTL_VID 2003
+
+#define ADM1024_ALARM_IN0 0x0001
+#define ADM1024_ALARM_IN1 0x0002
+#define ADM1024_ALARM_IN2 0x0004
+#define ADM1024_ALARM_IN3 0x0008
+#define ADM1024_ALARM_IN4 0x0100
+#define ADM1024_ALARM_IN5 0x0200
+#define ADM1024_ALARM_FAN1 0x0040
+#define ADM1024_ALARM_FAN2 0x0080
+#define ADM1024_ALARM_TEMP 0x0010
+#define ADM1024_ALARM_TEMP1 0x0020
+#define ADM1024_ALARM_TEMP2 0x0001
+#define ADM1024_ALARM_CHAS 0x1000
+
 #define ADM1025_SYSCTL_IN0 1000 /* Volts * 100 */
 #define ADM1025_SYSCTL_IN1 1001

lm-sensors/trunk/lib/chips.c

@@ -1100 +1100 @@
   };
 
+static sensors_chip_feature adm1024_features[] =
+  { 
+    { SENSORS_ADM1024_IN0, "2.5V", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, 
+                        SENSORS_MODE_R, ADM1024_SYSCTL_IN0, VALUE(3), 2 },
+    { SENSORS_ADM1024_IN1, "Vccp1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, ADM1024_SYSCTL_IN1, VALUE(3), 2 },
+    { SENSORS_ADM1024_IN2, "3.3V", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, ADM1024_SYSCTL_IN2, VALUE(3), 2 },
+    { SENSORS_ADM1024_IN3, "5V", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, ADM1024_SYSCTL_IN3, VALUE(3), 2 },
+    { SENSORS_ADM1024_IN4, "12V", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, ADM1024_SYSCTL_IN4, VALUE(3), 2 },
+    { SENSORS_ADM1024_IN5, "Vccp2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, ADM1024_SYSCTL_IN5, VALUE(3), 2 },
+    { SENSORS_ADM1024_IN0_MIN, "2.5V_min", SENSORS_ADM1024_IN0, 
+                        SENSORS_ADM1024_IN0, SENSORS_MODE_RW, 
+                        ADM1024_SYSCTL_IN0, VALUE(1), 2 },
+    { SENSORS_ADM1024_IN1_MIN, "Vccp1_min", SENSORS_ADM1024_IN1, 
+                        SENSORS_ADM1024_IN1, SENSORS_MODE_RW, 
+                        ADM1024_SYSCTL_IN1, VALUE(1), 2 },
+    { SENSORS_ADM1024_IN2_MIN, "3.3V_min", SENSORS_ADM1024_IN2, 
+                        SENSORS_ADM1024_IN2, SENSORS_MODE_RW, 
+                        ADM1024_SYSCTL_IN2, VALUE(1), 2 },
+    { SENSORS_ADM1024_IN3_MIN, "5V_min", SENSORS_ADM1024_IN3, 
+                        SENSORS_ADM1024_IN3, SENSORS_MODE_RW, 
+                        ADM1024_SYSCTL_IN3, VALUE(1), 2 },
+    { SENSORS_ADM1024_IN4_MIN, "12V_min", SENSORS_ADM1024_IN4, 
+                        SENSORS_ADM1024_IN4, SENSORS_MODE_RW, 
+                        ADM1024_SYSCTL_IN4, VALUE(1), 2 },
+    { SENSORS_ADM1024_IN5_MIN, "Vccp2_min", SENSORS_ADM1024_IN5, 
+                        SENSORS_ADM1024_IN5, SENSORS_MODE_RW, 
+                        ADM1024_SYSCTL_IN5, VALUE(1), 2 },
+    { SENSORS_ADM1024_IN0_MAX, "2.5V_max", SENSORS_ADM1024_IN0, 
+                        SENSORS_ADM1024_IN0, SENSORS_MODE_RW,
+                        ADM1024_SYSCTL_IN0, VALUE(2), 2 },
+    { SENSORS_ADM1024_IN1_MAX, "Vccp1_max", SENSORS_ADM1024_IN1, 
+                        SENSORS_ADM1024_IN1, SENSORS_MODE_RW, 
+                        ADM1024_SYSCTL_IN1, VALUE(2), 2 },
+    { SENSORS_ADM1024_IN2_MAX, "3.3V_max", SENSORS_ADM1024_IN2, 
+                        SENSORS_ADM1024_IN2, SENSORS_MODE_RW, 
+                        ADM1024_SYSCTL_IN2, VALUE(2), 2 },
+    { SENSORS_ADM1024_IN3_MAX, "5V_max", SENSORS_ADM1024_IN3, 
+                        SENSORS_ADM1024_IN3, SENSORS_MODE_RW, 
+                        ADM1024_SYSCTL_IN3, VALUE(2), 2 },
+    { SENSORS_ADM1024_IN4_MAX, "12V_max", SENSORS_ADM1024_IN4, 
+                        SENSORS_ADM1024_IN4, SENSORS_MODE_RW,
+                        ADM1024_SYSCTL_IN4, VALUE(2), 2 },
+    { SENSORS_ADM1024_IN5_MAX, "Vccp2_max", SENSORS_ADM1024_IN5, 
+                        SENSORS_ADM1024_IN5, SENSORS_MODE_RW, 
+                        ADM1024_SYSCTL_IN5, VALUE(2), 2 },
+    { SENSORS_ADM1024_FAN1, "fan1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, ADM1024_SYSCTL_FAN1, VALUE(2), 0 },
+    { SENSORS_ADM1024_FAN2, "fan2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, ADM1024_SYSCTL_FAN2, VALUE(2), 0 },
+    { SENSORS_ADM1024_FAN1_MIN, "fan1_min", SENSORS_ADM1024_FAN1,
+                        SENSORS_ADM1024_FAN1, SENSORS_MODE_RW, 
+                        ADM1024_SYSCTL_FAN1, VALUE(1), 0 },
+    { SENSORS_ADM1024_FAN2_MIN, "fan2_min", SENSORS_ADM1024_FAN2, 
+                        SENSORS_ADM1024_FAN2, SENSORS_MODE_RW, 
+                        ADM1024_SYSCTL_FAN2, VALUE(1), 0 },
+    { SENSORS_ADM1024_TEMP, "temp", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                         SENSORS_MODE_R, ADM1024_SYSCTL_TEMP, VALUE(3), 1 },
+    { SENSORS_ADM1024_TEMP1, "temp1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                         SENSORS_MODE_R, ADM1024_SYSCTL_TEMP1, VALUE(3), 1 },
+    { SENSORS_ADM1024_TEMP2, "temp2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                         SENSORS_MODE_R, ADM1024_SYSCTL_TEMP2, VALUE(3), 1 },
+    { SENSORS_ADM1024_TEMP_HYST, "temp_hyst", SENSORS_ADM1024_TEMP,
+                         SENSORS_ADM1024_TEMP, SENSORS_MODE_RW, 
+                         ADM1024_SYSCTL_TEMP, VALUE(2), 1 },
+    { SENSORS_ADM1024_TEMP_OVER, "temp_over", SENSORS_ADM1024_TEMP,
+                         SENSORS_ADM1024_TEMP, SENSORS_MODE_RW, 
+                         ADM1024_SYSCTL_TEMP, VALUE(1), 1 },
+    { SENSORS_ADM1024_TEMP1_HYST, "temp1_hyst", SENSORS_ADM1024_TEMP1,
+                         SENSORS_ADM1024_TEMP1, SENSORS_MODE_RW, 
+                         ADM1024_SYSCTL_TEMP1, VALUE(2), 1 },
+    { SENSORS_ADM1024_TEMP1_OVER, "temp1_over", SENSORS_ADM1024_TEMP1,
+                         SENSORS_ADM1024_TEMP1, SENSORS_MODE_RW, 
+                         ADM1024_SYSCTL_TEMP1, VALUE(1), 1 },
+    { SENSORS_ADM1024_TEMP2_HYST, "temp2_hyst", SENSORS_ADM1024_TEMP2,
+                         SENSORS_ADM1024_TEMP2, SENSORS_MODE_RW, 
+                         ADM1024_SYSCTL_TEMP2, VALUE(2), 1 },
+    { SENSORS_ADM1024_TEMP2_OVER, "temp2_over", SENSORS_ADM1024_TEMP2,
+                         SENSORS_ADM1024_TEMP2, SENSORS_MODE_RW, 
+                         ADM1024_SYSCTL_TEMP2, VALUE(1), 1 },
+
+    { SENSORS_ADM1024_VID, "vid", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                         SENSORS_MODE_R, ADM1024_SYSCTL_VID, VALUE(1), 2 },
+    { SENSORS_ADM1024_FAN1_DIV, "fan1_div", SENSORS_ADM1024_FAN1, 
+                         SENSORS_NO_MAPPING, SENSORS_MODE_RW, 
+                         ADM1024_SYSCTL_FAN_DIV, VALUE(1), 0 },
+    { SENSORS_ADM1024_FAN2_DIV, "fan2_div", SENSORS_ADM1024_FAN2, 
+                         SENSORS_NO_MAPPING, SENSORS_MODE_RW, 
+                         ADM1024_SYSCTL_FAN_DIV, VALUE(2), 0 },
+    { SENSORS_ADM1024_ALARMS, "alarms", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, 
+                         SENSORS_MODE_R, ADM1024_SYSCTL_ALARMS, VALUE(1), 0 },
+    { SENSORS_ADM1024_ANALOG_OUT, "analog_out", SENSORS_NO_MAPPING,
+                         SENSORS_NO_MAPPING, SENSORS_MODE_RW,
+                         ADM1024_SYSCTL_ANALOG_OUT, VALUE(1), 0 },
+    { 0 }
+  };
+
 static sensors_chip_feature ds1780_features[] =
   { 
@@ -2073 +2174 @@
  { SENSORS_MTP008_PREFIX, mtp008_features },
  { SENSORS_DS1621_PREFIX, ds1621_features },
+ { SENSORS_ADM1024_PREFIX, adm1024_features },
  { 0 }
 };

lm-sensors/trunk/lib/chips.h

@@ -926 +926 @@
 #define SENSORS_DS1621_ALARMS 81 /* R */
 
+/* ADM1024 chip */
+
+#define SENSORS_ADM1024_PREFIX "adm1024"
+
+#define SENSORS_ADM1024_IN0 1 /* R */
+#define SENSORS_ADM1024_IN1 2 /* R */
+#define SENSORS_ADM1024_IN2 3 /* R */
+#define SENSORS_ADM1024_IN3 4 /* R */
+#define SENSORS_ADM1024_IN4 5 /* R */
+#define SENSORS_ADM1024_IN5 6 /* R */
+#define SENSORS_ADM1024_IN0_MIN 11 /* RW */
+#define SENSORS_ADM1024_IN1_MIN 12 /* RW */
+#define SENSORS_ADM1024_IN2_MIN 13 /* RW */
+#define SENSORS_ADM1024_IN3_MIN 14 /* RW */
+#define SENSORS_ADM1024_IN4_MIN 15 /* RW */
+#define SENSORS_ADM1024_IN5_MIN 16 /* RW */
+#define SENSORS_ADM1024_IN0_MAX 21 /* RW */
+#define SENSORS_ADM1024_IN1_MAX 22 /* RW */
+#define SENSORS_ADM1024_IN2_MAX 23 /* RW */
+#define SENSORS_ADM1024_IN3_MAX 24 /* RW */
+#define SENSORS_ADM1024_IN4_MAX 25 /* RW */
+#define SENSORS_ADM1024_IN5_MAX 26 /* RW */
+#define SENSORS_ADM1024_FAN1 31 /* R */
+#define SENSORS_ADM1024_FAN2 32 /* R */
+#define SENSORS_ADM1024_FAN1_MIN 41 /* RW */
+#define SENSORS_ADM1024_FAN2_MIN 42 /* RW */
+#define SENSORS_ADM1024_TEMP 51 /* R */
+#define SENSORS_ADM1024_TEMP1 52 /* R */
+#define SENSORS_ADM1024_TEMP2 53 /* R */
+#define SENSORS_ADM1024_TEMP_HYST 61 /* RW */
+#define SENSORS_ADM1024_TEMP_OVER 62 /* RW */
+#define SENSORS_ADM1024_TEMP1_HYST 63 /* RW */
+#define SENSORS_ADM1024_TEMP1_OVER 64 /* RW */
+#define SENSORS_ADM1024_TEMP2_HYST 65 /* RW */
+#define SENSORS_ADM1024_TEMP2_OVER 66 /* RW */
+#define SENSORS_ADM1024_VID 71 /* R */
+#define SENSORS_ADM1024_FAN1_DIV 81 /* RW */
+#define SENSORS_ADM1024_FAN2_DIV 82 /* RW */
+#define SENSORS_ADM1024_ALARMS 91 /* R */
+#define SENSORS_ADM1024_ANALOG_OUT 92 /* RW */
+
 #endif /* def LIB_SENSORS_CHIPS_H */

lm-sensors/trunk/prog/detect/sensors-detect

@@ -377 +377 @@
             via686a_isa_detect adm1022_detect ltc1710_detect gl525sm_detect
             lm87_detect ite_detect ite_isa_detect ite_alias_detect
-            ddcmonitor_detect ds1621_detect);
+            ddcmonitor_detect ds1621_detect adm1024_detect);
 
 # This is a list of all recognized chips. 
@@ -560 +560 @@
        i2c_addrs => [0x2c..0x2e],
        i2c_detect => sub { adm1025_detect 0, @_ }
+     },
+     {
+       name => "Analog Devices ADM1024",
+       driver => "adm1024",
+       i2c_addrs => [0x2c..0x2e],
+       i2c_detect => sub { adm1024_detect 0, @_ }
      },
      {
@@ -1866 +1872 @@
 }
 
+# $_[0]: Chip to detect (0 = ADM1024)
+# $_[1]: A reference to the file descriptor to access this chip.
+#        We may assume an i2c_set_slave_addr was already done.
+# $_[2]: Address
+# Returns: undef if not detected, (8) if detected.
+# Registers used:
+#   0x3e: Company ID
+#   0x3f: Revision
+#   0x40: Configuration
+sub adm1024_detect
+{
+  my $reg;
+  my ($chip, $file,$addr) = @_;
+  $reg = i2c_smbus_read_byte_data($file,0x3e);
+  return unless ($reg == 0x41);
+  return unless (i2c_smbus_read_byte_data($file,0x40) & 0x80) == 0x00;
+  return unless (i2c_smbus_read_byte_data($file,0x3f) & 0xe0) == 0x20;
+  return (8);
+}
+
 # $_[0]: Chip to detect
 #   (0 = ADM1021, 1 = MAX1617, 2 = MAX1617A, 3 = THMC10, 4 = LM84, 5 = GL523)

lm-sensors/trunk/prog/sensors/chips.c

@@ -388 +388 @@
       printf("Chassis intrusion detection                  %s\n",
              alarms & ADM9240_ALARM_CHAS?"ALARM":"     ");
+    }
+  }
+  free_the_label(&label);
+}
+
+void print_adm1024(const sensors_chip_name *name)
+{
+  char *label = NULL;
+  double cur,min,max,fdiv;
+  int alarms;
+  int valid;
+
+  if (!sensors_get_feature(*name,SENSORS_ADM1024_ALARMS,&cur)) 
+    alarms = cur + 0.5;
+  else {
+    printf("ERROR: Can't get alarm data!\n");
+    alarms = 0;
+  }
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_IN0,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN0,&cur) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN0_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN0_MAX,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf( "%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
+             cur,min,max,alarms&ADM1024_ALARM_IN0?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN0 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_IN1,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN1,&cur) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN1_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN1_MAX,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
+             cur,min,max,alarms&ADM1024_ALARM_IN1?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN1 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_IN2,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN2,&cur) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN2_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN2_MAX,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
+             cur,min,max,alarms&ADM1024_ALARM_IN2?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN2 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_IN3,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN3,&cur) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN3_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN3_MAX,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
+             cur,min,max,alarms&ADM1024_ALARM_IN3?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN3 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_IN4,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN4,&cur) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN4_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN4_MAX,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
+             cur,min,max,alarms&ADM1024_ALARM_IN4?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN4 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_IN5,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN5,&cur) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN5_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_IN5_MAX,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
+             cur,min,max,alarms&ADM1024_ALARM_IN5?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN5 data!\n");
+  free_the_label(&label);
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_FAN1,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_FAN1,&cur) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_FAN1_DIV,&fdiv) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_FAN1_MIN,&min)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%4.0f RPM  (min = %4.0f RPM, div = %1.0f)          %s\n",
+             cur,min,fdiv, alarms&ADM1024_ALARM_FAN1?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get FAN1 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_FAN2,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_FAN2,&cur) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_FAN2_DIV,&fdiv) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_FAN2_MIN,&min)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%4.0f RPM  (min = %4.0f RPM, div = %1.0f)          %s\n",
+             cur,min,fdiv, alarms&ADM1024_ALARM_FAN2?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get FAN2 data!\n");
+  free_the_label(&label);
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_TEMP,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_TEMP,&cur) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_TEMP_HYST,&min) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_TEMP_OVER,&max)) {
+    if (valid) {
+      print_label(label,10);
+      print_temp_info( cur, min, max, HYST );
+      printf( " %s\n", alarms & ADM1024_ALARM_TEMP ? "ALARM" : "" );
+    }
+  } else
+    printf("ERROR: Can't get TEMP data!\n");
+  free_the_label(&label);
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_TEMP1,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_TEMP1,&cur) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_TEMP1_HYST,&min) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_TEMP1_OVER,&max)) {
+    if (valid) {
+      print_label(label,10);
+      print_temp_info( cur, min, max, HYST );
+      printf( " %s\n", alarms & ADM1024_ALARM_TEMP1 ? "ALARM" : "" );
+    }
+  } else
+    printf("ERROR: Can't get TEMP1 data!\n");
+  free_the_label(&label);
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_TEMP2,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_TEMP2,&cur) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_TEMP2_HYST,&min) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_TEMP2_OVER,&max)) {
+    if (valid) {
+      print_label(label,10);
+      print_temp_info( cur, min, max, HYST );
+      printf( " %s\n", alarms & ADM1024_ALARM_TEMP2 ? "ALARM" : "" );
+    }
+  } else
+    printf("ERROR: Can't get TEMP2 data!\n");
+  free_the_label(&label);
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_VID,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_ADM1024_VID,&cur)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+5.2f V\n",cur);
+    }
+  }
+  free_the_label(&label);
+    
+  if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_ALARMS,&label,&valid)) {
+    if (valid) {
+      print_label(label,10);
+      printf("Chassis intrusion detection                  %s\n",
+             alarms & ADM1024_ALARM_CHAS?"ALARM":"     ");
     }
   }

lm-sensors/trunk/prog/sensors/chips.h

@@ -30 +30 @@
 extern void print_adm1021(const sensors_chip_name *name);
 extern void print_adm1025(const sensors_chip_name *name);
+extern void print_adm1024(const sensors_chip_name *name);
 extern void print_adm9240(const sensors_chip_name *name);
 extern void print_lm78(const sensors_chip_name *name);

lm-sensors/trunk/prog/sensors/main.c

@@ -311 +311 @@
   else if (!strcmp(name.prefix,"adm1025"))
     print_adm1025(&name);
+  else if (!strcmp(name.prefix,"adm1024"))
+    print_adm1024(&name);
   else if ((!strcmp(name.prefix,"w83781d")) ||
            (!strcmp(name.prefix,"w83782d")) ||