Changeset 4976

Show
Ignore:
Timestamp:
10/22/07 20:06:23 (6 years ago)
Author:
khali
Message:

Handle gl518sm chips with no input values for in0, in1 and in2. This will happen
with the Linux 2.6 driver soon.

Location:
lm-sensors/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • lm-sensors/trunk/CHANGES

    r4974 r4976  
    3737                   Add thmc50/adm1022 support 
    3838                   Hide error on missing adm1021 die code 
     39                   Handle gl518sm with no voltage input values 
    3940  Program sensors-detect: Don't probe i2c-isa as a regular i2c bus 
    4041                          Add Winbond W83L786NR/NG/R/G detection 

  • lm-sensors/trunk/prog/sensors/chips.c

    r4952 r4976  
    10371037 * reading would be 0.0 V and displayed as "(n/a)" instead. */ 
    10381038  if (!sensors_get_label_and_valid(*name,SENSORS_GL518_VDD,&label,&valid) && 
    1039       !sensors_get_feature(*name,SENSORS_GL518_VDD,&cur) && 
    10401039      !sensors_get_feature(*name,SENSORS_GL518_VDD_MIN,&min) && 
    10411040      !sensors_get_feature(*name,SENSORS_GL518_VDD_MAX,&max)) { 
    10421041    if (valid) { 
    10431042      print_label(label,10); 
    1044       if (cur == 0.0) 
     1043      if (sensors_get_feature(*name, SENSORS_GL518_VDD, &cur) || cur == 0.0) 
    10451044        printf("(n/a)     "); 
    10461045      else 
    … …  
    10551054 
    10561055  if (!sensors_get_label_and_valid(*name,SENSORS_GL518_VIN1,&label,&valid) && 
    1057       !sensors_get_feature(*name,SENSORS_GL518_VIN1,&cur) && 
    10581056      !sensors_get_feature(*name,SENSORS_GL518_VIN1_MIN,&min) && 
    10591057      !sensors_get_feature(*name,SENSORS_GL518_VIN1_MAX,&max)) { 
    10601058    if (valid) { 
    10611059      print_label(label,10); 
    1062       if (cur == 0.0) 
     1060      if (sensors_get_feature(*name, SENSORS_GL518_VIN1, &cur) || cur == 0.0) 
    10631061        printf("(n/a)     "); 
    10641062      else 
    … …  
    10731071 
    10741072  if (!sensors_get_label_and_valid(*name,SENSORS_GL518_VIN2,&label,&valid) && 
    1075       !sensors_get_feature(*name,SENSORS_GL518_VIN2,&cur) && 
    10761073      !sensors_get_feature(*name,SENSORS_GL518_VIN2_MIN,&min) && 
    10771074      !sensors_get_feature(*name,SENSORS_GL518_VIN2_MAX,&max)) { 
    10781075    if (valid) { 
    10791076      print_label(label,10); 
    1080       if (cur == 0.0) 
     1077      if (sensors_get_feature(*name, SENSORS_GL518_VIN2, &cur) || cur == 0.0) 
    10811078        printf("(n/a)     "); 
    10821079      else