summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-11-12 14:55:52 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-11-12 14:55:52 +0000
commit30141e3ba2744ff861f809a8d7ccb91bd2680165 (patch)
tree402b35088fb0320e0d88e0cdc63368231daab59a /perl-install
parent8654b7eecff3391632803f1c835de299730a7ef6 (diff)
downloaddrakx-30141e3ba2744ff861f809a8d7ccb91bd2680165.tar
drakx-30141e3ba2744ff861f809a8d7ccb91bd2680165.tar.gz
drakx-30141e3ba2744ff861f809a8d7ccb91bd2680165.tar.bz2
drakx-30141e3ba2744ff861f809a8d7ccb91bd2680165.tar.xz
drakx-30141e3ba2744ff861f809a8d7ccb91bd2680165.zip
handle devices managed by usbvision too
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/harddrake/data.pm4
-rwxr-xr-xperl-install/standalone/drakxtv7
2 files changed, 5 insertions, 6 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index af45d7155..45af79479 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -11,7 +11,7 @@ my @devices = detect_devices::probeall(1);
# Update me each time you handle one more devices class (aka configurator)
sub unknown {
- grep { ($_->{media_type} !~ /tape|SERIAL_(USB|SMBUS)|Printer|DISPLAY|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|STORAGE_(IDE|SCSI|OTHER)|BRIDGE|NETWORK/) && ($_->{driver} ne 'scanner') && $_->{type} ne 'network' && $_->{driver} !~ /Mouse:USB|class\|Mouse/ } @devices;
+ grep { ($_->{media_type} !~ /tape|SERIAL_(USB|SMBUS)|Printer|DISPLAY|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|STORAGE_(IDE|SCSI|OTHER)|BRIDGE|NETWORK/) && ($_->{driver} ne '^(scanner|usbvideo)$') && $_->{type} ne 'network' && $_->{driver} !~ /Mouse:USB|class\|Mouse/ } @devices;
}
@@ -28,7 +28,7 @@ our @tree =
["DVDROM","DVD-ROM", "cd.png", "", sub { grep { ! detect_devices::isBurner($_) } detect_devices::dvdroms() }, 0 ],
["TAPE","Tape", "tape.png", "", \&detect_devices::tapes, 0 ],
["VIDEO","Videocard", "video.png", "$sbindir/XFdrake", sub { grep { $_->{driver} =~ /^(Card|Server):/ || $_->{media_type} =~ /DISPLAY_VGA/ } @devices }, 1 ],
- ["TV","Tvcard", "tv.png", "/usr/bin/XawTV", sub { grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO/ && $_->{bus} eq 'PCI' } @devices }, 0 ],
+ ["TV","Tvcard", "tv.png", "/usr/bin/XawTV", sub { grep { ($_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} eq 'PCI') || $_->{driver} eq 'usbvision' } @devices }, 0 ],
["MULTIMEDIA_OTHER","Other MultiMedia devices", "multimedia.png", "", sub { grep { $_->{media_type} =~ /MULTIMEDIA_OTHER/ } @devices }, 0 ],
["AUDIO","Soundcard", "sound.png", "$sbindir/draksound", sub { grep { $_->{media_type} =~ /MULTIMEDIA_AUDIO/ } @devices }, 0 ],
["WEBCAM","Webcam", "webcam.png", "", sub { grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO/ && $_->{bus} ne 'PCI' } @devices }, 0 ],
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index caeebcc59..0d27c7d01 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -134,11 +134,11 @@ You can install it by typing \"urpmi xawtv\" as root, in a console.")));
}
}
-my @devices = grep { $_->{media_type} eq 'MULTIMEDIA_VIDEO' } detect_devices::probeall(1);
+my @devices = grep { ($_->{media_type} eq 'MULTIMEDIA_VIDEO') || $_->{driver} eq 'usbvision' } detect_devices::probeall(1);
if (@devices) {
# TODO: That need some work for multiples TV cards
foreach (@devices) {
- if (($< == 0) && (grep { $_->{driver} =~ '(bttv|saa7134)' } @devices)) {
+ if (( $< == 0) && (grep { $_->{driver} =~ '(bttv|saa7134|usbvision)' } @devices)) {
require harddrake::v4l;
require modules;
no strict 'subs';
@@ -147,8 +147,6 @@ if (@devices) {
modules::write_conf;
}
scan4channels();
- $in->exit(0);
- }
} else {
$in->ask_warn(N("No TV Card detected!"), formatAlaTeX(
N("No TV Card has been detected on your machine. Please verify that a Linux-supported Video/TV Card is correctly plugged in.
@@ -159,6 +157,7 @@ You can visit our hardware database at:
http://www.linux-mandrake.com/en/hardware.php3")));
}
+$in->exit(0) if defined $in;
# TODO: