Changeset 4833

Timestamp:

09/23/07 14:02:59 (6 years ago)

Author:

khali

Message:

Store current temperature, voltage and fan values together with
the rest of the subfeatures. This makes the code more simple, and
prepares for current values to be subfeatures like any others (i.e.
they can be missing.)

Location:

lm-sensors/branches/lm-sensors-3.0.0/prog

Files:

• sensord/chips.c (modified) (4 diffs)
• sensors/chips.c (modified) (10 diffs)

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/chips.c

@@ -153 +153 @@
     int index0;
 
-    index0 = iter->type - first_val - 1;
+    index0 = iter->type - first_val;
     if (index0 < 0 || index0 >= size)
       /* New feature in libsensors? Ignore. */
@@ -163 +163 @@
 }
 
-#define IN_FEATURE(x)      has_features[x - SENSORS_FEATURE_IN - 1]
-#define IN_FEATURE_NR(x)   feature_nrs[x - SENSORS_FEATURE_IN - 1]
+#define IN_FEATURE(x)      has_features[x - SENSORS_FEATURE_IN]
+#define IN_FEATURE_NR(x)   feature_nrs[x - SENSORS_FEATURE_IN]
 static void fillChipVoltage (FeatureDescriptor *voltage,
                              const sensors_chip_name *name,
                              const sensors_subfeature *feature)
 {
-  const int size = SENSORS_FEATURE_IN_BEEP - SENSORS_FEATURE_IN;
-  short has_features[SENSORS_FEATURE_IN_BEEP - SENSORS_FEATURE_IN] = { 0, };
-  int feature_nrs[SENSORS_FEATURE_IN_BEEP - SENSORS_FEATURE_IN];
+  const int size = SENSORS_FEATURE_IN_BEEP - SENSORS_FEATURE_IN + 1;
+  short has_features[SENSORS_FEATURE_IN_BEEP - SENSORS_FEATURE_IN + 1] = { 0, };
+  int feature_nrs[SENSORS_FEATURE_IN_BEEP - SENSORS_FEATURE_IN + 1];
   int pos = 0;
 
   voltage->rrd = rrdF2;
   voltage->type = DataType_voltage;
-  voltage->dataNumbers[pos++] = feature->number;
 
   getAvailableFeatures (name, feature, has_features,
                         feature_nrs, size, SENSORS_FEATURE_IN);
+
+  voltage->dataNumbers[pos++] = IN_FEATURE_NR(SENSORS_FEATURE_IN);
 
   if (IN_FEATURE(SENSORS_FEATURE_IN_MIN) &&
@@ -211 +212 @@
 }
 
-#define TEMP_FEATURE(x)      has_features[x - SENSORS_FEATURE_TEMP - 1]
-#define TEMP_FEATURE_NR(x)   feature_nrs[x - SENSORS_FEATURE_TEMP - 1]
+#define TEMP_FEATURE(x)      has_features[x - SENSORS_FEATURE_TEMP]
+#define TEMP_FEATURE_NR(x)   feature_nrs[x - SENSORS_FEATURE_TEMP]
 static void fillChipTemperature (FeatureDescriptor *temperature,
                                  const sensors_chip_name *name,
                                  const sensors_subfeature *feature)
 {
-  const int size = SENSORS_FEATURE_TEMP_BEEP - SENSORS_FEATURE_TEMP;
-  short has_features[SENSORS_FEATURE_TEMP_BEEP - SENSORS_FEATURE_TEMP] = { 0, };
-  int feature_nrs[SENSORS_FEATURE_TEMP_BEEP - SENSORS_FEATURE_TEMP];
+  const int size = SENSORS_FEATURE_TEMP_BEEP - SENSORS_FEATURE_TEMP + 1;
+  short has_features[SENSORS_FEATURE_TEMP_BEEP - SENSORS_FEATURE_TEMP + 1] = { 0, };
+  int feature_nrs[SENSORS_FEATURE_TEMP_BEEP - SENSORS_FEATURE_TEMP + 1];
   int pos = 0;
 
   temperature->rrd = rrdF1;
   temperature->type = DataType_temperature;
-  temperature->dataNumbers[pos++] = feature->number;
 
   getAvailableFeatures (name, feature, has_features,
                         feature_nrs, size, SENSORS_FEATURE_TEMP);
+
+  temperature->dataNumbers[pos++] = TEMP_FEATURE_NR(SENSORS_FEATURE_TEMP);
 
   if (TEMP_FEATURE(SENSORS_FEATURE_TEMP_MIN) &&
@@ -262 +264 @@
 }
 
-#define FAN_FEATURE(x)      has_features[x - SENSORS_FEATURE_FAN - 1]
-#define FAN_FEATURE_NR(x)   feature_nrs[x - SENSORS_FEATURE_FAN - 1]
+#define FAN_FEATURE(x)      has_features[x - SENSORS_FEATURE_FAN]
+#define FAN_FEATURE_NR(x)   feature_nrs[x - SENSORS_FEATURE_FAN]
 static void fillChipFan (FeatureDescriptor *fan,
                          const sensors_chip_name *name,
                          const sensors_subfeature *feature)
 {
-  const int size = SENSORS_FEATURE_FAN_BEEP - SENSORS_FEATURE_FAN;
-  short has_features[SENSORS_FEATURE_FAN_BEEP - SENSORS_FEATURE_FAN] = { 0, };
-  int feature_nrs[SENSORS_FEATURE_FAN_BEEP - SENSORS_FEATURE_FAN];
+  const int size = SENSORS_FEATURE_FAN_BEEP - SENSORS_FEATURE_FAN + 1;
+  short has_features[SENSORS_FEATURE_FAN_BEEP - SENSORS_FEATURE_FAN + 1] = { 0, };
+  int feature_nrs[SENSORS_FEATURE_FAN_BEEP - SENSORS_FEATURE_FAN + 1];
   int pos = 0;
 
   fan->rrd = rrdF0;
   fan->type = DataType_rpm;
-  fan->dataNumbers[pos++] = feature->number;
 
   getAvailableFeatures (name, feature, has_features,
                         feature_nrs, size, SENSORS_FEATURE_FAN);
+
+  fan->dataNumbers[pos++] = FAN_FEATURE_NR(SENSORS_FEATURE_FAN);
 
   if (FAN_FEATURE(SENSORS_FEATURE_FAN_MIN)) {

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/chips.c

@@ -85 +85 @@
                 int indx, err;
 
-                indx = iter->type - first_val - 1;
+                indx = iter->type - first_val;
                 if (indx < 0 || indx >= size)
                         /* New feature in libsensors? Ignore. */
@@ -141 +141 @@
 }
 
-#define TEMP_FEATURE(x)         has_features[x - SENSORS_FEATURE_TEMP - 1]
-#define TEMP_FEATURE_VAL(x)     feature_vals[x - SENSORS_FEATURE_TEMP - 1]
+#define TEMP_FEATURE(x)         has_features[x - SENSORS_FEATURE_TEMP]
+#define TEMP_FEATURE_VAL(x)     feature_vals[x - SENSORS_FEATURE_TEMP]
 static void print_chip_temp(const sensors_chip_name *name,
                             const sensors_subfeature *feature,
@@ -151 +151 @@
         int alarm, crit_displayed = 0;
         char *label;
-        const int size = SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP;
-        short has_features[SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP] = { 0, };
-        double feature_vals[SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP] = { 0.0, };
+        const int size = SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP + 1;
+        short has_features[SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP + 1] = { 0, };
+        double feature_vals[SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP + 1] = { 0.0, };
 
         if (!(label = sensors_get_label(name, feature->number))) {
@@ -160 +160 @@
         }
 
-        if (sensors_get_value(name, feature->number, &val)) {
-                printf("ERROR: Can't get %s data!\n", label);
-                free(label);
-                return;
-        }
-
         sensors_get_available_features(name, feature, has_features,
                                        feature_vals, size,
                                        SENSORS_FEATURE_TEMP);
+        val = TEMP_FEATURE_VAL(SENSORS_FEATURE_TEMP);
 
         alarm = TEMP_FEATURE(SENSORS_FEATURE_TEMP_ALARM) &&
@@ -279 +274 @@
 }
 
-#define IN_FEATURE(x)           has_features[x - SENSORS_FEATURE_IN - 1]
-#define IN_FEATURE_VAL(x)       feature_vals[x - SENSORS_FEATURE_IN - 1]
+#define IN_FEATURE(x)           has_features[x - SENSORS_FEATURE_IN]
+#define IN_FEATURE_VAL(x)       feature_vals[x - SENSORS_FEATURE_IN]
 static void print_chip_in(const sensors_chip_name *name,
                           const sensors_subfeature *feature,
                           int label_size)
 {
-        const int size = SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN;
-        short has_features[SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN] = { 0, };
-        double feature_vals[SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN] = { 0.0, };
+        const int size = SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN + 1;
+        short has_features[SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN + 1] = { 0, };
+        double feature_vals[SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN + 1] = { 0.0, };
         double val, alarm_max, alarm_min;
         char *label;
@@ -296 +291 @@
         }
 
-        if (sensors_get_value(name, feature->number, &val)) {
-                printf("ERROR: Can't get %s data!\n", label);
-                free(label);
-                return;
-        }
-
         sensors_get_available_features(name, feature, has_features,
                                        feature_vals, size, SENSORS_FEATURE_IN);
+        val = IN_FEATURE_VAL(SENSORS_FEATURE_IN);
 
         print_label(label, label_size);
@@ -344 +334 @@
 }
 
-#define FAN_FEATURE(x)          has_features[x - SENSORS_FEATURE_FAN - 1]
-#define FAN_FEATURE_VAL(x)      feature_vals[x - SENSORS_FEATURE_FAN - 1]
+#define FAN_FEATURE(x)          has_features[x - SENSORS_FEATURE_FAN]
+#define FAN_FEATURE_VAL(x)      feature_vals[x - SENSORS_FEATURE_FAN]
 static void print_chip_fan(const sensors_chip_name *name,
                            const sensors_subfeature *feature,
@@ -351 +341 @@
 {
         char *label;
-        const int size = SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN;
-        short has_features[SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN] = { 0, };
-        double feature_vals[SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN] = { 0.0, };
+        const int size = SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN + 1;
+        short has_features[SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN + 1] = { 0, };
+        double feature_vals[SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN + 1] = { 0.0, };
         double val;
 
@@ -361 +351 @@
         }
 
-        if (sensors_get_value(name, feature->number, &val)) {
-                printf("ERROR: Can't get %s data!\n", label);
-                free(label);
-                return;
-        }
-
         print_label(label, label_size);
         free(label);
@@ -372 +356 @@
         sensors_get_available_features(name, feature, has_features,
                                        feature_vals, size, SENSORS_FEATURE_FAN);
+        val = FAN_FEATURE_VAL(SENSORS_FEATURE_FAN);
 
         if (FAN_FEATURE(SENSORS_FEATURE_FAN_FAULT) &&