Changeset 5896

Timestamp:

12/14/10 10:06:19 (2 years ago)

Author:

khali

Message:

Compute MAX_SUBFEATURES at run-time (#2378).

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• lib/sysfs.c (modified) (5 diffs)

lm-sensors/trunk/CHANGES

@@ -5 +5 @@
   Makefile: Check for bison and flex
   libsensors: Add support for intrusion detection (#2370)
+              Compute MAX_SUBFEATURES at run-time (#2378)
   sensors.conf.defauit: Add a section for the W83627THF
                         Add a section for the SCH5127

lm-sensors/trunk/lib/sysfs.c

@@ -140 +140 @@
 #define MAX_OTHER_SENSOR_TYPES  2
 #define MAX_SENSORS_PER_TYPE    24
-#define MAX_SUBFEATURES         8
-#define FEATURE_SIZE            (MAX_SUBFEATURES * 2)
+/* max_subfeatures is now computed dynamically */
+#define FEATURE_SIZE            (max_subfeatures * 2)
 #define FEATURE_TYPE_SIZE       (MAX_SENSORS_PER_TYPE * FEATURE_SIZE)
 
@@ -338 +338 @@
 }
 
+static int sensors_compute_max(void)
+{
+        int i, j, max, offset;
+        const struct subfeature_type_match *submatches;
+        sensors_feature_type ftype;
+
+        max = 0;
+        for (i = 0; i < ARRAY_SIZE(matches); i++) {
+                submatches = matches[i].submatches;
+                for (j = 0; submatches[j].name != NULL; j++) {
+                        ftype = submatches[j].type >> 8;
+
+                        if (ftype < SENSORS_FEATURE_VID) {
+                                offset = submatches[j].type & 0x7F;
+                                if (offset >= max)
+                                        max = offset + 1;
+                        } else {
+                                offset = submatches[j].type & 0xFF;
+                                if (offset >= max * 2)
+                                        max = ((offset + 1) + 1) / 2;
+                        }
+                }
+        }
+
+        return max;
+}
+
 static int sensors_get_attr_mode(const char *device, const char *attr)
 {
@@ -358 +385 @@
 {
         int i, fnum = 0, sfnum = 0, prev_slot;
+        static int max_subfeatures;
         DIR *dir;
         struct dirent *ent;
@@ -368 +396 @@
         if (!(dir = opendir(dev_path)))
                 return -errno;
+
+        /* Dynamically figure out the max number of subfeatures */
+        if (!max_subfeatures)
+                max_subfeatures = sensors_compute_max();
 
         /* We use a large sparse table at first to store all found
@@ -431 +463 @@
                         i = ftype * FEATURE_TYPE_SIZE +
                             nr * FEATURE_SIZE +
-                            ((sftype & 0x80) >> 7) * MAX_SUBFEATURES +
+                            ((sftype & 0x80) >> 7) * max_subfeatures +
                             (sftype & 0x7F);
                 }