mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-09-03 15:55:15 +00:00
Code Issues Releases Wiki Activity

Fix the parsing of I2C addresses not to scan.

Browse Source 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5243 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare
2008-05-09 17:59:51 +00:00
parent a4c078b3df
commit c814dad141
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -25,6 +25,7 @@ SVN-HEAD
Add Asus F8000 detection Add Asus F8000 detection
Add Intel ICH10 (bus) detection Add Intel ICH10 (bus) detection
Don't probe I2C addresses 0x40-0x47 Don't probe I2C addresses 0x40-0x47
Fix the parsing of I2C addresses not to scan
3.0.1 (2008-01-28) 3.0.1 (2008-01-28)
documentation: Update the application writing guidelines documentation: Update the application writing guidelines

32
prog/detect/sensors-detect
View File

@@ -2073,6 +2073,20 @@ sub contains
return 0; return 0;
} }
# Address can be decimal or hexadecimal
sub valid_address
{
my $value = shift;
if ($value !~ m/^(0x[0-9a-f]+|[0-9]+)$/i) {
print "$value is not a valid address, sorry.\n";
exit -1;
}
$value = oct($value) if $value =~ /^0x/i;
return $value;
}
sub parse_not_to_scan sub parse_not_to_scan
{ {
my ($min,$max,$to_parse) = @_; my ($min,$max,$to_parse) = @_;
@@ -2080,15 +2094,19 @@ sub parse_not_to_scan
my @res; my @res;
my $range; my $range;
foreach $range (@ranges) { foreach $range (@ranges) {
my ($start,$end) = split /\s*-s*/, $range; my ($start, $end) = split /\s*-\s*/, $range;
$start = oct $start if $start =~ /^0/; $start = valid_address($start);
if (defined $end) { if (defined $end) {
$end = oct $end if $end =~ /^0/; $end = valid_address($end);
if ($end <= $start) {
print "$start-$end is not a valid range, sorry.\n";
exit -1;
}
$start = $min if $start < $min; $start = $min if $start < $min;
$end = $max if $end > $max; $end = $max if $end > $max;
push @res, ($start+0..$end+0); push @res, ($start..$end);
} else { } else {
push @res, $start+0 if $start >= $min and $start <= $max; push @res, $start if $start >= $min and $start <= $max;
} }
} }
return sort { $a <=> $b } @res; return sort { $a <=> $b } @res;
@@ -3041,6 +3059,8 @@ sub scan_adapter
# Now scan each address in turn # Now scan each address in turn
foreach $addr (@{$i2c_addresses_to_scan}) { foreach $addr (@{$i2c_addresses_to_scan}) {
# As the not_to_scan list is sorted, we can check it fast # As the not_to_scan list is sorted, we can check it fast
shift @not_to_scan # User skipped an address which we didn't intend to probe anyway
while (@not_to_scan and $not_to_scan[0] < $addr);
if (@not_to_scan and $not_to_scan[0] == $addr) { if (@not_to_scan and $not_to_scan[0] == $addr) {
shift @not_to_scan; shift @not_to_scan;
next; next;
@@ -5675,7 +5695,7 @@ sub main
"Addresses: "; "Addresses: ";
$inp2 = <STDIN>; $inp2 = <STDIN>;
chop $inp2; chop $inp2;
@not_to_scan = parse_not_to_scan 0,0x7f,$inp2; @not_to_scan = parse_not_to_scan(0x03, 0x77, $inp2);
} }
scan_adapter $dev_nr, $adap, $i2c_adapters[$dev_nr]->{'driver'}, scan_adapter $dev_nr, $adap, $i2c_adapters[$dev_nr]->{'driver'},
\@not_to_scan unless $inp =~ /^\s*[Nn]/; \@not_to_scan unless $inp =~ /^\s*[Nn]/;