Changeset 5379

Timestamp:

10/24/08 11:04:26 (5 years ago)

Author:

khali

Message:

Add support for current sensors.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• doc/libsensors-API.txt (modified) (1 diff)
• lib/sensors.h (modified) (2 diffs)
• lib/sysfs.c (modified) (6 diffs)
• prog/sensors/chips.c (modified) (2 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -4 +4 @@
 SVN-HEAD
   libsensors: Add support for instantaneous power sensors
+              Add support for current sensors
   maxilife scripts: Delete (driver never ported to Linux 2.6)
   sensors: Add support for instantaneous power sensors
+           Add support for current sensors
   sensors-detect: Fix detection of ADT7463 and LM96000
                   Add VIA VX800/VX820 support 

lm-sensors/branches/lm-sensors-3.0.0/doc/libsensors-API.txt

@@ -12 +12 @@
   enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_INPUT_HIGHEST
   enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_INPUT_LOWEST
+* Added support for current sensors
+  enum sensors_feature_type SENSORS_FEATURE_CURR
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_INPUT
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_MIN
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_MAX
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_ALARM
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_MIN_ALARM
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_MAX_ALARM
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_BEEP
 
 0x401   lm-sensors 3.0.2 to 3.0.3

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

@@ -135 +135 @@
         SENSORS_FEATURE_POWER           = 0x03,
         SENSORS_FEATURE_ENERGY          = 0x04,
+        SENSORS_FEATURE_CURR            = 0x05,
         SENSORS_FEATURE_VID             = 0x10,
         SENSORS_FEATURE_BEEP_ENABLE     = 0x18,
@@ -182 +183 @@
 
         SENSORS_SUBFEATURE_ENERGY_INPUT = SENSORS_FEATURE_ENERGY << 8,
+
+        SENSORS_SUBFEATURE_CURR_INPUT = SENSORS_FEATURE_CURR << 8,
+        SENSORS_SUBFEATURE_CURR_MIN,
+        SENSORS_SUBFEATURE_CURR_MAX,
+        SENSORS_SUBFEATURE_CURR_ALARM = (SENSORS_FEATURE_CURR << 8) | 0x80,
+        SENSORS_SUBFEATURE_CURR_MIN_ALARM,
+        SENSORS_SUBFEATURE_CURR_MAX_ALARM,
+        SENSORS_SUBFEATURE_CURR_BEEP,
 
         SENSORS_SUBFEATURE_VID = SENSORS_FEATURE_VID << 8,

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

@@ -139 +139 @@
 #define MAX_SENSORS_PER_TYPE    20
 #define MAX_SUBFEATURES         8
-#define MAX_SENSOR_TYPES        5
+#define MAX_SENSOR_TYPES        6
 /* Room for all 5 types (in, fan, temp, power, energy) with all their
    subfeatures + VID + misc features */
@@ -154 +154 @@
         case SENSORS_SUBFEATURE_IN_INPUT:
         case SENSORS_SUBFEATURE_TEMP_INPUT:
+        case SENSORS_SUBFEATURE_CURR_INPUT:
                 return 1000;
         case SENSORS_SUBFEATURE_FAN_INPUT:
@@ -185 +186 @@
         case SENSORS_FEATURE_POWER:
         case SENSORS_FEATURE_ENERGY:
+        case SENSORS_FEATURE_CURR:
                 underscore = strchr(sfname, '_');
                 name = strndup(sfname, underscore - sfname);
@@ -260 +262 @@
 };
 
+static const struct subfeature_type_match curr_matches[] = {
+        { "input", SENSORS_SUBFEATURE_CURR_INPUT },
+        { "min", SENSORS_SUBFEATURE_CURR_MIN },
+        { "max", SENSORS_SUBFEATURE_CURR_MAX },
+        { "alarm", SENSORS_SUBFEATURE_CURR_ALARM },
+        { "min_alarm", SENSORS_SUBFEATURE_CURR_MIN_ALARM },
+        { "max_alarm", SENSORS_SUBFEATURE_CURR_MAX_ALARM },
+        { NULL, 0 }
+};
+
 static const struct subfeature_type_match cpu_matches[] = {
         { "vid", SENSORS_SUBFEATURE_VID },
@@ -271 +283 @@
         { "cpu%d%c", cpu_matches },
         { "power%d%c", power_matches },
+        { "curr%d%c", curr_matches },
         { "energy%d%c", energy_matches },
 };
@@ -361 +374 @@
                 case SENSORS_SUBFEATURE_POWER_AVERAGE:
                 case SENSORS_SUBFEATURE_ENERGY_INPUT:
+                case SENSORS_SUBFEATURE_CURR_INPUT:
                         nr--;
                         break;

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

@@ -579 +579 @@
 }
 
+static void print_chip_curr(const sensors_chip_name *name,
+                            const sensors_feature *feature,
+                            int label_size)
+{
+        const sensors_subfeature *sf, *sfmin, *sfmax;
+        double alarm_max, alarm_min;
+        char *label;
+
+        if (!(label = sensors_get_label(name, feature))) {
+                fprintf(stderr, "ERROR: Can't get label of feature %s!\n",
+                        feature->name);
+                return;
+        }
+        print_label(label, label_size);
+        free(label);
+
+        sf = sensors_get_subfeature(name, feature,
+                                    SENSORS_SUBFEATURE_CURR_INPUT);
+        if (sf)
+                printf("%+6.2f A", get_value(name, sf));
+        else
+                printf("     N/A");
+
+        sfmin = sensors_get_subfeature(name, feature,
+                                       SENSORS_SUBFEATURE_CURR_MIN);
+        sfmax = sensors_get_subfeature(name, feature,
+                                       SENSORS_SUBFEATURE_CURR_MAX);
+        if (sfmin && sfmax)
+                printf("  (min = %+6.2f A, max = %+6.2f A)",
+                       get_value(name, sfmin),
+                       get_value(name, sfmax));
+        else if (sfmin)
+                printf("  (min = %+6.2f A)",
+                       get_value(name, sfmin));
+        else if (sfmax)
+                printf("  (max = %+6.2f A)",
+                       get_value(name, sfmax));
+
+        sf = sensors_get_subfeature(name, feature,
+                                    SENSORS_SUBFEATURE_CURR_ALARM);
+        sfmin = sensors_get_subfeature(name, feature,
+                                       SENSORS_SUBFEATURE_CURR_MIN_ALARM);
+        sfmax = sensors_get_subfeature(name, feature,
+                                       SENSORS_SUBFEATURE_CURR_MAX_ALARM);
+        if (sfmin || sfmax) {
+                alarm_max = sfmax ? get_value(name, sfmax) : 0;
+                alarm_min = sfmin ? get_value(name, sfmin) : 0;
+
+                if (alarm_min || alarm_max) {
+                        printf(" ALARM (");
+
+                        if (alarm_min)
+                                printf("MIN");
+                        if (alarm_max)
+                                printf("%sMAX", (alarm_min) ? ", " : "");
+
+                        printf(")");
+                }
+        } else if (sf) {
+                printf("   %s",
+                       get_value(name, sf) ? "ALARM" : "");
+        }
+
+        printf("\n");
+}
+
 void print_chip(const sensors_chip_name *name)
 {
@@ -610 +676 @@
                         print_chip_energy(name, feature, label_size);
                         break;
+                case SENSORS_FEATURE_CURR:
+                        print_chip_curr(name, feature, label_size);
+                        break;
                 default:
                         continue;