Changeset 5917

Timestamp:

02/09/11 20:25:22 (2 years ago)

Author:

groeck

Message:

Add support for recently added sysfs ABI attributes

Location:

lm-sensors/trunk

Files:

• doc/libsensors-API.txt (modified) (1 diff)
• lib/sensors.h (modified) (4 diffs)
• lib/sysfs.c (modified) (4 diffs)

lm-sensors/trunk/doc/libsensors-API.txt

@@ -15 +15 @@
   enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_LCRIT
   enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_CRIT
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_LCRIT_ALARM
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_CRIT_ALARM
   enum sensors_subfeature_type SENSORS_SUBFEATURE_TEMP_LCRIT
   enum sensors_subfeature_type SENSORS_SUBFEATURE_TEMP_EMERGENCY
   enum sensors_subfeature_type SENSORS_SUBFEATURE_TEMP_EMERGENCY_HYST
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_TEMP_LCRIT_ALARM
   enum sensors_subfeature_type SENSORS_SUBFEATURE_TEMP_EMERGENCY_ALARM
   enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_CAP
   enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_CAP_HYST
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_MAX
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_CRIT
   enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_ALARM
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_CAP_ALARM
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_MAX_ALARM
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_CRIT_ALARM
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_LCRIT
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_CRIT
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_LCRIT_ALARM
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_CRIT_ALARM
 
 0x430   lm-sensors 3.2.0

lm-sensors/trunk/lib/sensors.h

@@ -161 +161 @@
         SENSORS_SUBFEATURE_IN_MAX_ALARM,
         SENSORS_SUBFEATURE_IN_BEEP,
+        SENSORS_SUBFEATURE_IN_LCRIT_ALARM,
+        SENSORS_SUBFEATURE_IN_CRIT_ALARM,
 
         SENSORS_SUBFEATURE_FAN_INPUT = SENSORS_FEATURE_FAN << 8,
@@ -187 +189 @@
         SENSORS_SUBFEATURE_TEMP_BEEP,
         SENSORS_SUBFEATURE_TEMP_EMERGENCY_ALARM,
+        SENSORS_SUBFEATURE_TEMP_LCRIT_ALARM,
 
         SENSORS_SUBFEATURE_POWER_AVERAGE = SENSORS_FEATURE_POWER << 8,
@@ -196 +199 @@
         SENSORS_SUBFEATURE_POWER_CAP,
         SENSORS_SUBFEATURE_POWER_CAP_HYST,
+        SENSORS_SUBFEATURE_POWER_MAX,
+        SENSORS_SUBFEATURE_POWER_CRIT,
         SENSORS_SUBFEATURE_POWER_AVERAGE_INTERVAL = (SENSORS_FEATURE_POWER << 8) | 0x80,
         SENSORS_SUBFEATURE_POWER_ALARM,
+        SENSORS_SUBFEATURE_POWER_CAP_ALARM,
+        SENSORS_SUBFEATURE_POWER_MAX_ALARM,
+        SENSORS_SUBFEATURE_POWER_CRIT_ALARM,
 
         SENSORS_SUBFEATURE_ENERGY_INPUT = SENSORS_FEATURE_ENERGY << 8,
@@ -204 +212 @@
         SENSORS_SUBFEATURE_CURR_MIN,
         SENSORS_SUBFEATURE_CURR_MAX,
+        SENSORS_SUBFEATURE_CURR_LCRIT,
+        SENSORS_SUBFEATURE_CURR_CRIT,
         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_CURR_LCRIT_ALARM,
+        SENSORS_SUBFEATURE_CURR_CRIT_ALARM,
 
         SENSORS_SUBFEATURE_VID = SENSORS_FEATURE_VID << 8,

lm-sensors/trunk/lib/sysfs.c

@@ -235 +235 @@
         { "crit_alarm", SENSORS_SUBFEATURE_TEMP_CRIT_ALARM },
         { "emergency_alarm", SENSORS_SUBFEATURE_TEMP_EMERGENCY_ALARM },
+        { "lcrit_alarm", SENSORS_SUBFEATURE_TEMP_LCRIT_ALARM },
         { "fault", SENSORS_SUBFEATURE_TEMP_FAULT },
         { "type", SENSORS_SUBFEATURE_TEMP_TYPE },
@@ -251 +252 @@
         { "min_alarm", SENSORS_SUBFEATURE_IN_MIN_ALARM },
         { "max_alarm", SENSORS_SUBFEATURE_IN_MAX_ALARM },
+        { "lcrit_alarm", SENSORS_SUBFEATURE_IN_LCRIT_ALARM },
+        { "crit_alarm", SENSORS_SUBFEATURE_IN_CRIT_ALARM },
         { "beep", SENSORS_SUBFEATURE_IN_BEEP },
         { NULL, 0 }
@@ -274 +277 @@
         { "cap", SENSORS_SUBFEATURE_POWER_CAP },
         { "cap_hyst", SENSORS_SUBFEATURE_POWER_CAP_HYST },
+        { "cap_alarm", SENSORS_SUBFEATURE_POWER_CAP_ALARM },
         { "alarm", SENSORS_SUBFEATURE_POWER_ALARM },
+        { "max", SENSORS_SUBFEATURE_POWER_MAX },
+        { "max_alarm", SENSORS_SUBFEATURE_POWER_MAX_ALARM },
+        { "crit", SENSORS_SUBFEATURE_POWER_CRIT },
+        { "crit_alarm", SENSORS_SUBFEATURE_POWER_CRIT_ALARM },
         { "average_interval", SENSORS_SUBFEATURE_POWER_AVERAGE_INTERVAL },
         { NULL, 0 }
@@ -288 +296 @@
         { "min", SENSORS_SUBFEATURE_CURR_MIN },
         { "max", SENSORS_SUBFEATURE_CURR_MAX },
+        { "lcrit", SENSORS_SUBFEATURE_CURR_LCRIT },
+        { "crit", SENSORS_SUBFEATURE_CURR_CRIT },
         { "alarm", SENSORS_SUBFEATURE_CURR_ALARM },
         { "min_alarm", SENSORS_SUBFEATURE_CURR_MIN_ALARM },
         { "max_alarm", SENSORS_SUBFEATURE_CURR_MAX_ALARM },
+        { "lcrit_alarm", SENSORS_SUBFEATURE_CURR_LCRIT_ALARM },
+        { "crit_alarm", SENSORS_SUBFEATURE_CURR_CRIT_ALARM },
         { "beep", SENSORS_SUBFEATURE_CURR_BEEP },
         { NULL, 0 }