Changeset 5897

Show
Ignore:
Timestamp:
12/14/10 10:09:42 (18 months ago)
Author:
khali
Message:

Compute MAX_*_SENSOR_TYPES at build time (#2378).

Location:
lm-sensors/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • lm-sensors/trunk/CHANGES

    r5896 r5897  
    66  libsensors: Add support for intrusion detection (#2370) 
    77              Compute MAX_SUBFEATURES at run-time (#2378) 
     8              Compute MAX_*_SENSOR_TYPES at build time (#2378) 
    89  sensors.conf.defauit: Add a section for the W83627THF 
    910                        Add a section for the SCH5127 

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

    r5879 r5897  
    141141        SENSORS_FEATURE_ENERGY          = 0x04, 
    142142        SENSORS_FEATURE_CURR            = 0x05, 
     143        SENSORS_FEATURE_MAX_MAIN, 
    143144        SENSORS_FEATURE_VID             = 0x10, 
    144145        SENSORS_FEATURE_INTRUSION       = 0x11, 
     146        SENSORS_FEATURE_MAX_OTHER, 
    145147        SENSORS_FEATURE_BEEP_ENABLE     = 0x18, 
    146148        SENSORS_FEATURE_UNKNOWN         = INT_MAX, 

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

    r5896 r5897  
    137137char sensors_sysfs_mount[NAME_MAX]; 
    138138 
    139 #define MAX_MAIN_SENSOR_TYPES   6 
    140 #define MAX_OTHER_SENSOR_TYPES  2 
     139#define MAX_MAIN_SENSOR_TYPES   (SENSORS_FEATURE_MAX_MAIN - SENSORS_FEATURE_IN) 
     140#define MAX_OTHER_SENSOR_TYPES  (SENSORS_FEATURE_MAX_OTHER - SENSORS_FEATURE_VID) 
    141141#define MAX_SENSORS_PER_TYPE    24 
    142142/* max_subfeatures is now computed dynamically */