Changeset 4846

Timestamp:

09/23/07 14:30:28 (1 year ago)

Author:

khali

Message:

New public library function: sensors_get_subfeature(). Applications can
use it to retrieve a specific subfeature by type. While it is slighly
less efficient than looping over sensors_get_all_subfeatures(), it
often makes the application code much more elegant.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/lib/access.c (modified) (1 diff)
• lm-sensors/branches/lm-sensors-3.0.0/lib/libsensors.3 (modified) (2 diffs)
• lm-sensors/branches/lm-sensors-3.0.0/lib/sensors.h (modified) (1 diff)
• lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/chips.c (modified) (11 diffs)
• lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/chips.c (modified) (16 diffs)

lm-sensors/branches/lm-sensors-3.0.0/lib/access.c

@@ -392 +392 @@
-                return subfeature;
-        return NULL;    /* end of subfeature list */
+}
+
+const sensors_subfeature *
+sensors_get_subfeature(const sensors_chip_name *name,
+                       const sensors_feature *feature,
+                       sensors_subfeature_type type)
+{
+        const sensors_chip_features *chip;
+        int i;
+
+        if (!(chip = sensors_lookup_chip(name)))
+                return NULL;    /* No such chip */
+
+        for (i = feature->first_subfeature; i < chip->subfeature_count &&
+             chip->subfeature[i].mapping == feature->number; i++) {
+                if (chip->subfeature[i].type == type)
+                        return &chip->subfeature[i];
+        }
+        return NULL;    /* No such subfeature */
-}
-

lm-sensors/branches/lm-sensors-3.0.0/lib/libsensors.3

@@ -47 +47 @@
-.B const sensors_feature *sensors_get_features(const sensors_chip_name *name, int *nr);\fP
-.B const sensors_subfeature *sensors_get_all_subfeatures(const sensors_chip_name *name, const sensors_feature *feature, int *nr);\fP
+.B const sensors_subfeature *sensors_get_subfeature(const sensors_chip_name *name, const sensors_feature *feature, sensors_subfeature_type type);\fP
-.B const char *libsensors_version;
-.fi
@@ -141 +142 @@
-data structures.
-
+\fBconst sensors_subfeature *sensors_get_subfeature(const sensors_chip_name *name, const sensors_feature *feature, sensors_subfeature_type type);\fP
+.br
+This returns the subfeature of the given type for a given main feature,
+if it exists, NULL otherwise.
+Do not try to change the returned structure; you will corrupt internal
+data structures.
+
-\fBconst char *libsensors_version;\fP
-.br

lm-sensors/branches/lm-sensors-3.0.0/lib/sensors.h

@@ -222 +222 @@
-                            const sensors_feature *feature, int *nr);
-
+/* This returns the subfeature of the given type for a given main feature,
+   if it exists, NULL otherwise.
+   Do not try to change the returned structure; you will corrupt internal
+   data structures. */
+const sensors_subfeature *
+sensors_get_subfeature(const sensors_chip_name *name,
+                       const sensors_feature *feature,
+                       sensors_subfeature_type type);
+
-#ifdef __cplusplus
-}

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

@@ -141 +141 @@
-}
-
-static void getAvailableFeatures (const sensors_chip_name *name,
-                                  const sensors_feature *feature,
-                                  short *has_features,
-                                  int *feature_nrs, int size,
-                                  int first_val)
-{
-  const sensors_subfeature *iter;
-  int i = 0;
-
-  while ((iter = sensors_get_all_subfeatures(name, feature, &i))) {
-    int index0;
-
-    index0 = iter->type - first_val;
-    if (index0 < 0 || index0 >= size)
-      /* New feature in libsensors? Ignore. */
-      continue;
-
-    has_features[index0] = 1;
-    feature_nrs[index0] = iter->number;
-  }
-}
-
-#define IN_FEATURE(x)      has_features[x - SENSORS_SUBFEATURE_IN_INPUT]
-#define IN_FEATURE_NR(x)   feature_nrs[x - SENSORS_SUBFEATURE_IN_INPUT]
-static void fillChipVoltage (FeatureDescriptor *voltage,
-                             const sensors_chip_name *name,
-                             const sensors_feature *feature)
-{
-
-
-
+
-  int pos = 0;
-
@@ -177 +151 @@
-  voltage->type = DataType_voltage;
-
-getAvailableFeatures (name, feature, has_features,
-                      feature_nrs, size, SENSORS_SUBFEATURE_IN_INPUT);
-
-
-
-if (IN_FEATURE(SENSORS_SUBFEATURE_IN_MIN) &&
-    IN_FEATURE(SENSORS_SUBFEATURE_IN_MAX)
+sf = sensors_get_subfeature(name, feature, SENSORS_SUBFEATURE_IN_INPUT);
+if (sf)
+
+
+
+sfmax = sensors_get_subfeature(name, feature, SENSORS_SUBFEATURE_IN_MAX);
+if (sfmin && sfmax
-    voltage->format = fmtVolts_2;
-IN_FEATURE_NR(SENSORS_SUBFEATURE_IN_MIN)
-IN_FEATURE_NR(SENSORS_SUBFEATURE_IN_MAX)
+sfmin->number
+sfmax->number
-  } else {
-    voltage->format = fmtVolt_2;
@@ -195 +169 @@
-
-  /* alarm if applicable */
-
-
-
-
-
-
+
+
+
+
-  } else {
-    voltage->alarmNumber = -1;
-  }
-  /* beep if applicable */
-IN_FEATURE(SENSORS_SUBFEATURE_IN_BEEP
-IN_FEATURE_NR(SENSORS_SUBFEATURE_IN_ALARM)
+(sf = sensors_get_subfeature(name, feature, SENSORS_SUBFEATURE_IN_BEEP)
+sf->number
-  } else {
-    voltage->beepNumber = -1;
@@ -212 +184 @@
-}
-
-#define TEMP_FEATURE(x)      has_features[x - SENSORS_SUBFEATURE_TEMP_INPUT]
-#define TEMP_FEATURE_NR(x)   feature_nrs[x - SENSORS_SUBFEATURE_TEMP_INPUT]
-static void fillChipTemperature (FeatureDescriptor *temperature,
-                                 const sensors_chip_name *name,
-                                 const sensors_feature *feature)
-{
-
-
-
+
-  int pos = 0;
-
@@ -226 +194 @@
-  temperature->type = DataType_temperature;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    temperature->format = fmtTemps_minmax_1;
-
-
-
-
+
+
+
-    temperature->format = fmtTemps_1;
-TEMP_FEATURE_NR(SENSORS_SUBFEATURE_TEMP_MAX)
-TEMP_FEATURE_NR(SENSORS_SUBFEATURE_TEMP_MAX_HYST)
+sfmax->number
+sfhyst->number
-  } else {
-    temperature->format = fmtTemp_only;
@@ -249 +217 @@
-
-  /* alarm if applicable */
-
-
-
-
+
+
+
-  } else {
-    temperature->alarmNumber = -1;
-  }
-  /* beep if applicable */
-TEMP_FEATURE(SENSORS_SUBFEATURE_TEMP_BEEP
-TEMP_FEATURE_NR(SENSORS_SUBFEATURE_TEMP_BEEP)
+(sf = sensors_get_subfeature(name, feature, SENSORS_SUBFEATURE_TEMP_BEEP)
+sf->number
-  } else {
-    temperature->beepNumber = -1;
@@ -264 +231 @@
-}
-
-#define FAN_FEATURE(x)      has_features[x - SENSORS_SUBFEATURE_FAN_INPUT]
-#define FAN_FEATURE_NR(x)   feature_nrs[x - SENSORS_SUBFEATURE_FAN_INPUT]
-static void fillChipFan (FeatureDescriptor *fan,
-                         const sensors_chip_name *name,
-                         const sensors_feature *feature)
-{
-
-
-
+
-  int pos = 0;
-
@@ -278 +241 @@
-  fan->type = DataType_rpm;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-      fan->format = fmtFans_0;
-FAN_FEATURE_NR(SENSORS_SUBFEATURE_FAN_DIV)
+sfdiv->number
-    } else {
-      fan->format = fmtFans_nodiv_0;
@@ -299 +263 @@
-
-  /* alarm if applicable */
-
-
+
+
+
-  } else {
-    fan->alarmNumber = -1;
-  }
-  /* beep if applicable */
-
-
+
+
+
-  } else {
-    fan->beepNumber = -1;
@@ -316 +282 @@
-                         const sensors_feature *feature)
-{
-  int i = 0;
-  const sensors_subfeature *sub;
-
-all_subfeatures(name, feature, &i
+subfeature(name, feature, SENSORS_SUBFEATURE_VID
-  if (!sub)
-    return;
@@ -336 +301 @@
-                                const sensors_feature *feature)
-{
-  int i = 0;
-  const sensors_subfeature *sub;
-
-all_subfeatures(name, feature, &i
+subfeature(name, feature, SENSORS_SUBFEATURE_BEEP_ENABLE
-  if (!sub)
-    return;

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

@@ -71 +71 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -139 +125 @@
-}
-
-#define TEMP_FEATURE(x)         has_features[x - SENSORS_SUBFEATURE_TEMP_INPUT]
-#define TEMP_FEATURE_VAL(x)     feature_vals[x - SENSORS_SUBFEATURE_TEMP_INPUT]
-static void print_chip_temp(const sensors_chip_name *name,
-                            const sensors_feature *feature,
-                            int label_size)
-{
+        const sensors_subfeature *sf, *sfmin, *sfmax, *sfcrit, *sfhyst;
-        double val, limit1, limit2;
-        const char *s1, *s2;
-        int alarm, crit_displayed = 0;
-        char *label;
-        const int size = SENSORS_SUBFEATURE_TEMP_TYPE - SENSORS_SUBFEATURE_TEMP_INPUT + 1;
-        short has_features[SENSORS_SUBFEATURE_TEMP_TYPE - SENSORS_SUBFEATURE_TEMP_INPUT + 1] = { 0, };
-        double feature_vals[SENSORS_SUBFEATURE_TEMP_TYPE - SENSORS_SUBFEATURE_TEMP_INPUT + 1] = { 0.0, };
-
-        if (!(label = sensors_get_label(name, feature))) {
@@ -157 +139 @@
-                return;
-        }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        alarm |= 1;
-
-TEMP_FEATURE(SENSORS_SUBFEATURE_TEMP_MIN)
-TEMP_FEATURE_VAL(SENSORS_SUBFEATURE_TEMP_MIN
+sfmin
+get_value(name, sfmin->number
-                        s1 = "low";
-TEMP_FEATURE_VAL(SENSORS_SUBFEATURE_TEMP_MAX
+get_value(name, sfmax->number
-                        s2 = "high";
-
-
-
+
+
+
-                                alarm |= 1;
-                } else {
-TEMP_FEATURE_VAL(SENSORS_SUBFEATURE_TEMP_MAX
+get_value(name, sfmax->number
-                        s1 = "high";
-
-
-
+
+
+
+
-                                s2 = "hyst";
-TEMP_FEATURE(SENSORS_SUBFEATURE_TEMP_CRIT)
-TEMP_FEATURE_VAL(SENSORS_SUBFEATURE_TEMP_CRIT
+sfcrit
+get_value(name, sfcrit->number
-                                s2 = "crit";
-
-
-
+
+
+
-                                        alarm |= 1;
-                                crit_displayed = 1;
@@ -199 +195 @@
-                        }
-                }
-TEMP_FEATURE(SENSORS_SUBFEATURE_TEMP_CRIT)
-TEMP_FEATURE_VAL(SENSORS_SUBFEATURE_TEMP_CRIT
+sfcrit
+get_value(name, sfcrit->number
-                s1 = "crit";
-
-
-
+
+
+
+
-                        s2 = "hyst";
-                } else {
@@ -211 +209 @@
-                }
-
-
-
+
+
+
-                        alarm |= 1;
-                crit_displayed = 1;
@@ -220 +219 @@
-        }
-
-
-
-
-
-
+
+
+
+
-                printf("   FAULT  ");
-        } else {
@@ -233 +231 @@
-        print_temp_limits(limit1, limit2, s1, s2, alarm);
-
-TEMP_FEATURE(SENSORS_SUBFEATURE_TEMP_CRIT)
-TEMP_FEATURE_VAL(SENSORS_SUBFEATURE_TEMP_CRIT
+sfcrit
+get_value(name, sfcrit->number
-                s1 = "crit";
-
-
-
+
+
+
+
-                        s2 = "hyst";
-                } else {
@@ -245 +245 @@
-                }
-
-
-
+
+
+
+
-
-                printf("\n%*s", label_size + 10, "");
@@ -253 +255 @@
-
-        /* print out temperature sensor info */
-
-
+
+
+
+
-
-                /* older kernels / drivers sometimes report a beta value for
@@ -272 +276 @@
-}
-
-#define IN_FEATURE(x)           has_features[x - SENSORS_SUBFEATURE_IN_INPUT]
-#define IN_FEATURE_VAL(x)       feature_vals[x - SENSORS_SUBFEATURE_IN_INPUT]
-static void print_chip_in(const sensors_chip_name *name,
-                          const sensors_feature *feature,
-                          int label_size)
-{
-
-
-
+
-        double val, alarm_max, alarm_min;
-        char *label;
@@ -288 +288 @@
-                return;
-        }
-
-        sensors_get_available_features(name, feature, has_features,
-                                       feature_vals, size,
-                                       SENSORS_SUBFEATURE_IN_INPUT);
-        val = IN_FEATURE_VAL(SENSORS_SUBFEATURE_IN_INPUT);
-
-        print_label(label, label_size);
-        free(label);
+
+        sf = sensors_get_subfeature(name, feature,
+                                    SENSORS_SUBFEATURE_IN_INPUT);
+        val = sf ? get_value(name, sf->number) : 0;
-        printf("%+6.2f V", val);
-
-
-
+
+
+
+
+
-                printf("  (min = %+6.2f V, max = %+6.2f V)",
-IN_FEATURE_VAL(SENSORS_SUBFEATURE_IN_MIN
-IN_FEATURE_VAL(SENSORS_SUBFEATURE_IN_MAX
-IN_FEATURE(SENSORS_SUBFEATURE_IN_MIN)
+get_value(name, sfmin->number
+get_value(name, sfmax->number
+sfmin
-                printf("  (min = %+6.2f V)",
-IN_FEATURE_VAL(SENSORS_SUBFEATURE_IN_MIN
-IN_FEATURE(SENSORS_SUBFEATURE_IN_MAX)
+get_value(name, sfmin->number
+sfmax
-                printf("  (max = %+6.2f V)",
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-                if (alarm_min || alarm_max) {
@@ -325 +331 @@
-                        printf(")");
-                }
-IN_FEATURE(SENSORS_SUBFEATURE_IN_ALARM)
+sf
-                printf("   %s",
-IN_FEATURE_VAL(SENSORS_SUBFEATURE_IN_ALARM
+       get_value(name, sf->number
-        }
-
@@ -333 +339 @@
-}
-
-#define FAN_FEATURE(x)          has_features[x - SENSORS_SUBFEATURE_FAN_INPUT]
-#define FAN_FEATURE_VAL(x)      feature_vals[x - SENSORS_SUBFEATURE_FAN_INPUT]
-static void print_chip_fan(const sensors_chip_name *name,
-                           const sensors_feature *feature,
-                           int label_size)
-{
-
-
-
-
+
+
-        double val;
-
@@ -349 +351 @@
-                return;
-        }
-
-        print_label(label, label_size);
-        free(label);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                printf("   FAULT");
-        else
-                printf("%4.0f RPM", val);
-
-
-
+
+
+
+
+
-                printf("  (min = %4.0f RPM, div = %1.0f)",
-FAN_FEATURE_VAL(SENSORS_SUBFEATURE_FAN_MIN
-FAN_FEATURE_VAL(SENSORS_SUBFEATURE_FAN_DIV
-FAN_FEATURE(SENSORS_SUBFEATURE_FAN_MIN)
+get_value(name, sfmin->number
+get_value(name, sfdiv->number
+sfmin
-                printf("  (min = %4.0f RPM)",
-FAN_FEATURE_VAL(SENSORS_SUBFEATURE_FAN_MIN
-FAN_FEATURE(SENSORS_SUBFEATURE_FAN_DIV)
+get_value(name, sfmin->number
+sfdiv
-                printf("  (div = %1.0f)",
-
-
-
-
+
+
+
+
+
-                printf("  ALARM");
-        }
@@ -391 +395 @@
-        const sensors_subfeature *subfeature;
-        double vid;
-
-
-subfeature = sensors_get_all_subfeatures(name, feature, &i
+
+
+                                   SENSORS_SUBFEATURE_VID
-        if (!subfeature)
-                return;
@@ -412 +416 @@
-        const sensors_subfeature *subfeature;
-        double beep_enable;
-
-
-subfeature = sensors_get_all_subfeatures(name, feature, &i
+
+
+                                   SENSORS_SUBFEATURE_BEEP_ENABLE
-        if (!subfeature)
-                return;