summaryrefslogtreecommitdiffstats
path: root/perl-install/detect_devices.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-12-16 16:13:34 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-12-16 16:13:34 +0000
commit3bf40616e233d127ecc0c1f90edd740d23a361ca (patch)
tree123688226f45977d93c97ab68635dfd492a5f54d /perl-install/detect_devices.pm
parente76ac94274b3c3e3bb809f9a73718a56e652631b (diff)
downloaddrakx-backup-do-not-use-3bf40616e233d127ecc0c1f90edd740d23a361ca.tar
drakx-backup-do-not-use-3bf40616e233d127ecc0c1f90edd740d23a361ca.tar.gz
drakx-backup-do-not-use-3bf40616e233d127ecc0c1f90edd740d23a361ca.tar.bz2
drakx-backup-do-not-use-3bf40616e233d127ecc0c1f90edd740d23a361ca.tar.xz
drakx-backup-do-not-use-3bf40616e233d127ecc0c1f90edd740d23a361ca.zip
use ldetect-lst
Diffstat (limited to 'perl-install/detect_devices.pm')
-rw-r--r--perl-install/detect_devices.pm16
1 files changed, 13 insertions, 3 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index f8cc294fb..802110185 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -179,19 +179,29 @@ sub pci_probe {
my %l;
@l{qw(vendor id subvendor subid type driver description)} = split "\t";
$l{$_} = hex $l{$_} foreach qw(vendor id subvendor subid);
+ $l{bus} = 'PCI';
\%l
} c::pci_probe($probe_type);
}
-# pci_probing::main::probe with $probe_type is unsafe for pci! (bug in kernel&hardware)
+sub usb_probe {
+ map {
+ my %l;
+ @l{qw(vendor id driver description)} = split "\t";
+ $l{$_} = hex $l{$_} foreach qw(vendor id);
+ $l{bus} = 'USB';
+ \%l
+ } c::usb_probe();
+}
+
+# pci_probe with $probe_type is unsafe for pci! (bug in kernel&hardware)
# get_pcmcia_devices provides field "device", used in network.pm
# => probeall with $probe_type is unsafe
sub probeall {
my ($probe_type) = @_;
- require pci_probing::main;
require sbus_probing::main;
require modules;
- pci_probe($probe_type), sbus_probing::main::probe(), modules::get_pcmcia_devices();
+ pci_probe($probe_type), usb_probe(), sbus_probing::main::probe(), modules::get_pcmcia_devices();
}
sub matching_desc {
my ($regexp) = @_;