- rename scanner::findScannerUsbport as scanner::detect

  as in mouse.pm
- scanner::detect : detect SCSI scanners too

1 files changed, 7 insertions, 5 deletions

diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm
index 995a2f2e4..1bc381c9d 100755
--- a/perl-install/scanner.pm
+++ b/perl-install/scanner.pm
@@ -51,7 +51,7 @@ sub add2dll {
     close F;
 }
 
-sub findScannerUsbport {
+sub detect {
     my ($i, $elem, @res) = (0, {});
     foreach (grep { $_->{driver} =~ /scanner/ } detect_devices::usb_probe()) {
 	#my ($manufacturer, $model) = split '\|', $_->{description};
@@ -65,14 +65,16 @@ sub findScannerUsbport {
 							  }};
 	++$i;
     }
+    foreach ({$_->{media_type} =~ /scanner/  } detect_devices::getSCSI()) {
+	   push @res, { port => "/dev/usb/scanner$i", 
+				 val => { DESCRIPTION => $_->{info} },
+	   };
+	   ++$i;
+    }
     @res;
 }
 
 
-sub findScannerScsi {
-
-}
-
 sub readScannerDB {
     my ($file) = @_;
     my ($card, %cards);