From 9489196befb8337ac1c149e2f1e68ee0b705b88e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 15 Oct 2002 14:21:41 +0000
Subject: add Pioneer to vendors list

---
 perl-install/detect_devices.pm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

(limited to 'perl-install/detect_devices.pm')

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index d11cfd657..21c2fa22f 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -259,6 +259,7 @@ my %eide_hds = (
     "MAXTOR" => "Maxtor",
     "Maxtor" => "Maxtor",
     "Micropolis" => "Micropolis",
+    "Pioneer" => "Pioneer",
     "PLEXTOR" => "Plextor",
     "QUANTUM" => "Quantum", 
     "SAMSUNG" => "Samsung",
@@ -345,6 +346,46 @@ sub getATARAID {
     values %l;
 }
 
+<<<<<<< detect_devices.pm
+#-AT&F&O2B40
+#- DialString=ATDT0231389595((
+
+#- modem_detect_backend : detects modem on serial ports and fills the infos in $modem : detects only one card
+#- input
+#-  $modem
+#-  $mouse : facultative, hash containing device to exclude not to test mouse port : ( device => /ttyS[0-9]/ )
+#- output:
+#-  $modem->{device} : device where the modem were detected
+sub getSerialModem {
+    my ($modem, $mouse) = @_;
+    $mouse ||= {};
+    $mouse->{device} = readlink "/dev/mouse";
+    my $serdev = arch() =~ /ppc/ ? "macserial" : "serial";
+    eval { modules::load($serdev) };
+
+    detect_devices::probeSerialDevices();
+    foreach ('modem', map { "ttyS$_" } (0..7)) {
+	next if $mouse->{device} =~ /$_/;
+	next unless -e "/dev/$_";
+	detect_devices::hasModem("/dev/$_") and $modem->{device} = $_, last;
+    }
+
+    #- add an alias for macserial on PPC
+    modules::add_alias('serial', $serdev) if (arch() =~ /ppc/ && $modem->{device});
+    my @devs = detect_devices::pcmcia_probe();
+    foreach (@devs) {
+	$_->{type} =~ /serial/ and $modem->{device} = $_->{device};
+    }
+}
+
+sub getModem() {
+    my @modems = grep { $_->{media_type} eq 'COMMUNICATION_MODEM' || $_->{media_type}  =~ /modem/ } probeall(0);
+    my $serial_modem = {};
+    getSerialModem($serial_modem);
+    @modems, $serial_modem;
+}
+
+=======
 #-AT&F&O2B40
 #- DialString=ATDT0231389595((
 
@@ -387,6 +428,7 @@ sub getSpeedtouch {
     grep { $_->{description} eq 'Alcatel|USB ADSL Modem (Speed Touch)' } probeall(0);
 }
 
+>>>>>>> 1.217
 sub getNet() {
     grep { !(($::isStandalone || $::live) && /plip/) && c::hasNetDevice($_) } @netdevices;
 }
-- 
cgit v1.2.1