mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-09-04 00:05:10 +00:00
Code Issues Releases Wiki Activity

Restore support for beeps.

Browse Source 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4827 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare
2007-09-20 21:24:12 +00:00
parent 9cf1330eb0
commit 49649fcf05
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
prog/sensord/chips.c
View File

@@ -168,9 +168,9 @@ static void fillChipVoltage (FeatureDescriptor *voltage,
const sensors_chip_name *name, const sensors_chip_name *name,
const sensors_feature_data *feature, int i) const sensors_feature_data *feature, int i)
{ {
const int size = SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN; const int size = SENSORS_FEATURE_IN_BEEP - SENSORS_FEATURE_IN;
short has_features[SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN] = { 0, }; short has_features[SENSORS_FEATURE_IN_BEEP - SENSORS_FEATURE_IN] = { 0, };
int feature_nrs[SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN]; int feature_nrs[SENSORS_FEATURE_IN_BEEP - SENSORS_FEATURE_IN];
int pos = 0; int pos = 0;
voltage->rrd = rrdF2; voltage->rrd = rrdF2;
@@ -202,8 +202,12 @@ static void fillChipVoltage (FeatureDescriptor *voltage,
} else { } else {
voltage->alarmNumber = -1; voltage->alarmNumber = -1;
} }
/* beep support missing for now */ /* beep if applicable */
voltage->beepNumber = -1; if (IN_FEATURE(SENSORS_FEATURE_IN_BEEP)) {
voltage->beepNumber = IN_FEATURE_NR(SENSORS_FEATURE_IN_ALARM);
} else {
voltage->beepNumber = -1;
}
} }
#define TEMP_FEATURE(x) has_features[x - SENSORS_FEATURE_TEMP - 1] #define TEMP_FEATURE(x) has_features[x - SENSORS_FEATURE_TEMP - 1]
@@ -212,9 +216,9 @@ static void fillChipTemperature (FeatureDescriptor *temperature,
const sensors_chip_name *name, const sensors_chip_name *name,
const sensors_feature_data *feature, int i) const sensors_feature_data *feature, int i)
{ {
const int size = SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP; const int size = SENSORS_FEATURE_TEMP_BEEP - SENSORS_FEATURE_TEMP;
short has_features[SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP] = { 0, }; short has_features[SENSORS_FEATURE_TEMP_BEEP - SENSORS_FEATURE_TEMP] = { 0, };
int feature_nrs[SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP]; int feature_nrs[SENSORS_FEATURE_TEMP_BEEP - SENSORS_FEATURE_TEMP];
int pos = 0; int pos = 0;
temperature->rrd = rrdF1; temperature->rrd = rrdF1;
@@ -249,8 +253,12 @@ static void fillChipTemperature (FeatureDescriptor *temperature,
} else { } else {
temperature->alarmNumber = -1; temperature->alarmNumber = -1;
} }
/* beep support missing for now */ /* beep if applicable */
temperature->beepNumber = -1; if (TEMP_FEATURE(SENSORS_FEATURE_TEMP_BEEP)) {
temperature->beepNumber = TEMP_FEATURE_NR(SENSORS_FEATURE_TEMP_BEEP);
} else {
temperature->beepNumber = -1;
}
} }
#define FAN_FEATURE(x) has_features[x - SENSORS_FEATURE_FAN - 1] #define FAN_FEATURE(x) has_features[x - SENSORS_FEATURE_FAN - 1]
@@ -259,9 +267,9 @@ static void fillChipFan (FeatureDescriptor *fan,
const sensors_chip_name *name, const sensors_chip_name *name,
const sensors_feature_data *feature, int i) const sensors_feature_data *feature, int i)
{ {
const int size = SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN; const int size = SENSORS_FEATURE_FAN_BEEP - SENSORS_FEATURE_FAN;
short has_features[SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN] = { 0, }; short has_features[SENSORS_FEATURE_FAN_BEEP - SENSORS_FEATURE_FAN] = { 0, };
int feature_nrs[SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN]; int feature_nrs[SENSORS_FEATURE_FAN_BEEP - SENSORS_FEATURE_FAN];
int pos = 0; int pos = 0;
fan->rrd = rrdF0; fan->rrd = rrdF0;
@@ -292,8 +300,12 @@ static void fillChipFan (FeatureDescriptor *fan,
} else { } else {
fan->alarmNumber = -1; fan->alarmNumber = -1;
} }
/* beep support missing for now */ /* beep if applicable */
fan->beepNumber = -1; if (FAN_FEATURE(SENSORS_FEATURE_FAN_BEEP)) {
fan->beepNumber = FAN_FEATURE_NR(SENSORS_FEATURE_FAN_BEEP);
} else {
fan->beepNumber = -1;
}
} }
static void fillChipVid (FeatureDescriptor *vid, static void fillChipVid (FeatureDescriptor *vid,