From 65693d70b34cb6c9983253d3eba5a345587f04a4 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 2 Feb 2003 19:26:34 +0000
Subject: move whatParport() to printer::detect

---
 perl-install/detect_devices.pm | 21 ---------------------
 perl-install/printer/detect.pm | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 4d77e06ef..62e03e87d 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -565,27 +565,6 @@ sub isLaptop {
 		    matching_desc('ATI.*(Mobility|LT)'));
 }
 
-sub whatParport() {
-    my @res;
-    foreach (0..3) {
-	my $elem = {};
-	my $F;
-	open $F, "/proc/parport/$_/autoprobe" or open $F, "/proc/sys/dev/parport/parport$_/autoprobe" or next;
-	{
-	    local $_;
-	    while (<$F>) { 
-		if (/(.*):(.*);/) { #-#
-		    $elem->{$1} = $2;
-		    $elem->{$1} =~ s/Hewlett[-\s_]Packard/HP/;
-		    $elem->{$1} =~ s/HEWLETT[-\s_]PACKARD/HP/;
-		}
-	    }
-	}
-	push @res, { port => "/dev/lp$_", val => $elem };
-    }
-    @res;
-}
-
 sub usbMice      { grep { $_->{media_type} =~ /\|Mouse/ && $_->{driver} !~ /Tablet:wacom/ ||
 			  $_->{driver} =~ /Mouse:USB/ } usb_probe() }
 sub usbWacom     { grep { $_->{driver} =~ /Tablet:wacom/ } usb_probe() }
diff --git a/perl-install/printer/detect.pm b/perl-install/printer/detect.pm
index 5c3a4fe1e..5a4c3e1f8 100644
--- a/perl-install/printer/detect.pm
+++ b/perl-install/printer/detect.pm
@@ -31,6 +31,27 @@ sub whatPrinter {
     grep { $_->{val}{CLASS} eq "PRINTER" } @res;
 }
 
+sub whatParport() {
+    my @res;
+    foreach (0..3) {
+	my $elem = {};
+	my $F;
+	open $F, "/proc/parport/$_/autoprobe" or open $F, "/proc/sys/dev/parport/parport$_/autoprobe" or next;
+	{
+	    local $_;
+	    while (<$F>) { 
+		if (/(.*):(.*);/) { #-#
+		    $elem->{$1} = $2;
+		    $elem->{$1} =~ s/Hewlett[-\s_]Packard/HP/;
+		    $elem->{$1} =~ s/HEWLETT[-\s_]PACKARD/HP/;
+		}
+	    }
+	}
+	push @res, { port => "/dev/lp$_", val => $elem };
+    }
+    @res;
+}
+
 sub whatPrinterPort() {
     grep { tryWrite($_) } qw(/dev/lp0 /dev/lp1 /dev/lp2 /dev/usb/lp0 /dev/usb/lp1 /dev/usb/lp2 /dev/usb/lp3 /dev/usb/lp4 /dev/usb/lp5 /dev/usb/lp6 /dev/usb/lp7 /dev/usb/lp8 /dev/usb/lp9);
 }
-- 
cgit v1.2.1