diff options
| author | khali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0> | 2008-12-01 13:19:17 +0000 |
|---|---|---|
| committer | khali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0> | 2008-12-01 13:19:17 +0000 |
| commit | c1b8882f624d26664550c58614fe7d98bf3db7c2 (patch) | |
| tree | 91c6322e4f5730e0b8d0bea2bfa45de0385d9580 | |
| parent | 6b8d888eef658f01fe30034078b01c1bc7848716 (diff) | |
| download | lm-sensors-c1b8882f624d26664550c58614fe7d98bf3db7c2.tar.gz | |
Refactor code in adt7467_detect and adt7473_detect.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5486 7894878c-1315-0410-8ee3-d5d059ff63e0
| -rwxr-xr-x | prog/detect/sensors-detect | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect index 30d4a158..46c33219 100755 --- a/prog/detect/sensors-detect +++ b/prog/detect/sensors-detect @@ -3714,39 +3714,36 @@ sub adt7467_detect my $cid = i2c_smbus_read_byte_data($file, 0x3d); my $drev = i2c_smbus_read_byte_data($file, 0x3f); + return if $mid != 0x41; # Analog Devices + if ($chip == 0) { - return if $mid != 0x41; # Analog Devices return if $cid != 0x68; # ADT7467 return if ($drev & 0xf0) != 0x70; - return 7 if ($drev == 0x71 || $drev == 0x72); + return 7 if $drev == 0x71 || $drev == 0x72; return 5; } if ($chip == 1) { - return if $mid != 0x41; # Analog Devices return if $cid != 0x76; # ADT7476 return if ($drev & 0xf0) != 0x60; - return 7 if ($drev == 0x69); + return 7 if $drev == 0x69; return 5; } if ($chip == 2) { - return if $mid != 0x41; # Analog Devices return if $cid != 0x62; # ADT7462 return if ($drev & 0xf0) != 0x00; - return 7 if ($drev == 0x04); + return 7 if $drev == 0x04; return 5; } if ($chip == 3) { - return if $mid != 0x41; # Analog Devices return if $cid != 0x66; # ADT7466 return if ($drev & 0xf0) != 0x00; - return 7 if ($drev == 0x02); + return 7 if $drev == 0x02; return 5; } if ($chip == 4) { - return if $mid != 0x41; # Analog Devices return if $cid != 0x70; # ADT7470 return if ($drev & 0xf0) != 0x00; - return 7 if ($drev == 0x00); + return 7 if $drev == 0x00; return 5; } } @@ -3761,16 +3758,11 @@ sub adt7473_detect my $mid = i2c_smbus_read_byte_data($file, 0x3e); my $cid = i2c_smbus_read_byte_data($file, 0x3d); - if ($chip == 0) { - return if $mid != 0x41; # Analog Devices - return if $cid != 0x73; # ADT7473 - return 5; - } - if ($chip == 1) { - return if $mid != 0x41; # Analog Devices - return if $cid != 0x75; # ADT7475 - return 5; - } + return if $mid != 0x41; # Analog Devices + + return if $chip == 0 && $cid != 0x73; # ADT7473 + return if $chip == 1 && $cid != 0x75; # ADT7475 + return 5; } # Chip to detect: 0 = aSC7512, 1 = aSC7611, 2 = aSC7621 |