Changeset 4354

Show
Ignore:
Timestamp:
03/25/07 19:08:20 (2 years ago)
Author:
khali
Message:

libsensors: Clean up pwm symbol names translation.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • lm-sensors/trunk/CHANGES

    r4353 r4354  
    33 
    44SVN HEAD 
     5  Library: Clean up pwm symbol names translation 
    56  Program isadump: Detect when address bit 7 is a busy flag 
    67  Program sensors: Drop ddcmon and eeprom support 
  • lm-sensors/trunk/lib/proc.c

    r4287 r4354  
    248248static const struct match matches[] = { 
    249249        { "beeps", "beep_mask", 0 }, 
    250         { "pwm", "fan1_pwm", 0 }, 
     250        { "pwm", "pwm1", 0, "fan1_pwm" }, 
    251251        { "vid", "cpu0_vid", INMAG, "in0_ref" }, 
    252252        { "remote_temp", "temp2_input", TEMPMAG }, 
     
    260260        { "temp_high", "temp1_max", TEMPMAG }, 
    261261        { "temp_crit", "temp1_crit", TEMPMAG }, 
    262         { "pwm1", "pwm1", 0, "fan1_pwm" }, 
    263         { "pwm2", "pwm2", 0, "fan2_pwm" }, 
    264         { "pwm3", "pwm3", 0, "fan3_pwm" }, 
    265         { "pwm4", "pwm4", 0, "fan4_pwm" }, 
    266         { "pwm1_enable", "pwm1_enable", 0, "fan1_pwm_enable" }, 
    267         { "pwm2_enable", "pwm2_enable", 0, "fan2_pwm_enable" }, 
    268         { "pwm3_enable", "pwm3_enable", 0, "fan3_pwm_enable" }, 
    269         { "pwm4_enable", "pwm4_enable", 0, "fan4_pwm_enable" }, 
    270262        { NULL, NULL } 
    271263}; 
     
    358350        } 
    359351        if(sscanf(name, "pwm%d%c", &num, &check) == 1) { 
    360                 sprintf(sysname, "fan%d_pwm", num); 
     352                strcpy(sysname, name); 
    361353                *sysmag = 0; 
     354                sprintf(altsysname, "fan%d_pwm", num); 
    362355                return 0; 
    363356        } 
    364357        if(sscanf(name, "pwm%d_enabl%c%c", &num, &last, &check) == 2 && last == 'e') { 
    365                 sprintf(sysname, "fan%d_pwm_enable", num); 
     358                strcpy(sysname, name); 
    366359                *sysmag = 0; 
     360                sprintf(altsysname, "fan%d_pwm_enable", num); 
    367361                return 0; 
    368362        }