Changeset 4831 for lm-sensors/branches/lm-sensors-3.0.0/lib/access.c

Timestamp:

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

Author:

khali

Message:

Split sensors_get_all_features() into two distinct functions, one to
get the list of all main features, and one to get the list of all the
subfeatures of a given main feature. This is a more logical interface for
applications to use. The current implementation is admittedly less than
optimal, because the storage structures weren't meant for it, but this
issue can (and will) be addressed later.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/lib/access.c (modified) (2 diffs)

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

@@ -344 +344 @@
 }
 
-/* nr-1 is the last feature returned */
-const sensors_feature_data *sensors_get_all_features(const sensors_chip_name *name,
-                                                     int *nr)
+static const sensors_feature_data *
+sensors_get_all_features(const sensors_chip_name *name, int *nr)
 {
         sensors_feature_data *feature_list;
@@ -362 +361 @@
                 }
         return NULL;
+}
+
+const sensors_feature_data *
+sensors_get_features(const sensors_chip_name *name, int *nr)
+{
+        const sensors_feature_data *feature;
+
+        while ((feature = sensors_get_all_features(name, nr))) {
+                if (feature->mapping == SENSORS_NO_MAPPING)
+                        return feature;
+        }
+        return NULL;    /* end of list */
+}
+
+const sensors_feature_data *
+sensors_get_all_subfeatures(const sensors_chip_name *name, int feature, int *nr)
+{
+        const sensors_feature_data *subfeature;
+
+        /* Seek directly to the first subfeature */
+        if (*nr < feature)
+                *nr = feature;
+
+        subfeature = sensors_get_all_features(name, nr);
+        if (!subfeature)
+                return NULL;    /* end of list */
+        if (subfeature->number == feature ||
+            subfeature->mapping == feature)
+                return subfeature;
+        return NULL;            /* end of subfeature list */
 }