From 950422ae55e2bbdf449106a9ea76aae3895af073 Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Wed, 31 Dec 2003 19:24:46 -0800 Subject: [PATCH] [PATCH] DVB: Update documentation and credits - add new documentation for getting bt8xx based DVB cards runnig - extend contributors list - change various email addresses in header files --- Documentation/dvb/bt8xx.txt | 90 +++++++++++++++++++ Documentation/dvb/contributors.txt | 16 +++- Documentation/dvb/readme.txt | 5 ++ drivers/media/dvb/bt8xx/dvb-bt8xx.c | 4 +- drivers/media/dvb/bt8xx/dvb-bt8xx.h | 2 +- drivers/media/dvb/frontends/at76c651.c | 5 +- drivers/media/dvb/frontends/dst-bt878.h | 3 +- drivers/media/dvb/frontends/mt312.c | 4 +- drivers/media/dvb/frontends/mt312.h | 2 +- drivers/media/dvb/frontends/nxt6000.c | 2 +- drivers/media/dvb/frontends/stv0299.c | 2 +- drivers/media/dvb/frontends/ves1x93.c | 4 +- .../media/dvb/ttusb-budget/dvb-ttusb-budget.c | 2 +- 13 files changed, 123 insertions(+), 18 deletions(-) create mode 100644 Documentation/dvb/bt8xx.txt diff --git a/Documentation/dvb/bt8xx.txt b/Documentation/dvb/bt8xx.txt new file mode 100644 index 000000000000..e3cacf4f2345 --- /dev/null +++ b/Documentation/dvb/bt8xx.txt @@ -0,0 +1,90 @@ +How to get the Nebula, PCTV and Twinhan DST cards working +========================================================= + +This class of cards has a bt878a as the PCI interface, and +require the bttv driver. + +Please pay close attention to the warning about the bttv module +options below for the DST card. + +1) General informations +======================= + +These drivers require the bttv driver to provide the means to access +the i2c bus and the gpio pins of the bt8xx chipset. + +Because of this, you need to enable +"Device drivers" => "Multimedia devices" + => "Video For Linux" => "BT848 Video For Linux" + +2) Loading Modules +================== + +In general you need to load the bttv driver, which will handle the gpio and +i2c communication for us. Next you need the common dvb-bt8xx device driver +and one frontend driver. + +The bttv driver will HANG YOUR SYSTEM IF YOU DO NOT SPECIFY THE CORRECT +CARD ID! + +(If you don't get your card running and you suspect that the card id you're +using is wrong, have a look at "bttv-cards.c" for a list of possible card +ids.) + +Pay attention to failures when you load the frontend drivers +(e.g. dmesg, /var/log/messages). + +3a) Nebula / Pinnacle PCTV +-------------------------- + + $ modprobe bttv i2c_hw=1 card=0x68 + $ modprobe dvb-bt8xx + +For Nebula cards use the "nxt6000" frontend driver: + $ modprobe nxt6000 + +For Pinnacle PCTV cards use the "cx24110" frontend driver: + $ modprobe cx24110 + +3b) TwinHan +----------- + + $ modprobe bttv i2c_hw=1 card=0x71 + $ modprobe dvb-bt8xx + $ modprobe dst + +The value 0x71 will override the PCI type detection for dvb-bt8xx, which +is necessary for TwinHan cards.# + +If you're having an older card (blue color circuit) and card=0x71 locks your +machine, try using 0x68, too. If that does not work, ask on the DVB mailing list. + +The DST module takes a couple of useful parameters, in case the +dst drivers fails to detect your type of card correctly. + +dst_type takes values 0 (satellite), 1 (terrestial TV), 2 (cable). + +dst_type_flags takes bit combined values: +1 = new tuner type packets. You can use this if your card is detected + and you have debug and you continually see the tuner packets not + working (make sure not a basic problem like dish alignment etc.) + +2 = TS 204. If your card tunes OK, but the picture is terrible, seemingly + breaking up in one half continually, and crc fails a lot, then + this is worth a try (or trying to turn off) + +4 = has symdiv. Some cards, mostly without new tuner packets, require + a symbol division algorithm. Doesn't apply to terrestial TV. + +You can also specify a value to have the autodetected values turned off +(e.g. 0). The autodected values are determined bythe cards 'response +string' which you can see in your logs e.g. + +dst_check_ci: recognize DST-MOT + +or + +dst_check_ci: unable to recognize DSTXCI or STXCI + +-- +Authors: Richard Walker, Jamie Honan, Michael Hunold diff --git a/Documentation/dvb/contributors.txt b/Documentation/dvb/contributors.txt index d4776e500035..923d937cddfa 100644 --- a/Documentation/dvb/contributors.txt +++ b/Documentation/dvb/contributors.txt @@ -30,11 +30,15 @@ Steve Brown Christoph Martin for his LIRC infrared handler -Andreas Oberritter +Andreas Oberritter +Dennis Noermann +Felix Domke Florian Schirmer -...and all the other dBox2 people - for many bugfixes in the generic DVB Core and their work on the - dBox2 port of the DVB driver +Ronny Strutz <3des@elitedvb.de> +Wolfram Joost +...and all the other dbox2 people + for many bugfixes in the generic DVB Core, frontend drivers and + their work on the dbox2 port of the DVB driver Oliver Endriss for many bugfixes @@ -50,5 +54,9 @@ Roberto Ragusa Augusto Cardoso for all the work for the FlexCopII chipset by B2C2,Inc. +Davor Emard + for his work on the budget drivers, the demux code, + the module unloading problems, ... + (If you think you should be in this list, but you are not, drop a line to the DVB mailing list) diff --git a/Documentation/dvb/readme.txt b/Documentation/dvb/readme.txt index 9cd4be849f62..720aa8ce099c 100644 --- a/Documentation/dvb/readme.txt +++ b/Documentation/dvb/readme.txt @@ -36,4 +36,9 @@ files and where to get them. contains detailed informations about the TT DEC2000/DEC3000 USB DVB hardware. +"bt8xx.txt" +contains detailed installation instructions for the +various bt8xx based "budget" DVB cards +(Nebula, Pinnacle PCTV, Twinhan DST) + Good luck and have fun! diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c index c46777f13eb0..b5006ecafc0a 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c @@ -1,7 +1,7 @@ /* * Bt8xx based DVB adapter driver * - * Copyright (C) 2002,2003 Florian Schirmer + * Copyright (C) 2002,2003 Florian Schirmer * * 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 @@ -525,6 +525,6 @@ static void __exit dvb_bt8xx_exit(void) module_init(dvb_bt8xx_init); module_exit(dvb_bt8xx_exit); MODULE_DESCRIPTION("Bt8xx based DVB adapter driver"); -MODULE_AUTHOR("Florian Schirmer "); +MODULE_AUTHOR("Florian Schirmer "); MODULE_LICENSE("GPL"); MODULE_PARM(debug, "i"); diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/drivers/media/dvb/bt8xx/dvb-bt8xx.h index 973e69e50bd0..969606ecc12f 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.h +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.h @@ -1,7 +1,7 @@ /* * Bt8xx based DVB adapter driver * - * Copyright (C) 2002,2003 Florian Schirmer + * Copyright (C) 2002,2003 Florian Schirmer * Copyright (C) 2002 Peter Hettkamp * Copyright (C) 1999-2001 Ralph Metzler & Marcus Metzler for convergence integrated media GmbH * Copyright (C) 1998,1999 Christian Theiss diff --git a/drivers/media/dvb/frontends/at76c651.c b/drivers/media/dvb/frontends/at76c651.c index b523c58f1947..16629ef8bb2c 100644 --- a/drivers/media/dvb/frontends/at76c651.c +++ b/drivers/media/dvb/frontends/at76c651.c @@ -4,7 +4,8 @@ * Atmel DVB-C Frontend Driver (at76c651/dat7021) * * Copyright (C) 2001 fnbrd - * & 2002 Andreas Oberritter + * & 2002 Andreas Oberritter + * & 2003 Wolfram Joost * * 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 @@ -524,6 +525,6 @@ module_init(at76c651_init); module_exit(at76c651_exit); MODULE_DESCRIPTION("at76c651/dat7021 dvb-c frontend driver"); -MODULE_AUTHOR("Andreas Oberritter "); +MODULE_AUTHOR("Andreas Oberritter "); MODULE_LICENSE("GPL"); MODULE_PARM(debug, "i"); diff --git a/drivers/media/dvb/frontends/dst-bt878.h b/drivers/media/dvb/frontends/dst-bt878.h index 0174f3e189ad..5c63d2972ef8 100644 --- a/drivers/media/dvb/frontends/dst-bt878.h +++ b/drivers/media/dvb/frontends/dst-bt878.h @@ -32,6 +32,7 @@ union dst_gpio_packet { struct bt878 ; -int bt878_device_control(struct bt878 *bt, unsigned int cmd, union dst_gpio_packet *mp); +int +bt878_device_control(struct bt878 *bt, unsigned int cmd, union dst_gpio_packet *mp); struct bt878 *bt878_find_by_dvb_adap(struct dvb_adapter *adap); diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c index fa70038f153f..404378485c0e 100644 --- a/drivers/media/dvb/frontends/mt312.c +++ b/drivers/media/dvb/frontends/mt312.c @@ -1,7 +1,7 @@ /* Driver for Zarlink MT312 Satellite Channel Decoder - Copyright (C) 2003 Andreas Oberritter + Copyright (C) 2003 Andreas Oberritter 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 @@ -813,5 +813,5 @@ MODULE_PARM_DESC(debug, "enable verbose debug messages"); #endif MODULE_DESCRIPTION("MT312 Satellite Channel Decoder Driver"); -MODULE_AUTHOR("Andreas Oberritter "); +MODULE_AUTHOR("Andreas Oberritter "); MODULE_LICENSE("GPL"); diff --git a/drivers/media/dvb/frontends/mt312.h b/drivers/media/dvb/frontends/mt312.h index dd24b184e07a..222c6ecbd0cc 100644 --- a/drivers/media/dvb/frontends/mt312.h +++ b/drivers/media/dvb/frontends/mt312.h @@ -1,7 +1,7 @@ /* Driver for Zarlink MT312 QPSK Frontend - Copyright (C) 2003 Andreas Oberritter + Copyright (C) 2003 Andreas Oberritter 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 diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb/frontends/nxt6000.c index 42de68d27ba6..1e29fcef8d85 100644 --- a/drivers/media/dvb/frontends/nxt6000.c +++ b/drivers/media/dvb/frontends/nxt6000.c @@ -8,7 +8,7 @@ Alps TDED4 (Tuner: TI ALP510, external Nxt6000) Comtech DVBT-6k07 (PLL IC: SP5730) - Copyright (C) 2002-2003 Florian Schirmer + Copyright (C) 2002-2003 Florian Schirmer Copyright (C) 2003 Paul Andreassen This program is free software; you can redistribute it and/or modify diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c index 1cb1450e686f..705132320f8e 100644 --- a/drivers/media/dvb/frontends/stv0299.c +++ b/drivers/media/dvb/frontends/stv0299.c @@ -18,7 +18,7 @@ LG TDQF-S001F Copyright (C) 2002 Felix Domke - & Andreas Oberritter + & Andreas Oberritter Support for Samsung TBMU24112IMB used on Technisat SkyStar2 rev. 2.6B diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb/frontends/ves1x93.c index 4d1f940ea09a..12410b1ea693 100644 --- a/drivers/media/dvb/frontends/ves1x93.c +++ b/drivers/media/dvb/frontends/ves1x93.c @@ -2,9 +2,9 @@ Driver for VES1893 and VES1993 QPSK Frontends Copyright (C) 1999 Convergence Integrated Media GmbH - Copyright (C) 2001 Ronny Strutz <3des@tuxbox.org> + Copyright (C) 2001 Ronny Strutz <3des@elitedvb.de> Copyright (C) 2002 Dennis Noermann - Copyright (C) 2002-2003 Andreas Oberritter + Copyright (C) 2002-2003 Andreas Oberritter 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 diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index 32268ebee8f5..96d89e4ed7a7 100644 --- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c @@ -2,7 +2,7 @@ * TTUSB DVB driver * * Copyright (c) 2002 Holger Waechtler - * Copyright (c) 2003 Felix Domke + * Copyright (c) 2003 Felix Domke * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as -- 2.39.5