summaryrefslogtreecommitdiffstats
path: root/perl-install/detect_devices.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-12-16 00:01:01 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-12-16 00:01:01 +0000
commite76ac94274b3c3e3bb809f9a73718a56e652631b (patch)
tree3432bdcb3572cbb5f2119320479a740e21fcf151 /perl-install/detect_devices.pm
parentb54e6a2e39241e56b58e94aeade346a55e4885e4 (diff)
downloaddrakx-e76ac94274b3c3e3bb809f9a73718a56e652631b.tar
drakx-e76ac94274b3c3e3bb809f9a73718a56e652631b.tar.gz
drakx-e76ac94274b3c3e3bb809f9a73718a56e652631b.tar.bz2
drakx-e76ac94274b3c3e3bb809f9a73718a56e652631b.tar.xz
drakx-e76ac94274b3c3e3bb809f9a73718a56e652631b.zip
pci_probing now done by libldetect
config files moved in package ldetect-lst
Diffstat (limited to 'perl-install/detect_devices.pm')
-rw-r--r--perl-install/detect_devices.pm13
1 files changed, 12 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 79bfedb71..f8cc294fb 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -173,6 +173,16 @@ sub getNet() {
grep { !($::isStandalone && /plip/) && c::hasNetDevice($_) } @netdevices;
}
+sub pci_probe {
+ my ($probe_type) = @_;
+ map {
+ my %l;
+ @l{qw(vendor id subvendor subid type driver description)} = split "\t";
+ $l{$_} = hex $l{$_} foreach qw(vendor id subvendor subid);
+ \%l
+ } c::pci_probe($probe_type);
+}
+
# pci_probing::main::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
@@ -181,7 +191,7 @@ sub probeall {
require pci_probing::main;
require sbus_probing::main;
require modules;
- pci_probing::main::probe($probe_type), sbus_probing::main::probe(), modules::get_pcmcia_devices();
+ pci_probe($probe_type), sbus_probing::main::probe(), modules::get_pcmcia_devices();
}
sub matching_desc {
my ($regexp) = @_;
@@ -230,6 +240,7 @@ sub hasUsbZip { hasUsb(8, -1) }
sub hasSMP { c::detectSMP() }
sub hasUltra66 {
+ die "hasUltra66 deprecated";
#- keep it BUT DO NOT USE IT as now included in kernel.
cat_("/proc/cmdline") =~ /(ide2=(\S+)(\s+ide3=(\S+))?)/ and return $1;