diff options
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 13 |
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; |