removed vp7041 doc and added dibusb doc

2 files changed, 54 insertions, 53 deletions

diff --git a/linux/Documentation/dvb/vp7041.txt b/linux/Documentation/dvb/README.dibusb
index a706f3be5..fd8719a18 100644
--- a/linux/Documentation/dvb/vp7041.txt
+++ b/linux/Documentation/dvb/README.dibusb
@@ -1,19 +1,38 @@
-Linux Driver for 
- VisionPlus VisionDTV USB-Ter DVB-T Device (VP7041)
- (http://www.twinhan.com/visiontv-2_4.htm)
-and
- CTS Portable (Chinese Television System)
- (http://www.2cts.tv/ctsportable/)
+Documentation for dib3000mb frontend driver and dibusb device driver
 
-Copyright (C) 2004 Patrick Boettcher (patrick.boettcher@desy.de), 
+The drivers should work with 
+
+- Twinhan VisionPlus VisionDTV USB-Ter DVB-T Device (VP7041)
+	http://www.twinhan.com/visiontv-2_4.htm
+	
+- CTS Portable (Chinese Television System)
+	http://www.2cts.tv/ctsportable/
+
+- KWorld V-Stream XPERT DTV - DVB-T USB
+	http://www.kworld.com.tw/asp/pindex.asp?id=4&pid=13
+
+- HAMA DVB-T USB device
+    http://www.hama.de/portal/articleId*110620/action*2598
  
+- DiBcom USB DVB-T reference device
+
+
+Copyright (C) 2004 Patrick Boettcher (patrick.boettcher@desy.de), 
+
+both drivers based on GPL code, which has
+
+Copyright (C) 2004 Amaury Demol for DiBcom (ademol@dibcom.fr)
+
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation, version 2.
 
-Koenigs Wusterhausen, Germany
 
 NEWS:
+
+  2004-09-05 - released the dibusb device and dib3000mb-frontend driver
+
+  (old news for vp7041.c)
   2004-07-15 - found out, by accident, that the device has a TUA6010XS for 
                frequency generator
   2004-07-12 - figured out, that the driver should also work with the
@@ -31,42 +50,23 @@ NEWS:
   2004-05-14 - firmware loader is working
   2004-05-11 - start writing the driver
 
-0. About the driver.
-This driver is completly reverse-engineered by using the device on a guest PC
-with Windows (where a working driver exists). 
-If you have a look into the source code, you will find a lot of buffers with
-a lot of hex-numbers in it. By all means, I will not assert, that I understand
-each of them. But this is like the windows driver controls the device, and
-obviously it is working even in Linux.
-
-If someone of you recognizes something in those buffers (maybe there is 
-a frontend or any other device, which are fed like this) please let me know.
-If I could assign a function name to any of those anonymous numbers, I will
-be very happy. 
-
-By all means, I will highly appreciate any comment, critic and patch to improve 
-the quality of this piece of software.
-
-When using this driver your system can crash or hang. I'm not responsibly for 
-any data you may lose. So be warned. (Enabling sysrq saves a lot of data).
-
-Addition: This driver should also work with the CTS Portable since the 
-windriver seems to be identical to the Twinhan one. Comment on this badly
-needed.
-
 1. How to use?
-NOTE: This driver was developed on Linux 2.6.6., it is working with 2.6.7. 
+NOTE: This driver was developed using Linux 2.6.6., 
+it is working with 2.6.7, 2.6.8.1.
+
 Linux 2.4.x support is not planned, but patches are very welcome.
 
 NOTE: I'm using Debian testing, so the following explaination (especially
 the hotplug-path) needn't match your system, but probably it will :).
 
-1.1. Firmware extraction
+1.1. Firmware
 
-First of all you have to extract the firmware from the windows driver:
+The USB driver needs to download a firmware to start working.
 
-Please use the command "get_dvb_firmware vp7041" to download and extract the
-firmware. Then copy it to /usr/lib/hotplug/firmware.
+You can either use "get_dvb_firmware dibusb" to download the firmware or you
+can get it directly via 
+
+http://linuxtv.org/cgi-bin/cvsweb.cgi/dvb-kernel/firmware/dvb-dibusb-5.0.0.11.fw?rev=1.1&content-type=text/plain
 
 1.2. Compiling
 
@@ -74,14 +74,15 @@ Since the driver is in the linux kernel, activating the driver in
 your favorite config-environment should sufficient. I recommend
 to compile the driver as module. Hotplug does the rest.
 
-1.3. Loading the driver
+1.3. Loading the drivers
 
 Hotplug is able to load the driver, when it is needed (because you plugged
 in the device).
 
 If you want to enable debug output, you have to load the driver manually.
 
-modprobe vp7041 debug=1 
+modprobe dvb-dibusb debug=1 
+modprobe dib3000m debug=1
 
 should do the trick.
 
@@ -89,28 +90,20 @@ When the driver is loaded successfully, the firmware file was in
 the right place and the device is connected, the "Power"-LED should be
 turned on.
 
-If this is done, even in the non-debug mode, dmesg should show  
-something like the following:
-
-DVB: registering new adapter (VisionPlus VisionDTV USB-Ter DVB-T Device).
-DVB: registering frontend 0:0 (VisionPlus VisionDTV USB-Ter (VP7041) Frontend)...
-VisionPlus VisionDTV USB-Ter DVB-T Device successfully initialized and connected.
-
-At this point you are able to start a dvb-capable application. For myself
+At this point you should be able to start a dvb-capable application. For myself
 I used mplayer, dvbscan, tzap and kaxtv, they are working. Using the device
 as a slave device in vdr, was not working for me. Some work has to be done 
 (patches and comments are very welcome).
 
 2. Known problems and bugs
 
-see vp7041.c
-
-2.1 TODO
-see vp7041.c
-
 again, patches and comments are very very welcome
 
 3. Acknowledgements
+	Amaury Demol (ademol@dibcom.fr) and Francois Kanounnikoff from DiBcom for 
+	providing specs, code and help, on which the dvb-dibusb and dib3000mb are 
+	based.
+  
    Alex Woods for frequently answering question about usb and dvb
     stuff, a big thank you
 
diff --git a/linux/Documentation/dvb/get_dvb_firmware b/linux/Documentation/dvb/get_dvb_firmware
index 49a40f845..78ad29174 100644
--- a/linux/Documentation/dvb/get_dvb_firmware
+++ b/linux/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" );
+@components = ( "alps_tdlb7", "sp887x", "tda10045", "tda10046", "av7110", "dec2000t", "dec2540t", "dec3000s", "vp7041", "dibusb" );
 
 # Check args
 syntax() if (scalar(@ARGV) != 1);
@@ -220,8 +220,16 @@ sub vp7041 {
     $outfile;
 }
 
+sub dibusb {
+	my $url = "http://linuxtv.org/cgi-bin/cvsweb.cgi/dvb-kernel/firmware/dvb-dibusb-5.0.0.11.fw?rev=1.1&content-type=text/plain";
+	my $outfile = "dvb-dibusb-5.0.0.11.fw";
+	my $hash = "fa490295a527360ca16dcdf3224ca243";
 
+	wgetfile($outfile, $url);
+	verify($outfile,$hash);
 
+	$outfile;
+}
 
 # ---------------------------------------------------------------
 # Utilities
@@ -248,7 +256,7 @@ sub wgetfile {
     my ($sourcefile, $url) = @_;
 
     if (! -f $sourcefile) {
-	system("wget \"$url\"") and die "wget failed - unable to download firmware";
+	system("wget -O \"$sourcefile\" \"$url\"") and die "wget failed - unable to download firmware";
     }
 }