From 3230c59d6b4db3f40acbcd8d40d3835cac89adb7 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 29 Jul 2003 10:36:31 +0000 Subject: [PATCH] ADM1025: Match changes made to libsensors (swap temp1 and temp2, rename hyst/over to low/high) Handle remote diode fault git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1918 7894878c-1315-0410-8ee3-d5d059ff63e0 --- prog/sensors/chips.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c index 1e19dfa0..68453f5d 100644 --- a/prog/sensors/chips.c +++ b/prog/sensors/chips.c @@ -1269,12 +1269,13 @@ void print_adm1025(const sensors_chip_name *name) if (!sensors_get_label_and_valid(*name,SENSORS_ADM1025_TEMP1,&label,&valid) && !sensors_get_feature(*name,SENSORS_ADM1025_TEMP1,&cur) && - !sensors_get_feature(*name,SENSORS_ADM1025_TEMP1_HYST,&min) && - !sensors_get_feature(*name,SENSORS_ADM1025_TEMP1_OVER,&max)) { + !sensors_get_feature(*name,SENSORS_ADM1025_TEMP1_LOW,&min) && + !sensors_get_feature(*name,SENSORS_ADM1025_TEMP1_HIGH,&max)) { if (valid) { print_label(label,10); print_temp_info( cur, max, min, MINMAX, 1, 0); - printf(" %s\n", alarms&ADM1025_ALARM_TEMP?"ALARM":""); + printf(" %s\n", alarms&ADM1025_ALARM_RFAULT?"FAULT": + alarms&ADM1025_ALARM_RTEMP?"ALARM":""); } } else printf("ERROR: Can't get TEMP1 data!\n"); @@ -1282,12 +1283,12 @@ void print_adm1025(const sensors_chip_name *name) if (!sensors_get_label_and_valid(*name,SENSORS_ADM1025_TEMP2,&label,&valid) && !sensors_get_feature(*name,SENSORS_ADM1025_TEMP2,&cur) && - !sensors_get_feature(*name,SENSORS_ADM1025_TEMP2_HYST,&min) && - !sensors_get_feature(*name,SENSORS_ADM1025_TEMP2_OVER,&max)) { + !sensors_get_feature(*name,SENSORS_ADM1025_TEMP2_LOW,&min) && + !sensors_get_feature(*name,SENSORS_ADM1025_TEMP2_HIGH,&max)) { if (valid) { print_label(label,10); print_temp_info( cur, max, min, MINMAX, 1, 0); - printf(" %s\n", alarms&ADM1025_ALARM_RTEMP ? "ALARM":""); + printf(" %s\n", alarms&ADM1025_ALARM_TEMP ? "ALARM":""); } } else printf("ERROR: Can't get TEMP2 data!\n");