Changeset 4551

Timestamp:

07/05/07 07:27:35 (6 years ago)

Author:

jwrdegoede

Message:

Add abituguru3 support

Location:

lm-sensors/trunk

Files:

• lib/access.c (modified) (3 diffs)
• lib/chips.c (modified) (2 diffs)
• lib/chips.h (modified) (1 diff)
• prog/sensors/chips.c (modified) (5 diffs)
• prog/sensors/chips.h (modified) (1 diff)
• prog/sensors/main.c (modified) (1 diff)

lm-sensors/trunk/lib/access.c

@@ -21 +21 @@
 #include <string.h>
 #include <math.h>
+#include <limits.h>
 #include "access.h"
 #include "sensors.h"
@@ -149 +150 @@
         const sensors_chip *chip;
         const sensors_chip_feature *featureptr;
+        char buf[128], path[PATH_MAX];
+        FILE *f;
         int i;
 
@@ -160 +163 @@
                 for (i = 0; i < chip->labels_count; i++)
                         if (!strcasecmp(featureptr->data.name,chip->labels[i].name)){
-                                if (*result)
-                                        free(*result);
-                                if (!(*result = strdup(chip->labels[i].value)))
-                                        sensors_fatal_error("sensors_get_label",
-                                                            "Allocating label text");
-                                return 0;
-                        }
+                                *result = strdup(chip->labels[i].value);
+                                goto sensors_get_label_exit;
+                        }
+
+        /* No user specified label, check for a _label sysfs file */
+        snprintf(path, PATH_MAX, "%s/%s_label", name.busname,
+                featureptr->data.name);
+        
+        if ((f = fopen(path, "r"))) {
+                i = fread(buf, 1, sizeof(buf) - 1, f);
+                fclose(f);
+                if (i > 0) {
+                        /* i - 1 to strip the '\n' at the end */
+                        buf[i - 1] = 0;
+                        *result = strdup(buf);
+                        goto sensors_get_label_exit;
+                }
+        }
 
         /* No label, return the feature name instead */
-        if (!(*result = strdup(featureptr->data.name)))
+        *result = strdup(featureptr->data.name);
+        
+sensors_get_label_exit:
+        if (*result == NULL)
                 sensors_fatal_error("sensors_get_label",
                                     "Allocating label text");

lm-sensors/trunk/lib/chips.c

@@ -5953 +5953 @@
 };
 
+static sensors_chip_feature abituguru3_features[] =
+{
+        SENSORS_ABITUGURU_IN_FEATURES(0),
+        SENSORS_ABITUGURU_IN_FEATURES(1),
+        SENSORS_ABITUGURU_IN_FEATURES(2),
+        SENSORS_ABITUGURU_IN_FEATURES(3),
+        SENSORS_ABITUGURU_IN_FEATURES(4),
+        SENSORS_ABITUGURU_IN_FEATURES(5),
+        SENSORS_ABITUGURU_IN_FEATURES(6),
+        SENSORS_ABITUGURU_IN_FEATURES(7),
+        SENSORS_ABITUGURU_IN_FEATURES(8),
+        SENSORS_ABITUGURU_IN_FEATURES(9),
+        SENSORS_ABITUGURU_IN_FEATURES(10),
+        SENSORS_ABITUGURU_IN_FEATURES(11),
+        SENSORS_ABITUGURU_IN_FEATURES(12),
+        SENSORS_ABITUGURU_IN_FEATURES(13),
+        SENSORS_ABITUGURU_TEMP_FEATURES(1),
+        SENSORS_ABITUGURU_TEMP_FEATURES(2),
+        SENSORS_ABITUGURU_TEMP_FEATURES(3),
+        SENSORS_ABITUGURU_TEMP_FEATURES(4),
+        SENSORS_ABITUGURU_TEMP_FEATURES(5),
+        SENSORS_ABITUGURU_TEMP_FEATURES(6),
+        SENSORS_ABITUGURU_TEMP_FEATURES(7),
+        SENSORS_ABITUGURU_FAN_FEATURES(1),
+        SENSORS_ABITUGURU_FAN_FEATURES(2),
+        SENSORS_ABITUGURU_FAN_FEATURES(3),
+        SENSORS_ABITUGURU_FAN_FEATURES(4),
+        SENSORS_ABITUGURU_FAN_FEATURES(5),
+        SENSORS_ABITUGURU_FAN_FEATURES(6),
+        SENSORS_ABITUGURU_FAN_FEATURES(7),
+        SENSORS_ABITUGURU_FAN_FEATURES(8),
+        { { 0 }, 0 }
+};
+
 
 static sensors_chip_feature k8temp_features[] =
@@ -6219 +6253 @@
  { SENSORS_F71872F_PREFIX, f71805f_features },
  { SENSORS_ABITUGURU_PREFIX, abituguru_features },
+ { SENSORS_ABITUGURU3_PREFIX, abituguru3_features },
  { SENSORS_K8TEMP_PREFIX, k8temp_features },
  { SENSORS_CORETEMP_PREFIX, coretemp_features },

lm-sensors/trunk/lib/chips.h

@@ -2237 +2237 @@
 #define SENSORS_F71805F_ALARMS_TEMP     202
 
-/* Abit uGuru chip */
+/* Abit uGuru chips */
 #define SENSORS_ABITUGURU_PREFIX "abituguru"
+#define SENSORS_ABITUGURU3_PREFIX "abituguru3"
 
 /* in n from 0 to 10 */

lm-sensors/trunk/prog/sensors/chips.c

@@ -5835 +5835 @@
           !sensors_get_feature(*name, in_max_alarm, &alarm_high)) {
         print_label(label, 23);
-        printf("%+6.2f V (min %+6.2f V, max %+6.2f V)",
+        printf("%+6.2f V  (min %+6.2f V, max %+6.2f V)",
                cur, min, max);
         if (alarm_low || alarm_high) {
@@ -5846 +5846 @@
         }
         printf("\n");
-      } else
-        printf("ERROR: Can't get IN data! (0x%04x)\n", in);
+      }
     }
     free(label);
@@ -5875 +5874 @@
         else
           printf("\n");
-      } else
-        printf("ERROR: Can't get TEMP data! (0x%04x)\n", temp);
+      }
     }
     free(label);
@@ -5898 +5896 @@
           !sensors_get_feature(*name, fan_min, &min)) {
         print_label(label, 23);
-        printf("%4.0f RPM (min %4.0f RPM)               %s\n",
+        printf("%4.0f RPM  (min %4.0f RPM)               %s\n",
                cur, min, alarm ? "ALARM" : "");
-      } else
-        printf("ERROR: Can't get FAN data! (0x%04x)\n", fan);
+      }
     }
     free(label);
@@ -5922 +5919 @@
 
   for (i=1; i<=6; i++)
+    print_abituguru_fan(name, SENSORS_ABITUGURU_FAN(i),
+      SENSORS_ABITUGURU_FAN_ALARM(i), SENSORS_ABITUGURU_FAN_MIN(i));
+}
+
+void print_abituguru3(const sensors_chip_name *name)
+{
+  int i;
+
+  for (i=0; i<14; i++)
+    print_abituguru_in(name, SENSORS_ABITUGURU_IN(i),
+      SENSORS_ABITUGURU_IN_MIN(i), SENSORS_ABITUGURU_IN_MIN_ALARM(i),
+      SENSORS_ABITUGURU_IN_MAX(i), SENSORS_ABITUGURU_IN_MAX_ALARM(i));
+
+  for (i=1; i<=7; i++)
+    print_abituguru_temp(name, SENSORS_ABITUGURU_TEMP(i),
+      SENSORS_ABITUGURU_TEMP_ALARM(i), SENSORS_ABITUGURU_TEMP_MAX(i),
+      SENSORS_ABITUGURU_TEMP_CRIT(i));
+
+  for (i=1; i<=8; i++)
     print_abituguru_fan(name, SENSORS_ABITUGURU_FAN(i),
       SENSORS_ABITUGURU_FAN_ALARM(i), SENSORS_ABITUGURU_FAN_MIN(i));

lm-sensors/trunk/prog/sensors/chips.h

@@ -75 +75 @@
 extern void print_f71805f(const sensors_chip_name *name);
 extern void print_abituguru(const sensors_chip_name *name);
+extern void print_abituguru3(const sensors_chip_name *name);
 extern void print_k8temp(const sensors_chip_name *name);
 extern void print_coretemp(const sensors_chip_name *name);

lm-sensors/trunk/prog/sensors/main.c

@@ -421 +421 @@
         { "f71872f", print_f71805f },
         { "abituguru", print_abituguru },
+        { "abituguru3", print_abituguru3 },
         { "k8temp", print_k8temp },
         { "coretemp", print_coretemp },