Changeset 4287

Timestamp:

01/09/07 03:46:13 (2 years ago)

Author:

mmh

Message:

The sensors library relied on one structure having an identical layout in
memory as part of another structure. This rather large patch fixes that by
making the smaller piece an explicit member of the larger.

I brought this patch into sync with the latest SVN, and tested it by comparing
objects files from the tree pre- and post- patch.

The remaining 99% of the credit goes to Bob Schlärmann <bob2@dsv.nl> for
creating the original patch... thanks Bob!

* Bob Schlärmann <bob2@dsv.nl> [2006-12-24 18:29:39 +0100]:

The following patch changes all of the lib/chips.c entries and any function
that uses sensors_chip_feature. Most of the conversion was done through a
perl script, so if you don't agree with the syntax it'll be easy to change.

Files:

• lm-sensors/trunk/lib/access.c (modified) (10 diffs)
• lm-sensors/trunk/lib/chips.c (modified) (25 diffs)
• lm-sensors/trunk/lib/data.h (modified) (1 diff)
• lm-sensors/trunk/lib/proc.c (modified) (1 diff)
• lm-sensors/trunk/lib/sensors.h (modified) (1 diff)

lm-sensors/trunk/lib/access.c

@@ -101 +101 @@
-                if (!strcasecmp(sensors_chip_features_list[i].prefix, prefix)) {
-                        features = sensors_chip_features_list[i].feature;
-
-
+data.
+data.
-                                        return features + j;
-                }
@@ -120 +120 @@
-                if (!strcasecmp(sensors_chip_features_list[i].prefix, prefix)) {
-                        features = sensors_chip_features_list[i].feature;
-
-
+data.
+data.
-                                        return features + j;
-                }
@@ -159 +159 @@
-        for (chip = NULL; (chip = sensors_for_all_config_chips(name, chip));)
-                for (i = 0; i < chip->labels_count; i++)
-
+data.
-                                if (*result)
-                                        free(*result);
@@ -169 +169 @@
-
-        /* No label, return the feature name instead */
-
+data.
-                sensors_fatal_error("sensors_get_label",
-                                    "Allocating label text");
@@ -188 +188 @@
-        if (!(featureptr = sensors_lookup_feature_nr(name.prefix, feature)))
-                return -SENSORS_ERR_NO_ENTRY;
-logical_
+data.
-                alt_featureptr = NULL;
-        else if (!(alt_featureptr =
-                   sensors_lookup_feature_nr(name.prefix,
-logical_
+data.
-                return -SENSORS_ERR_NO_ENTRY;
-        for (chip = NULL; (chip = sensors_for_all_config_chips(name, chip));)
-                for (i = 0; i < chip->ignores_count; i++)
-
+data.
-                                return 0; /* Exact match always overrules! */
-                        else if (alt_featureptr &&
-
+data.
-                                             chip->ignores[i].name))
-                                res = 0;
@@ -222 +222 @@
-        if (!(main_feature = sensors_lookup_feature_nr(name.prefix, feature)))
-                return -SENSORS_ERR_NO_ENTRY;
-
+data.
-                alt_feature = NULL;
-        else if (!(alt_feature = sensors_lookup_feature_nr(name.prefix,
-
-
-
+data.
+
+data.
-                return -SENSORS_ERR_ACCESS_R;
-        for (chip = NULL;
-             !expr && (chip = sensors_for_all_config_chips(name, chip));)
-                for (i = 0; !final_expr && (i < chip->computes_count); i++) {
-
+data.
-                                expr = chip->computes[i].from_proc;
-                                final_expr = 1;
-
+data.
-                                               chip->computes[i].name)) {
-                                expr = chip->computes[i].from_proc;
@@ -266 +266 @@
-        if (!(main_feature = sensors_lookup_feature_nr(name.prefix, feature)))
-                return -SENSORS_ERR_NO_ENTRY;
-
+data.
-                alt_feature = NULL;
-        else if (!(alt_feature = sensors_lookup_feature_nr(name.prefix,
-
-
-
+data.
+
+data.
-                return -SENSORS_ERR_ACCESS_W;
-        for (chip = NULL;
-             !expr && (chip = sensors_for_all_config_chips(name, chip));)
-                for (i = 0; !final_expr && (i < chip->computes_count); i++)
-
+data.
-                                expr = chip->computes->to_proc;
-                                final_expr = 1;
-
+data.
-                                               chip->computes[i].name)) {
-                                expr = chip->computes[i].to_proc;
@@ -335 +335 @@
-                        feature_list = sensors_chip_features_list[i].feature;
-                        if (!*nr1 && !*nr2) {   /* Return the first entry */
-
+data.
-                                        return NULL;
-                                *nr1 = *nr2 = 1;
-
-
-
-
-
-
-
+
+
+
+
+
+
-                        for ((*nr1)++;
-
-logical_
+data.
+data.
-                                 SENSORS_NO_MAPPING); (*nr1)++) ;
-                        *nr2 = *nr1;
-
+data.
-                                return NULL;
-(sensors_feature_data *)(feature_list + *nr1 - 1
+&((feature_list + *nr1 - 1)->data
-                }
-        return NULL;
@@ -376 +375 @@
-                                                            expr->data.var)))
-                        return SENSORS_ERR_NO_ENTRY;
-
+data.
-                        return res;
-                return 0;
@@ -440 +439 @@
-                                continue;
-                        }
-
+data.
-
-                        /* Check whether we already set this feature */

lm-sensors/trunk/lib/chips.c

@@ -45 +45 @@
-static sensors_chip_feature lm78_features[] =
-  { 
-SENSORS_LM78_IN0, "in0", NOMAP, NOMAP
-R,
-SENSORS_LM78_IN1, "in1", NOMAP, NOMAP,
-R,
-SENSORS_LM78_IN2, "in2", NOMAP, NOMAP,
-R,
-SENSORS_LM78_IN3, "in3", NOMAP, NOMAP,
-R,
-SENSORS_LM78_IN4, "in4", NOMAP, NOMAP,
-R,
-SENSORS_LM78_IN5, "in5", NOMAP, NOMAP,
-R,
-SENSORS_LM78_IN6, "in6", NOMAP, NOMAP,
-R,
-SENSORS_LM78_IN0_MIN, "in0_min", SENSORS_LM78_IN0, SENSORS_LM78_IN0,
-RW,
-SENSORS_LM78_IN1_MIN, "in1_min", SENSORS_LM78_IN1, SENSORS_LM78_IN1,
-RW,
-SENSORS_LM78_IN2_MIN, "in2_min", SENSORS_LM78_IN2, SENSORS_LM78_IN2,
-RW,
-SENSORS_LM78_IN3_MIN, "in3_min", SENSORS_LM78_IN3, SENSORS_LM78_IN3,
-RW,
-SENSORS_LM78_IN4_MIN, "in4_min", SENSORS_LM78_IN4, SENSORS_LM78_IN4,
-RW,
+{ SENSORS_LM78_IN0, "in0", NOMAP, NOMAP, R }
+ 
+{ SENSORS_LM78_IN1, "in1", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM78_IN2, "in2", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM78_IN3, "in3", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM78_IN4, "in4", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM78_IN5, "in5", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM78_IN6, "in6", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM78_IN0_MIN, "in0_min", SENSORS_LM78_IN0, SENSORS_LM78_IN0, RW }, 
+ 
+{ SENSORS_LM78_IN1_MIN, "in1_min", SENSORS_LM78_IN1, SENSORS_LM78_IN1, RW }, 
+ 
+{ SENSORS_LM78_IN2_MIN, "in2_min", SENSORS_LM78_IN2, SENSORS_LM78_IN2, RW }, 
+ 
+{ SENSORS_LM78_IN3_MIN, "in3_min", SENSORS_LM78_IN3, SENSORS_LM78_IN3, RW }, 
+ 
+{ SENSORS_LM78_IN4_MIN, "in4_min", SENSORS_LM78_IN4, SENSORS_LM78_IN4, RW }, 
+ 
-/* swap 5 and 6 min/max because compute lines will be inverting */
-SENSORS_LM78_IN5_MIN, "in5_min", SENSORS_LM78_IN5, SENSORS_LM78_IN5,
-RW,
-SENSORS_LM78_IN6_MIN, "in6_min", SENSORS_LM78_IN6, SENSORS_LM78_IN6,
-RW,
-SENSORS_LM78_IN0_MAX, "in0_max", SENSORS_LM78_IN0, SENSORS_LM78_IN0,
-RW,
-SENSORS_LM78_IN1_MAX, "in1_max", SENSORS_LM78_IN1, SENSORS_LM78_IN1,
-RW,
-SENSORS_LM78_IN2_MAX, "in2_max", SENSORS_LM78_IN2, SENSORS_LM78_IN2,
-RW,
-SENSORS_LM78_IN3_MAX, "in3_max", SENSORS_LM78_IN3, SENSORS_LM78_IN3,
-RW,
-SENSORS_LM78_IN4_MAX, "in4_max", SENSORS_LM78_IN4, SENSORS_LM78_IN4,
-RW,
-SENSORS_LM78_IN5_MAX, "in5_max", SENSORS_LM78_IN5, SENSORS_LM78_IN5,
-RW,
-SENSORS_LM78_IN6_MAX, "in6_max", SENSORS_LM78_IN6, SENSORS_LM78_IN6,
-RW,
-SENSORS_LM78_FAN1, "fan1", NOMAP, NOMAP,
-R,
-SENSORS_LM78_FAN2, "fan2", NOMAP, NOMAP,
-R,
-SENSORS_LM78_FAN3, "fan3", NOMAP, NOMAP,
-R,
-SENSORS_LM78_FAN1_MIN, "fan1_min", SENSORS_LM78_FAN1, SENSORS_LM78_FAN1,
-RW, LM78_SYSCTL_FAN1, VALUE(1), 0 },
-{ SENSORS_LM78_FAN2_MIN, "fan2_min", SENSORS_LM78_FAN2, SENSORS_LM78_FAN2
-                         RW, LM78_SYSCTL_FAN2, VALUE(1), 0 },
-{ SENSORS_LM78_FAN3_MIN, "fan3_min", SENSORS_LM78_FAN3, SENSORS_LM78_FAN3,
-RW, LM78_SYSCTL_FAN3
-SENSORS_LM78_TEMP, "temp", NOMAP, NOMAP,
-R, LM78_SYSCTL_TEMP, VALUE(3), 1 },
-{ SENSORS_LM78_TEMP_HYST, "temp_hyst", SENSORS_LM78_TEMP
-                          SENSORS_LM78_TEMP, RW
-   LM78_SYSCTL_TEMP, VALUE(2
-SENSORS_LM78_TEMP_OVER, "temp_over", SENSORS_LM78_TEMP,
-SENSORS_LM78_TEMP, RW
-LM78_SYSCTL_TEMP, VALUE(1
-SENSORS_LM78_VID, "vid", NOMAP, NOMAP,
-R, LM78_SYSCTL_VID, VALUE(1), 2 },
-{ SENSORS_LM78_FAN1_DIV, "fan1_div", SENSORS_LM78_FAN1, NOMAP
-                         RW, LM78_SYSCTL_FAN_DIV, VALUE(1)
-   0
-SENSORS_LM78_FAN2_DIV, "fan2_div", SENSORS_LM78_FAN2, NOMAP,
-RW, LM78_SYSCTL_FAN_DIV, VALUE(2), 
-                         0 },
-{ SENSORS_LM78_FAN3_DIV, "fan3_div", SENSORS_LM78_FAN3, NOMAP
-                          R, LM78_SYSCTL_FAN_DIV, VALUE(3)
-
-SENSORS_LM78_ALARMS, "alarms", NOMAP, NOMAP
-R,
-
+{ SENSORS_LM78_IN5_MIN, "in5_min", SENSORS_LM78_IN5, SENSORS_LM78_IN5, RW }, 
+ 
+{ SENSORS_LM78_IN6_MIN, "in6_min", SENSORS_LM78_IN6, SENSORS_LM78_IN6, RW }, 
+ 
+{ SENSORS_LM78_IN0_MAX, "in0_max", SENSORS_LM78_IN0, SENSORS_LM78_IN0, RW }, 
+ 
+{ SENSORS_LM78_IN1_MAX, "in1_max", SENSORS_LM78_IN1, SENSORS_LM78_IN1, RW }, 
+ 
+{ SENSORS_LM78_IN2_MAX, "in2_max", SENSORS_LM78_IN2, SENSORS_LM78_IN2, RW }, 
+ 
+{ SENSORS_LM78_IN3_MAX, "in3_max", SENSORS_LM78_IN3, SENSORS_LM78_IN3, RW }, 
+ 
+{ SENSORS_LM78_IN4_MAX, "in4_max", SENSORS_LM78_IN4, SENSORS_LM78_IN4, RW }, 
+ 
+{ SENSORS_LM78_IN5_MAX, "in5_max", SENSORS_LM78_IN5, SENSORS_LM78_IN5, RW }, 
+ 
+{ SENSORS_LM78_IN6_MAX, "in6_max", SENSORS_LM78_IN6, SENSORS_LM78_IN6, RW }, 
+ 
+{ SENSORS_LM78_FAN1, "fan1", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM78_FAN2, "fan2", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM78_FAN3, "fan3", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM78_FAN1_MIN, "fan1_min", SENSORS_LM78_FAN1, SENSORS_LM78_FAN1, 
+  RW }, 
+                           LM78_SYSCTL_FAN1, VALUE(1), 0 }
+{ { SENSORS_LM78_FAN2_MIN, "fan2_min", SENSORS_LM78_FAN2, SENSORS_LM78_FAN2, 
+                           RW }, 
+  LM78_SYSCTL_FAN2
+{ SENSORS_LM78_FAN3_MIN, "fan3_min", SENSORS_LM78_FAN3, SENSORS_LM78_FAN3, 
+      RW }, 
+                           LM78_SYSCTL_FAN3, VALUE(1), 0 }
+{ { SENSORS_LM78_TEMP, "temp", NOMAP, NOMAP, R }
+LM78_SYSCTL_TEMP, VALUE(3
+{ SENSORS_LM78_TEMP_HYST, "temp_hyst", SENSORS_LM78_TEMP, 
+  SENSORS_LM78_TEMP, RW }
+  LM78_SYSCTL_TEMP, VALUE(2
+{ SENSORS_LM78_TEMP_OVER, "temp_over", SENSORS_LM78_TEMP, 
+        SENSORS_LM78_TEMP, RW }, 
+                            LM78_SYSCTL_TEMP, VALUE(1), 1 }
+{ { SENSORS_LM78_VID, "vid", NOMAP, NOMAP, R }
+LM78_SYSCTL_VID, VALUE(1), 2
+{ SENSORS_LM78_FAN1_DIV, "fan1_div", SENSORS_LM78_FAN1, NOMAP, RW }, 
+  LM78_SYSCTL_FAN_DIV, VALUE(1), 0 },
+{ { SENSORS_LM78_FAN2_DIV, "fan2_div", SENSORS_LM78_FAN2, NOMAP, RW }, 
+                           LM78_SYSCTL_FAN_DIV, VALUE(2), 0 }
+{ { SENSORS_LM78_FAN3_DIV, "fan3_div", SENSORS_LM78_FAN3, NOMAP, R }
+ LM78_SYSCTL_FAN_DIV, VALUE(3), 
+{ SENSORS_LM78_ALARMS, "alarms", NOMAP, NOMAP, R }
+ 
+{ 0 }, 
-  };
-
-static sensors_chip_feature lm78j_features[] =
-  { 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-/* swap 5 and 6 min/max because compute lines will be inverting */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  };
-
-static sensors_chip_feature lm79_features[] =
-  { 
-SENSORS_LM79_IN0, "in0", NOMAP, NOMAP
-R,
-SENSORS_LM79_IN1, "in1", NOMAP, NOMAP,
-R,
-SENSORS_LM79_IN2, "in2", NOMAP, NOMAP,
-R,
-SENSORS_LM79_IN3, "in3", NOMAP, NOMAP,
-R,
-SENSORS_LM79_IN4, "in4", NOMAP, NOMAP,
-R,
-SENSORS_LM79_IN5, "in5", NOMAP, NOMAP,
-R,
-SENSORS_LM79_IN6, "in6", NOMAP, NOMAP,
-R,
-SENSORS_LM79_IN0_MIN, "in0_min", SENSORS_LM79_IN0, SENSORS_LM79_IN0,
-RW,
-SENSORS_LM79_IN1_MIN, "in1_min", SENSORS_LM79_IN1, SENSORS_LM79_IN1,
-RW,
-SENSORS_LM79_IN2_MIN, "in2_min", SENSORS_LM79_IN2, SENSORS_LM79_IN2,
-RW,
-SENSORS_LM79_IN3_MIN, "in3_min", SENSORS_LM79_IN3, SENSORS_LM79_IN3,
-RW,
-SENSORS_LM79_IN4_MIN, "in4_min", SENSORS_LM79_IN4, SENSORS_LM79_IN4,
-RW,
+{ SENSORS_LM79_IN0, "in0", NOMAP, NOMAP, R }
+ 
+{ SENSORS_LM79_IN1, "in1", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM79_IN2, "in2", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM79_IN3, "in3", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM79_IN4, "in4", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM79_IN5, "in5", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM79_IN6, "in6", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM79_IN0_MIN, "in0_min", SENSORS_LM79_IN0, SENSORS_LM79_IN0, RW }, 
+ 
+{ SENSORS_LM79_IN1_MIN, "in1_min", SENSORS_LM79_IN1, SENSORS_LM79_IN1, RW }, 
+ 
+{ SENSORS_LM79_IN2_MIN, "in2_min", SENSORS_LM79_IN2, SENSORS_LM79_IN2, RW }, 
+ 
+{ SENSORS_LM79_IN3_MIN, "in3_min", SENSORS_LM79_IN3, SENSORS_LM79_IN3, RW }, 
+ 
+{ SENSORS_LM79_IN4_MIN, "in4_min", SENSORS_LM79_IN4, SENSORS_LM79_IN4, RW }, 
+ 
-/* swap 5 and 6 min/max because compute lines will be inverting */
-SENSORS_LM79_IN5_MIN, "in5_min", SENSORS_LM79_IN5, SENSORS_LM79_IN5,
-RW,
-SENSORS_LM79_IN6_MIN, "in6_min", SENSORS_LM79_IN6, SENSORS_LM79_IN6,
-RW,
-SENSORS_LM79_IN0_MAX, "in0_max", SENSORS_LM79_IN0, SENSORS_LM79_IN0,
-RW,
-SENSORS_LM79_IN1_MAX, "in1_max", SENSORS_LM79_IN1, SENSORS_LM79_IN1,
-RW,
-SENSORS_LM79_IN2_MAX, "in2_max", SENSORS_LM79_IN2, SENSORS_LM79_IN2,
-RW,
-SENSORS_LM79_IN3_MAX, "in3_max", SENSORS_LM79_IN3, SENSORS_LM79_IN3,
-RW,
-SENSORS_LM79_IN4_MAX, "in4_max", SENSORS_LM79_IN4, SENSORS_LM79_IN4,
-RW,
-SENSORS_LM79_IN5_MAX, "in5_max", SENSORS_LM79_IN5, SENSORS_LM79_IN5,
-RW,
-SENSORS_LM79_IN6_MAX, "in6_max", SENSORS_LM79_IN6, SENSORS_LM79_IN6,
-RW,
-SENSORS_LM79_FAN1, "fan1", NOMAP, NOMAP,
-R,
-SENSORS_LM79_FAN2, "fan2", NOMAP, NOMAP,
-R,
-SENSORS_LM79_FAN3, "fan3", NOMAP, NOMAP,
-R,
-SENSORS_LM79_FAN1_MIN, "fan1_min", SENSORS_LM79_FAN1, SENSORS_LM79_FAN1,
-RW, LM78_SYSCTL_FAN1, VALUE(1), 0 },
-{ SENSORS_LM79_FAN2_MIN, "fan2_min", SENSORS_LM79_FAN2, SENSORS_LM79_FAN2
-                         RW, LM78_SYSCTL_FAN2, VALUE(1), 0 },
-{ SENSORS_LM79_FAN3_MIN, "fan3_min", SENSORS_LM79_FAN3, SENSORS_LM79_FAN3,
-RW, LM78_SYSCTL_FAN3
-SENSORS_LM79_TEMP, "temp", NOMAP, NOMAP,
-R, LM78_SYSCTL_TEMP, VALUE(3), 1 },
-{ SENSORS_LM79_TEMP_HYST, "temp_hyst", SENSORS_LM79_TEMP
-                          SENSORS_LM79_TEMP, RW
-   LM78_SYSCTL_TEMP, VALUE(2
-SENSORS_LM79_TEMP_OVER, "temp_over", SENSORS_LM79_TEMP,
-SENSORS_LM79_TEMP, RW
-LM78_SYSCTL_TEMP, VALUE(1
-SENSORS_LM79_VID, "vid", NOMAP, NOMAP,
-R, LM78_SYSCTL_VID, VALUE(1), 2 },
-{ SENSORS_LM79_FAN1_DIV, "fan1_div", SENSORS_LM79_FAN1, NOMAP
-                         RW, LM78_SYSCTL_FAN_DIV, VALUE(1)
-   0
-SENSORS_LM79_FAN2_DIV, "fan2_div", SENSORS_LM79_FAN2, NOMAP,
-RW, LM78_SYSCTL_FAN_DIV, VALUE(2), 
-                         0 },
-{ SENSORS_LM79_FAN3_DIV, "fan3_div", SENSORS_LM79_FAN3, NOMAP
-                          R, LM78_SYSCTL_FAN_DIV, VALUE(3)
-
-SENSORS_LM79_ALARMS, "alarms", NOMAP, NOMAP
-R,
-
+{ SENSORS_LM79_IN5_MIN, "in5_min", SENSORS_LM79_IN5, SENSORS_LM79_IN5, RW }, 
+ 
+{ SENSORS_LM79_IN6_MIN, "in6_min", SENSORS_LM79_IN6, SENSORS_LM79_IN6, RW }, 
+ 
+{ SENSORS_LM79_IN0_MAX, "in0_max", SENSORS_LM79_IN0, SENSORS_LM79_IN0, RW }, 
+ 
+{ SENSORS_LM79_IN1_MAX, "in1_max", SENSORS_LM79_IN1, SENSORS_LM79_IN1, RW }, 
+ 
+{ SENSORS_LM79_IN2_MAX, "in2_max", SENSORS_LM79_IN2, SENSORS_LM79_IN2, RW }, 
+ 
+{ SENSORS_LM79_IN3_MAX, "in3_max", SENSORS_LM79_IN3, SENSORS_LM79_IN3, RW }, 
+ 
+{ SENSORS_LM79_IN4_MAX, "in4_max", SENSORS_LM79_IN4, SENSORS_LM79_IN4, RW }, 
+ 
+{ SENSORS_LM79_IN5_MAX, "in5_max", SENSORS_LM79_IN5, SENSORS_LM79_IN5, RW }, 
+ 
+{ SENSORS_LM79_IN6_MAX, "in6_max", SENSORS_LM79_IN6, SENSORS_LM79_IN6, RW }, 
+ 
+{ SENSORS_LM79_FAN1, "fan1", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM79_FAN2, "fan2", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM79_FAN3, "fan3", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM79_FAN1_MIN, "fan1_min", SENSORS_LM79_FAN1, SENSORS_LM79_FAN1, 
+  RW }, 
+                           LM78_SYSCTL_FAN1, VALUE(1), 0 }
+{ { SENSORS_LM79_FAN2_MIN, "fan2_min", SENSORS_LM79_FAN2, SENSORS_LM79_FAN2, 
+                           RW }, 
+  LM78_SYSCTL_FAN2
+{ SENSORS_LM79_FAN3_MIN, "fan3_min", SENSORS_LM79_FAN3, SENSORS_LM79_FAN3, 
+      RW }, 
+                           LM78_SYSCTL_FAN3, VALUE(1), 0 }
+{ { SENSORS_LM79_TEMP, "temp", NOMAP, NOMAP, R }
+LM78_SYSCTL_TEMP, VALUE(3
+{ SENSORS_LM79_TEMP_HYST, "temp_hyst", SENSORS_LM79_TEMP, 
+  SENSORS_LM79_TEMP, RW }
+  LM78_SYSCTL_TEMP, VALUE(2
+{ SENSORS_LM79_TEMP_OVER, "temp_over", SENSORS_LM79_TEMP, 
+        SENSORS_LM79_TEMP, RW }, 
+                            LM78_SYSCTL_TEMP, VALUE(1), 1 }
+{ { SENSORS_LM79_VID, "vid", NOMAP, NOMAP, R }
+LM78_SYSCTL_VID, VALUE(1), 2
+{ SENSORS_LM79_FAN1_DIV, "fan1_div", SENSORS_LM79_FAN1, NOMAP, RW }, 
+  LM78_SYSCTL_FAN_DIV, VALUE(1), 0 },
+{ { SENSORS_LM79_FAN2_DIV, "fan2_div", SENSORS_LM79_FAN2, NOMAP, RW }, 
+                           LM78_SYSCTL_FAN_DIV, VALUE(2), 0 }
+{ { SENSORS_LM79_FAN3_DIV, "fan3_div", SENSORS_LM79_FAN3, NOMAP, R }
+ LM78_SYSCTL_FAN_DIV, VALUE(3), 
+{ SENSORS_LM79_ALARMS, "alarms", NOMAP, NOMAP, R }
+ 
+{ 0 }, 
-  };
-
@@ -292 +303 @@
-static sensors_chip_feature lm75_features[] =
-  {
-SENSORS_LM75_TEMP, "temp", NOMAP, NOMAP,
-R,
-SENSORS_LM75_TEMP_HYST, "temp_hyst", SENSORS_LM75_TEMP,
-SENSORS_LM75_TEMP, RW
-
-SENSORS_LM75_TEMP_OVER, "temp_over", SENSORS_LM75_TEMP,
-SENSORS_LM75_TEMP, RW
-
-
+{ SENSORS_LM75_TEMP, "temp", NOMAP, NOMAP, R }, 
+ 
+{ SENSORS_LM75_TEMP_HYST, "temp_hyst", SENSORS_LM75_TEMP, 
+  SENSORS_LM75_TEMP, RW }
+  
+{ SENSORS_LM75_TEMP_OVER, "temp_over", SENSORS_LM75_TEMP, 
+  SENSORS_LM75_TEMP, RW }
+  
+{ 0 }, 
-  };
-
-static sensors_chip_feature adm1021_features[] =
-  {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-