From 454822a9c2d377a5b8001926d3f817bbbf866016 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 19 Aug 2003 21:31:24 +0000
Subject: pci hardware discovery: do full-probe by default

---
 perl-install/c/stuff.xs.pl     |  5 ++---
 perl-install/commands.pm       |  2 +-
 perl-install/detect_devices.pm | 10 ++++------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl
index 497d60c19..d65afeeb2 100644
--- a/perl-install/c/stuff.xs.pl
+++ b/perl-install/c/stuff.xs.pl
@@ -356,10 +356,9 @@ int
 detectSMP()
 
 void
-pci_probe(probe_type)
-  int probe_type
+pci_probe()
   PPCODE:
-    struct pciusb_entries entries = pci_probe(probe_type);
+    struct pciusb_entries entries = pci_probe();
     char buf[2048];
     int i;
 
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 77991a0e0..bf61ac05d 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -443,7 +443,7 @@ sub kill {
 
 sub lspci() {
     require detect_devices;
-    print join "\n", detect_devices::stringlist(1), '';
+    print join "\n", detect_devices::stringlist(), '';
 }
 *lssbus = \&lspci;
 
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index dadf0f3a0..2746a480d 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -465,16 +465,14 @@ sub add_addons {
     @l;
 }
 
-sub pci_probe {
-    my ($probe_type) = @_;
-    log::l("full pci_probe") if $probe_type;
+sub pci_probe() {
     add_addons($pcitable_addons, map {
 	my %l;
 	@l{qw(vendor id subvendor subid pci_bus pci_device pci_function media_type driver description)} = split "\t";
 	$l{$_} = hex $l{$_} foreach qw(vendor id subvendor subid);
 	$l{bus} = 'PCI';
 	\%l
-    } c::pci_probe($probe_type || 0));
+    } c::pci_probe());
 }
 
 sub usb_probe() {
@@ -516,7 +514,7 @@ sub matching_desc {
     my ($regexp) = @_;
     grep { $_->{description} =~ /$regexp/i } probeall();
 }
-sub stringlist { 
+sub stringlist() { 
     map {
 	sprintf("%-16s: %s%s%s", 
 		$_->{driver} || 'unknown', 
@@ -524,7 +522,7 @@ sub stringlist {
 		$_->{media_type} ? sprintf(" [%s]", $_->{media_type}) : '',
 		$_->{subid} && $_->{subid} != 0xffff ? sprintf(" SubVendor=0x%04x SubDevice=0x%04x", $_->{subvendor}, $_->{subid}) : '',
 	       )
-    } probeall(@_); 
+    } probeall; 
 }
 
 sub tryOpen($) {
-- 
cgit v1.2.1