Changeset 5898

Show
Ignore:
Timestamp:
12/14/10 21:26:27 (2 years ago)
Author:
groeck
Message:

Added support for new sysfs attributes

Location:
lm-sensors/trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • lm-sensors/trunk/CHANGES

    r5897 r5898  
    77              Compute MAX_SUBFEATURES at run-time (#2378) 
    88              Compute MAX_*_SENSOR_TYPES at build time (#2378) 
    9   sensors.conf.defauit: Add a section for the W83627THF 
     9              Add support for new sysfs attributes 
     10  sensors.conf.default: Add a section for the W83627THF 
    1011                        Add a section for the SCH5127 
    1112  sensors: Display 3 decimal places in raw output 

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

    r5879 r5898  
    1212  enum sensors_subfeature_type SENSORS_SUBFEATURE_INTRUSION_ALARM 
    1313  enum sensors_subfeature_type SENSORS_SUBFEATURE_INTRUSION_BEEP 
     14* Added support for various new sysfs attributes 
     15  enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_LCRIT 
     16  enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_CRIT 
     17  enum sensors_subfeature_type SENSORS_SUBFEATURE_TEMP_LCRIT 
     18  enum sensors_subfeature_type SENSORS_SUBFEATURE_TEMP_EMERGENCY 
     19  enum sensors_subfeature_type SENSORS_SUBFEATURE_TEMP_EMERGENCY_HYST 
     20  enum sensors_subfeature_type SENSORS_SUBFEATURE_TEMP_EMERGENCY_ALARM 
     21  enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_CAP 
     22  enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_CAP_HYST 
     23  enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_ALARM 
    1424 
    15250x430   lm-sensors 3.2.0 

  • lm-sensors/trunk/lib/sensors.h

    r5897 r5898  
    155155        SENSORS_SUBFEATURE_IN_MIN, 
    156156        SENSORS_SUBFEATURE_IN_MAX, 
     157        SENSORS_SUBFEATURE_IN_LCRIT, 
     158        SENSORS_SUBFEATURE_IN_CRIT, 
    157159        SENSORS_SUBFEATURE_IN_ALARM = (SENSORS_FEATURE_IN << 8) | 0x80, 
    158160        SENSORS_SUBFEATURE_IN_MIN_ALARM, 
    … …  
    173175        SENSORS_SUBFEATURE_TEMP_CRIT, 
    174176        SENSORS_SUBFEATURE_TEMP_CRIT_HYST, 
     177        SENSORS_SUBFEATURE_TEMP_LCRIT, 
     178        SENSORS_SUBFEATURE_TEMP_EMERGENCY, 
     179        SENSORS_SUBFEATURE_TEMP_EMERGENCY_HYST, 
    175180        SENSORS_SUBFEATURE_TEMP_ALARM = (SENSORS_FEATURE_TEMP << 8) | 0x80, 
    176181        SENSORS_SUBFEATURE_TEMP_MAX_ALARM, 
    … …  
    181186        SENSORS_SUBFEATURE_TEMP_OFFSET, 
    182187        SENSORS_SUBFEATURE_TEMP_BEEP, 
     188        SENSORS_SUBFEATURE_TEMP_EMERGENCY_ALARM, 
    183189 
    184190        SENSORS_SUBFEATURE_POWER_AVERAGE = SENSORS_FEATURE_POWER << 8, 
    … …  
    188194        SENSORS_SUBFEATURE_POWER_INPUT_HIGHEST, 
    189195        SENSORS_SUBFEATURE_POWER_INPUT_LOWEST, 
     196        SENSORS_SUBFEATURE_POWER_CAP, 
     197        SENSORS_SUBFEATURE_POWER_CAP_HYST, 
    190198        SENSORS_SUBFEATURE_POWER_AVERAGE_INTERVAL = (SENSORS_FEATURE_POWER << 8) | 0x80, 
     199        SENSORS_SUBFEATURE_POWER_ALARM, 
    191200 
    192201        SENSORS_SUBFEATURE_ENERGY_INPUT = SENSORS_FEATURE_ENERGY << 8, 

  • lm-sensors/trunk/lib/sysfs.c

    r5897 r5898  
    227227        { "crit", SENSORS_SUBFEATURE_TEMP_CRIT }, 
    228228        { "crit_hyst", SENSORS_SUBFEATURE_TEMP_CRIT_HYST }, 
     229        { "lcrit", SENSORS_SUBFEATURE_TEMP_LCRIT }, 
     230        { "emergency", SENSORS_SUBFEATURE_TEMP_EMERGENCY }, 
     231        { "emergency_hyst", SENSORS_SUBFEATURE_TEMP_EMERGENCY_HYST }, 
    229232        { "alarm", SENSORS_SUBFEATURE_TEMP_ALARM }, 
    230233        { "min_alarm", SENSORS_SUBFEATURE_TEMP_MIN_ALARM }, 
    231234        { "max_alarm", SENSORS_SUBFEATURE_TEMP_MAX_ALARM }, 
    232235        { "crit_alarm", SENSORS_SUBFEATURE_TEMP_CRIT_ALARM }, 
     236        { "emergency_alarm", SENSORS_SUBFEATURE_TEMP_EMERGENCY_ALARM }, 
    233237        { "fault", SENSORS_SUBFEATURE_TEMP_FAULT }, 
    234238        { "type", SENSORS_SUBFEATURE_TEMP_TYPE }, 
    … …  
    242246        { "min", SENSORS_SUBFEATURE_IN_MIN }, 
    243247        { "max", SENSORS_SUBFEATURE_IN_MAX }, 
     248        { "lcrit", SENSORS_SUBFEATURE_IN_LCRIT }, 
     249        { "crit", SENSORS_SUBFEATURE_IN_CRIT }, 
    244250        { "alarm", SENSORS_SUBFEATURE_IN_ALARM }, 
    245251        { "min_alarm", SENSORS_SUBFEATURE_IN_MIN_ALARM }, 
    … …  
    266272        { "input_highest", SENSORS_SUBFEATURE_POWER_INPUT_HIGHEST }, 
    267273        { "input_lowest", SENSORS_SUBFEATURE_POWER_INPUT_LOWEST }, 
     274        { "cap", SENSORS_SUBFEATURE_POWER_CAP }, 
     275        { "cap_hyst", SENSORS_SUBFEATURE_POWER_CAP_HYST }, 
     276        { "alarm", SENSORS_SUBFEATURE_POWER_ALARM }, 
    268277        { "average_interval", SENSORS_SUBFEATURE_POWER_AVERAGE_INTERVAL }, 
    269278        { NULL, 0 }