This commit was manufactured by cvs2svn to create tag 'V1_1_9_25mdk'.V1_1_9_25mdk

5 files changed, 0 insertions, 678 deletions

diff --git a/perl-install/harddrake/TODO b/perl-install/harddrake/TODO
deleted file mode 100644
index 2c7654c75..000000000
--- a/perl-install/harddrake/TODO
+++ /dev/null
@@ -1,171 +0,0 @@
--*- outline -*-
-
-* Harddrake TODO:
-** fixes
-*** non needed stuff to run X must be posponed after X11 startup
-**** eg: scanner/audio/printer/floppy/cdrom/tape/tv/webcam/joystick/ ... 
-*** add updfstab as in kudzu
-*** enable the user to force a module (isa, isapnp, ...)
-*** timeout on dialogs in service
-*** usb mouse in unknown
-*** pci freeze (fseek ?)
-*** 2detect/look 4
-**** pcmcia devices
-**** isapnp devices
-*** print "NOT LOADED" if module isn't loaded
-
-** soundrake
-*** add a dialog so that the user choose its wavetable.
-*** package'n patch alsaconf to prevent "alias sound-slot-0 snd-card-0"
-
-
-** validation:
-*** see dadou (GUI)
-*** qa team (test cases)
-
-
-* Postponed
-** 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 ?
-        -> description
-
-
-* ####################################################################
-* ####################################################################
-
-
-sub disconnect($$) {
-    my ($button, $sig) = @_;
-    if ($sig) {
-	   $button->signal_disconnect($sig);
-	   undef $sig;
-    }
-}
-
-* / no hope / useless :
-** enable a string to be passed as detector; in that case, do ourself the =~
-** alter detect_devices in order to only probe one time
-** detect *ALL* mouses if more than one (mousedrake?)
-
-**  deeper data structure in Mandrake 9.1 :
-
-    "Mass storage" => (Floppy,
-				   Disk,
-				   Cdrom,
-				   Tape)
-
-    "Network" => (Ethernetcard,
-			   Modem,
-			   Isdn)
-    "Multimedia" => (Videocard,
-				 Tvcard,
-				 Soundcard,
-				 Webcam)
-    "System" => (Bridge,
-			  Cpu,
-			  Memory)
-
-
-    "Publishing" => (Printer,
-				 Scanner)
-
-    "Pointing" => (Mouse,
-			    Joystick)
-
-    "Buses" => (Ideinterface,
-			 Scsiinterface,
-			 Usbinterface,
-			 );
-
-    "Unknown/Others",
-
-* ####################################################################
-
-* Suggestions
-** a dialog in harddrake to select the driver of choice. 
-easy way: greping pcitable for all known oss modules and alsa' snd-*
-ones, then build a hand hash (oss<->alsa modules names) that enable to
-get alsa or (respectively oss) module from oss (respectively alsa)
-module.
-then offering a window to switch from alsa to oss.
-
-** various
-Subject: Re: [Cooker] Optional ALSA Support for SB Live!
-From: Fabrice FACORAT <f.faber@netcourrier.com>
-To: cooker@linux-mandrake.com
-In-Reply-To: <m2ofhvtpaq.fsf@vador.mandrakesoft.com>
-References: <20020311051222.47DC087CA5@yavin.mandrax.org> 
-	<m2ofhvtpaq.fsf@vador.mandrakesoft.com>
-Date: 11 Mar 2002 11:12:31 +0100
-Message-Id: <1015841551.3895.31.camel@bastard.localdomain>
-
-Le lun 11/03/2002 à 10:41, Thierry Vignaud a écrit :
- 
-> >   In Mandrake 8.1 rerunning Harddrake post-setup would switch over
-> > to ALSA (which supports MIDI synth), however in 8.2 the only way to
-> > get ALSA support is to manually edit the modules.conf file. This
-> > would be disasterous for someone who isn't familar with
-> > modules.conf, but had been instructed on the mandrake-expert/newbie
-> > lists (as many had been) to simply rerun Harddrake on the sound card
-> > to get ALSA (and hence MIDI synth support).
-> 
-> give me the result of lspcidrake -f -v so that i switch your card
-> from oss to alsa.
-
-no please.
-just one month ago you switch SBLive from Alsa to OSS ( cause drakX
-set it as OSS and harddrake as Alsa ).
-There were also a discussion concerning the fact that Alsa doesn't
-support emu-tools and so all available options.
-Last but not least, several peoples report pbs with Alsa ( is sound is
-too high you have disturbances ). So someone is going to ask you for
-OSS as it want to use some features os SBLive, etc ...
-
-To my mind the best way for this ( but too late for 8.2 ) will be to
-have a tool called soundrake. Thanks to this tools, you choose at the
-beginning if you want to use OSS or alsa and then try to correctly
-configure your sound card. This tool should be able to work in
-embended mo in harddrake or harddrake2 ( infos concerning this so long
-awaiting harddrake 2 ? ).
-
-In order to make this tool be a perfect tool, it should be able to
-advice user concerning the advantage and the disadvantage of each
-driver ( indeed alsa sometimes is better than OSS as it support full
-duplex and wave mixing on more sound cards ).
-It's also disturbing is harddrake set alsa by default and XrakX set
-OSS by default as sometimes by lanching harddrake ( just to see what
-happen ) you lose ( or seems to lose ) your sound card ( mute mixer )
-
-For example :
-+ launch harddrake
-+ use autodetection : yes/no
-+ if auto detects enable, it detects a SBLive.
-+ explanations text concerning the fact that :
-   if I use OSS I will be able to use sounds effects, live drive and
-others things ( AC-3 passthrough ) thanks to the emu10k1-tools packages
-( available on CD sets and installable via Software Manager )
-   if I use Alsa, I won't be able to use emu10k1-tools but at the
-contrary I will be able to use midi software as alsa module support midi
-+ ask user which one he wants to use : OSS / Alsa ?
-+ set the sound card drivers and modules.conf according to user wishes
-+ <mode= dream> if I select OSS, installed emu10k1-tools and provide a
-GUI to configure them </mode = dream>
-+ <mode= dream> if I select Alsa unmute at least PCM and Vol or display
-a warning saying that by default Alsa mute everything ( configure alsa
-service so that it save mixer settings )
-+ test the sound ( mandrake sound theme )
-+ do you hear something ?
-+ yes -> your sound card have been properly set.
-+ if no -> try the others drivers set or send lspcidrake -v to
-somebody@somewhere.org to check for support for your sound card
-+ Do you ahave another sound card ?
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
deleted file mode 100644
index 4742f1d6b..000000000
--- a/perl-install/harddrake/data.pm
+++ /dev/null
@@ -1,82 +0,0 @@
-package harddrake::data;
-
-use strict;
-use detect_devices;
-use common;
-use class_discard;
-
-our (@ISA, @EXPORT_OK) = (qw(Exporter), (qw(version tree)));
-our ($version, $sbindir, $bindir) = ("1.1.8", "/usr/sbin", "/usr/bin");
-
-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)|BRIDGE|NETWORK/) && ($_->{driver} ne 'scanner') && $_->{type} ne 'network'} @devices;
-}
-
-
-# tree format ("CLASS_ID", "type", "type_icon", configurator, detect_sub)
-# NEVER, NEVER alter CLASS_ID or you'll harddrake2 service to detect changes
-# in hw configuration ... :-(
-
-our @tree =
-    (
-	["FLOPPY","Floppy", "floppy.png", "",\&detect_devices::floppies, 0 ],
-	["HARDDISK","Disk", "harddisk.png", "$sbindir/diskdrake", \&detect_devices::hds, 1 ],
-	["CDROM","CDROM", "cd.png", "", sub { grep { !(detect_devices::isBurner($_) || detect_devices::isDvdDrive($_)) } &detect_devices::cdroms } , 0 ],
-	["BURNER","CD/DVD burners", "cd.png", "", \&detect_devices::burners, 0 ],
-	["DVDROM","DVD-ROM", "cd.png", "", sub { grep { ! detect_devices::isBurner($_) } detect_devices::dvdroms}, 0 ],
-	["TAPE","Tape", "tape.png", "", \&detect_devices::tapes, 0 ],
-#	["CDBURNER","Cd burners", "cd.png", "", \&detect_devices::burners, 1 ],
-
-	["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 ],
-	["MULTIMEDIA_OTHER","Other MultiMedia devices", "tv.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 ],
-	["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
-	    #- known drivers :-(
-	    my @usbnet = qw/CDCEther catc kaweth pegasus usbnet/;
-	    # 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 ],
-#	["","Tokenring cards", "Ethernetcard.png", "", \&detect_devices::getNet, 1 ],
-#	["","FDDI cards", "Ethernetcard.png", "", \&detect_devices::getNet, 1 ],
-	["MODEM","Modem", "modem.png", "", sub { require network::modem; 
-									 my $modem;
-									 network::modem::modem_detect_backend($modem);
-									 grep { $modem->{device} } @{ $modem };
-								  } , 0 ],
-#	["","Isdn", "", "", \&detect_devices::getNet]
-
-	["BRIDGE","Bridge(s)", "memory.png", "", sub { grep { $_->{media_type} =~ 'BRIDGE' } @devices}, 0 ],
-# 	["","Cpu", "cpu.png", "", sub {}, 0 ],
-#	["","Memory", "memory.png", "", sub {}, 0 ],
-	["UNKNOWN","Unknown/Others", "unknown.png", "" , \&unknown, 0 ],
-
-	["PRINTER","Printer", "hw_printer.png", "$sbindir/printerdrake", 
-	 sub { 
-		require printerdrake; printerdrake::auto_detect(class_discard->new)  } , 0 ],
-	["SCANNER","Scanner", "scanner.png", "$sbindir/scannerdrake",
-	 sub { 
-		require scanner; scanner::detect() }, 0 ],
-	["MOUSE","Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub { 
-	    require mouse; &mouse::detect() } , 1 ],
-	["JOYSTICK","Joystick", "joystick.png", "", sub {}, 0 ],
-
-	["ATA_STORAGE","(E)IDE/ATA controllers", "ide_hd.png", "", sub { grep { $_->{media_type} =~ 'STORAGE_IDE' } @devices}, 0 ],
-	["SCSI_CONTROLLER","SCSI controllers", "scsi.png", "", sub { grep { $_->{media_type} =~ 'STORAGE_SCSI' } @devices}, 0 ],
-	["USB_CONTROLLER","USB controllers", "usb.png", "", sub { grep { $_->{media_type} =~ 'SERIAL_USB' } @devices}, 0 ],
-	["SMB_CONTROLLER","SMBus controllers", "usb.png", "", sub { grep { $_->{media_type} =~ 'SERIAL_SMBUS' } @devices}, 0 ],
-	);
-
-
-1;
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
deleted file mode 100644
index 2f235d711..000000000
--- a/perl-install/harddrake/sound.pm
+++ /dev/null
@@ -1,188 +0,0 @@
-package harddrake::sound;
-# lists filled with Danny Tholen help, enhanced by Thierry Vignaud
-#
-# No ALSA for OSS's 
-#    o tv cards: btaudio,
-#    o isa cards: msnd_pinnacle, pas2, 
-# No OSS for ALSA's
-#    o pci cards: snd-ali5451, snd-als4000, snd-es968, snd-fm801,
-#      snd-hdsp, snd-via8233
-#    o isa cards: snd-als100, snd-azt2320, snd-cmi8330, snd-cs4231,
-#      snd-cs4236, snd-dt0197h, snd-es18xx,snd-es1688, snd-ice1712,
-#      snd-korg1212, snd-rme32, snd-rme96
-#    o usb cards: snd-usb-audio
-
-# TODO: 
-#    o ensure sound isn't user (either dsp/midi/sequencer/mixer)
-#    o fix sound/alsa services
-
-use strict;
-use common;
-use interactive;
-use run_program;
-use modules;
-use standalone;
-
-my %alsa2oss = 
-    (
-	"snd-ad1816a" => [ "ad1816" ], # isa
-	"snd-ad1848"  => [ "ad1848" ], # isa
-	"snd-ali5451" => [ "unknown" ],
-	"snd-als100"  => [ "unknown" ], # isa
-	"snd-als4000" => [ "unknown" ],
-	"snd-azt2320" => [ "unknown" ], # isa
-	"snd-cmi8330" => [ "unknown" ], # isa
-	"snd-cmipci"  => [ "cmpci" ],
-	"snd-cs4231"  => [ "unknown" ], # isa
-	"snd-cs4232"  => [ "cs4232" ],  # isa
-	"snd-cs4236"  => [ "unknown" ], # isa
-	"snd-cs4281"  => [ "cs4281" ],
-	"snd-cs46xx"  => [ "cs46xx" ],
-	"snd-dt0197h" => [ "unknown" ], # isa
-	"snd-emu10k1" => [ "audigy", "emu10k1" ],
-	"snd-ens1370" => [ "es1370" ],
-	"snd-ens1371" => [ "es1371" ],
-	"snd-es1688"  => [ "unknown" ], # isa
-	"snd-es18xx"  => [ "unknown" ], # isa
-	"snd-es1938"  => [ "esssolo1" ],
-	"snd-es1968"  => [ "maestro" ], # isa
-	"snd-es968"   => [ "unknown" ],
-	"snd-fm801"   => [ "unknown"],
-	"snd-gusclassic" => [ "gus" ], # isa
-	"snd-gusextreme" => [ "gus" ], # isa
-	"snd-gusmax"  => [ "gus" ],    # isa
-	"snd-hdsp" => [ "unknown" ],
-	"snd-ice1712" => [ "unknown" ], # isa
-	"snd-intel8x0" => [ "i810_audio" ],
-	"snd-interwave" => [ "gus" ],  # isa
-	"snd-korg1212" => [ "unknown" ], # isa
-	"snd-maestro3" => [ "maestro3" ],
-	"snd-mpu401"  => [ "mpu401" ],
-	"snd-nm256"   => [ "nm256_audio" ],
-	"snd-opl3sa2" => [ "opl3", "opl3sa", "opl3sa2" ], # isa
-	"snd-opti93x" => [ "mad16" ],
-	"snd-rme32"   => [ "unknown" ], # isa
-	"snd-rme96"   => [ "unknown" ], # isa
-	"snd-rme9652g" => [ "rme96xx" ],
-	"snd-sb16"    => ["sscape", "sb"],
-	"snd-sb8"     => [ "sb" ],
-	"snd-sbawe"   => [ "awe_wave" ],
-	"snd-sgalaxy" => [ "sgalaxy" ], # isa
-	"snd-sonicvibes" => [ "sonicvibes" ],
-	"snd-trident" => [ "trident" ],
-	"snd-usb-audio" => [ "unknown" ], # usb
-	"snd-via686"  => [ "via82cxxx_audio" ],
-	"snd-via8233" => [ "unknown" ],
-	"snd-wavefront" => [ "wavefront" ], # isa
-	"snd-ymfpci"  => [ "ymfpci" ]
-	);
-
-
-my %oss2alsa = 
-    (
-	"ad1816"  => [ "snd-ad1816a" ],
-	"ad1848"  => [ "snd-ad1848" ],
-	"audigy"  => [ "snd-emu10k1" ],
-	"awe_wave" => [ "snd-sbawe" ],
-	"btaudio" => [ "unknown" ],
-	"cmpci"   => [ "snd-cmipci" ],
-	"cs4232"  => [ "snd-cs4232" ],
-	"cs4281"  => [ "snd-cs4281" ],
-	"cs46xx"  => [ "snd-cs46xx" ],
-	"emu10k1" => [ "snd-emu10k1" ],
-	"es1370"  => [ "snd-ens1370" ],
-	"es1371"  => [ "snd-ens1371" ],
-	"esssolo1" => [ "snd-es1938" ],
-	"gus"     => ["snd-interwave", "snd-gusclassic", "snd-gusmax", "snd-gusextreme"],
-	"i810_audio" => [ "snd-intel8x0"],
-	"mad16"   => [ "snd-opti93x" ],
-	"maestro" => [ "snd-es1968" ],
-	"maestro3" => [ "snd-maestro3" ],
-	"mpu401"  => [ "snd-mpu401" ],
-	"msnd_pinnacle" => [ "unknown" ],
-	"msnd_pinnacle" =>  [ "unknown" ],
-	"nm256_audio" => [ "snd-nm256" ],
-	"opl3"    => [ "snd-opl3sa2" ],
-	"opl3sa"  => [ "snd-opl3sa2" ],
-	"opl3sa2" => [ "snd-opl3sa2" ],
-	"pas2"    => [ "unknown" ],
-	"rme96xx" => [ "snd-rme9652.o.g" ],
-	"sb"      => ["snd-sb8", "snd-sb16"],
-	"sgalaxy" => [ "snd-sgalaxy" ],
-	"sonicvibes" => [ "snd-sonicvibes" ],
-	"sscape"  => [ "snd-sb16" ],
-	"trident" => [ "snd-trident" ],
-	"via82cxxx_audio" => [ "snd-via686" ],
-	"wavefront" => [ "snd-wavefront" ],
-	"ymfpci"  => [ "snd-ymfpci" ]
-	);
-
-sub get_alternative {
-    my ($driver) = @_;
-    if ($alsa2oss{$driver}) {
-	   $alsa2oss{$driver};
-    } elsif ($oss2alsa{$driver}) {
-	   $oss2alsa{$driver}
-    } else { undef }
-}
-
-sub do_switch {
-    my ($old_driver, $new_driver) = @_;
-    standalone::explanations("removing old $old_driver\n");
-    run_program::run("service sound stop");
-    run_program::run("service alsa stop") if $old_driver =~ /^snd-/;
-    modules::unload($old_driver); #    run_program("/sbin/modprobe -r $driver"); # just in case ...
-    modules::remove_module($old_driver); # completed by the next add_alias()
-    modules::add_alias("sound-slot-$::i", $new_driver);
-    modules::write_conf;
-    if ($new_driver =~ /^snd-/) {
-	   run_program::run("service alsa start");
-	   run_program::run("/sbin/chkconfig --add alsa");
-	   modules::load($new_driver); # service alsa is buggy
-    } else { run_program::run("/sbin/chkconfig --del alsa") }
-    standalone::explanations("loading new $new_driver\n");
-    run_program::run("/sbin/chkconfig --add sound"); # just in case ...
-    run_program::run("service sound start");
-}
-
-sub switch {
-    my ($in, $device) = @_;
-    my $driver = $device->{driver};
-    my $alternative = get_alternative($driver);
-    if ($alternative) {
-	   my $new_driver = $alternative->[0];
-	   if ($new_driver eq "unknown") {
-		  $in->ask_warn(_("No alternative driver"),
-							_("There's no known OSS/ALSA alternative driver for your sound card (%s)",
-							  $device->{description}));
-	   } elsif ($in->ask_from(_("Sound configuration"),
-						 _("Here you can select an alternative driver (either OSS or ALSA) for your sound card (%s)",
-							  $device->{description}),
-						 [
-						  { label => _("Driver:"), val => \$new_driver, list => $alternative, default => $new_driver, sort =>1, format => sub {
-							 my %des = modules::category2modules_and_description('multimedia/sound');
-							 "$_[0] (". $des{$_[0]} . ')'
-						  }, allow_empty_list => 1 }
-						  ]))
-	   {
-		  standalone::explanations("switching audio driver from '$driver' to '$new_driver'\n");
-		  do_switch($driver, $new_driver);
-	   }
-    } elsif ($driver eq "unknown") {
-	   $in->ask_warn(_("No known driver"), 
-						 _("There's no known driver for your sound card (%s)",
-							  $device->{description}));
-    } else {
-	   $in->ask_warn(_("Unkown driver"), 
-							 _("The \"%s\" driver for your sound card is unlisted\n
-Please send the output of the \"lspcidrake -v\" command to
-Thierry Vignaud <tvignaud at mandrakesoft dot com>
-with subject: unlisted sound driver")
-							   , $driver);
-    }
-}
-
-sub config {
-    my ($in, $device) = @_;
-    switch($in, $device);
-}
diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm
deleted file mode 100644
index b9636ab06..000000000
--- a/perl-install/harddrake/ui.pm
+++ /dev/null
diff --git a/perl-install/harddrake/v4l.pm b/perl-install/harddrake/v4l.pm
deleted file mode 100644
index aa80e2fd8..000000000
--- a/perl-install/harddrake/v4l.pm
+++ /dev/null
@@ -1,237 +0,0 @@
-package harddrake::v4l;
-
-use strict;
-
-use standalone;
-use interactive;
-use detect_devices;
-use lang;
-use log;
-use common;
-use modules;
-
-# please update me on bttv update :
-
-my $default = _("Auto-detect");
-# TODO: split %tuners_lst in per driver perl source files that get transformed in Storable files
-my %tuners_lst = 
-    (
-	-1 => $default,
-	0 => "Temic|PAL (4002 FH5)",
-	1 => "Philips|PAL_I (FI1246 and compatibles)",
-	2 => "Philips|NTSC (FI1236 and compatibles)",
-	3 => "Philips|(SECAM+PAL_BG) (FI1216MF, FM1216MF, FR1216MF)",
-	4 => "NoTuner",
-	5 => "Philips|PAL_BG (FI1216 and compatibles)",
-	6 => "Temic|NTSC (4032 FY5)",
-	7 => "Temic|PAL_I (4062 FY5)",
-	8 => "Temic|NTSC (4036 FY5)",
-	9 => "Alps|HSBH1",
-	10 => "Alps|TSBE1",
-	11 => "Alps|TSBB5",
-	12 => "Alps|TSBE5",
-	13 => "Alps|TSBC5",
-	14 => "Temic|PAL_BG (4006FH5)",
-	15 => "Alps|TSCH6",
-	16 => "Temic|PAL_DK (4016 FY5)",
-	17 => "Philips|NTSC_M (MK2)",
-	18 => "Temic|PAL_I (4066 FY5)",
-	19 => "Temic|PAL* auto (4006 FN5)",
-	20 => "Temic|PAL_BG (4009 FR5) or PAL_I (4069 FR5)",
-	21 => "Temic|NTSC (4039 FR5)",
-	22 => "Temic|PAL/SECAM multi (4046 FM5)",
-	23 => "Philips|PAL_DK (FI1256 and compatibles)",
-	24 => "Philips|PAL/SECAM multi (FQ1216ME)",
-	25 => "LG|PAL_I+FM (TAPC-I001D)",
-	26 => "LG|PAL_I (TAPC-I701D)",
-	27 => "LG|NTSC+FM (TPI8NSR01F)",
-	28 => "LG|PAL_BG+FM (TPI8PSB01D)",
-	29 => "LG|PAL_BG (TPI8PSB11D)",
-	30 => "Temic|PAL* auto + FM (4009 FN5)",
-	31 => "SHARP|NTSC_JP (2U5JF5540)",
-	32 => "Samsung|PAL TCPM9091PD27",
-	33 => "MT2032|universal",
-	34 => "Temic|PAL_BG (4106 FH5)",
-	35 => "Temic|PAL_DK/SECAM_L (4012 FY5)",
-	36 => "Temic|NTSC (4136 FY5)",
-	37 => "LG|PAL (newer TAPC series)",
-	38 => "Philips|PAL/SECAM multi (FM1216ME)",
-	39 => "LG NTSC (newer TAPC series)"
-	);
-
-# Tweaked from Cardlist
-my $cards_lst = {
-    'bttv' => {
-	   _("Auto-detect") => -1,
-	   _("Unknown|Generic") => 0,
-	   "M|Miro|PCTV" => 1,
-	   "Hauppauge|bt848" => 2,
-	   "S|STB|Hauppauge 878" => 3,
-	   "I|Intel|Create and Share PCI (bttv type 4)" => 4,
-	   "I|Intel|Smart Video Recorder III (bttv type 4)" => 4,
-	   "D|Diamond|DTV2000" => 5,
-	   "A|AVerMedia|TVPhone" => 6,
-	   "M|MATRIX-Vision|MV-Delta" => 7,
-	   "L|Lifeview|FlyVideo II (Bt848) LR26" => 8,
-	   "G|Genius/Kye|Video Wonder Pro II (848 or 878)" => 8,
-	   "I|IMS/IXmicro|TurboTV" => 9,
-	   "Hauppauge|bt878" => 10,
-	   "M|Miro|PCTV pro" => 11,
-	   "A|ADS Technologies|Channel Surfer TV (bt848)" => 12,
-	   "A|AVerMedia|TVCapture 98" => 13,
-	   "A|Aimslab|Video Highway Xtreme (VHX)" => 14,
-	   "Z|Zoltrix|TV-Max" => 15,
-	   "P|Prolink|Pixelview PlayTV (bt878)" => 16,
-	   "L|Leadtek|WinView 601" => 17,
-	   "A|AVEC|Intercapture" => 18,
-	   "L|Lifeview|FlyKit LR38 Bt848 (capture only)" => 19,
-	   "L|Lifeview|FlyVideo II EZ" => 19,
-	   "C|CEI|Raffles Card" => 20,
-	   "L|Lifeview|FlyVideo 98" => 21,
-	   "L|Lucky Star|Image World ConferenceTV LR50" => 21,
-	   "A|Askey|CPH050" => 22,
-	   "P|Phoebe Micro|Tv Master + FM" => 22,
-	   "M|Modular|Technology MM205 PCTV (bt878)" => 23,
-	   "A|Askey|CPH06X (bt878)" => 24,
-	   "G|Guillemot|Maxi TV Video 3" => 24,
-	   "A|Askey|CPH05X (bt878)" => 24,
-	   _("Unknown|CPH05X (bt878) [many vendors]") => 24,
-	   _("Unknown|CPH06X (bt878) [many vendors]") => 24,
-	   "T|Terratec|Terra TV+ Version 1.0 (Bt848)" => 25,
-	   "Vobis|TV-Boostar" => 25,
-	   "T|Terratec|TV-Boostar" => 25,
-	   "Hauppauge|WinCam newer (bt878)" => 26,
-	   "L|Lifeview|FlyVideo 98" => 27,
-	   "G|Guillemot|MAXI TV Video PCI2 LR50" => 27,
-	   "T|Terratec|TerraTV+" => 28,
-	   "I|Imagenation|PXC200" => 29,
-	   "L|Lifeview|FlyVideo 98 LR50" => 30,
-	   "Formac|iProTV" => 31,
-	   "I|Intel|Create and Share PCI (bttv type 32)" => 32,
-	   "I|Intel|Smart Video Recorder III (bttv type 32)" => 32,
-	   "T|Terratec|TerraTValue" => 33,
-	   "L|Leadtek|WinFast TV 2000" => 34,
-	   "L|Leadtek|WinFast VC 100" => 35,
-	   "L|Lifeview|FlyVideo 98 LR50" => 35,
-	   "C|Chronos|Video Shuttle II" => 35,
-	   "L|Lifeview|FlyVideo 98FM LR50" => 36,
-	   "T|Typhoon|TView TV/FM Tuner" => 36,
-	   "P|Prolink|PixelView PlayTV pro" => 37,
-	   "P|Prolink|PixelView PlayTV Theater" => 37,
-	   "A|Askey|CPH06X TView99" => 38,
-	   "P|Pinnacle|PCTV Studio/Rave" => 39,
-	   "S|STB|STB2 TV PCI FM, P/N 6000704" => 40,
-	   "A|AVerMedia|TVPhone 98" => 41,
-	   "P|ProVideo|PV951" => 42,
-	   "L|Little|OnAir TV" => 43,
-	   "S|Sigma|TVII-FM" => 44,
-	   "M|MATRIX-Vision|MV-Delta 2" => 45,
-	   "Z|Zoltrix|Genie TV/FM" => 46,
-	   "T|Terratec|TV/Radio+" => 47,
-	   "A|Askey|CPH03x" => 48,
-	   "D|Dynalink|Magic TView" => 48,
-	   "I|IODATA|GV-BCTV3/PCI" => 49,
-	   "P|Prolink|PixelView PlayTV PAK" => 50,
-	   "L|Lenco|MXTV-9578 CP" => 50,
-	   "P|Prolink|PV-BT878P+4E" => 50,
-	   "L|Lenco|MXTV-9578CP (Bt878)" => 50,
-	   "Eagle|Wireless Capricorn2 (bt878A)" => 51,
-	   "P|Pinnacle|PCTV Studio Pro" => 52,
-	   "T|Typhoon|KNC1 TV Station RDS" => 53,
-	   "T|Typhoon|TV Tuner RDS (black package)" => 53,
-	   "T|Typhoon|TView RDS + FM Stereo" => 53,
-	   "L|Lifeview|FlyVideo 2000" => 54,
-	   "L|Lifeview|FlyVideo A2" => 54,
-	   "L|Lifetec|LT 9415 TV [LR90]" => 54,
-	   "A|Askey|CPH031" => 55,
-	   "L|Lenco|MXR-9571 (Bt848)" => 55,
-	   "Bestbuy|Easy TV" => 55,
-	   "L|Lifeview|FlyVideo 98FM LR50" => 56,
-	   "G|GrandTec|Grand Video Capture (Bt848)" => 57,
-	   "A|Askey|CPH060" => 58,
-	   "P|Phoebe Micro|TV Master Only (No FM)" => 58,
-	   "A|Askey|CPH03x TV Capturer" => 59,
-	   "M|Modular|Technology MM100 PCTV" => 60,
-	   "A|AG|Electronics GMV1" => 61,
-	   "A|Askey|CPH061" => 62,
-	   "Bestbuy|Easy TV (bt878)" => 62,
-	   "L|Lifetec|LT9306" => 62,
-	   "M|Medion|MD9306" => 62,
-	   "A|ATI|TV-Wonder" => 63,
-	   "A|ATI|TV-Wonder VE" => 64,
-	   "L|Lifeview|FlyVideo 2000S LR90" => 65,
-	   "T|Terratec|TValueRadio" => 66,
-	   "I|IODATA|GV-BCTV4/PCI" => 67,
-	   "3Dfx|VoodooTV FM (Euro)" => 68,
-	   "3Dfx|VoodooTV 200 (USA)" => 68,
-	   "A|Active|Imaging AIMMS" => 69,
-	   "P|Prolink|Pixelview PV-BT878P+ (Rev.4C)" => 70,
-	   "L|Lifeview|FlyVideo 98EZ (capture only) LR51" => 71,
-#	"G|Genius/Kye|Video Wonder/Genius Internet Video Kit" => 71,
-	   "P|Prolink|Pixelview PV-BT878P+ (Rev.9B) (PlayTV Pro rev.9B FM+NICAM)" => 72,
-	   "T|Typhoon|TV Tuner Pal BG (blue package)" => 72,
-	   "S|Sensoray|311" => 73,
-	   "RemoteVision|MX (RV605)" => 74,
-	   "P|Powercolor|MTV878" => 75,
-	   "P|Powercolor|MTV878R" => 75,
-	   "P|Powercolor|MTV878F" => 75,
-	   "C|Canopus|WinDVR PCI (COMPAQ Presario 3524JP, 5112JP)" => 76,
-	   "G|GrandTec|Multi Capture Card (Bt878)" => 77,
-	   "Jetway|TV/Capture JW-TV878-FBK" => 78,
-	   "Kworld|KW-TV878RF" => 78,
-	   "D|DSP Design|TCVIDEO" => 79,
-	   "Hauppauge|WinTV PVR" => 80
-	   },
-	  'saa7134' => {
-		 _("Unknown|Generic") => 0,
-		 "Proteus|Pro [philips reference design]" => 1,
-		 "LifeView|FlyVIDEO3000" => 2,
-		 "LifeView|FlyVIDEO2000" => 3,
-		 "EMPRESS" => 4,
-		 "SKNet|Monster TV" => 5,
-		 "Tevion|MD 9717" => 6,
-		 "KNC|One TV-Station RDS" => 7,
-		 "Terratec|Cinergy 400 TV" => 8,
-		 "Medion|5044" => 9
-		 }
-	   };
-
-my %pll_lst = 
-    (
-	-1 => _("Default"),
-	0 => "don't use pll",
-	1 => "28 Mhz Crystal (X)",
-	2 =>"35 Mhz Crystal"
-	);
-
-sub config {
-    my ($in, $driver) = @_;
-    my %conf = (gbuffers => 4, card => $default, tuner => -1, radio => 0, pll => -1);
-    if ($in->ask_from("BTTV configuration", _("For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters.
-If your card is misdetected, you can force the right tuner and card types here. Just select your tv card parameters if needed"),
-				  [
-				   { label => _("Card model:"), val => \$conf{card}, list => [keys %{$cards_lst->{$driver}}], type => 'combo', default => -1, sort =>1, separator => '|'},
-				   { label => _("Tuner type:"), val => \$conf{tuner}, list => [keys %tuners_lst], format => sub { $tuners_lst{$_[0]} }, sort => 1, separator => '|'},
-				   { label => _("Number of capture buffers:"), val => \$conf{gbuffers}, min=>2, max=>32, sort => 1, default => 0, type=>'range', advanced =>1, help => _("number of capture buffers for mmap'ed capture")},				   
-				   if_($driver eq 'bttv',
-				   { label => _("PLL setting:"), val => \$conf{pll}, list => [keys %pll_lst], format => sub { $pll_lst{$_[0]} }, sort => 1, default => 0, advanced =>1},
-				   { label => _("Radio support:"), val => \$conf{radio}, type => "bool", text => _("enable radio support")}),
-				   ]
-				  ))
-    {
-	   $conf{card}=$cards_lst->{$driver}{$conf{card}};
-
-	   my $options = 
-	     'radio=' . ($conf{radio} ? 1 : 0) . ' '.
-	     join(' ', map { if_($conf{$_} ne -1, "$_=$conf{$_}") } qw(card pll tuner gbuffers));
-	   if ($options) {
-		  log::l("[harddrake::bttv] $options");
-		    standalone::explanations("modified file /etc/modules.conf ($options)") if $::isStandalone;
-		    modules::set_options("bttv", $options);
-		}
-	 }
-}
-
-
-
-1;