From 8fe5ada6266a4d0ac2c1e413356ee149888db46f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 24 Sep 2002 15:02:18 +0000
Subject: move usb video devices to webcam category

---
 perl-install/harddrake/TODO    | 17 +++++++++++------
 perl-install/harddrake/data.pm |  4 ++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/perl-install/harddrake/TODO b/perl-install/harddrake/TODO
index 97140c97e..02e4bcff2 100644
--- a/perl-install/harddrake/TODO
+++ b/perl-install/harddrake/TODO
@@ -7,23 +7,28 @@
 *** enable the user to force a module (isa, isapnp, ...)
 *** pci freeze (fseek ?)
 *** print "NOT LOADED" if module isn't loaded
+** add bus_position to make unique id in ui
+** cdrom
+*** ide-scsi / ide-cd switch
+*** supermount switch
 
 ** draksound
 *** add a dialog so that the user choose its wavetable.
 *** list all availlables drivers, defaulting to first alternative, prepending old one with '*'
 *** add 'ALSA/OSS': tag to modules list
 
-* Postponed
-*** detect isapnp devices
-** more use of my_gtk/ugtk
-** use fbgtk+2 when booting on fbcon for smoother GUI => interactive::fbgtk
-*** fpons, convert perl-GTK to gtk+2 :-)
+** detect isapnp devices
+** ui
+*** more use of my_gtk/ugtk
+*** use fbgtk+2 when booting on fbcon for smoother GUI => interactive::fbgtk
+**** fpons, convert perl-GTK to gtk+2 :-)
+
 ** move all drakx tools into just a small one-liner that uses real <tool>.pm
     so that harddrake and mcc reduces their memory usage pattern and
     be faster (the next fast step will be to use perl6/parrot)
+
 ** check there're enough parameters in module config
 ** for to send a message for unknown hardware to install@mandrakesoft.com
-*** use drakbugreport ?
 
     Subject: [UNKNOW HARDWARE] or a new other ml
         -> do you konw how to configure it under linux ?
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 0da8974fa..c1bfd8669 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -33,13 +33,13 @@ our @tree =
 	["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' } @devices}, 0 ],
+	 sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} eq 'PCI' } @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 ],
 #	"MULTIMEDIA_AUDIO" => "/usr/bin/X11/sounddrake";
-	["WEBCAM","Webcam", "webcam.png", "", sub {}, 0 ],
+	["WEBCAM","Webcam", "webcam.png", "", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} ne 'PCI'} @devices }, 0 ],
 	["ETHERNET","Ethernetcard", "hw_network.png", "$sbindir/drakconnect", sub {
 	    #- generic NIC detection for USB seems broken (class, subclass, 
 	    #- protocol report are not accurate) so I'll need to verify against
-- 
cgit v1.2.1