mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-09-02 23:35:57 +00:00
Code Issues Releases Wiki Activity

Changed alarms proc entry to a single value

Browse Source 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1449 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Abraham van der Merwe
2002-07-12 08:50:44 +00:00
parent 6b65a1d7b3
commit a52803cdc5
3 changed files with 22 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/chips.c
View File

@@ -2803,16 +2803,16 @@ static sensors_chip_feature smsc47m1_features[] =
scaling: 4 \ scaling: 4 \
} }
#define LM92_ALARM(_idx,_name,_mapping,_offset) \ #define LM92_ALARM(_idx,_name,_mapping,_offset) \
{ \ { \
number: _idx, \ number: _idx, \
name: _name, \ name: _name, \
logical_mapping: _mapping, \ logical_mapping: _mapping, \
compute_mapping: _mapping, \ compute_mapping: _mapping, \
mode: SENSORS_MODE_R, \ mode: SENSORS_MODE_R, \
sysctl: LM92_SYSCTL_ALARMS, \ sysctl: LM92_SYSCTL_ALARMS, \
offset: VALUE(_offset), \ offset: VALUE(_offset), \
scaling: 0 \ scaling: 0 \
} }
static sensors_chip_feature lm92_features[] = static sensors_chip_feature lm92_features[] =
@@ -2822,9 +2822,7 @@ static sensors_chip_feature lm92_features[] =
LM92_TEMP (SENSORS_LM92_TEMP_LOW,"temp_low",SENSORS_LM92_TEMP,SENSORS_MODE_RW,3), LM92_TEMP (SENSORS_LM92_TEMP_LOW,"temp_low",SENSORS_LM92_TEMP,SENSORS_MODE_RW,3),
LM92_TEMP (SENSORS_LM92_TEMP_CRIT,"temp_crit",SENSORS_LM92_TEMP,SENSORS_MODE_RW,4), LM92_TEMP (SENSORS_LM92_TEMP_CRIT,"temp_crit",SENSORS_LM92_TEMP,SENSORS_MODE_RW,4),
LM92_TEMP (SENSORS_LM92_TEMP_HYST,"temp_hyst",SENSORS_LM92_TEMP,SENSORS_MODE_RW,5), LM92_TEMP (SENSORS_LM92_TEMP_HYST,"temp_hyst",SENSORS_LM92_TEMP,SENSORS_MODE_RW,5),
LM92_ALARM (SENSORS_LM92_ALARMS_HIGH,"alarms_high",SENSORS_NO_MAPPING,1), LM92_ALARM (SENSORS_LM92_ALARMS,"alarms",SENSORS_NO_MAPPING,1),
LM92_ALARM (SENSORS_LM92_ALARMS_LOW,"alarms_low",SENSORS_LM92_ALARMS_HIGH,2),
LM92_ALARM (SENSORS_LM92_ALARMS_CRIT,"alarms_crit",SENSORS_LM92_ALARMS_CRIT,3)
}; };
sensors_chip_features sensors_chip_features_list[] = sensors_chip_features sensors_chip_features_list[] =

4
lib/chips.h
View File

@@ -1202,8 +1202,6 @@
#define SENSORS_LM92_TEMP_CRIT 3 /* RW */ #define SENSORS_LM92_TEMP_CRIT 3 /* RW */
#define SENSORS_LM92_TEMP_HYST 4 /* RW */ #define SENSORS_LM92_TEMP_HYST 4 /* RW */
#define SENSORS_LM92_TEMP 5 /* R */ #define SENSORS_LM92_TEMP 5 /* R */
#define SENSORS_LM92_ALARMS_HIGH 6 /* R */ #define SENSORS_LM92_ALARMS 6 /* R */
#define SENSORS_LM92_ALARMS_LOW 7 /* R */
#define SENSORS_LM92_ALARMS_CRIT 8 /* R */
#endif /* def LIB_SENSORS_CHIPS_H */ #endif /* def LIB_SENSORS_CHIPS_H */

31
prog/sensors/chips.c
View File

@@ -3334,18 +3334,14 @@ static void lm92_print_temp (float n_cur,float n_high,float n_low,float n_crit,f
void print_lm92 (const sensors_chip_name *name) void print_lm92 (const sensors_chip_name *name)
{ {
char *label = NULL; char *label = NULL;
double temp[5],alarms[3]; double temp[5];
int valid,comma = 0; int valid;
if (fahrenheit) { if (fahrenheit) {
sprintf (degv,"%cF",176); sprintf (degv,"%cF",176);
n n
if (!sensors_get_feature (*name,SENSORS_LM92_ALARMS_HIGH,alarms) && if (!sensors_get_feature (*name,SENSORS_LM92_ALARMS,temp)) {
!sensors_get_feature (*name,SENSORS_LM92_ALARMS_LOW,alarms + 1) && alarms = *temp + 0.5;
!sensors_get_feature (*name,SENSORS_LM92_ALAMRS_CRIT,alarms + 2)) {
alarms[0] = (int) (alarms[0] + 0.5);
alarms[1] = (int) (alarms[1] + 0.5);
alarms[2] = (int) (alarms[2] + 0.5);
} else { } else {
printf ("ERROR: Can't get alarm data!\n"); printf ("ERROR: Can't get alarm data!\n");
return; return;
@@ -3360,24 +3356,17 @@ void print_lm92 (const sensors_chip_name *name)
if (valid) { if (valid) {
print_label (label,10); print_label (label,10);
print_temp_info (temp[0],temp[1],temp[2],temp[3],temp[4]); print_temp_info (temp[0],temp[1],temp[2],temp[3],temp[4]);
if (alarms[0] || alarms[1] || alarms[2]) { if (alarms) {
printf (" ALARMS ("); printf (" ALARMS (");
if (alarms[0]) { if ((alarms & LM92_ALARM_TEMP_HIGH))
comma = 1;
printf ("HIGH"); printf ("HIGH");
}
if (alarms[1]) { if (alarms & LM92_ALARM_TEMP_LOW)
if (comma) printf (","); printf ("%sLOW",(alarms & LM92_ALARM_TEMP_HIGH) ? "," : "");
comma = 1;
printf ("LOW");
}
if (alarms[2]) { if (alarms & LM92_ALARM_TEMP_CRIT)
if (comma) printf (","); printf ("%sCRIT",(alarms & (LM92_ALARM_TEMP_HIGH | LM92_ALARM_TEMP_LOW)) ? "," : "");
printf ("CRIT");
}
printf (")"); printf (")");
} }