Changeset 4549

Show
Ignore:
Timestamp:
07/03/07 21:38:37 (6 years ago)
Author:
jwrdegoede
Message:

generic in and fan print routine fixes

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/chips_generic.c

    r4545 r4549  
    250250  printf("%+6.2f V", val); 
    251251   
    252   if (IN_FEATURE(SENSORS_FEATURE_IN_MIN)) 
    253     printf("  (min = %+6.2f V", IN_FEATURE_VAL(SENSORS_FEATURE_IN_MIN)); 
    254    
    255   if (IN_FEATURE(SENSORS_FEATURE_IN_MAX)) { 
    256     if (IN_FEATURE(SENSORS_FEATURE_IN_MIN)) 
    257       printf(", "); 
    258     else 
    259       printf("  ("); 
    260     printf("max = %+6.2f V)", IN_FEATURE_VAL(SENSORS_FEATURE_IN_MAX)); 
    261   } 
     252  if (IN_FEATURE(SENSORS_FEATURE_IN_MIN) && IN_FEATURE(SENSORS_FEATURE_IN_MAX)) 
     253    printf("  (min = %+6.2f V, max = %+6.2f V)", 
     254      IN_FEATURE_VAL(SENSORS_FEATURE_IN_MIN), 
     255      IN_FEATURE_VAL(SENSORS_FEATURE_IN_MAX)); 
     256  else if (IN_FEATURE(SENSORS_FEATURE_IN_MIN)) 
     257    printf("  (min = %+6.2f V)", IN_FEATURE_VAL(SENSORS_FEATURE_IN_MIN)); 
     258  else if (IN_FEATURE(SENSORS_FEATURE_IN_MAX)) 
     259    printf("  (max = %+6.2f V)", IN_FEATURE_VAL(SENSORS_FEATURE_IN_MAX)); 
    262260   
    263261  if (IN_FEATURE(SENSORS_FEATURE_IN_MAX_ALARM) || 
    … …  
    320318      size, SENSORS_FEATURE_FAN); 
    321319   
    322   if (FAN_FEATURE(SENSORS_FEATURE_FAN_MIN)) { 
    323     printf("  (min = %4.0f RPM", FAN_FEATURE_VAL(SENSORS_FEATURE_FAN_MIN)); 
    324      
    325     if (FAN_FEATURE(SENSORS_FEATURE_FAN_DIV)) { 
    326       printf(", div = %1.0f", FAN_FEATURE_VAL(SENSORS_FEATURE_FAN_DIV));   
    327     } 
    328      
    329     printf(")"); 
    330   } 
    331    
     320  if (FAN_FEATURE(SENSORS_FEATURE_FAN_MIN) && 
     321      FAN_FEATURE(SENSORS_FEATURE_FAN_DIV)) 
     322    printf("  (min = %4.0f RPM, div = %1.0f)", 
     323      FAN_FEATURE_VAL(SENSORS_FEATURE_FAN_MIN), 
     324      FAN_FEATURE_VAL(SENSORS_FEATURE_FAN_DIV)); 
     325  else if (FAN_FEATURE(SENSORS_FEATURE_FAN_MIN)) 
     326    printf("  (min = %4.0f RPM)", FAN_FEATURE_VAL(SENSORS_FEATURE_FAN_MIN)); 
     327  else if (FAN_FEATURE(SENSORS_FEATURE_FAN_DIV)) 
     328    printf("  (div = %1.0f)", FAN_FEATURE_VAL(SENSORS_FEATURE_FAN_DIV)); 
     329   
     330  /* ALARM and FAULT features */ 
     331  if (FAN_FEATURE(SENSORS_FEATURE_FAN_FAULT) && 
     332      FAN_FEATURE_VAL(SENSORS_FEATURE_FAN_FAULT)) { 
     333    printf(" FAULT"); 
     334  } else 
    332335  if (FAN_FEATURE(SENSORS_FEATURE_FAN_ALARM) &&  
    333336      FAN_FEATURE_VAL(SENSORS_FEATURE_FAN_ALARM)) {