summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb
AgeCommit message (Collapse)Author
2007-07-21dtt200u: add support for the Miglia TVMini USB DVB-T adapterMichael Krufky
From: Rasmus Rohde <rohde@duff.dk> add code for autodetection and firmware download to the Miglia TVMini USB DVB-T adapter. After firmware download, the device re-registers using the WT220U_ZL0353_WARM usb id. Signed-off-by: Rasmus Rohde <rohde@duff.dk> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-07-20Backport changeset from kernel mainstreamMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: The original patch from Yoann Padioleau <padator@wanadoo.fr>: Transform some calls to kmalloc/memset to a single kzalloc (or kcalloc). Here is a short excerpt of the semantic patch performing this transformation: @@ type T2; expression x; identifier f,fld; expression E; expression E1,E2; expression e1,e2,e3,y; statement S; @@ x = - kmalloc + kzalloc (E1,E2) ... when != \(x->fld=E;\|y=f(...,x,...);\|f(...,x,...);\|x=E;\|while(...) S\|for(e1;e2;e3) S\) - memset((T2)x,0,E1); @@ expression E1,E2,E3; @@ - kzalloc(E1 * E2,E3) + kcalloc(E1,E2,E3) Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-07-19backport kernel commit 59faba1b316a7798a33752b3889193333f8af1a0Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Original patch from Trent Piepho <xyzzy@speakeasy.org>. Its description: Fix Kconfig dependency problems wrt boolean menuconfigs If one has a dependency chain (tristate)FOO depends on (bool)BAR depends on (tristate)BAZ, build problems will result. If BAZ=m, then BAR can be set y, which allows FOO=y. It's possible to have FOO=y && BAZ=m, which wouldn't be allowed if FOO depended directly on BAZ. In effect, the bool promotes the tristate from m to y. This ends up causing a problem with several menuconfigs that look like: menuconfig BAR bool depends on BAZ [tristate] if BAR config FOO tristate endif The solution used here is to add the dependencies of BAR to the if statement, so that items in the if block will gain a direct non-bool-promoted dependency on BAZ. This is how it would work if a menu was used instead of an if block. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-07-19backport kernel changeset 831441862956fffa17b9801db37e6ea1650b0f69Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Original patch description from the patch by Rafael J. Wysocki <rjw@sisk.pl>: Freezer: make kernel threads nonfreezable by default Currently, the freezer treats all tasks as freezable, except for the kernel threads that explicitly set the PF_NOFREEZE flag for themselves. This approach is problematic, since it requires every kernel thread to either set PF_NOFREEZE explicitly, or call try_to_freeze(), even if it doesn't care for the freezing of tasks at all. It seems better to only require the kernel threads that want to or need to be frozen to use some freezer-related code and to remove any freezer-related code from the other (nonfreezable) kernel threads, which is done in this patch. The patch causes all kernel threads to be nonfreezable by default (ie. to have PF_NOFREEZE set by default) and introduces the set_freezable() function that should be called by the freezable kernel threads in order to unset PF_NOFREEZE. It also makes all of the currently freezable kernel threads call set_freezable(), so it shouldn't cause any (intentional) change of behaviour to appear. Additionally, it updates documentation to describe the freezing of tasks more accurately. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-07-16Av7110: fix typoMauro Carvalho Chehab
From: Yoann Padioleau <padator@wanadoo.fr> Parse error in ifdef or bad use of macro. Signed-off-by: Yoann Padioleau <padator@wanadoo.fr> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-07-16fix dst and cx24123: tune() callback changed signess for delayMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> tune() dvb_frontend callback changed delay signess: int (*tune)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, unsigned int mode_flags, - int *delay, + unsigned int *delay, This change caused warnings on cx24123 and dst modules: /home/v4l/master/v4l/cx24123.c:1034: warning: initialization from incompatible pointer type /home/v4l/master/v4l/dst.c:1782: warning: initialization from incompatible pointer type /home/v4l/master/v4l/dst.c:1808: warning: initialization from incompatible pointer type /home/v4l/master/v4l/dst.c:1837: warning: initialization from incompatible pointer type /home/v4l/master/v4l/dst.c:1860: warning: initialization from incompatible pointer type This patch corrects the function prototype on both modules to follow the core change. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-07-16merge: http://linuxtv.org/hg/~endriss/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-07-13dvb-core: fix signedness warnings and const strippingTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> Make some pointers const, and then delete some now unnecessary casts, which were the wrong signedness anyway, being used to strip the const from another pointer. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2007-07-13dvb-core: Fix signedness warnings (gcc 4.1.1, kernel 2.6.22)Oliver Endriss
From: Oliver Endriss <o.endriss@gmx.de> Fix signedness warnings (gcc 4.1.1, kernel 2.6.22). Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
2007-07-13stv0299: Fix signedness warning (gcc 4.1.1, kernel 2.6.22)Oliver Endriss
From: Oliver Endriss <o.endriss@gmx.de> Fix signedness warning (gcc 4.1.1, kernel 2.6.22). Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
2007-07-13dvb-ttpci: re-initialize aspect ratio and pan scan after arm crashOliver Endriss
From: Oliver Endriss <o.endriss@gmx.de> Re-initialize aspect ratio and pan scan after arm crash. Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
2007-07-13saa7146/dvb-ttpci: Fix signedness warnings (gcc 4.1.1, kernel 2.6.22)Oliver Endriss
From: Oliver Endriss <o.endriss@gmx.de> Fix signedness warnings (gcc 4.1.1, kernel 2.6.22). Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
2007-07-05Firmware extract and loading for opera dvb-usb updateMarco Gittler
From: Marco Gittler <g.marco@freenet.de> Better way of creating and loading the firmware used. Update for get_dvb_firmware script to extract the files for opera usb-box Help file for creating the firmware added Signed-off-by: Marco Gittler <g.marco@freenet.de>
2007-07-02merge: http://linuxtv.org/hg/~mkrufky/pendingMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-07-02Cleanup on cinergyT2: Remove unneeded if(1)Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Before kernel 2.6.14, the driver checked for status before stopping the thread. So, a compatibility test did exist. After 2.6.14, the if (state) were replaced by: if (1) However, it makes no sense to keep the if(1). Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-07-02Fix v4l-dvb backward compatibilityMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Due to several internal API changes on kernel, kernel backward compatibility were lost. Basically, compat.h should be the last include for it to work properly. This patch basically reorders kernel headers to allow backward compat to work fine. Also: Some includes were added after some non-include macros, on old drivers. Better to keep all includes at the beginning of the files. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-07-02Fix the return value in ttpci_budget_init()Michael Krufky
From: Hartmut Birr <e9hack@googlemail.com> if the call to budget_register() fails in ttpci_budget_int(), ttpci_budget_init() returns success. The attached patch will fix this problem. Signed-off-by: Hartmut Birr <e9hack@googlemail.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-07-02cinergyT2: fix flush_workqueue() vs work->func() deadlockMauro Carvalho Chehab
From: Oleg Nesterov <oleg@tv-sign.ru> Spotted and tested by Thomas Sattler <tsattler@gmx.de>. cinergyT2.c does cancel_delayed_work() + flush_scheduled_work() while holding cinergyt2->sem. This leads to deadlock because work->func() needs the same mutex to complete. Another bug is that this code in fact can't reliably stop the re-arming delayed_work. Convert this code to use cancel_rearming_delayed_work() and move it out of ->sem. Another mutex, ->wq_sem, was added to protect against the concurrent open/resume. This patch is a horrible hack to fix the lockup which happens in practice. As Dmitry Torokhov pointed out this driver has other problems and needs further changes. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-07-01unexport dvb_pll_configureMichael Krufky
From: Adrian Bunk <bunk@stusta.de> Now that it's static, it should no longer be exported to modules... Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-06-28merge: ~mkrufky/fcv1236dMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-06-28Fix: remove unused struct that could avoiding load the firmwareMauro Carvalho Chehab
From: Marco Gittler <g.marco@freenet.de> The dvb_usb_device* d is not used anymore and can be removed. Signed-off-by: Marco Gittler <g.marco@freenet.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-06-24or51211: remove hardcoded fcv1236d tuner programmingMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - Remove hardcoded fcv1236d tuner programmming from or51211.c - Alter dvb-bt8xx for the pcHDTV-2000 to use dvb-pll for fcv1236d support. Thanks to Jarom Hatch <jshatch@gmail.com> for testing this change. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Cc: Jarom Hatch <jshatch@gmail.com>
2007-06-22dibusb-mb: fix tuner autodetection regressionMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> We must set i2c_msg.addr in order for the autodetection test to succeed! Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-06-12dvb: Remove static dependencies on dvb-pllMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> This patch removes all static dependencies on the dvb-pll module. All exported dvb_pll_desc's have been UNexported, and the caller will reference the individual dvb_pll_desc by it's index in the pll_list array. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Acked-by: Oliver Endriss <o.endriss@gmx.de> Acked-by: Manu Abraham <manu@linuxtv.org>
2007-06-12dibusb-mb: fix broken 'tuner_pass_ctrl' functionalityMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> 'tuner_pass_ctrl' functionality of the dib3000-mb devices was broken in the previous changeset: "dibusb-mb: convert pll handling to properly use dvb-pll" This patch fixes this problem by assigning this functionality to the i2c_gate_ctrl callback Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
2007-06-12dvb-usb: kill unused tuner/i2c functionsMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> These two functions are no longer being used. kill dvb_usb_tuner_init_i2c kill dvb_usb_tuner_set_params_i2c This functionality has been taken over by dvb-pll Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
2007-06-02dvb-pll digitv dvb-usb: Eliminate last user of dvb_pll_configureTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> The last user of dvb_pll_configure was the dvb-usb function dvb_usb_tuner_calc_regs(), which was nothing more than a wrapper around dvb_pll_configure(). It's just a copy of the functionality provided by the tuner_ops calc_regs method, and can be deleted. There were two users of dvb_usb_tuner_calc_regs(). One was dvb_usb_tuner_set_params_i2c(), which is converted to use fe->ops.tuner_ops.calc_regs(). The other was the digitv driver. This driver can use one of two demods, mt352 or nxt6000. For the mt352, the driver would set tuner_ops.calc_regs to dvb_usb_tuner_calc_regs(). We can just attach dvb_pll and use the tuner_ops.calc_regs() provided by that module. For the nxt600, the driver would set tuner_ops.set_params to digitv_nxt6000_tuner_set_params. That function would in turn use dvb_usb_tuner_calc_regs(). We convert it to use tuner_ops.calc_regs() instead, and use dvb_pll_attach. The digitv_tuner_attach() needs to know which frontend was attached by digitv_frontend_attach(), since the nxt6000 needs tuner_ops.set_params() to be overridden with digitv_nxt6000_tuner_set_params(). So to do this a digitv_state that says which frontend was used is added to the dvb_usb_device private state field. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-06-07Fix flexcop compilationMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Unfortunately, I missed a debug dependency on the last patchset. This patch should properly fix compilation for flexcop-usb on non-pci systems. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-06-07Fix broken b2c2 dependency on non x86 architecturesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> As reported by Geert Uytterhoeven <geert@linux-m68k.org>: drivers/media/dvb/b2c2/flexcop-dma.c uses the PCI DMA API, but DVB_B2C2_FLEXCOP doesn't depend on PCI, causing the following problem on PCI-less systems: | linux/drivers/media/dvb/b2c2/flexcop-dma.c:20: warning: implicit declaration of function 'pci_alloc_consistent' | linux/drivers/media/dvb/b2c2/flexcop-dma.c:20: warning: implicit declaration of function 'pci_alloc_consistent' Apparently this is the flexcop DMA core, which is used by both DVB_B2C2_FLEXCOP_PCI and DVB_B2C2_FLEXCOP_USB. This patch moves flexcop-dma (currently used only by flexcop-pci) to b2c2-flexcop-pci module, that is dependent on CONFIG_PCI. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-06-04dvb: use '+=' instead of '=' for EXTRA_CFLAGSTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> The Makefiles in the dvb directory tree used '=' when defining EXTRA_CFLAGS rather than '+=', which is far more common in the rest of the kernel source. = 14 times (9 of which this patch removes) := 25 times += 123 times This change also has certain advantages for the out of kernel v4l-dvb build system. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2007-06-05Replace C code with calls to ARRAY_SIZE macro.Mauro Carvalho Chehab
From: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-06-01Improve compatibility handlingMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> V4L/DVB tree keeps backward compatibility with vanilla 2.6.x kernels. However, if some API changes happens on 2.6.x.y, this wouldn't be handled. This patch improves the compatibility capabilities of the tree by allowing customized scripts to be added on make_config_compat.pl. So, when generating config-compat.h, some compat checks can be done against the kernel tree. The practical effect is allowing compilation on 2.6.17.x trees, used by several distros, where some changes on netdevice.h affects dvb-net, stopping its compilation. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-06-01Reverting last changeset. There were two different patches merged togetherMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-06-01saa7134-tvaudio: kthread conversionMauro Carvalho Chehab
From: Christoph Hellwig <hch@lst.de> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Hermann Pitton <hermann-pitton@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-28tda10086,tda826x: fix tuning, STR/SNR valuesOliver Endriss
From: Oliver Endriss <o.endriss@gmx.de> Several people reported unreliable reception with the current driver. Furthermore, STR and SNR values seem to be inverted. This fix is based on a patch posted by Hartmut Hackman. Thanks to Helmut Auer for testing and helping to optimize the patch. tda826x: - set baseband cut-off to 19 MHz tda10086: - change the parameters of the carrier recovery loop - toggle register 0x02 between 0x35 (tuning) and 0x00 (locked) - invert STR and SNR values Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Thanks-to: Hartmut Hackmann <hartmut.hackmann@t-online.de> Thanks-to: Helmut Auer <vdr@helmutauer.de>
2007-05-26Cinergyt2: fix file release handlerMauro Carvalho Chehab
From: Andrew Morton <akpm@linux-foundation.org> If this mutex_lock_interruptible() does fail due to signal_pending() then the state of the driver will get trashed in interesting ways, because userspace cannot and will not retry the close(). Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-23Input: drivers/media - switch to using input_dev->dev.parentMichael Krufky
From: Dmitry Torokhov <dtor at mail.ru> In preparation for struct class_device -> struct device input core conversion switch to using input_dev->dev.parent when specifying device position in sysfs tree. Signed-off-by: Dmitry Torokhov <dtor at mail.ru> Acked-by: Thierry Merle <thierry.merle@free.fr> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-05-22merge: http://linuxtv.org/hg/~aapot/m920xMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-14budget-av: Add support for EasyWatch DVB-S (0x1894:0x001b)Oliver Endriss
From: Oliver Endriss <o.endriss@gmx.de> Add support for Satelco EasyWatch PCI DVB-S card (subsystem 0x1894:0x001b). Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
2007-05-13Backport kernel changeset 59c51591a0ac7568824f541f57de967e88adaa07Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: The original patch is from Michael Opdenacker <michael@free-electrons.com> Fix occurrences of "the the " Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-13Backport kernel changeset beb7dd86a101263bf63a78c7c6d4da3849b35bd6Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: The original patch is from Robert P. J. Day <rpjday@mindspring.com>: Fix misspellings collected by members of KJ list. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-13Backport several i2c cleanups from mainstreamMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> backport commit 2096b956d24c4b5950b808fc23b218425d79ebb1 from David Brownell <david-b@pacbell.net> Maybe I've merged also other i2c cleanups here that happened on Kernel. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-13Whitespace cleanupsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-13Backport several changesets on dvb_net.cMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Backport several patches from Arnaldo Carvalho de Melo <acme@redhat.com>: [SK_BUFF]: Introduce skb_copy_from_linear_data{_offset} [SK_BUFF]: Convert skb->tail to sk_buff_data_t [SK_BUFF]: Introduce skb_mac_header() The API changed on 2.6.22, so this patch add the proper compat macros to allow compilation with older versions. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-13backport mainstream changeset 6473d160b4aba8023bcf38519a5989694dfd51a7Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: The original kernel patch is from Jean Delvare <khali@linux-fr.org> PCI: Cleanup the includes of <linux/pci.h> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-13Backport kernel changeset e63340ae6b6205fef26b40a75673d1c9c0c8bb90Mauro Carvalho Chehab
From: Mauro Carvalho Chehab kernel-sync: The original patch description, from Randy Dunlap <randy.dunlap@oracle.com>: header cleaning: don't include smp_lock.h when not used Remove includes of <linux/smp_lock.h> where it is not used/needed. Suggested by Al Viro. Builds cleanly on x86_64, i386, alpha, ia64, powerpc, sparc, sparc64, and arm (all 59 defconfigs). Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-09dibusb-mb: use dvb_attach for dib3000mb_attachMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> convert calls to dib3000mb_attach to use dvb_attach Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-05-09dibusb-mb: convert pll handling to properly use dvb-pllMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> moved tda665x pll_init into dvb_pll_desc dvb_pll_tda665x.initdata convert handling of tda665x and tua6010xs to properly use dvb-pll Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-05-09umt-010: trivial whitespace cleanupMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-05-09umt-010: convert tua6034 handling to properly use dvb-pllMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>