- forgot to commit latest changes regarding tda1004x to CVS

1 files changed, 49 insertions, 28 deletions

diff --git a/linux/Documentation/dvb/firmware.txt b/linux/Documentation/dvb/firmware.txt
index 4c7f3d49c..e1e14b2c9 100644
--- a/linux/Documentation/dvb/firmware.txt
+++ b/linux/Documentation/dvb/firmware.txt
@@ -24,6 +24,33 @@ Proprietary solutions which need to be converted:
 		extracted from the Windows driver (Sc_main.mc).
 - ttusb-dec: see "ttusb-dec.txt" for details
 
+0) Getting a usable firmware file 
+
+- For the dvb-ttpci driver/av7110 card you can download the firmware files from
+http://linuxtv.org/download/dvb/
+
+Please note that in case of the dvb-ttpci driver this is *not* the "Root"
+file you probably know from the 2.4 DVB releases driver.
+
+The ttpci-firmware utility from linuxtv.org CVS can be used to
+convert Dpram and Root files into a usable firmware image.
+See dvb-kerrnel/scripts/ in http://linuxtv.org/cvs/.
+
+> wget http://www.linuxtv.org/download/dvb/dvb-ttpci-01.fw
+gets you the version 01 of the firmware fot the ttpci driver.
+
+- The tda1004x driver needs a copy of the DLL "ttlcdacc.dll" from the Haupauge or Technotrend
+windows driver. Currently the DLL from v2.15a of the technotrend driver is supported. Other versions can
+added reasonably painlessly.
+
+Windows driver URL: http://www.technotrend.de/
+
+> 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
+
+Rename "ttlcdacc.dll" to "tda1004x.bin" -- that's currently the default name
+for the firmware file.
+
 1) Automatic firmware loading
 
 You need to install recent hotplug scripts if your distribution did not do it
@@ -43,6 +70,22 @@ conflicts we propose the following naming scheme:
   driver/firmware internal API changes (so users are free to install the
   latest firmware compatible with the driver).
 
+Currently the drivers mentionend above support firmware upload through the
+hotplug manager. If you have such a card, a simple "modprobe" of the driver
+will take care of everything, ie.
+
+> modprobe dvb-ttpci
+or
+> modprobe tda1004x
+
+If you have the hotplug firmware scripts installed, both drivers will ask the hotplug
+daemon for their default firmware. If the scripts are there, but the firmware cannot
+be found, an error message will be printed immediately. Make sure that the firmware
+are in a path where the hotplug manager can find them.
+
+Please note that the default firmware name of the tda1004x doesn't follow the
+naming conventions stated above. It's still called "tda1004x.bin".
+
 2) Manually loading the firmware into a driver
    
 Step a) Mount sysfs-filesystem.
@@ -71,31 +114,7 @@ you want to upload the firmware by hand, however, this might be too fast.
 
 > echo "180" > /sys/class/firmware/timeout
 
-Step c) Getting a usable firmware file 
-
-- For the dvb-ttpci driver/av7110 card you can download the firmware files from
-http://linuxtv.org/download/dvb/
-
-Please note that in case of the dvb-ttpci driver this is *not* the "Root"
-file you probably know from the 2.4 DVB releases driver.
-
-The ttpci-firmware utility from linuxtv.org CVS can be used to
-convert Dpram and Root files into a usable firmware image.
-See dvb-kerrnel/scripts/ in http://linuxtv.org/cvs/.
-
-> wget http://www.linuxtv.org/download/dvb/dvb-ttpci-01.fw
-gets you the version 01 of the firmware fot the ttpci driver.
-
-- The tda1004x driver needs a copy of the DLL "ttlcdacc.dll" from the Haupauge or Technotrend
-windows driver. Currently the DLL from v2.15a of the technotrend driver is supported. Other versions can
-added reasonably painlessly.
-
-Windows driver URL: http://www.technotrend.de/
-
-> 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
-
-Step d) Loading the driver and uploading the firmware manually
+Step c) Loading the driver and uploading the firmware manually
 
 "modprobe" will take care that every needed module will be loaded
 automatically 
@@ -104,7 +123,8 @@ automatically
 or
 > modprobe tda1004x
 
-The "modprobe" process will hang until
+If you don't have the hotplug subsystem running, the "modprobe" process will
+now hang until
 a) you upload the firmware or
 b) the timeout occurs.
 
@@ -130,8 +150,9 @@ You can upload the firmware like that:
 For the dvb-ttpci card:
 > cat dvb-ttpci-01.fw > $DEVDIR/data
 
-For the tda1004x frontend:
-> cat ttlcdacc.dll > $DEVDIR/data
+For the tda1004x frontend, the path above might be different, but the other things
+are the same:
+> cat tda1004x.bin > $DEVDIR/data
 
 > echo 0 > $DEVDIR/loading