Introduce a separate type for main features. Make subfeatures map to

the real main feature rather than the first subfeature.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4838 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2007-09-23 12:16:50 +00:00
1 parent 65f1d1f1cd
commit da7b4e48da
6 files changed
+136 -130

No files matched your search

+5 -5
View File
@@ -373,19 +373,19 @@ FeatureDescriptor * generateChipFeatures (const sensors_chip_name *chip)
nr = 0;
while ((sensor = sensors_get_features(chip, &nr))) {
switch (sensor->type) {
case SENSORS_SUBFEATURE_TEMP_INPUT:
case SENSORS_FEATURE_TEMP:
fillChipTemperature(&features[count], chip, sensor);
break;
case SENSORS_SUBFEATURE_IN_INPUT:
case SENSORS_FEATURE_IN:
fillChipVoltage(&features[count], chip, sensor);
break;
case SENSORS_SUBFEATURE_FAN_INPUT:
case SENSORS_FEATURE_FAN:
fillChipFan(&features[count], chip, sensor);
break;
case SENSORS_SUBFEATURE_VID:
case SENSORS_FEATURE_VID:
fillChipVid(&features[count], chip, sensor);
break;
case SENSORS_SUBFEATURE_BEEP_ENABLE:
case SENSORS_FEATURE_BEEP_ENABLE:
fillChipBeepEnable(&features[count], chip, sensor);
break;
default:
+5 -5
View File
@@ -435,19 +435,19 @@ void print_chip(const sensors_chip_name *name)
i = 0;
while ((feature = sensors_get_features(name, &i))) {
switch (feature->type) {
case SENSORS_SUBFEATURE_TEMP_INPUT:
case SENSORS_FEATURE_TEMP:
print_chip_temp(name, feature, label_size);
break;
case SENSORS_SUBFEATURE_IN_INPUT:
case SENSORS_FEATURE_IN:
print_chip_in(name, feature, label_size);
break;
case SENSORS_SUBFEATURE_FAN_INPUT:
case SENSORS_FEATURE_FAN:
print_chip_fan(name, feature, label_size);
break;
case SENSORS_SUBFEATURE_VID:
case SENSORS_FEATURE_VID:
print_chip_vid(name, feature, label_size);
break;
case SENSORS_SUBFEATURE_BEEP_ENABLE:
case SENSORS_FEATURE_BEEP_ENABLE:
print_chip_beep_enable(name, feature, label_size);
break;
default: