summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-02-12 11:09:00 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-02-12 11:09:00 +0000
commit1d4e3c397e759dd066d50423213859b058a8c028 (patch)
tree8286a72affe1371c4f849309a8fda3801f7a2b5b /perl-install
parentd0fedc3f70cd7b339fdcd32f351fa6da4ebe059c (diff)
downloaddrakx-backup-do-not-use-1d4e3c397e759dd066d50423213859b058a8c028.tar
drakx-backup-do-not-use-1d4e3c397e759dd066d50423213859b058a8c028.tar.gz
drakx-backup-do-not-use-1d4e3c397e759dd066d50423213859b058a8c028.tar.bz2
drakx-backup-do-not-use-1d4e3c397e759dd066d50423213859b058a8c028.tar.xz
drakx-backup-do-not-use-1d4e3c397e759dd066d50423213859b058a8c028.zip
detect more webcams
Diffstat (limited to 'perl-install')
-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 6697be295..aa9cd214e 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -13,7 +13,8 @@ my @devices = detect_devices::probeall();
# 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} !~ /^(ISDN|mod_quickcam|ohci1394|scanner|usbvision)$|Mouse:USB|class\|Mouse|Removable:zip|megaraid|nvnet|www.linmodems.org/
+ && member($_->{driver}, qw(cpia_usb cyber2000fb forcedeth ibmcam megaraid mod_quickcam nvnet ohci1394 ov511 ov518_decomp scanner ultracam usbvideo usbvision))
+ && $_->{driver} !~ /^ISDN|Mouse:USB|Removable:zip|class\|Mouse|www.linmodems.org/
&& $_->{type} ne 'network'
&& $_->{description} !~ /Alcatel|ADSL Modem/
} @devices;
@@ -53,7 +54,10 @@ our @tree =
[ "TV", , N("Tvcard"), "tv.png", "/usr/bin/XawTV", sub { grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO/ && $_->{bus} eq 'PCI' || $_->{driver} eq 'usbvision' } @devices }, 0 ],
[ "MULTIMEDIA_OTHER", , N("Other MultiMedia devices"), "multimedia.png", "", sub { grep { $_->{media_type} =~ /MULTIMEDIA_OTHER/ } @devices }, 0 ],
[ "AUDIO", , N("Soundcard"), "sound.png", "$sbindir/draksound", sub { grep { $_->{media_type} =~ /MULTIMEDIA_AUDIO/ } @devices }, 0 ],
- [ "WEBCAM", , N("Webcam"), "webcam.png", "", sub { grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO/ && $_->{bus} ne 'PCI' || $_->{driver} eq 'mod_quickcam' } @devices }, 0 ],
+ [ "WEBCAM", , N("Webcam"), "webcam.png", "", sub {
+ grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO/ && $_->{bus} ne 'PCI' ||
+ member($_->{driver}, qw(cpia_usb cyber2000fb ibmcam mod_quickcam ov511 ov518_decomp ultracam usbvideo)) } @devices },
+ 0 ],
[ "CPU", , N("Processors"), "cpu.png", "", sub { detect_devices::getCPUs() }, 0 ],
[ "ETHERNET", , N("Ethernetcard"), "hw_network.png", "$sbindir/drakconnect", sub {
#- generic NIC detection for USB seems broken (class, subclass,