[PATCH] dvb: collateral frontend changes

- [DVB] get_dvb_firmware: rework to reflect new frontend design, added
  additional firmware location

- [DVB] Kconfig and Makefile changes all over the place, remove Makefile.lib
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Documentation/dvb/get_dvb_firmware

@@ -21,7 +21,7 @@
 use File::Temp qw/ tempdir /;
 use IO::Handle;
 
-@components = ( "alps_tdlb7", "sp887x", "tda10045", "tda10046", "av7110", "dec2000t", "dec2540t", "dec3000s", "vp7041", "dibusb" );
+@components = ( "sp8870", "sp887x", "tda10045", "tda10046", "av7110", "dec2000t", "dec2540t", "dec3000s", "vp7041", "dibusb" );
 
 # Check args
 syntax() if (scalar(@ARGV) != 1);
@@ -32,7 +32,7 @@ for($i=0; $i < scalar(@components); $i++) {
     if ($cid eq $components[$i]) {
 	$outfile = eval($cid);
 	die $@ if $@;
-	print STDERR "Firmware $outfile extracted successfully. Now copy it to /usr/lib/hotplug/firmware/.\n";
+	print STDERR "Firmware $outfile extracted successfully. Now copy it to either /lib/firmware or /usr/lib/hotplug/firmware/ (depending on your hotplug version).\n";
 	exit(0);
     }
 }
@@ -47,11 +47,11 @@ syntax();
 # ---------------------------------------------------------------
 # Firmware-specific extraction subroutines
 
-sub alps_tdlb7 {
+sub sp8870 {
     my $sourcefile = "tt_Premium_217g.zip";
     my $url = "http://www.technotrend.de/new/217g/$sourcefile";
     my $hash = "53970ec17a538945a6d8cb608a7b3899";
-    my $outfile = "dvb-fe-tdlb7.fw";
+    my $outfile = "dvb-fe-sp8870.fw";
     my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
 
     checkstandard();

drivers/media/dvb/Kconfig

@@ -21,8 +21,6 @@ config DVB
 
 source "drivers/media/dvb/dvb-core/Kconfig"
 
-source "drivers/media/dvb/frontends/Kconfig"
-
 comment "Supported SAA7146 based PCI Adapters"
 	depends on DVB_CORE && PCI
 source "drivers/media/dvb/ttpci/Kconfig"
@@ -42,5 +40,8 @@ comment "Supported BT878 Adapters"
 	depends on DVB_CORE && PCI
 source "drivers/media/dvb/bt8xx/Kconfig"
 
-endmenu
+comment "Supported DVB Frontends"
+	depends on DVB_CORE
+source "drivers/media/dvb/frontends/Kconfig"
 
+endmenu

drivers/media/dvb/b2c2/Kconfig

 config DVB_B2C2_SKYSTAR
 	tristate "Technisat Skystar2 PCI"
 	depends on DVB_CORE && PCI
+	select DVB_STV0299
+	select DVB_MT352
 	help
 	  Support for the Skystar2 PCI DVB card by Technisat, which
 	  is equipped with the FlexCopII chipset by B2C2.

drivers/media/dvb/b2c2/Makefile

 obj-$(CONFIG_DVB_B2C2_SKYSTAR) += skystar2.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
+EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/

drivers/media/dvb/bt8xx/Kconfig

 config DVB_BT8XX
 	tristate "Nebula/Pinnacle PCTV/Twinhan PCI cards"
 	depends on DVB_CORE && PCI && VIDEO_BT848
+	select DVB_MT352
+	select DVB_SP887X
 	help
 	  Support for PCI cards based on the Bt8xx PCI bridge. Examples are
 	  the Nebula cards, the Pinnacle PCTV cards and Twinhan DST cards.

drivers/media/dvb/bt8xx/Makefile

 
-obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o
+obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o
 
 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/video -Idrivers/media/dvb/frontends
 

drivers/media/dvb/dibusb/Kconfig

 config DVB_DIBUSB
-	tristate "DiBcom/Twinhan/KWorld/Hama/Artec/Compro USB DVB-T devices"
+	tristate "DiBcom USB DVB-T devices (see help for device list)"
 	depends on DVB_CORE && USB
 	select FW_LOADER
+	select DVB_DIB3000MB
 	help
-	  Support for USB 1.1 DVB-T devices based on a reference design made by
+	  Support for USB 1.1 and 2.0 DVB-T devices based on reference designs made by
 	  DiBcom (http://www.dibcom.fr).
 
 	  Devices supported by this driver:
@@ -15,19 +16,35 @@ config DVB_DIBUSB
 	    DiBcom reference device (non-public)
 	    Ultima Electronic/Artec T1 USB TVBOX
 	    Compro Videomate DVB-U2000 - DVB-T USB
+	    Grandtec DVB-T USB
+	    Avermedia AverTV DVBT USB
+	    Yakumo DVB-T mobile USB2.0
 
 	  The VP7041 seems to be identical to "CTS Portable" (Chinese
 	  Television System).
 
 	  These devices can be understood as budget ones, they "only" deliver
-	  the MPEG data.
+	  (a part of) the MPEG2 transport stream.
 
-	  Currently all known copies of the DiBcom reference design have the DiBcom 3000-MB 
-	  frontend onboard. Please enable and load this one manually in order to use this
-	  device.
-
-	  A firmware is needed to use the device. See Documentation/dvb/README.dibusb
+	  A firmware is needed to get the device working. See Documentation/dvb/README.dibusb
 	  details.
 
 	  Say Y if you own such a device and want to use it. You should build it as
 	  a module.
+
+config DVB_DIBUSB_MISDESIGNED_AN2235
+	bool "Enable support for some Artec T1 device, which identifies as AN2235"
+	depends on DVB_DIBUSB
+	help
+	  Somehow Artec forgot to program the eeprom for some of their T1 devices. So
+	  comes that they identify with the default Vendor and Product ID of the Cypress
+	  CY7C64613 (AN2235).
+
+	  Say Y if your Artec device has 0x0574 as Vendor ID and 0x2235 as Product ID.
+
+config DVB_DIBCOM_DEBUG
+	bool "Enable extended debug support for DiBcom USB device"
+	depends on DVB_DIBUSB
+	help
+	  Say Y if you want to enable debuging. See modinfo dvb-dibusb for
+	  debug level.

drivers/media/dvb/dibusb/Makefile

 obj-$(CONFIG_DVB_DIBUSB) += dvb-dibusb.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
+EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/

drivers/media/dvb/dvb-core/Makefile

@@ -4,6 +4,6 @@
 
 dvb-core-objs = dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o \
 	        dvb_ca_en50221.o dvb_frontend.o \
-		dvb_net.o dvb_ksyms.o dvb_ringbuffer.o
+		dvb_net.o dvb_ringbuffer.o
 
 obj-$(CONFIG_DVB_CORE) += dvb-core.o

drivers/media/dvb/dvb-core/Makefile.lib

-obj-$(CONFIG_DVB_CORE)		+= crc32.o

drivers/media/dvb/frontends/Kconfig

+menu "Customise DVB Frontends"
+	depends on DVB_CORE
+
 comment "DVB-S (satellite) frontends"
 	depends on DVB_CORE
 
@@ -7,32 +10,23 @@ config DVB_STV0299
 	help
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 
-	  Some examples are the Alps BSRU6, the Philips SU1278 and
-	  the LG TDQB-S00x.
-
-	  If you don't know what tuner module is soldered on your 
-	  DVB adapter simply enable all supported frontends, the 
-	  right one will get autodetected.
-
 config DVB_CX24110
-	tristate "Connexant CX24110 based"
+	tristate "Conexant CX24110 based"
  	depends on DVB_CORE
  	help
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
  
- 	  If you don't know what tuner module is soldered on your
- 	  DVB adapter simply enable all supported frontends, the
- 	  right one will get autodetected.
-
-config DVB_GRUNDIG_29504_491
-	tristate "Grundig 29504-491 based"
+config DVB_TDA8083
+	tristate "Philips TDA8083 based"
 	depends on DVB_CORE
 	help
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 
-	  If you don't know what tuner module is soldered on your
-	  DVB adapter simply enable all supported frontends, the
-	  right one will get autodetected.
+config DVB_TDA80XX
+	tristate "Philips TDA8044 or TDA8083 based"
+	depends on DVB_CORE
+	help
+	  A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_MT312
 	tristate "Zarlink MT312 based"
@@ -40,81 +34,53 @@ config DVB_MT312
 	help
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 
-	  If you don't know what tuner module is soldered on your
-	  DVB adapter simply enable all supported frontends, the
-	  right one will get autodetected.
-
 config DVB_VES1X93
 	tristate "VLSI VES1893 or VES1993 based"
 	depends on DVB_CORE
 	help
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 
-	  If you don't know what tuner module is soldered on your
-	  DVB adapter simply enable all supported frontends, the
-	  right one will get autodetected.
-
 comment "DVB-T (terrestrial) frontends"
 	depends on DVB_CORE
 
-config DVB_SP887X
- 	tristate "Microtune sp887x based (i.e. Microtune DTF7072)"
+config DVB_SP8870
+ 	tristate "Spase sp8870 based"
 	depends on DVB_CORE
 	help
  	  A DVB-T tuner module. Say Y when you want to support this frontend.
 
 	  This driver needs external firmware. Please use the command
-	  "<kerneldir>/Documentation/dvb/get_dvb_firmware sp887x" to
+	  "<kerneldir>/Documentation/dvb/get_dvb_firmware sp8870" to
 	  download/extract it, and then copy it to /usr/lib/hotplug/firmware.
 
-	  If you don't know what tuner module is soldered on your 
-	  DVB adapter simply enable all supported frontends, the 
-	  right one will get autodetected.
-
-config DVB_ALPS_TDLB7
-	tristate "Alps TDLB7 based"
+config DVB_SP887X
+ 	tristate "Spase sp887x based"
 	depends on DVB_CORE
 	help
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 
 	  This driver needs external firmware. Please use the command
-	  "<kerneldir>/Documentation/dvb/get_dvb_firmware alps_tdlb7" to
+	  "<kerneldir>/Documentation/dvb/get_dvb_firmware sp887x" to
 	  download/extract it, and then copy it to /usr/lib/hotplug/firmware.
 
-	  If you don't know what tuner module is soldered on your 
-	  DVB adapter simply enable all supported frontends, the 
-	  right one will get autodetected.
-
-config DVB_ALPS_TDMB7
-	tristate "Alps TDMB7 based"
+config DVB_CX22700
+	tristate "Conexant CX22700 based"
 	depends on DVB_CORE
 	help
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 
-	  If you don't know what tuner module is soldered on your 
-	  DVB adapter simply enable all supported frontends, the 
-	  right one will get autodetected.
-
 config DVB_CX22702
  	tristate "Conexant cx22702 demodulator (OFDM)"
  	depends on DVB_CORE
  	help
  	  A DVB-T tuner module. Say Y when you want to support this frontend.
 
- 	  If you don't know what tuner module is soldered on your
- 	  DVB adapter simply enable all supported frontends, the
- 	  right one will get autodetected.
-
-config DVB_GRUNDIG_29504_401
-	tristate "Grundig 29504-401 based"
+config DVB_L64781
+	tristate "LSI L64781"
 	depends on DVB_CORE
 	help
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 
-	  If you don't know what tuner module is soldered on your 
-	  DVB adapter simply enable all supported frontends, the 
-	  right one will get autodetected.
-
 config DVB_TDA1004X
 	tristate "Philips TDA10045H/TDA10046H based"
 	depends on DVB_CORE
@@ -126,30 +92,18 @@ config DVB_TDA1004X
   	  "<kerneldir>/Documentation/dvb/get_dvb_firmware tda10046" to
 	  download/extract them, and then copy them to /usr/lib/hotplug/firmware.
 
-	  If you don't know what tuner module is soldered on your 
-	  DVB adapter simply enable all supported frontends, the 
-	  right one will get autodetected.
-
 config DVB_NXT6000
 	tristate "NxtWave Communications NXT6000 based"
 	depends on DVB_CORE
 	help
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 
-	  If you don't know what tuner module is soldered on your 
-	  DVB adapter simply enable all supported frontends, the 
-	  right one will get autodetected.
-
 config DVB_MT352
 	tristate "Zarlink MT352 based"
 	depends on DVB_CORE
 	help
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 
-	  If you don't know what tuner module is soldered on your
-	  DVB adapter simply enable all supported frontends, the
-	  right one will get autodetected.
-
 config DVB_DIB3000MB
 	tristate "DiBcom 3000-MB"
 	depends on DVB_CORE
@@ -157,14 +111,6 @@ config DVB_DIB3000MB
 	  A DVB-T tuner module. Designed for mobile usage. Say Y when you want
 	  to support this frontend.
 
-	  Used on USB-powered devices. You should also say Y to DVB_DIBUSB
-	  (DiBcom USB DVB-T Adapter) to support the actual device,
-	  this is "only" the frontend/tuner.
-
-	  If you don't know what tuner module is soldered on your
-	  DVB adapter simply enable all supported frontends, the
-	  right one will get autodetected.
-
 comment "DVB-C (cable) frontends"
 	depends on DVB_CORE
 
@@ -174,27 +120,22 @@ config DVB_ATMEL_AT76C651
         help
  	  A DVB-C tuner module. Say Y when you want to support this frontend.
 
-	  If you don't know what tuner module is soldered on your
-	  DVB adapter simply enable all supported frontends, the
-	  right one will get autodetected.
-
 config DVB_VES1820
 	tristate "VLSI VES1820 based"
 	depends on DVB_CORE
 	help
  	  A DVB-C tuner module. Say Y when you want to support this frontend.
 
-	  If you don't know what tuner module is soldered on your
-	  DVB adapter simply enable all supported frontends, the
-	  right one will get autodetected.
-
-comment "Misc. Frontend Modules"
+config DVB_TDA10021
+	tristate "Philips TDA10021 based"
 	depends on DVB_CORE
+	help
+ 	  A DVB-C tuner module. Say Y when you want to support this frontend.
 
-config DVB_TWINHAN_DST
-	tristate "Twinhan DST based DVB-S/-T frontend"
-	depends on DVB_CORE && DVB_BT8XX
+config DVB_STV0297
+	tristate "ST STV0297 based"
+	depends on DVB_CORE
 	help
-	  Used in such cards as the VP-1020/1030, Twinhan DST,
-	  VVmer TV@SAT. Say Y when you want to support frontends
-	  using this asic.
+	  A DVB-C tuner module. Say Y when you want to support this frontend.
+
+endmenu

drivers/media/dvb/frontends/Makefile

@@ -4,14 +4,13 @@
 
 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
 
-obj-$(CONFIG_DVB_TWINHAN_DST) += dst.o
 obj-$(CONFIG_DVB_STV0299) += stv0299.o
-obj-$(CONFIG_DVB_ALPS_TDLB7) += alps_tdlb7.o
-obj-$(CONFIG_DVB_ALPS_TDMB7) += alps_tdmb7.o
+obj-$(CONFIG_DVB_SP8870) += sp8870.o
+obj-$(CONFIG_DVB_CX22700) += cx22700.o
 obj-$(CONFIG_DVB_ATMEL_AT76C651) += at76c651.o
 obj-$(CONFIG_DVB_CX24110) += cx24110.o
-obj-$(CONFIG_DVB_GRUNDIG_29504_491) += grundig_29504-491.o
-obj-$(CONFIG_DVB_GRUNDIG_29504_401) += grundig_29504-401.o
+obj-$(CONFIG_DVB_TDA8083) += tda8083.o
+obj-$(CONFIG_DVB_L64781) += l64781.o
 obj-$(CONFIG_DVB_DIB3000MB) += dib3000mb.o
 obj-$(CONFIG_DVB_MT312) += mt312.o
 obj-$(CONFIG_DVB_VES1820) += ves1820.o
@@ -21,4 +20,6 @@ obj-$(CONFIG_DVB_SP887X) += sp887x.o
 obj-$(CONFIG_DVB_NXT6000) += nxt6000.o
 obj-$(CONFIG_DVB_MT352) += mt352.o
 obj-$(CONFIG_DVB_CX22702) += cx22702.o
-
+obj-$(CONFIG_DVB_TDA80XX) += tda80xx.o
+obj-$(CONFIG_DVB_TDA10021) += tda10021.o
+obj-$(CONFIG_DVB_STV0297) += stv0297.o

drivers/media/dvb/ttpci/Kconfig

@@ -4,6 +4,12 @@ config DVB_AV7110
 	select FW_LOADER
 	select VIDEO_DEV
 	select VIDEO_SAA7146_VV
+	select DVB_VES1820
+	select DVB_VES1X93
+	select DVB_STV0299
+	select DVB_TDA8083
+	select DVB_SP8870
+	select DVB_STV0297
 	help
 	  Support for SAA7146 and AV7110 based DVB cards as produced 
 	  by Fujitsu-Siemens, Technotrend, Hauppauge and others.
@@ -53,6 +59,12 @@ config DVB_BUDGET
 	tristate "Budget cards"
 	depends on DVB_CORE && PCI
 	select VIDEO_SAA7146
+	select DVB_STV0299
+	select DVB_VES1X93
+	select DVB_VES1820
+	select DVB_L64781
+	select DVB_TDA8083
+	select DVB_TDA10021
 	help
 	  Support for simple SAA7146 based DVB cards
 	  (so called Budget- or Nova-PCI cards) without onboard
@@ -67,6 +79,8 @@ config DVB_BUDGET_CI
 	tristate "Budget cards with onboard CI connector"
 	depends on DVB_CORE && PCI
 	select VIDEO_SAA7146
+	select DVB_STV0299
+	select DVB_TDA1004X
 	help
 	  Support for simple SAA7146 based DVB cards
 	  (so called Budget- or Nova-PCI cards) without onboard
@@ -85,6 +99,7 @@ config DVB_BUDGET_AV
 	depends on DVB_CORE && PCI
 	select VIDEO_DEV
 	select VIDEO_SAA7146_VV
+	select DVB_STV0299
 	help
 	  Support for simple SAA7146 based DVB cards
 	  (so called Budget- or Nova-PCI cards) without onboard
@@ -99,6 +114,9 @@ config DVB_BUDGET_PATCH
 	tristate "AV7110 cards with Budget Patch"
 	depends on DVB_CORE && DVB_BUDGET
 	select DVB_AV7110
+	select DVB_STV0299
+	select DVB_VES1X93
+	select DVB_TDA8083
 	help
 	  Support for Budget Patch (full TS) modification on 
 	  SAA7146+AV7110 based cards (DVB-S cards). This

drivers/media/dvb/ttpci/Makefile

@@ -11,7 +11,7 @@ obj-$(CONFIG_DVB_BUDGET_CI) += budget-core.o budget-ci.o ttpci-eeprom.o
 obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-core.o budget-patch.o ttpci-eeprom.o
 obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o ttpci-eeprom.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
+EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
 
 hostprogs-y	:= fdump
 

drivers/media/dvb/ttusb-budget/Kconfig

 config DVB_TTUSB_BUDGET
 	tristate "Technotrend/Hauppauge Nova-USB devices"
 	depends on DVB_CORE && USB
+	select DVB_CX22700
+	select DVB_TDA1004X
 	help
 	  Support for external USB adapters designed by Technotrend and
 	  produced by Hauppauge, shipped under the brand name 'Nova-USB'.

drivers/media/dvb/ttusb-budget/Makefile

 obj-$(CONFIG_DVB_TTUSB_BUDGET) += dvb-ttusb-budget.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
+EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends

drivers/media/dvb/ttusb-dec/Makefile

-obj-$(CONFIG_DVB_TTUSB_DEC) += ttusb_dec.o
+obj-$(CONFIG_DVB_TTUSB_DEC) += ttusb_dec.o ttusbdecfe.o
 
 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/