From c358e2192145ed6ca5e6ffca542ea68d8068767d Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 6 Jan 2004 15:52:39 -0800 Subject: [PATCH] [PATCH] dvb: firmware fixes From: Michael Hunold - move around sp887x firmware file entry to be close to sp887x selection - fix a bunch of filenames to point to /usr/lib/hotplug/firmware/ rather then /etc/dvb - fix the av7110 firmware config entry for "make allyesconfig" --- drivers/media/dvb/frontends/Kconfig | 37 +++++++++++++------------- drivers/media/dvb/frontends/sp887x.c | 4 +-- drivers/media/dvb/frontends/tda1004x.c | 4 +-- drivers/media/dvb/ttpci/Kconfig | 5 ++-- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig index 5c335a8a27ea8..0d0fb617f0e30 100644 --- a/drivers/media/dvb/frontends/Kconfig +++ b/drivers/media/dvb/frontends/Kconfig @@ -37,6 +37,23 @@ config DVB_SP887X DVB adapter simply enable all supported frontends, the right one will get autodetected. + +config DVB_SP887X_FIRMWARE_FILE + string "Full pathname of sp887x firmware file" + depends on DVB_SP887X + default "/usr/lib/hotplug/firmware/sc_main.mc" + help + This driver needs a copy of the Avermedia firmware. The version tested + is part of the Avermedia DVB-T 1.3.26.3 Application. This can be downloaded + from the Avermedia web site. + If the software is installed in Windows the file will be in the + /Program Files/AVerTV DVB-T/ directory and is called sc_main.mc. + Alternatively it can "extracted" from the install cab files but this will have + to be done in windows as I don't know of a linux version of extract.exe. + Copy this file to /usr/lib/hotplug/firmware/sc_main.mc. + With this version of the file the first 10 bytes are discarded and the next + 0x4000 loaded. This may change in future versions. + config DVB_ALPS_TDLB7 tristate "Alps TDLB7 (OFDM)" depends on DVB_CORE @@ -149,26 +166,10 @@ config DVB_TDA1004X config DVB_TDA1004X_FIRMWARE_FILE string "Full pathname of tda1004x.bin firmware file" depends on DVB_TDA1004X - default "/etc/dvb/tda1004x.bin" + default "/usr/lib/hotplug/firmware/tda1004x.bin" help The TDA1004X requires additional firmware in order to function. The firmware file can obtained as follows: wget http://www.technotrend.de/new/215/TTweb_215a_budget_20_05_2003.zip unzip -j TTweb_215a_budget_20_05_2003.zip Software/Oem/PCI/App/ttlcdacc.dll - mv ttlcdacc.dll /etc/dvb/tda1004x.bin - -config DVB_SP887X_FIRMWARE_FILE - string "Full pathname of sp887x firmware file" - depends on DVB_SP887X - default "/etc/dvb/sc_main.mc" - help - This driver needs a copy of the Avermedia firmware. The version tested - is part of the Avermedia DVB-T 1.3.26.3 Application. This can be downloaded - from the Avermedia web site. - If the software is installed in Windows the file will be in the - /Program Files/AVerTV DVB-T/ directory and is called sc_main.mc. - Alternatively it can "extracted" from the install cab files but this will have - to be done in windows as I don't know of a linux version of extract.exe. - Copy this file to /etc/dvb/sc_main.mc. With this version of the file the first - 10 bytes are discarded and the next 0x4000 loaded. This may change in future - versions. + mv ttlcdacc.dll /usr/lib/hotplug/firmware/tda1004x.bin diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c index 745154bfd8f2d..7cb9d8aec5471 100644 --- a/drivers/media/dvb/frontends/sp887x.c +++ b/drivers/media/dvb/frontends/sp887x.c @@ -7,7 +7,7 @@ is part of the Avermedia DVB-T 1.3.26.3 Application. If the software is installed in Windows the file will be in the /Program Files/AVerTV DVB-T/ directory and is called sc_main.mc. Alternatively it can "extracted" from - the install cab files. Copy this file to /etc/dvb/sc_main.mc. + the install cab files. Copy this file to '/usr/lib/hotplug/firmware/sc_main.mc'. With this version of the file the first 10 bytes are discarded and the next 0x4000 loaded. This may change in future versions. */ @@ -30,7 +30,7 @@ #include "dvb_functions.h" #ifndef DVB_SP887X_FIRMWARE_FILE -#define DVB_SP887X_FIRMWARE_FILE "/etc/dvb/sc_main.mc" +#define DVB_SP887X_FIRMWARE_FILE "/usr/lib/hotplug/firmware/sc_main.mc" #endif static char *sp887x_firmware = DVB_SP887X_FIRMWARE_FILE; diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c index 90139d5734ffe..1160822a39077 100644 --- a/drivers/media/dvb/frontends/tda1004x.c +++ b/drivers/media/dvb/frontends/tda1004x.c @@ -20,7 +20,7 @@ /* This driver needs a copy of the DLL "ttlcdacc.dll" from the Haupauge or Technotrend - windows driver saved as '/etc/dvb/tda1004x.mc'. + windows driver saved as '/usr/lib/hotplug/firmware/tda1004x.mc'. You can also pass the complete file name with the module parameter 'tda1004x_firmware'. Currently the DLL from v2.15a of the technotrend driver is supported. Other versions can @@ -45,7 +45,7 @@ #include "dvb_functions.h" #ifndef DVB_TDA1004X_FIRMWARE_FILE -#define DVB_TDA1004X_FIRMWARE_FILE "/etc/dvb/tda1004x.mc" +#define DVB_TDA1004X_FIRMWARE_FILE "/usr/lib/hotplug/firmware/tda1004x.mc" #endif static int tda1004x_debug = 0; diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig index ff4e963300634..4f9facc243958 100644 --- a/drivers/media/dvb/ttpci/Kconfig +++ b/drivers/media/dvb/ttpci/Kconfig @@ -15,7 +15,7 @@ config DVB_AV7110 config DVB_AV7110_FIRMWARE bool "Compile AV7110 firmware into the driver" - depends on DVB_AV7110 + depends on DVB_AV7110 && !STANDALONE 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 @@ -89,8 +89,7 @@ config DVB_BUDGET_AV config DVB_BUDGET_PATCH tristate "AV7110 cards with Budget Patch" depends on DVB_BUDGET - select VIDEO_DEV - select VIDEO_SAA7146_VV + select DVB_AV7110 help Support for Budget Patch (full TS) modification on SAA7146+AV7110 based cards (DVB-S cards). This -- 2.53.0