Changeset 4367

Timestamp:

04/09/07 20:07:07 (6 years ago)

Author:

jwrdegoede

Message:

-comment abituguru entry in lib/chips.c and prog/sensors/main.c, as the

abituguru seems to work well with the new dynamic chip support and generic
chip printroutines. note: the abituguru code should be completly removed in
the future.

-comment k8temp entry in lib/chips.c and prog/sensors/main.c, as the

k8temp seems to work well with the new dynamic chip support and generic
chip printroutines. note: the k8temp code should be completly removed in
the future.

-make the match for the subtype exact instead of a strncmp, otherwise

an alarm_enable flag gets classified as an alarm, leading to all sensors who
have their alarm enabled getting an alarm reported, as the alarm_enabled gets
read as alarm.

-and do the same for the _input match to check if this is a main or subfeature

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• lib/access.c (modified) (1 diff)
• lib/chips.c (modified) (1 diff)
• lib/sysfs.c (modified) (1 diff)
• prog/sensors/main.c (modified) (1 diff)

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

@@ -599 +599 @@
         submatches = matches[i].submatches;
         for(i = 0; submatches[i].name != 0; i++)
-                if (!strncmp(name + pmatch[3].rm_so, submatches[i].name, size_second))
+                if (!strcmp(name + pmatch[3].rm_so, submatches[i].name))
                         return submatches[i].type;
         

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

@@ -6160 +6160 @@
  { SENSORS_F71805F_PREFIX, f71805f_features },
  { SENSORS_F71872F_PREFIX, f71805f_features },
- { SENSORS_ABITUGURU_PREFIX, abituguru_features },
- { SENSORS_K8TEMP_PREFIX, k8temp_features },
+// { SENSORS_ABITUGURU_PREFIX, abituguru_features },
+// { SENSORS_K8TEMP_PREFIX, k8temp_features },
  { SENSORS_CORETEMP_PREFIX, coretemp_features },
  { SENSORS_DME1737_PREFIX, dme1737_features },

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

@@ -97 +97 @@
                         
                 if (pmatch[2].rm_so != -1) {
-                        if (!strncmp(name + pmatch[2].rm_so, "_input",
-                                        pmatch[2].rm_eo - pmatch[2].rm_so)) {
+                        if (!strcmp(name + pmatch[2].rm_so, "_input")) {
                                 int last_match;
                                 

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

@@ -426 +426 @@
         { "f71805f", print_f71805f },
         { "f71872f", print_f71805f },
-        { "abituguru", print_abituguru },
-        { "k8temp", print_k8temp },
+//      { "abituguru", print_abituguru },
+//      { "k8temp", print_k8temp },
         { "coretemp", print_coretemp },
         { "dme1737", print_dme1737 },