Restore support for alarms.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4825 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2007-09-20 21:22:42 +00:00
1 parent 071e4a8008
commit 36ded1b5fc
3 files changed
+63 -26

No files matched your search

+37
View File
@@ -191,6 +191,19 @@ static void fillChipVoltage (FeatureDescriptor *voltage,
/* terminate the list */
voltage->dataNumbers[pos] = -1;
/* alarm if applicable */
if (IN_FEATURE(SENSORS_FEATURE_IN_ALARM)) {
voltage->alarmNumber = IN_FEATURE_NR(SENSORS_FEATURE_IN_ALARM);
} else if (IN_FEATURE(SENSORS_FEATURE_IN_MIN_ALARM)) {
voltage->alarmNumber = IN_FEATURE_NR(SENSORS_FEATURE_IN_MIN_ALARM);
} else if (IN_FEATURE(SENSORS_FEATURE_IN_MAX_ALARM)) {
voltage->alarmNumber = IN_FEATURE_NR(SENSORS_FEATURE_IN_MAX_ALARM);
} else {
voltage->alarmNumber = -1;
}
/* beep support missing for now */
voltage->beepNumber = -1;
}
#define TEMP_FEATURE(x) has_features[x - SENSORS_FEATURE_TEMP - 1]
@@ -227,6 +240,17 @@ static void fillChipTemperature (FeatureDescriptor *temperature,
/* terminate the list */
temperature->dataNumbers[pos] = -1;
/* alarm if applicable */
if (TEMP_FEATURE(SENSORS_FEATURE_TEMP_ALARM)) {
temperature->alarmNumber = TEMP_FEATURE_NR(SENSORS_FEATURE_TEMP_ALARM);
} else if (TEMP_FEATURE(SENSORS_FEATURE_TEMP_MAX_ALARM)) {
temperature->alarmNumber = TEMP_FEATURE_NR(SENSORS_FEATURE_TEMP_MAX_ALARM);
} else {
temperature->alarmNumber = -1;
}
/* beep support missing for now */
temperature->beepNumber = -1;
}
#define FAN_FEATURE(x) has_features[x - SENSORS_FEATURE_FAN - 1]
@@ -261,6 +285,15 @@ static void fillChipFan (FeatureDescriptor *fan,
/* terminate the list */
fan->dataNumbers[pos] = -1;
/* alarm if applicable */
if (FAN_FEATURE(SENSORS_FEATURE_FAN_ALARM)) {
fan->alarmNumber = FAN_FEATURE_NR(SENSORS_FEATURE_FAN_ALARM);
} else {
fan->alarmNumber = -1;
}
/* beep support missing for now */
fan->beepNumber = -1;
}
static void fillChipVid (FeatureDescriptor *vid,
@@ -269,6 +302,8 @@ static void fillChipVid (FeatureDescriptor *vid,
vid->format = fmtVolt_3;
vid->rrd = rrdF3;
vid->type = DataType_voltage;
vid->alarmNumber = -1;
vid->beepNumber = -1;
vid->dataNumbers[0] = feature->number;
vid->dataNumbers[1] = -1;
}
@@ -279,6 +314,8 @@ static void fillChipBeepEnable (FeatureDescriptor *beepen,
beepen->format = fmtSoundAlarm;
beepen->rrd = rrdF0;
beepen->type = DataType_other;
beepen->alarmNumber = -1;
beepen->beepNumber = -1;
beepen->dataNumbers[0] = feature->number;
beepen->dataNumbers[1] = -1;
}