DVB update, mostly dvb-usb
Subsystems (2)
cover DVB update, mostly dvb-usb
Hi Andrew,
Here's another update for DVB. Two of the patches are huge (sigh), one drops the dibusb driver, and the other adds a generalized dvb-usb driver. Both dibusb and dvb-usb were written by Patrick Boettcher, and dvb-usb is a refactored version of the dibusb driver, extended to support a whole zoo of devices. Unforunately the dvb-usb patch comes with some incompatible changes to the dibcom frontend drivers, so we can't have both the dibusb and the dvb-usb drivers.
The dvb-usb driver has been in CVS for more than a month and is considered stable by its author.
The two big patches probably exceed the mailing list limit and are also available here:
http://linuxtv.org/downloads/patches/2.6.12-rc4-3/quilt/dvb-remove-dibusb-driver.patch
http://linuxtv.org/downloads/patches/2.6.12-rc4-3/quilt/dvb-add-dvb-usb-driver.patch
Please apply.
Thanks,
Johannes
PATCH 1/5 drop obsolete dibusb driver
Remove the dibusb driver which has been obsoleted by the generalized dvb-usb driver.
--- Documentation/dvb/README.dibusb | 285 ------------ drivers/media/dvb/Kconfig | 1 drivers/media/dvb/Makefile | 2 drivers/media/dvb/dibusb/Kconfig | 62 -- drivers/media/dvb/dibusb/Makefile | 11 drivers/media/dvb/dibusb/dvb-dibusb-core.c | 558 ----------------------- drivers/media/dvb/dibusb/dvb-dibusb-dvb.c | 185 ------- drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c | 582 ------------------------- drivers/media/dvb/dibusb/dvb-dibusb-firmware.c | 87 --- drivers/media/dvb/dibusb/dvb-dibusb-remote.c | 316 ------------- drivers/media/dvb/dibusb/dvb-dibusb-usb.c | 303 ------------- drivers/media/dvb/dibusb/dvb-dibusb.h | 327 -------------- drivers/media/dvb/dibusb/dvb-fe-dtt200u.c | 263 ----------- 13 files changed, 1 insertion(+), 2981 deletions(-)
Documentation/dvb/README.dibusb deleted +0 -285
@@ -1,285 +0,0 @@ -Documentation for dib3000* frontend drivers and dibusb device driver -==================================================================== - -Copyright (C) 2004-5 Patrick Boettcher ([email protected]), - -dibusb and dib3000mb/mc drivers based on GPL code, which has - -Copyright (C) 2004 Amaury Demol for DiBcom ([email protected]) - -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. - - -Supported devices USB1.1 -======================== - -Produced and reselled by Twinhan: ---------------------------------- -- TwinhanDTV USB-Ter DVB-T Device (VP7041) - http://www.twinhan.com/product_terrestrial_3.asp - -- TwinhanDTV Magic Box (VP7041e) - http://www.twinhan.com/product_terrestrial_4.asp - -- HAMA DVB-T USB device - http://www.hama.de/portal/articleId*110620/action*2598 - -- CTS Portable (Chinese Television System) (2) - http://www.2cts.tv/ctsportable/ - -- Unknown USB DVB-T device with vendor ID Hyper-Paltek - - -Produced and reselled by KWorld: --------------------------------- -- KWorld V-Stream XPERT DTV DVB-T USB - http://www.kworld.com.tw/en/product/DVBT-USB/DVBT-USB.html - -- JetWay DTV DVB-T USB - http://www.jetway.com.tw/evisn/product/lcd-tv/DVT-USB/dtv-usb.htm - -- ADSTech Instant TV DVB-T USB - http://www.adstech.com/products/PTV-333/intro/PTV-333_intro.asp?pid=PTV-333 - - -Others: -------- -- Ultima Electronic/Artec T1 USB TVBOX (AN2135, AN2235, AN2235 with Panasonic Tuner) - http://82.161.246.249/products-tvbox.html - -- Compro Videomate DVB-U2000 - DVB-T USB (2) - http://www.comprousa.com/products/vmu2000.htm - -- Grandtec USB DVB-T - http://www.grand.com.tw/ - -- Avermedia AverTV DVBT USB (2) - http://www.avermedia.com/ - -- DiBcom USB DVB-T reference device (non-public) - - -Supported devices USB2.0 -======================== -- Twinhan MagicBox II (2) - http://www.twinhan.com/product_terrestrial_7.asp - -- Hanftek UMT-010 (1) - http://www.globalsources.com/si/6008819757082/ProductDetail/Digital-TV/product_id-100046529 - -- Typhoon/Yakumo/HAMA DVB-T mobile USB2.0 (1) - http://www.yakumo.de/produkte/index.php?pid=1&ag=DVB-T - -- Artec T1 USB TVBOX (FX2) (2) - -- Hauppauge WinTV NOVA-T USB2 - http://www.hauppauge.com/ - -- KWorld/ADSTech Instant DVB-T USB2.0 (DiB3000M-B) - -- DiBcom USB2.0 DVB-T reference device (non-public) - -1) It is working almost. -2) No test reports received yet. - - -0. NEWS: - 2005-02-11 - added support for the KWorld/ADSTech Instant DVB-T USB2.0. Thanks a lot to Joachim von Caron - 2005-02-02 - added support for the Hauppauge Win-TV Nova-T USB2 - 2005-01-31 - distorted streaming is finally gone for USB1.1 devices - 2005-01-13 - moved the mirrored pid_filter_table back to dvb-dibusb - - first almost working version for HanfTek UMT-010 - - found out, that Yakumo/HAMA/Typhoon are predessors of the HanfTek UMT-010 - 2005-01-10 - refactoring completed, now everything is very delightful - - tuner quirks for some weird devices (Artec T1 AN2235 device has sometimes a - Panasonic Tuner assembled). Tunerprobing implemented. Thanks a lot to Gunnar Wittich. - 2004-12-29 - after several days of struggling around bug of no returning URBs fixed. - 2004-12-26 - refactored the dibusb-driver, splitted into separate files - - i2c-probing enabled - 2004-12-06 - possibility for demod i2c-address probing - - new usb IDs (Compro,Artec) - 2004-11-23 - merged changes from DiB3000MC_ver2.1 - - revised the debugging - - possibility to deliver the complete TS for USB2.0 - 2004-11-21 - first working version of the dib3000mc/p frontend driver. - 2004-11-12 - added additional remote control keys. Thanks to Uwe Hanke. - 2004-11-07 - added remote control support. Thanks to David Matthews. - 2004-11-05 - added support for a new devices (Grandtec/Avermedia/Artec) - - merged my changes (for dib3000mb/dibusb) to the FE_REFACTORING, because it became HEAD - - moved transfer control (pid filter, fifo control) from usb driver to frontend, it seems - better settled there (added xfer_ops-struct) - - created a common files for frontends (mc/p/mb) - 2004-09-28 - added support for a new device (Unkown, vendor ID is Hyper-Paltek) - 2004-09-20 - added support for a new device (Compro DVB-U2000), thanks - to Amaury Demol for reporting - - changed usb TS transfer method (several urbs, stopping transfer - before setting a new pid) - 2004-09-13 - added support for a new device (Artec T1 USB TVBOX), thanks - to Christian Motschke for reporting - 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 - PLL - 2004-07-12 - figured out, that the driver should also work with the - CTS Portable (Chinese Television System) - 2004-07-08 - firmware-extraction-2.422-problem solved, driver is now working - properly with firmware extracted from 2.422 - - #if for 2.6.4 (dvb), compile issue - - changed firmware handling, see vp7041.txt sec 1.1 - 2004-07-02 - some tuner modifications, v0.1, cleanups, first public - 2004-06-28 - now using the dvb_dmx_swfilter_packets, everything - runs fine now - 2004-06-27 - able to watch and switching channels (pre-alpha) - - no section filtering yet - 2004-06-06 - first TS received, but kernel oops :/ - 2004-05-14 - firmware loader is working - 2004-05-11 - start writing the driver - -1. How to use? -NOTE: This driver was developed using Linux 2.6.6., -it is working with 2.6.7 and above. - -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 :). - -The driver is included in the kernel since Linux 2.6.10. - -1.1. Firmware - -The USB driver needs to download a firmware to start working. - -You can either use "get_dvb_firmware dibusb" to download the firmware or you -can get it directly via - -for USB1.1 (AN2135) -http://www.linuxtv.org/downloads/firmware/dvb-dibusb-5.0.0.11.fw - -for USB1.1 (AN2235) (a few Artec T1 devices) -http://www.linuxtv.org/downloads/firmware/dvb-dibusb-an2235-1.fw - -for USB2.0 (FX2) Hauppauge, DiBcom -http://www.linuxtv.org/downloads/firmware/dvb-dibusb-6.0.0.5.fw - -for USB2.0 ADSTech/Kworld USB2.0 -http://www.linuxtv.org/downloads/firmware/dvb-dibusb-adstech-usb2-1.fw - -for USB2.0 HanfTek -http://www.linuxtv.org/downloads/firmware/dvb-dibusb-an2235-1.fw - - -1.2. Compiling - -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 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 and -from withing the dvb-kernel cvs repository. - -first have a look, which debug level are available: - -modinfo dib3000mb -modinfo dib3000-common -modinfo dib3000mc -modinfo dvb-dibusb - -modprobe dib3000-common debug=<level> -modprobe dib3000mb debug=<level> -modprobe dib3000mc debug=<level> -modprobe dvb-dibusb debug=<level> - -should do the trick. - -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. - -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 -in vdr is working now also. - -2. Known problems and bugs - -- Don't remove the USB device while running an DVB application, your system will die. - -2.1. Adding support for devices - -It is not possible to determine the range of devices based on the DiBcom -reference designs. This is because the reference design of DiBcom can be sold -to thirds, without telling DiBcom (so done with the Twinhan VP7041 and -the HAMA device). - -When you think you have a device like this and the driver does not recognizes it, -please send the ****load*.inf and the ****cap*.inf of the Windows driver to me. - -Sometimes the Vendor or Product ID is identical to the ones of Twinhan, even -though it is not a Twinhan device (e.g. HAMA), then please send me the name -of the device. I will add it to this list in order to make this clear to -others. - -If you are familar with C you can also add the VID and PID of the device to -the dvb-dibusb-core.c-file and create a patch and send it over to me or to -the linux-dvb mailing list, _after_ you have tried compiling and modprobing -it. - -2.2. USB1.1 Bandwidth limitation - -Most of the currently supported devices are USB1.1 and thus they have a -maximum bandwidth of about 5-6 MBit/s when connected to a USB2.0 hub. -This is not enough for receiving the complete transport stream of a -DVB-T channel (which can be about 16 MBit/s). Normally this is not a -problem, if you only want to watch TV (this does not apply for HDTV), -but watching a channel while recording another channel on the same -frequency simply does not work very well. This applies to all USB1.1 -DVB-T devices, not just dibusb) - -Update: For the USB1.1 and VDR some work has been done (patches and comments -are still very welcome). Maybe the problem is solved in the meantime because I -now use the dmx_sw_filter function instead of dmx_sw_filter_packet. I hope the -linux-dvb software filter is able to get the best of the garbled TS. - -The bug, where the TS is distorted by a heavy usage of the device is gone -definitely. All dibusb-devices I was using (Twinhan, Kworld, DiBcom) are -working like charm now with VDR. Sometimes I even was able to record a channel -and watch another one. - -2.3. Comments - -Patches, comments and suggestions are very very welcome. - -3. Acknowledgements - Amaury Demol ([email protected]) and Francois Kanounnikoff from DiBcom for - providing specs, code and help, on which the dvb-dibusb, dib3000mb and - dib3000mc are based. - - David Matthews for identifying a new device type (Artec T1 with AN2235) - and for extending dibusb with remote control event handling. Thank you. - - Alex Woods for frequently answering question about usb and dvb - stuff, a big thank you. - - Bernd Wagner for helping with huge bug reports and discussions. - - Gunnar Wittich and Joachim von Caron for their trust for giving me - root-shells on their machines to implement support for new devices. - - Some guys on the linux-dvb mailing list for encouraging me - - Peter Schildmann >peter.schildmann-nospam-at-web.de< for his - user-level firmware loader, which saves a lot of time - (when writing the vp7041 driver) - - Ulf Hermenau for helping me out with traditional chinese. - - Andr� Smoktun and Christian Fr�mmel for supporting me with - hardware and listening to my problems very patient
drivers/media/dvb/Makefile +1 -1
@@ -2,4 +2,4 @@ # Makefile for the kernel multimedia device drivers. # -obj-y := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ dibusb/ cinergyT2/ +obj-y := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ cinergyT2/
drivers/media/dvb/Kconfig +0 -1
@@ -29,7 +29,6 @@ comment "Supported USB Adapters" depends on DVB_CORE && USB source "drivers/media/dvb/ttusb-budget/Kconfig" source "drivers/media/dvb/ttusb-dec/Kconfig" -source "drivers/media/dvb/dibusb/Kconfig" source "drivers/media/dvb/cinergyT2/Kconfig" comment "Supported FlexCopII (B2C2) Adapters"
drivers/media/dvb/dibusb/Makefile deleted +0 -11
@@ -1,11 +0,0 @@ -dvb-dibusb-objs = dvb-dibusb-core.o \ - dvb-dibusb-dvb.o \ - dvb-dibusb-fe-i2c.o \ - dvb-dibusb-firmware.o \ - dvb-dibusb-remote.o \ - dvb-dibusb-usb.o \ - dvb-fe-dtt200u.o - -obj-$(CONFIG_DVB_DIBUSB) += dvb-dibusb.o - -EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
drivers/media/dvb/dibusb/dvb-fe-dtt200u.c deleted +0 -263
263 lines not on this page · raw message
drivers/media/dvb/dibusb/dvb-dibusb-firmware.c deleted +0 -87
87 lines not on this page · raw message
drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c deleted +0 -582
582 lines not on this page · raw message
drivers/media/dvb/dibusb/dvb-dibusb-usb.c deleted +0 -303
303 lines not on this page · raw message
drivers/media/dvb/dibusb/dvb-dibusb.h deleted +0 -327
327 lines not on this page · raw message
drivers/media/dvb/dibusb/dvb-dibusb-core.c deleted +0 -558
558 lines not on this page · raw message
drivers/media/dvb/dibusb/dvb-dibusb-remote.c deleted +0 -316
316 lines not on this page · raw message
drivers/media/dvb/dibusb/Kconfig deleted +0 -62
62 lines not on this page · raw message
drivers/media/dvb/dibusb/dvb-dibusb-dvb.c deleted +0 -185
185 lines not on this page · raw message
--
PATCH 3/5 dvb-usb: fix init error checking
In reply to Johannes StezenbachFix error checking during initialization.
Thanks to Gerolf Wendland for discovering.
--- drivers/media/dvb/dvb-usb/dibusb-mb.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-)
drivers/media/dvb/dvb-usb/dibusb-mb.c +1 -1
@@ -81,7 +81,7 @@ static int dibusb_probe(struct usb_inter const struct usb_device_id *id) {if (dvb_usb_device_init (intf,&dibusb1_1_properties,THIS_MODULE ) ==0 || -dvb_usb_device_init (intf,&dibusb1_1_an2235_properties,THIS_MODULE ) || +dvb_usb_device_init (intf,&dibusb1_1_an2235_properties,THIS_MODULE ) ==0 ||dvb_usb_device_init (intf,&dibusb2_0b_properties,THIS_MODULE ) ==0 )return 0 ;
--
PATCH 4/5 dvb_frontend: use time_after()
In reply to Johannes StezenbachUse time_after() macro.
--- drivers/media/dvb/dvb-core/dvb_frontend.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-)
drivers/media/dvb/dvb-core/dvb_frontend.c +3 -1
@@ -35,6 +35,7 @@#include <linux/moduleparam.h> #include <linux/list.h> #include <linux/suspend.h> +#include <linux/jiffies.h> #include <asm/processor.h> #include <asm/semaphore.h>
@@ -327,7 +328,8 @@ static int dvb_frontend_is_exiting(strucreturn 1 ;if (fepriv->dvbdev->writers ==1 ) -if (jiffies - fepriv->release_jiffies > dvb_shutdown_timeout *HZ ) +if (time_after (jiffies, fepriv->release_jiffies + + dvb_shutdown_timeout *HZ ))return 1 ;return 0 ;
--
PATCH 5/5 flexcop: add BCM3510 ATSC frontend support for Air2PC card
In reply to Johannes Stezenbachadded support for the Broadcom BCM3510 ATSC (8VSB/16VSB & ITU J83 AnnexB FEC QAM64/256) demodulator used in the first generation of Air2PC ATSC PCI-cards/USB-boxes made by B2C2.
--- drivers/media/dvb/b2c2/Kconfig | 1 drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 26 drivers/media/dvb/b2c2/flexcop-misc.c | 11 drivers/media/dvb/b2c2/flexcop-reg.h | 3 drivers/media/dvb/frontends/Kconfig | 8 drivers/media/dvb/frontends/Makefile | 1 drivers/media/dvb/frontends/bcm3510.c | 851 +++++++++++++++++++++++++++++ drivers/media/dvb/frontends/bcm3510.h | 40 + drivers/media/dvb/frontends/bcm3510_priv.h | 460 +++++++++++++++ 9 files changed, 1387 insertions(+), 14 deletions(-)
drivers/media/dvb/b2c2/Kconfig +1 -0
@@ -6,6 +6,7 @@ config DVB_B2C2_FLEXCOP select DVB_MT312 select DVB_NXT2002 select DVB_STV0297 + select DVB_BCM3510 help Support for the digital TV receiver chip made by B2C2 Inc. included in Technisats PCI cards and USB boxes.
drivers/media/dvb/b2c2/flexcop-fe-tuner.c +18 -8
@@ -10,6 +10,7 @@#include "stv0299.h" #include "mt352.h" #include "nxt2002.h" +#include "bcm3510.h" #include "stv0297.h" #include "mt312.h"
@@ -285,21 +286,25 @@ static int samsung_tdtc9251dh0_pll_set(s }static struct mt352_config samsung_tdtc9251dh0_config = { - .demod_address =0x0f , - .demod_init = samsung_tdtc9251dh0_demod_init, - .pll_set = samsung_tdtc9251dh0_pll_set, + .demod_init = samsung_tdtc9251dh0_demod_init, + .pll_set = samsung_tdtc9251dh0_pll_set, }; -static int nxt2002_request_firmware (struct dvb_frontend * fe,const struct firmware **fw,char * name) +static int flexcop_fe_request_firmware (struct dvb_frontend * fe,const struct firmware **fw,char * name) {struct flexcop_device *fc = fe->dvb->priv;return request_firmware (fw, name, fc->dev); }static struct nxt2002_config samsung_tbmv_config = { - .demod_address =0x0a , - .request_firmware = nxt2002_request_firmware, + .demod_address =0x0a , + .request_firmware = flexcop_fe_request_firmware, +}; + +static struct bcm3510_config air2pc_atsc_first_gen_config = { + .demod_address =0x0f , + .request_firmware = flexcop_fe_request_firmware, };static int skystar23_samsung_tbdu18132_pll_set (struct dvb_frontend * fe,struct dvb_frontend_parameters * params)
@@ -354,11 +359,16 @@ int flexcop_frontend_init(struct flexcop fc->dev_type =FC_AIR_DVB ;info ("found the mt352 at i2c address: 0x%02x" ,samsung_tdtc9251dh0_config.demod_address); }else -/* try the air atsc (nxt2002) */ +/* try the air atsc 2nd generation (nxt2002) */ if ((fc->fe =nxt2002_attach (&samsung_tbmv_config, &fc->i2c_adap)) !=NULL ) { - fc->dev_type =FC_AIR_ATSC ; + fc->dev_type =FC_AIR_ATSC2 ;info ("found the nxt2002 at i2c address: 0x%02x" ,samsung_tbmv_config.demod_address); }else +/* try the air atsc 1nd generation (bcm3510)/panasonic ct10s */ +if ((fc->fe =bcm3510_attach (&air2pc_atsc_first_gen_config, &fc->i2c_adap)) !=NULL ) { + fc->dev_type =FC_AIR_ATSC1 ; +info ("found the bcm3510 at i2c address: 0x%02x" ,air2pc_atsc_first_gen_config.demod_address); + }else /* try the cable dvb (stv0297) */ if ((fc->fe =stv0297_attach (&alps_tdee4_stv0297_config, &fc->i2c_adap,0xf8 )) !=NULL ) { fc->dev_type =FC_CABLE ;
drivers/media/dvb/b2c2/flexcop-misc.c +6 -5
@@ -45,11 +45,12 @@ const char *flexcop_revision_names[] = {const char *flexcop_device_names[] = {"Unkown device" , -"AirStar 2 DVB-T" , -"AirStar 2 ATSC" , -"SkyStar 2 DVB-S" , -"SkyStar 2 DVB-S (old version)" , -"CableStar 2 DVB-C" , +"Air2PC/AirStar 2 DVB-T" , +"Air2PC/AirStar 2 ATSC 1st generation" , +"Air2PC/AirStar 2 ATSC 2nd generation" , +"Sky2PC/SkyStar 2 DVB-S" , +"Sky2PC/SkyStar 2 DVB-S (old version)" , +"Cable2PC/CableStar 2 DVB-C" , };const char *flexcop_bus_names[] = {
drivers/media/dvb/b2c2/flexcop-reg.h +2 -1
@@ -21,7 +21,8 @@ extern const char *flexcop_revision_name typedef enum { FC_UNK = 0, FC_AIR_DVB, - FC_AIR_ATSC, + FC_AIR_ATSC1, + FC_AIR_ATSC2, FC_SKY, FC_SKY_OLD, FC_CABLE,
drivers/media/dvb/frontends/Kconfig +8 -0
@@ -173,4 +173,12 @@ config DVB_OR51132 An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want to support this frontend. +config DVB_BCM3510 + tristate "Broadcom BCM3510" + depends on DVB_CORE + select FW_LOADER + help + An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to + support this frontend. + endmenu
drivers/media/dvb/frontends/Makefile +1 -0
@@ -28,3 +28,4 @@ obj-$(CONFIG_DVB_STV0297) += stv0297.o obj-$(CONFIG_DVB_NXT2002) += nxt2002.o obj-$(CONFIG_DVB_OR51211) += or51211.o obj-$(CONFIG_DVB_OR51132) += or51132.o +obj-$(CONFIG_DVB_BCM3510) += bcm3510.o
drivers/media/dvb/frontends/bcm3510.c new file +851 -0
851 lines not on this page · raw message
drivers/media/dvb/frontends/bcm3510.h new file +40 -0
@@ -0,0 +1,40 @@ +/* +* Support for the Broadcom BCM3510 ATSC demodulator (1st generation Air2PC) +* +* Copyright (C) 2001-5, B2C2 inc. +* +* GPL/Linux driver written by Patrick Boettcher <[email protected]> +* +* 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; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +#ifndef BCM3510_H +#define BCM3510_H + +#include <linux/dvb/frontend.h> +#include <linux/firmware.h> + +struct bcm3510_config +{ +/* the demodulator's i2c address */ +u8 demod_address; + +/* request firmware for device */ +int (*request_firmware)(struct dvb_frontend * fe,const struct firmware **fw,char * name); +}; + +extern struct dvb_frontend *bcm3510_attach (const struct bcm3510_config * config, +struct i2c_adapter * i2c); + +#endif
drivers/media/dvb/frontends/bcm3510_priv.h new file +460 -0
460 lines not on this page · raw message
--
Re: [DVB patch 5/5] flexcop: add BCM3510 ATSC frontend support for Air2PC card
Hi Andrew,
here's an incremental patch which fixes the following warning when compiling with gcc-3.4.4:
drivers/media/dvb/frontends/bcm3510.c: In function `bcm3510_read_signal_strength':drivers/media/dvb/frontends/bcm3510.c:322: warning: ISO C90 forbids mixed declarations and code
Johannes
---
Fix compilation with gcc-2.95 (warning with gcc-3.4.4) by not mixing code and declarations.
drivers/media/dvb/frontends/bcm3510.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-)
drivers/media/dvb/frontends/bcm3510.c +3 -1
@@ -318,8 +318,10 @@ static int bcm3510_read_unc(struct dvb_fstatic int bcm3510_read_signal_strength (struct dvb_frontend * fe,u16 * strength) {struct bcm3510_state * st = fe->demodulator_priv; +s32 t; +bcm3510_refresh_state (st); -s32 t = st->status2.SIGNAL; + t = st->status2.SIGNAL;if (t >190 ) t =190 ;