[2.6 patch] remove DVB_AV7110_FIRMWARE

[2.6 patch] remove DVB_AV7110_FIRMWARE

[Adrian Bunk]

DVB_AV7110_FIRMWARE was (except for some OSS drivers) the only option 
that was still compiling a binary-only user-supplied firmware file at 
build-time into the kernel.

This patch changes the driver to always use the standard 
request_firmware() way for firmware by removing DVB_AV7110_FIRMWARE.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 drivers/media/dvb/ttpci/Kconfig  |   20 --------------
 drivers/media/dvb/ttpci/Makefile |    8 -----
 drivers/media/dvb/ttpci/av7110.c |   15 ----------
 drivers/media/dvb/ttpci/fdump.c  |   44 -------------------------------
 4 files changed, 1 insertion(+), 86 deletions(-)

--- linux-2.6.19-rc6-mm1/drivers/media/dvb/ttpci/Kconfig.old	2006-11-26 00:41:45.000000000 +0100
+++ linux-2.6.19-rc6-mm1/drivers/media/dvb/ttpci/Kconfig	2006-11-26 00:42:06.000000000 +0100
@@ -1,7 +1,7 @@
 config DVB_AV7110
 	tristate "AV7110 cards"
 	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
-	select FW_LOADER if !DVB_AV7110_FIRMWARE
+	select FW_LOADER
 	select VIDEO_SAA7146_VV
 	select DVB_PLL
 	select DVB_VES1820 if !DVB_FE_CUSTOMISE
@@ -26,24 +26,6 @@
 
 	  Say Y if you own such a card and want to use it.
 
-config DVB_AV7110_FIRMWARE
-	bool "Compile AV7110 firmware into the driver"
-	depends on DVB_AV7110 && !STANDALONE
-	default y if DVB_AV7110=y
-	help
-	  The AV7110 firmware is normally loaded by the firmware hotplug manager.
-	  If you want to compile the firmware into the driver you need to say
-	  Y here and provide the correct path of the firmware. You need this
-	  option if you want to compile the whole driver statically into the
-	  kernel.
-
-	  All other people say N.
-
-config DVB_AV7110_FIRMWARE_FILE
-	string "Full pathname of av7110 firmware file"
-	depends on DVB_AV7110_FIRMWARE
-	default "/usr/lib/hotplug/firmware/dvb-ttpci-01.fw"
-
 config DVB_AV7110_OSD
 	bool "AV7110 OSD support"
 	depends on DVB_AV7110
--- linux-2.6.19-rc6-mm1/drivers/media/dvb/ttpci/Makefile.old	2006-11-26 00:42:15.000000000 +0100
+++ linux-2.6.19-rc6-mm1/drivers/media/dvb/ttpci/Makefile	2006-11-26 00:42:28.000000000 +0100
@@ -13,11 +13,3 @@
 
 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
 
-hostprogs-y	:= fdump
-
-ifeq ($(CONFIG_DVB_AV7110_FIRMWARE),y)
-$(obj)/av7110.o: $(obj)/av7110_firm.h
-
-$(obj)/av7110_firm.h: $(obj)/fdump
-	$(obj)/fdump $(CONFIG_DVB_AV7110_FIRMWARE_FILE) dvb_ttpci_fw $@
-endif
--- linux-2.6.19-rc6-mm1/drivers/media/dvb/ttpci/av7110.c.old	2006-11-26 00:43:18.000000000 +0100
+++ linux-2.6.19-rc6-mm1/drivers/media/dvb/ttpci/av7110.c	2006-11-26 00:43:58.000000000 +0100
@@ -1484,20 +1484,6 @@
 	return 0;
 }
 
-#ifdef CONFIG_DVB_AV7110_FIRMWARE_FILE
-#include "av7110_firm.h"
-static void put_firmware(struct av7110* av7110)
-{
-	av7110->bin_fw = NULL;
-}
-
-static inline int get_firmware(struct av7110* av7110)
-{
-	av7110->bin_fw = dvb_ttpci_fw;
-	av7110->size_fw = sizeof(dvb_ttpci_fw);
-	return check_firmware(av7110);
-}
-#else
 static void put_firmware(struct av7110* av7110)
 {
 	vfree(av7110->bin_fw);
@@ -1546,7 +1532,6 @@
 	release_firmware(fw);
 	return ret;
 }
-#endif
 
 
 static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
--- linux-2.6.19-rc6-mm1/drivers/media/dvb/ttpci/fdump.c	2006-09-20 05:42:06.000000000 +0200
+++ /dev/null	2006-09-19 00:45:31.000000000 +0200
@@ -1,44 +0,0 @@
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-int main(int argc, char **argv)
-{
-    unsigned char buf[8];
-    unsigned int i, count, bytes = 0;
-    FILE *fd_in, *fd_out;
-
-    if (argc != 4) {
-	fprintf(stderr, "\n\tusage: %s <ucode.bin> <array_name> <output_name>\n\n", argv[0]);
-	return -1;
-    }
-
-    fd_in = fopen(argv[1], "rb");
-    if (fd_in == NULL) {
-	fprintf(stderr, "firmware file '%s' not found\n", argv[1]);
-	return -1;
-    }
-
-    fd_out = fopen(argv[3], "w+");
-    if (fd_out == NULL) {
-	fprintf(stderr, "cannot create output file '%s'\n", argv[3]);
-	return -1;
-    }
-
-    fprintf(fd_out, "\n#include <asm/types.h>\n\nu8 %s [] = {", argv[2]);
-
-    while ((count = fread(buf, 1, 8, fd_in)) > 0) {
-	fprintf(fd_out, "\n\t");
-	for (i = 0; i < count; i++, bytes++)
-	    fprintf(fd_out, "0x%02x, ", buf[i]);
-    }
-
-    fprintf(fd_out, "\n};\n\n");
-
-    fclose(fd_in);
-    fclose(fd_out);
-
-    return 0;
-}

Re: [v4l-dvb-maintainer] [2.6 patch] remove DVB_AV7110_FIRMWARE

[Trent Piepho]

On Sun, 26 Nov 2006, Adrian Bunk wrote:
> DVB_AV7110_FIRMWARE was (except for some OSS drivers) the only option
> that was still compiling a binary-only user-supplied firmware file at
> build-time into the kernel.
>
> This patch changes the driver to always use the standard
> request_firmware() way for firmware by removing DVB_AV7110_FIRMWARE.

Doesn't this also prevent the AV7110 module from getting compiled
into the kernel?  Shouldn't the Kconfig file be adjusted so
that 'y' can't be selected anymore and it depends on MODULES?

Re: [v4l-dvb-maintainer] [2.6 patch] remove DVB_AV7110_FIRMWARE

[Adrian Bunk]

On Tue, Nov 28, 2006 at 01:06:02PM -0800, Trent Piepho wrote:
> On Sun, 26 Nov 2006, Adrian Bunk wrote:
> > DVB_AV7110_FIRMWARE was (except for some OSS drivers) the only option
> > that was still compiling a binary-only user-supplied firmware file at
> > build-time into the kernel.
> >
> > This patch changes the driver to always use the standard
> > request_firmware() way for firmware by removing DVB_AV7110_FIRMWARE.
> 
> Doesn't this also prevent the AV7110 module from getting compiled
> into the kernel?  Shouldn't the Kconfig file be adjusted so
> that 'y' can't be selected anymore and it depends on MODULES?

No.
No.

request_firmware() works fine for built-in drivers.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [v4l-dvb-maintainer] [2.6 patch] remove DVB_AV7110_FIRMWARE

[Trent Piepho]

On Wed, 29 Nov 2006, Adrian Bunk wrote:
> On Tue, Nov 28, 2006 at 01:06:02PM -0800, Trent Piepho wrote:
> > On Sun, 26 Nov 2006, Adrian Bunk wrote:
> > > DVB_AV7110_FIRMWARE was (except for some OSS drivers) the only option
> > > that was still compiling a binary-only user-supplied firmware file at
> > > build-time into the kernel.
> > >
> > > This patch changes the driver to always use the standard
> > > request_firmware() way for firmware by removing DVB_AV7110_FIRMWARE.
> >
> > Doesn't this also prevent the AV7110 module from getting compiled
> > into the kernel?  Shouldn't the Kconfig file be adjusted so
> > that 'y' can't be selected anymore and it depends on MODULES?
>
> No.
> No.
>
> request_firmware() works fine for built-in drivers.

Wouldn't that require loading the firmware file before the filesystems are
mounted?

Re: [v4l-dvb-maintainer] [2.6 patch] remove DVB_AV7110_FIRMWARE

[Adrian Bunk]

On Tue, Nov 28, 2006 at 08:45:56PM -0800, Trent Piepho wrote:
> On Wed, 29 Nov 2006, Adrian Bunk wrote:
> > On Tue, Nov 28, 2006 at 01:06:02PM -0800, Trent Piepho wrote:
> > > On Sun, 26 Nov 2006, Adrian Bunk wrote:
> > > > DVB_AV7110_FIRMWARE was (except for some OSS drivers) the only option
> > > > that was still compiling a binary-only user-supplied firmware file at
> > > > build-time into the kernel.
> > > >
> > > > This patch changes the driver to always use the standard
> > > > request_firmware() way for firmware by removing DVB_AV7110_FIRMWARE.
> > >
> > > Doesn't this also prevent the AV7110 module from getting compiled
> > > into the kernel?  Shouldn't the Kconfig file be adjusted so
> > > that 'y' can't be selected anymore and it depends on MODULES?
> >
> > No.
> > No.
> >
> > request_firmware() works fine for built-in drivers.
> 
> Wouldn't that require loading the firmware file before the filesystems are
> mounted?

Sure.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [v4l-dvb-maintainer] [2.6 patch] remove DVB_AV7110_FIRMWARE

[Oliver Endriss]

Adrian Bunk wrote:
> On Tue, Nov 28, 2006 at 08:45:56PM -0800, Trent Piepho wrote:
> > On Wed, 29 Nov 2006, Adrian Bunk wrote:
> > > On Tue, Nov 28, 2006 at 01:06:02PM -0800, Trent Piepho wrote:
> > > > On Sun, 26 Nov 2006, Adrian Bunk wrote:
> > > > > DVB_AV7110_FIRMWARE was (except for some OSS drivers) the only option
> > > > > that was still compiling a binary-only user-supplied firmware file at
> > > > > build-time into the kernel.
> > > > >
> > > > > This patch changes the driver to always use the standard
> > > > > request_firmware() way for firmware by removing DVB_AV7110_FIRMWARE.
> > > >
> > > > Doesn't this also prevent the AV7110 module from getting compiled
> > > > into the kernel?  Shouldn't the Kconfig file be adjusted so
> > > > that 'y' can't be selected anymore and it depends on MODULES?
> > >
> > > No.
> > > No.
> > >
> > > request_firmware() works fine for built-in drivers.
> > 
> > Wouldn't that require loading the firmware file before the filesystems are
> > mounted?
> 
> Sure.

And you have to create an initrd for the firmware!

As I wrote before: 
I NAK any attempt to remove this option.

The option _is_ useful because it allows a user to build an av7110 driver
without hotplug, initrd etc.

Nobody has to use this option, but it should be possible to do so.

CU
Oliver

-- 
--------------------------------------------------------
VDR Remote Plugin 0.3.8 available at
http://www.escape-edv.de/endriss/vdr/
--------------------------------------------------------

Re: [v4l-dvb-maintainer] [2.6 patch] remove DVB_AV7110_FIRMWARE

[Adrian Bunk]

On Thu, Nov 30, 2006 at 01:58:32AM +0100, Oliver Endriss wrote:
> Adrian Bunk wrote:
> > On Tue, Nov 28, 2006 at 08:45:56PM -0800, Trent Piepho wrote:
> > > On Wed, 29 Nov 2006, Adrian Bunk wrote:
> > > > On Tue, Nov 28, 2006 at 01:06:02PM -0800, Trent Piepho wrote:
> > > > > On Sun, 26 Nov 2006, Adrian Bunk wrote:
> > > > > > DVB_AV7110_FIRMWARE was (except for some OSS drivers) the only option
> > > > > > that was still compiling a binary-only user-supplied firmware file at
> > > > > > build-time into the kernel.
> > > > > >
> > > > > > This patch changes the driver to always use the standard
> > > > > > request_firmware() way for firmware by removing DVB_AV7110_FIRMWARE.
> > > > >
> > > > > Doesn't this also prevent the AV7110 module from getting compiled
> > > > > into the kernel?  Shouldn't the Kconfig file be adjusted so
> > > > > that 'y' can't be selected anymore and it depends on MODULES?
> > > >
> > > > No.
> > > > No.
> > > >
> > > > request_firmware() works fine for built-in drivers.
> > > 
> > > Wouldn't that require loading the firmware file before the filesystems are
> > > mounted?
> > 
> > Sure.
> 
> And you have to create an initrd for the firmware!
> 
> As I wrote before: 
> I NAK any attempt to remove this option.
> 
> The option _is_ useful because it allows a user to build an av7110 driver
> without hotplug, initrd etc.
> 
> Nobody has to use this option, but it should be possible to do so.

Sorry, but the direction of kernel development is to replace statically 
into the kernel compiled firmware (that also brings some non-trivial 
legal questions - is distributing such a kernel a violation of the GPL?)
with request_firmware().

> CU
> Oliver

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed