wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-11-07 16:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Really fix ADM1024 support for Linux 2.6.

Browse Source 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4933 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2007-10-09 12:59:28 +00:00
1 parent 8651b3bcc8
commit e005669493
2 files changed
+11 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/chips.c
+3 -3
View File
@@ -2311,19 +2311,19 @@ static sensors_chip_feature adm1024_features[] =
ADM1024_SYSCTL_TEMP2, VALUE(3), 1, "temp3_input", 3 },
{ { SENSORS_ADM1024_TEMP_HYST, "temp_hyst", SENSORS_ADM1024_TEMP,
SENSORS_ADM1024_TEMP, RW },
ADM1024_SYSCTL_TEMP, VALUE(2), 1 },
ADM1024_SYSCTL_TEMP, VALUE(2), 1, "temp1_min", 3 },
{ { SENSORS_ADM1024_TEMP_OVER, "temp_over", SENSORS_ADM1024_TEMP,
SENSORS_ADM1024_TEMP, RW },
ADM1024_SYSCTL_TEMP, VALUE(1), 1 },
{ { SENSORS_ADM1024_TEMP1_HYST, "temp1_hyst", SENSORS_ADM1024_TEMP1,
SENSORS_ADM1024_TEMP1, RW },
ADM1024_SYSCTL_TEMP1, VALUE(2), 1, "temp2_max_hyst", 3 },
ADM1024_SYSCTL_TEMP1, VALUE(2), 1, "temp2_min", 3 },
{ { SENSORS_ADM1024_TEMP1_OVER, "temp1_over", SENSORS_ADM1024_TEMP1,
SENSORS_ADM1024_TEMP1, RW },
ADM1024_SYSCTL_TEMP1, VALUE(1), 1, "temp2_max", 3 },
{ { SENSORS_ADM1024_TEMP2_HYST, "temp2_hyst", SENSORS_ADM1024_TEMP2,
SENSORS_ADM1024_TEMP2, RW },
ADM1024_SYSCTL_TEMP2, VALUE(2), 1, "temp3_max_hyst", 3 },
ADM1024_SYSCTL_TEMP2, VALUE(2), 1, "temp3_min", 3 },
{ { SENSORS_ADM1024_TEMP2_OVER, "temp2_over", SENSORS_ADM1024_TEMP2,
SENSORS_ADM1024_TEMP2, RW },
ADM1024_SYSCTL_TEMP2, VALUE(1), 1, "temp3_max", 3 },
prog/sensors/chips.c
+8 -13
View File
@@ -435,8 +435,7 @@ void print_adm1024(const sensors_chip_name *name)
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");
} /* No error, can be missing */
free(label);
if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_IN1,&label,&valid) &&
!sensors_get_feature(*name,SENSORS_ADM1024_IN1,&cur) &&
@@ -495,8 +494,7 @@ void print_adm1024(const sensors_chip_name *name)
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");
} /* No error, can be missing */
free(label);
if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_FAN1,&label,&valid) &&
@@ -508,8 +506,7 @@ void print_adm1024(const sensors_chip_name *name)
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");
} /* No error, can be missing */
free(label);
if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_FAN2,&label,&valid) &&
!sensors_get_feature(*name,SENSORS_ADM1024_FAN2,&cur) &&
@@ -520,8 +517,7 @@ void print_adm1024(const sensors_chip_name *name)
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");
} /* No error, can be missing */
free(label);
if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_TEMP,&label,&valid) &&
@@ -530,7 +526,7 @@ void print_adm1024(const sensors_chip_name *name)
!sensors_get_feature(*name,SENSORS_ADM1024_TEMP_OVER,&max)) {
if (valid) {
print_label(label,10);
print_temp_info( cur, min, max, HYST, 1, 0);
print_temp_info(cur, max, min, MINMAX, 0, 0);
printf( " %s\n", alarms & ADM1024_ALARM_TEMP ? "ALARM" : "" );
}
} else
@@ -543,7 +539,7 @@ void print_adm1024(const sensors_chip_name *name)
!sensors_get_feature(*name,SENSORS_ADM1024_TEMP1_OVER,&max)) {
if (valid) {
print_label(label,10);
print_temp_info( cur, min, max, HYST, 1, 0);
print_temp_info(cur, max, min, MINMAX, 0, 0);
printf( " %s\n", alarms & ADM1024_ALARM_TEMP1 ? "ALARM" : "" );
}
} else
@@ -556,11 +552,10 @@ void print_adm1024(const sensors_chip_name *name)
!sensors_get_feature(*name,SENSORS_ADM1024_TEMP2_OVER,&max)) {
if (valid) {
print_label(label,10);
print_temp_info( cur, min, max, HYST, 1, 0);
print_temp_info(cur, max, min, MINMAX, 0, 0);
printf( " %s\n", alarms & ADM1024_ALARM_TEMP2 ? "ALARM" : "" );
}
} else
printf("ERROR: Can't get TEMP2 data!\n");
} /* No error, can be missing */
free(label);
if (!sensors_get_label_and_valid(*name,SENSORS_ADM1024_VID,&label,&valid) &&