summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-08-08 11:40:31 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-08-08 11:40:31 +0000
commit1a9643beb30e238fda21978d41e8c7af6b18cffb (patch)
tree2b1ef3c770e0f967faa8b69513f578cb8e484f8a
parent009023a74562757d59bf7eb2d6f6ab9048b44239 (diff)
downloaddrakx-1a9643beb30e238fda21978d41e8c7af6b18cffb.tar
drakx-1a9643beb30e238fda21978d41e8c7af6b18cffb.tar.gz
drakx-1a9643beb30e238fda21978d41e8c7af6b18cffb.tar.bz2
drakx-1a9643beb30e238fda21978d41e8c7af6b18cffb.tar.xz
drakx-1a9643beb30e238fda21978d41e8c7af6b18cffb.zip
old hp scanners report themselves as "Processor"s as :
- tested in hw lab - written in linux/include/scsi/scsi.h: "TYPE_PROCESSOR.*HP scanners use this" - reported by sane-find-sane: "old HP scanners use the CPU id"
-rw-r--r--perl-install/detect_devices.pm2
-rwxr-xr-xperl-install/scanner.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index e3b053fa0..6f5086a0e 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -195,7 +195,7 @@ sub getSCSI() {
each_index {
put_in_hash $_, { media_type => 'scanner' };
- } grep { $_->{raw_type} =~ /Scanner/ } @l;
+ } grep { $_->{raw_type} =~ /Scanner/ || $_->{raw_type} =~ /Processor /} @l;
get_devfs_devices(@l);
get_sys_cdrom_info(@l);
diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm
index 502237c19..fccca25e8 100755
--- a/perl-install/scanner.pm
+++ b/perl-install/scanner.pm
@@ -66,7 +66,7 @@ sub detect {
++$i;
}
foreach (grep { $_->{media_type} =~ /scanner/ } detect_devices::getSCSI()) {
- push @res, { port => "/dev/usb/scanner$i",
+ push @res, { port => "/dev/sg",
val => { DESCRIPTION => $_->{info} },
};
++$i;