wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-10-31 13:10:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move some code from main() to scan_i2c_adapter() as it makes more sense

Browse Source 
that way.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5500 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2008-12-02 17:54:20 +00:00
1 parent b8309aa3bd
commit dc22cce727
1 file changed
+18 -21
Download Patch File Download Diff File Expand all files Collapse all files
prog/detect/sensors-detect
+18 -21
View File
@@ -2706,11 +2706,24 @@ sub probe_free_i2c_address
# $_[1]: Addresses not to scan (array reference)
sub scan_i2c_adapter
{
my ($adapter_nr, $not_to_scan) = @_;
my ($funcs, $chip, $addr);
my ($adapter_nr) = @_;
my ($funcs, $chip, $addr, $input, @not_to_scan);
# As we modify it, we need a copy
my @not_to_scan = @$not_to_scan;
print "Next adapter: $i2c_adapters[$adapter_nr]->{name} (i2c-$adapter_nr)\n".
"Do you want to scan it? (YES/no/selectively): ";
$input = <STDIN>;
return if $input =~ /^\s*n/i;
if ($input =~ /^\s*s/i) {
print "Please enter one or more addresses not to scan. Separate them with commas.\n",
"You can specify a range by using dashes. Example: 0x58-0x5f,0x69.\n",
"Addresses: ";
$input = <STDIN>;
chomp($input);
@not_to_scan = parse_not_to_scan(0x03, 0x77, $input);
}
print "\n";
open(local *FILE, "$dev_i2c$adapter_nr") or
(print "Can't open $dev_i2c$adapter_nr\n"), return;
@@ -4932,25 +4945,9 @@ sub main
$i2c_addresses_to_scan = i2c_addresses_to_scan();
print "\n";
my ($input, @not_to_scan);
for (my $dev_nr = 0; $dev_nr < @i2c_adapters; $dev_nr++) {
next unless exists $i2c_adapters[$dev_nr];
print "Next adapter: $i2c_adapters[$dev_nr]->{name} (i2c-$dev_nr)\n".
"Do you want to scan it? (YES/no/selectively): ";
$input = <STDIN>;
unless ($input =~ /^\s*n/i) {
if ($input =~ /^\s*s/i) {
print "Please enter one or more addresses not to scan. Separate them with commas.\n",
"You can specify a range by using dashes. Example: 0x58-0x5f,0x69.\n",
"Addresses: ";
$input = <STDIN>;
chomp($input);
@not_to_scan = parse_not_to_scan(0x03, 0x77, $input);
}
scan_i2c_adapter($dev_nr, \@not_to_scan)
}
print "\n";
scan_i2c_adapter($dev_nr);
}
}