Changeset 4834

Timestamp:

09/23/07 14:05:16 (6 years ago)

Author:

khali

Message:

Define a separate structure to represent main features. This allows
for faster main features lookup. One side effect of this change is
that subfeatures can no longer have labels nor be ignored. I do not
think that this is a problem in practice, and actually this makes a
lot of sense.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• lib/access.c (modified) (7 diffs)
• lib/data.h (modified) (1 diff)
• lib/init.c (modified) (1 diff)
• lib/libsensors.3 (modified) (5 diffs)
• lib/sensors.h (modified) (4 diffs)
• lib/sysfs.c (modified) (2 diffs)
• prog/sensord/chips.c (modified) (11 diffs)
• prog/sensord/rrd.c (modified) (1 diff)
• prog/sensord/sense.c (modified) (2 diffs)
• prog/sensord/sensord.h (modified) (2 diffs)
• prog/sensors/chips.c (modified) (16 diffs)

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

@@ -142 +142 @@
    yourself). On failure, NULL is returned.
    If no label exists for this feature, its name is returned itself. */
-char *sensors_get_label(const sensors_chip_name *name, int feature)
+char *sensors_get_label(const sensors_chip_name *name,
+                        const sensors_feature *feature)
 {
         char *label;
         const sensors_chip *chip;
-        const sensors_subfeature *featureptr;
         char buf[128], path[PATH_MAX];
         FILE *f;
@@ -153 +153 @@
         if (sensors_chip_name_has_wildcards(name))
                 return NULL;
-        if (!(featureptr = sensors_lookup_feature_nr(name, feature)))
-                return NULL;
 
         for (chip = NULL; (chip = sensors_for_all_config_chips(name, chip));)
                 for (i = 0; i < chip->labels_count; i++)
-                        if (!strcmp(featureptr->name, chip->labels[i].name)) {
+                        if (!strcmp(feature->name, chip->labels[i].name)) {
                                 label = strdup(chip->labels[i].value);
                                 goto sensors_get_label_exit;
@@ -164 +162 @@
 
         /* No user specified label, check for a _label sysfs file */
-        snprintf(path, PATH_MAX, "%s/%s_label", name->path,
-                featureptr->name);
+        snprintf(path, PATH_MAX, "%s/%s_label", name->path, feature->name);
         
         if ((f = fopen(path, "r"))) {
@@ -179 +176 @@
 
         /* No label, return the feature name instead */
-        label = strdup(featureptr->name);
+        label = strdup(feature->name);
         
 sensors_get_label_exit:
@@ -189 +186 @@
 
 /* Looks up whether a feature should be ignored. Returns
-   1 if it should be ignored, 0 if not. This function takes
-   mappings into account. */
+   1 if it should be ignored, 0 if not. */
 static int sensors_get_ignored(const sensors_chip_name *name,
-                               const sensors_subfeature *feature)
+                               const sensors_feature *feature)
 {
         const sensors_chip *chip;
-        const char *main_feature_name;
         int i;
-
-        if (feature->mapping == SENSORS_NO_MAPPING)
-                main_feature_name = NULL;
-        else
-                main_feature_name = sensors_lookup_feature_nr(name,
-                                        feature->mapping)->name;
 
         for (chip = NULL; (chip = sensors_for_all_config_chips(name, chip));)
                 for (i = 0; i < chip->ignores_count; i++)
-                        if (!strcmp(feature->name, chip->ignores[i].name) ||
-                            (main_feature_name &&
-                             !strcmp(main_feature_name, chip->ignores[i].name)))
+                        if (!strcmp(feature->name, chip->ignores[i].name))
                                 return 1;
         return 0;
@@ -353 +340 @@
                 if (sensors_match_chip(&sensors_proc_chips[i].chip, name)) {
                         subfeature_list = sensors_proc_chips[i].subfeature;
-                        while (*nr < sensors_proc_chips[i].subfeature_count
-                            && sensors_get_ignored(name, &subfeature_list[*nr]))
-                                (*nr)++;
-                        if (*nr == sensors_proc_chips[i].subfeature_count)
+                        if (*nr >= sensors_proc_chips[i].subfeature_count)
                                 return NULL;
                         return &subfeature_list[(*nr)++];
@@ -363 +347 @@
 }
 
+const sensors_feature *
+sensors_get_features(const sensors_chip_name *name, int *nr)
+{
+        const sensors_feature *feature_list;
+        int i;
+
+        for (i = 0; i < sensors_proc_chips_count; i++)
+                if (sensors_match_chip(&sensors_proc_chips[i].chip, name)) {
+                        feature_list = sensors_proc_chips[i].feature;
+                        while (*nr < sensors_proc_chips[i].feature_count
+                            && sensors_get_ignored(name, &feature_list[*nr]))
+                                (*nr)++;
+                        if (*nr >= sensors_proc_chips[i].feature_count)
+                                return NULL;
+                        return &feature_list[(*nr)++];
+                }
+        return NULL;    /* end of list */
+}
+
 const sensors_subfeature *
-sensors_get_features(const sensors_chip_name *name, int *nr)
-{
-        const sensors_subfeature *feature;
-
-        while ((feature = sensors_get_all_features(name, nr))) {
-                if (feature->mapping == SENSORS_NO_MAPPING)
-                        return feature;
-        }
-        return NULL;    /* end of list */
-}
-
-const sensors_subfeature *
-sensors_get_all_subfeatures(const sensors_chip_name *name, int feature, int *nr)
+sensors_get_all_subfeatures(const sensors_chip_name *name,
+                        const sensors_feature *feature, int *nr)
 {
         const sensors_subfeature *subfeature;
 
         /* Seek directly to the first subfeature */
-        if (*nr < feature)
-                *nr = feature;
+        if (*nr < feature->first_subfeature)
+                *nr = feature->first_subfeature;
 
         subfeature = sensors_get_all_features(name, nr);
         if (!subfeature)
                 return NULL;    /* end of list */
-        if (subfeature->number == feature ||
-            subfeature->mapping == feature)
+        if (subfeature->number == feature->first_subfeature ||
+            subfeature->mapping == feature->first_subfeature)
                 return subfeature;
         return NULL;            /* end of subfeature list */

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

@@ -124 +124 @@
 typedef struct sensors_chip_features {
         struct sensors_chip_name chip;
+        struct sensors_feature *feature;
         struct sensors_subfeature *subfeature;
+        int feature_count;
         int subfeature_count;
 } sensors_chip_features;

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

@@ -60 +60 @@
                 free(features->subfeature[i].name);
         free(features->subfeature);
+        for (i = 0; i < features->feature_count; i++)
+                free(features->feature[i].name);
+        free(features->feature);
 }
 

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

@@ -37 +37 @@
                             \fBsensors_chip_name *res);\fP
 .B const char *sensors_get_adapter_name(int bus_nr);
-.B char *sensors_get_label(const sensors_chip_name *name, int feature);\fP
+.B char *sensors_get_label(const sensors_chip_name *name, const sensors_feature *feature);\fP
 .B int sensors_get_value(const sensors_chip_name *name, int feature,
                       \fBdouble *value);\fP
@@ -45 +45 @@
 .B const sensors_chip_name *sensors_get_detected_chips(const sensors_chip_name
                                                     \fB*match, int *nr);\fP
-.B const sensors_feature_data *sensors_get_features
-             \fB(const sensors_chip_name *name, int *nr);\fP
-.B const sensors_feature_data *sensors_get_all_subfeatures
-             \fB(const sensors_chip_name *name, int feature, int *nr);\fP
+.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 char *libsensors_version;
 .fi
@@ -74 +72 @@
 sensors_chip_name structure. If it could not be found, it returns NULL.
 
-\fBchar *sensors_get_label(const sensors_chip_name *name, int feature);\fP
+\fBchar *sensors_get_label(const sensors_chip_name *name, const sensors_feature *feature);\fP
 .br
 Look up the label which belongs to this chip. Note that chip should not
@@ -125 +123 @@
 (affected by the computation rules of the main feature).
 
-\fBconst sensors_feature_data *sensors_get_features(const sensors_chip_name *name, int *nr);\fP
+\fBconst sensors_feature *sensors_get_features(const sensors_chip_name *name, int *nr);\fP
 .br
 This returns all main features of a specific chip. nr is an internally
@@ -133 +131 @@
 data structures.
 
-\fBconst sensors_feature_data *sensors_get_all_subfeatures(const sensors_chip_name *name, int feature, int *nr);\fP
+\fBconst sensors_subfeature *sensors_get_all_subfeatures(const sensors_chip_name *name, const sensors_feature *feature, int *nr);\fP
 .br
 This returns all subfeatures of a given main feature (including that
 main feature itself, in first position.) nr is an internally used
 variable. Set it to zero to start at the begin of the list. If no more
-features are found NULL is returned.
+subfeatures are found NULL is returned.
 Do not try to change the returned structure; you will corrupt internal
 data structures.

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

@@ -83 +83 @@
 const char *sensors_get_adapter_name(const sensors_bus_id *bus);
 
+typedef struct sensors_feature sensors_feature;
+
 /* Look up the label which belongs to this chip. Note that chip should not
    contain wildcard values! The returned string is newly allocated (free it
    yourself). On failure, NULL is returned.
    If no label exists for this feature, its name is returned itself. */
-char *sensors_get_label(const sensors_chip_name *name, int feature);
+char *sensors_get_label(const sensors_chip_name *name,
+                        const sensors_feature *feature);
 
 /* Read the value of a feature of a certain chip. Note that chip should not
@@ -163 +166 @@
         SENSORS_FEATURE_UNKNOWN = INT_MAX,
 } sensors_feature_type;
+
+/* Data about a single chip feature (or category leader) */
+struct sensors_feature {
+        char *name;
+        int first_subfeature;
+        sensors_feature_type type;
+};
 
 /* Data about a single chip subfeature:
@@ -189 +199 @@
    Do not try to change the returned structure; you will corrupt internal
    data structures. */
-const sensors_subfeature *
+const sensors_feature *
 sensors_get_features(const sensors_chip_name *name, int *nr);
 
@@ -199 +209 @@
    data structures. */
 const sensors_subfeature *
-sensors_get_all_subfeatures(const sensors_chip_name *name, int feature, int *nr);
+sensors_get_all_subfeatures(const sensors_chip_name *name,
+                            const sensors_feature *feature, int *nr);
 
 #ifdef __cplusplus

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

@@ -164 +164 @@
         sensors_subfeature *features;
         sensors_subfeature *dyn_subfeatures;
+        sensors_feature *dyn_features;
 
         attrs = sysfs_get_device_attributes(sysdir);
@@ -290 +291 @@
         chip->subfeature_count = fnum;
 
+        /* And now the main features */
+        fnum = 0;
+        for (i = 0; i < chip->subfeature_count; i++) {
+                if (chip->subfeature[i].mapping == SENSORS_NO_MAPPING)
+                        fnum++;
+        }
+
+        dyn_features = calloc(fnum, sizeof(sensors_feature));
+        if (dyn_features == NULL) {
+                sensors_fatal_error(__FUNCTION__, "Out of memory");
+        }
+
+        fnum = 0;
+        for (i = 0; i < chip->subfeature_count; i++) {
+                if (chip->subfeature[i].mapping == SENSORS_NO_MAPPING) {
+                        dyn_features[fnum].name = strdup(chip->subfeature[i].name);
+                        dyn_features[fnum].first_subfeature = i;
+                        dyn_features[fnum].type = chip->subfeature[i].type;
+                        fnum++;
+                }
+        }
+
+        chip->feature = dyn_features;
+        chip->feature_count = fnum;
+
 exit_free:
         free(features);

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

@@ -142 +142 @@
 
 static void getAvailableFeatures (const sensors_chip_name *name,
-                                  const sensors_subfeature *feature,
+                                  const sensors_feature *feature,
                                   short *has_features,
                                   int *feature_nrs, int size,
@@ -150 +150 @@
   int i = 0;
 
-  while ((iter = sensors_get_all_subfeatures(name, feature->number, &i))) {
+  while ((iter = sensors_get_all_subfeatures(name, feature, &i))) {
     int index0;
 
@@ -167 +167 @@
 static void fillChipVoltage (FeatureDescriptor *voltage,
                              const sensors_chip_name *name,
-                             const sensors_subfeature *feature)
+                             const sensors_feature *feature)
 {
   const int size = SENSORS_FEATURE_IN_BEEP - SENSORS_FEATURE_IN + 1;
@@ -216 +216 @@
 static void fillChipTemperature (FeatureDescriptor *temperature,
                                  const sensors_chip_name *name,
-                                 const sensors_subfeature *feature)
+                                 const sensors_feature *feature)
 {
   const int size = SENSORS_FEATURE_TEMP_BEEP - SENSORS_FEATURE_TEMP + 1;
@@ -268 +268 @@
 static void fillChipFan (FeatureDescriptor *fan,
                          const sensors_chip_name *name,
-                         const sensors_subfeature *feature)
+                         const sensors_feature *feature)
 {
   const int size = SENSORS_FEATURE_FAN_BEEP - SENSORS_FEATURE_FAN + 1;
@@ -313 +313 @@
 
 static void fillChipVid (FeatureDescriptor *vid,
-                         const sensors_subfeature *feature)
-{
+                         const sensors_chip_name *name,
+                         const sensors_feature *feature)
+{
+  int i = 0;
+  const sensors_subfeature *sub;
+
+  sub = sensors_get_all_subfeatures(name, feature, &i);
+  if (!sub)
+    return;
+
   vid->format = fmtVolt_3;
   vid->rrd = rrdF3;
@@ -320 +328 @@
   vid->alarmNumber = -1;
   vid->beepNumber = -1;
-  vid->dataNumbers[0] = feature->number;
+  vid->dataNumbers[0] = sub->number;
   vid->dataNumbers[1] = -1;
 }
 
 static void fillChipBeepEnable (FeatureDescriptor *beepen,
-                                const sensors_subfeature *feature)
-{
+                                const sensors_chip_name *name,
+                                const sensors_feature *feature)
+{
+  int i = 0;
+  const sensors_subfeature *sub;
+
+  sub = sensors_get_all_subfeatures(name, feature, &i);
+  if (!sub)
+    return;
+
   beepen->format = fmtSoundAlarm;
   beepen->rrd = rrdF0;
@@ -332 +348 @@
   beepen->alarmNumber = -1;
   beepen->beepNumber = -1;
-  beepen->dataNumbers[0] = feature->number;
+  beepen->dataNumbers[0] = sub->number;
   beepen->dataNumbers[1] = -1;
 }
@@ -340 +356 @@
 {
         int nr, count = 1;
-        const sensors_subfeature *sensor;
+        const sensors_feature *sensor;
         FeatureDescriptor *features;
 
@@ -368 +384 @@
                         break;
                 case SENSORS_FEATURE_VID:
-                        fillChipVid(&features[count], sensor);
+                        fillChipVid(&features[count], chip, sensor);
                         break;
                 case SENSORS_FEATURE_BEEP_ENABLE:
-                        fillChipBeepEnable(&features[count], sensor);
+                        fillChipBeepEnable(&features[count], chip, sensor);
                         break;
                 default:
@@ -377 +393 @@
                 }
 
+                features[count].feature = sensor;
                 count++;
         }

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

@@ -157 +157 @@
         for (index0 = 0; (ret == 0) && (num < MAX_RRD_SENSORS) && features[index0].format; ++ index0) {
           const FeatureDescriptor *feature = features + index0;
-          int labelNumber = feature->dataNumbers[0];
-          const char *rawLabel = NULL;
+          const char *rawLabel = features->feature->name;
           char *label = NULL;
 
-          if (getRawLabel (chip, labelNumber, &rawLabel)) {
-            sensorLog (LOG_ERR, "Error getting raw sensor label: %s/#%d", chip->prefix, labelNumber);
-            ret = -1;
-          } else if (!(label = sensors_get_label (chip, labelNumber))) {
-            sensorLog (LOG_ERR, "Error getting sensor label: %s/#%d", chip->prefix, labelNumber);
+          if (!(label = sensors_get_label (chip, features->feature))) {
+            sensorLog (LOG_ERR, "Error getting sensor label: %s/%s", chip->prefix, rawLabel);
             ret = -1;
           } else  {

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

@@ -33 +33 @@
 #define DO_SET 2
 #define DO_RRD 3
-
-int
-getRawLabel
-(const sensors_chip_name *name, int feature, const char **label) {
-  const sensors_subfeature *mainfeat, *sub;
-  int a, b;
-
-  a = 0;
-  while ((mainfeat = sensors_get_features(name, &a))) {
-    b = 0;
-    while ((sub = sensors_get_all_subfeatures(name, mainfeat->number, &b))) {
-      if (sub->number == feature) {
-        *label = sub->name;
-        return 0;
-      }
-    }
-  }
-  /* TODO: Ensure labels match RRD construct and are not repeated! */
-  return -1;
-}
 
 static const char *
@@ -88 +68 @@
   for (index0 = 0; (ret == 0) && features[index0].format; ++ index0) {
     const FeatureDescriptor *feature = features + index0;
-    int labelNumber = feature->dataNumbers[0];
     int alarm, beep;
     char *label = NULL;
 
-    if (!(label = sensors_get_label (chip, labelNumber))) {
-      sensorLog (LOG_ERR, "Error getting sensor label: %s/#%d", chip->prefix, labelNumber);
+    if (!(label = sensors_get_label (chip, feature->feature))) {
+      sensorLog (LOG_ERR, "Error getting sensor label: %s/%s", chip->prefix, feature->feature->name);
       ret = 22;
     } else {

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sensord.h

@@ -57 +57 @@
 /* from sense.c */
 
-extern int getRawLabel (const sensors_chip_name *name, int feature, const char **label);
-
 extern int readChips (void);
 extern int scanChips (void);
@@ -92 +90 @@
   int alarmNumber;
   int beepNumber;
-  int dataNumbers[MAX_DATA + 1]; /* First entry is used for the label */
+  const sensors_feature *feature;
+  int dataNumbers[MAX_DATA + 1];
 } FeatureDescriptor;
 

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

@@ -32 +32 @@
 {
         int a, b;
-        const sensors_subfeature *feature, *sub;
+        const sensors_feature *feature;
+        const sensors_subfeature *sub;
         char *label;
         double val;
@@ -38 +39 @@
         a = 0;
         while ((feature = sensors_get_features(name, &a))) {
+                if (!(label = sensors_get_label(name, feature))) {
+                        printf("ERROR: Can't get feature label!\n");
+                        continue;
+                }
+                printf("%s:\n", label);
+                free(label);
+
                 b = 0;
-                while ((sub = sensors_get_all_subfeatures(name, feature->number,
-                                                      &b))) {
-                        if (!(label = sensors_get_label(name, sub->number))) {
-                                printf("ERROR: Can't get feature `%s' label!\n",
-                                       sub->name);
-                                continue;
-                        }
+                while ((sub = sensors_get_all_subfeatures(name, feature, &b))) {
                         if (sub->flags & SENSORS_MODE_R) {
                                 if (sensors_get_value(name, sub->number, &val))
                                         printf("ERROR: Can't get feature `%s' "
                                                "data!\n", sub->name);
-                                else if (sub->mapping != SENSORS_NO_MAPPING)
-                                        printf("  %s: %.2f\n", label, val);
                                 else
-                                        printf("%s: %.2f (%s)\n", label, val,
-                                               sub->name);
+                                        printf("  %s: %.2f\n", sub->name, val);
                         } else
                                 printf("(%s)\n", label);
-                        free(label);
                 }
         }
@@ -74 +72 @@
 
 static void sensors_get_available_features(const sensors_chip_name *name,
-                                           const sensors_subfeature *feature,
+                                           const sensors_feature *feature,
                                            short *has_features,
                                            double *feature_vals, int size,
@@ -82 +80 @@
         int i = 0;
 
-        while ((iter = sensors_get_all_subfeatures(name, feature->number, &i))) {
+        while ((iter = sensors_get_all_subfeatures(name, feature, &i))) {
                 int indx, err;
 
@@ -104 +102 @@
 {
         int i;
-        const sensors_subfeature *iter;
+        const sensors_feature *iter;
         char *label;
         unsigned int max_size = 11;     /* 11 as minumum label width */
@@ -110 +108 @@
         i = 0;
         while ((iter = sensors_get_features(name, &i))) {
-                if ((label = sensors_get_label(name, iter->number)) &&
+                if ((label = sensors_get_label(name, iter)) &&
                     strlen(label) > max_size)
                         max_size = strlen(label);
@@ -144 +142 @@
 #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,
+                            const sensors_feature *feature,
                             int label_size)
 {
@@ -155 +153 @@
         double feature_vals[SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP + 1] = { 0.0, };
 
-        if (!(label = sensors_get_label(name, feature->number))) {
+        if (!(label = sensors_get_label(name, feature))) {
                 printf("ERROR: Can't get temperature label!\n");
                 return;
@@ -277 +275 @@
 #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,
+                          const sensors_feature *feature,
                           int label_size)
 {
@@ -286 +284 @@
         char *label;
 
-        if (!(label = sensors_get_label(name, feature->number))) {
+        if (!(label = sensors_get_label(name, feature))) {
                 printf("ERROR: Can't get in label!\n");
                 return;
@@ -337 +335 @@
 #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,
+                           const sensors_feature *feature,
                            int label_size)
 {
@@ -346 +344 @@
         double val;
 
-        if (!(label = sensors_get_label(name, feature->number))) {
+        if (!(label = sensors_get_label(name, feature))) {
                 printf("ERROR: Can't get fan label!\n");
                 return;
@@ -384 +382 @@
 }
 
-static void print_chip_vid(const sensors_chip_name *name, int f_vid,
+static void print_chip_vid(const sensors_chip_name *name,
+                           const sensors_feature *feature,
                            int label_size)
 {
         char *label;
+        const sensors_subfeature *subfeature;
         double vid;
-
-        if ((label = sensors_get_label(name, f_vid))
-         && !sensors_get_value(name, f_vid, &vid)) {
+        int i = 0;
+
+        subfeature = sensors_get_all_subfeatures(name, feature, &i);
+        if (!subfeature)
+                return;
+
+        if ((label = sensors_get_label(name, feature))
+         && !sensors_get_value(name, subfeature->number, &vid)) {
                 print_label(label, label_size);
                 printf("%+6.3f V\n", vid);
@@ -398 +403 @@
 }
 
-static void print_chip_beep_enable(const sensors_chip_name *name, int f_beep,
+static void print_chip_beep_enable(const sensors_chip_name *name,
+                                   const sensors_feature *feature,
                                    int label_size)
 {
         char *label;
+        const sensors_subfeature *subfeature;
         double beep_enable;
-
-        if ((label = sensors_get_label(name, f_beep))
-         && !sensors_get_value(name, f_beep, &beep_enable)) {
+        int i = 0;
+
+        subfeature = sensors_get_all_subfeatures(name, feature, &i);
+        if (!subfeature)
+                return;
+
+        if ((label = sensors_get_label(name, feature))
+         && !sensors_get_value(name, subfeature->number, &beep_enable)) {
                 print_label(label, label_size);
                 printf("%s\n", beep_enable ? "enabled" : "disabled");
@@ -414 +426 @@
 void print_chip(const sensors_chip_name *name)
 {
-        const sensors_subfeature *feature;
+        const sensors_feature *feature;
         int i, label_size;
 
@@ -432 +444 @@
                         break;
                 case SENSORS_FEATURE_VID:
-                        print_chip_vid(name, feature->number, label_size);
+                        print_chip_vid(name, feature, label_size);
                         break;
                 case SENSORS_FEATURE_BEEP_ENABLE:
-                        print_chip_beep_enable(name, feature->number,
-                                               label_size);
+                        print_chip_beep_enable(name, feature, label_size);
                         break;
                 default: