From 2fb12b9bc814ef721941a68856221039dbcf3df8 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Mon, 10 Sep 2001 15:55:12 +0000
Subject: moved modules::get_pcmcia_devices into detect_devices::pcmcia_probe.

---
 perl-install/detect_devices.pm | 20 +++++++++++++++++---
 perl-install/modules.pm        | 14 --------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 8d26f3cd5..2052d5e0d 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -236,14 +236,28 @@ sub usb_probe {
     } c::usb_probe();
 }
 
+sub pcmcia_probe {
+    -e "/var/run/stab" or return ();
+
+    my (@devs, $desc);
+    foreach (cat_("/var/run/stab")) {
+	if (/^Socket\s+\d+:\s+(.*)/) {
+	    $desc = $1;
+	} else {
+	    my (undef, $type, $module, undef, $device) = split;
+	    push @devs, { description => $desc, driver => $module, type => $type, device => $device };
+	}
+    }
+    @devs;
+}
+
 # pci_probe with $probe_type is unsafe for pci! (bug in kernel&hardware)
-# get_pcmcia_devices provides field "device", used in network.pm
+# pcmcia_probe provides field "device", used in network.pm
 # => probeall with $probe_type is unsafe
 sub probeall {
     my ($probe_type) = @_;
     require sbus_probing::main;
-    require modules;
-    pci_probe($probe_type), usb_probe(), sbus_probing::main::probe(), modules::get_pcmcia_devices();
+    pci_probe($probe_type), usb_probe(), pcmcia_probe(), sbus_probing::main::probe();
 }
 sub matching_desc {
     my ($regexp) = @_;
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 26286ddfe..8850147e2 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -818,20 +818,6 @@ sub configure_pcmcia {
     read_already_loaded();
 }
 
-sub get_pcmcia_devices {
-    my (@devs, $desc);
-
-    foreach (cat_("/var/run/stab")) {
-	if (/^Socket\s+\d+:\s+(.*)/) {
-	    $desc = $1;
-	} else {
-	    my (undef, $type, $module, undef, $device) = split;
-	    push @devs, { description => $desc, driver => $module, type => $type, device => $device };
-	}
-    }
-    @devs;
-}
-
 sub write_pcmcia {
     my ($prefix, $pcmcia) = @_;
 
-- 
cgit v1.2.1