summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-02-26 15:07:21 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-02-26 15:07:21 +0000
commit0ef10f9c0842747a2d879947d72eae1a7669b866 (patch)
tree7b2209a7d7cff94489d75ec465d206d58fbe2103
parent9c79e4b52e0f4ddac9fb9ff56cc93ced92763e1c (diff)
downloaddrakx-0ef10f9c0842747a2d879947d72eae1a7669b866.tar
drakx-0ef10f9c0842747a2d879947d72eae1a7669b866.tar.gz
drakx-0ef10f9c0842747a2d879947d72eae1a7669b866.tar.bz2
drakx-0ef10f9c0842747a2d879947d72eae1a7669b866.tar.xz
drakx-0ef10f9c0842747a2d879947d72eae1a7669b866.zip
detect usb adsl speed touch modem as modem and not as unknown device
what's remain: why sane-find-scanner keep detect it a scanner ??
-rw-r--r--perl-install/harddrake/data.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index f29c59f24..5d1a67239 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -12,7 +12,11 @@ my @devices = detect_devices::probeall(1);
# Update me each time you handle one more devices class (aka configurator)
sub unknown {
- grep { $_->{media_type} !~ /BRIDGE|class\|Mouse|DISPLAY|Hub|MEMORY_RAM|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|NETWORK|Printer|SERIAL_(USB|SMBUS)|STORAGE_(IDE|OTHER|SCSI)|tape/ && $_->{driver} !~ /^(scanner|usbvision)$|Mouse:USB|class\|Mouse|Removable:zip|www.linmodems.org|nvnet/ && $_->{type} ne 'network' } @devices;
+ grep { $_->{media_type} !~ /BRIDGE|class\|Mouse|DISPLAY|Hub|MEMORY_RAM|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|NETWORK|Printer|SERIAL_(USB|SMBUS)|STORAGE_(IDE|OTHER|SCSI)|tape/
+ && $_->{driver} !~ /^(scanner|usbvision)$|Mouse:USB|class\|Mouse|Removable:zip|www.linmodems.org|nvnet/
+ && $_->{type} ne 'network'
+ && $_->{description} !~ /Alcatel|ADSL Modem/
+ } @devices;
}
@@ -52,7 +56,7 @@ our @tree =
# should be taken from detect_devices.pm or modules.pm. it's identical
grep { $_->{media_type} =~ /^NETWORK/ || member($_->{driver}, @usbnet) || $_->{type} eq 'network' } @devices }, 1 ],
- [ "MODEM", , N("Modem"), "modem.png", "", sub { detect_devices::getModem() }, 0 ],
+ [ "MODEM", , N("Modem"), "modem.png", "", sub { detect_devices::getSpeedtouch(), detect_devices::getSagem(), detect_devices::getModem() }, 0 ],
[ "BRIDGE", , N("Bridges and system controllers"), "memory.png", "", sub { grep { $_->{media_type} =~ /BRIDGE|MEMORY_RAM/ && $_->{driver} ne 'nvnet' } @devices }, 0 ],
[ "UNKNOWN", , N("Unknown/Others"), "unknown.png", "", \&unknown, 0 ],