summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-03-08 08:54:49 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-03-08 08:54:49 +0000
commit3fc1e32932e52fea115b1ed530c732ab2de965dc (patch)
tree4f1f8da883bf7d19a3bd9e0c8812440c56762542
parentdfe9b6a59c35f115831a70a354e76573fda21d86 (diff)
downloaddrakx-3fc1e32932e52fea115b1ed530c732ab2de965dc.tar
drakx-3fc1e32932e52fea115b1ed530c732ab2de965dc.tar.gz
drakx-3fc1e32932e52fea115b1ed530c732ab2de965dc.tar.bz2
drakx-3fc1e32932e52fea115b1ed530c732ab2de965dc.tar.xz
drakx-3fc1e32932e52fea115b1ed530c732ab2de965dc.zip
(isdn_detect_backend) enhance detection: just return a list of devices
-rw-r--r--perl-install/network/isdn.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 20c4ceb32..037968629 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -195,12 +195,11 @@ If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card.
}
sub isdn_detect_backend() {
- my $isdn = { };
+ my @isdn;
require detect_devices;
each_index {
my $c = $_;
- $isdn->{$::i} = { map { $_ => $c->{$_} } qw(description vendor id driver card_type type) };
- my $isdn = $isdn->{$::i};
+ my $isdn = { map { $_ => $c->{$_} } qw(description vendor id driver card_type type) };
$isdn->{intf_id} = $::i;
$isdn->{$_} = sprintf("%0x", $isdn->{$_}) foreach 'vendor', 'id';
$isdn->{card_type} = $c->{bus} eq 'USB' ? 'usb' : 'pci';
@@ -211,8 +210,9 @@ sub isdn_detect_backend() {
modules::set_options($c->{driver}, $c->{options} . " protocol=" . $isdn->{protocol});
}
$c->{options} =~ /protocol=(\d)/ and $isdn->{protocol} = $1;
+ push @isdn, $isdn;
} modules::probe_category('network/isdn');
- $isdn;
+ \@isdn;
}
sub isdn_get_list() {