summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
AgeCommit message (Collapse)Author
2006-10-29pvrusb2: use NULL instead of 0Mauro Carvalho Chehab
From: Randy Dunlap <randy.dunlap@oracle.com> Fix sparse NULL usage warnings: drivers/media/video/pvrusb2/pvrusb2-v4l2.c:714:14: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-v4l2.c:715:16: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-v4l2.c:1079:10: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c:224:58: warning: Using plain integer as NULL pointer Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-21Two cleanups made at kernel treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-21IRQ: Maintain regs pointer globally rather than passing to IRQ handlersMauro Carvalho Chehab
Kernel-sync: This patch is required to allow compilation of the tree with kernel 2.6.19. This is the original description of the original patch, signed by David Howells <dhowells@redhat.com>: Maintain a per-CPU global "struct pt_regs *" variable which can be used instead of passing regs around manually through all ~1800 interrupt handlers in the Linux kernel. The regs pointer is used in few places, but it potentially costs both stack space and code to pass it around. On the FRV arch, removing the regs parameter from all the genirq function results in a 20% speed up of the IRQ exit path (ie: from leaving timer_interrupt() to leaving do_IRQ()). Where appropriate, an arch may override the generic storage facility and do something different with the variable. On FRV, for instance, the address is maintained in GR28 at all times inside the kernel as part of general exception handling. Having looked over the code, it appears that the parameter may be handed down through up to twenty or so layers of functions. Consider a USB character device attached to a USB hub, attached to a USB controller that posts its interrupts through a cascaded auxiliary interrupt controller. A character device driver may want to pass regs to the sysrq handler through the input layer which adds another few layers of parameter passing. I've build this code with allyesconfig for x86_64 and i386. I've runtested the main part of the code on FRV and i386, though I can't test most of the drivers. I've also done partial conversion for powerpc and MIPS - these at least compile with minimal configurations. This will affect all archs. Mostly the changes should be relatively easy. Take do_IRQ(), store the regs pointer at the beginning, saving the old one: struct pt_regs *old_regs = set_irq_regs(regs); And put the old one back at the end: set_irq_regs(old_regs); Don't pass regs through to generic_handle_irq() or __do_IRQ(). In timer_interrupt(), this sort of change will be necessary: - update_process_times(user_mode(regs)); - profile_tick(CPU_PROFILING, regs); + update_process_times(user_mode(get_irq_regs())); + profile_tick(CPU_PROFILING); I'd like to move update_process_times()'s use of get_irq_regs() into itself, except that i386, alone of the archs, uses something other than user_mode(). Some notes on the interrupt handling in the drivers: (*) input_dev() is now gone entirely. The regs pointer is no longer stored in the input_dev struct. (*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does something different depending on whether it's been supplied with a regs pointer or not. (*) Various IRQ handler function pointers have been moved to type irq_handler_t. Signed-Off-By: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-18merge: http://linuxtv.org/hg/~hhackmann/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-18Fix mode switch of Compro Videomate T300Hartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> The board did not return to analog mode since the board specific "demod sleep" function was not called. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-17merge: http://linuxtv.org/hg/~mcisely/pvrusb2Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-17Stv680.c: check kmalloc() return value.Mauro Carvalho Chehab
From: Amit Choudhary <amit2030@gmail.com> Signed-off-by: Amit Choudhary <amit2030@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-16cx88: use external adc for rca audio inputs on the ASUS PVR-416Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> For the ASUS PVR-416, the external adc must be used for the rca audio inputs, but television / radio inputs use the internal adc. Thanks to Alex Deucher for lending his card to me. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-10-16cx88: use external adc for svideo/composite on the KWorld HardwareMpegTV XPertMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> For the KWorld HardwareMpegTV XPert, the external adc must be used for svideo / composite inputs, but television / radio inputs use the internal adc. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-10-16cx88: determine whether or not to use external adc based on input settingMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Some cx88-blackbird boards use an external adc, but not necessarily for all inputs. Thus, this needs to be configurable on the card level for each input. This patch allows for the usage of the external adc to be determined by a bit setting in the cx88_input struct for cards based on the cx88 blackbird design. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-10-16cx88: cleanupsMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - fixed whitespace, replaced leading spaces with tabs - moved .mpeg descriptor below input settings Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-10-15pvrusb2: Implement IR reception for 24xxx devicesMike Isely
From: Mike Isely <isely@pobox.com> Unlike 29xxx devices, the 24xxx model series does not have a dedicated I2C device for reception of IR codes. Instead IR is handled directly by the FX2 microcontroller and the results are communicated via commands to the FX2. Rather than implement a whole new IR reception pathway for 24xxx devices, this changeset instead emulates the presence of the 29xxx device's I2C based IR receiver by intercepting commands to that chip and issuing appropriate FX2 commands to do the needed action. This has the result of allowing all the usual IR frameworks (ir-kbd-i2c or lirc) to continue working unmodified for 24xxx devices. Signed-off-by: Mike Isely <isely@pobox.com>
2006-10-13merge: http://linuxtv.org/hg/~hverkuil/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-13Fix oops in VIDIOC_G_PARMMauro Carvalho Chehab
From: Jonathan Corbet <corbet-v4l@lwn.net> The call to v4l2_std_construct() in the VIDIOC_G_PARM handler treats vfd->current_norm as if it were an index - but it's not. The result is an oops if the driver has no vidioc_g_parm() method defined. Here's the fix. Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-13drivers/media/video: handle sysfs errorsMauro Carvalho Chehab
From: Jeff Garzik <jeff@garzik.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-13Added support for a ASUSTEK P7131 Dual DVB-T variantHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> This card has no firmware eeprom. The old version still should not need a firmware file due to an undocumented feature of the TDA10046. The patch also includes Hermann Pittons proposal for improved antenna switch handling Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-13add the Asus P7131 Dual hybrid to the new tda8290_i2c_gate_ctrlHartmut Hackmann
From: Hermann Pitton <hermann-pitton@arcor.de> The gate control was moved to a separate function. Signed-off-by: Hermann Pitton <hermann-pitton@arcor.de> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-13Make Remote control of the Pinnacle PCTV 310i workHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> The remote control works, but we still need a better keymap. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-12The Samsung TCPN2121P30A does not have a tda9887Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Contrary to all expections the Samsung TCPN2121P30A tuner does NOT have a tda9887. Remove the tda9887 flag from the tuner definition. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-10-10{ov511,stv680}: handle sysfs errorsMauro Carvalho Chehab
From: Jeff Garzik <jeff@garzik.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-09Fixed an if-block to avoid floating with debug-messagesMauro Carvalho Chehab
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> The dbgarg() macro in videodev.c contains some printk() statements where only the first one is influenced by an if-statement. This causes floating with debug-messages which is fixed by this patch by adding a '{ ... }' pair. Signed-off-by: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-09From: Pádraig Brady <P@draigBrady.com>Mauro Carvalho Chehab
Subject: SECAM support for saa7113 into saa7115 Date: Mon, 09 Oct 2006 12:02:17 +0100 Without the attached trivial patch, the saa7113 is set up for PAL when SECAM is selected and hence will see only show black and white for SECAM signals. Tested the patch against the saa7115 module in linux-2.6.17 with a Pinnacle 50e USB tuner (em28xx). Signed-off-by: Pádraig Brady <P@draigBrady.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-09merge: http://www.linuxtv.org/hg/~stoth/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-09merge: http://linuxtv.org/hg/~hverkuil/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-07Merge: from masterHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-10-07Fix VIDIOC_G_FMT for NTSC in cx25840.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> VIDIOC_G_FMT returned the sliced VBI types in the wrong lines for NTSC (three lines too low). Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-10-06cx88-blackbird module is rejected during probe.Steven Toth
From: Steven Toth <stoth@hauppauge.com> If the last cx88 board probed is not backbird based, and a previous board was, the entire module is unloaded leading to an oops during mpeg_open on the first /dev/videoN device. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2006-10-07Add support for AverMedia AverTV Studio 507Hartmut Hackmann
From: Mikhail Fedotov <mo_fedotov.mail.ru> This is just an additional analog board configuration. Signed-off-by: Mikhail Fedotov <mo_fedotov.mail.ru> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-07Support status readout for saa713x based FM radioHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> This patch adds readout for stereo and signal level for saa713x cards which use the saa713x as FM demodulator. These are many cards based on saa7133, tda8290 and tda8275a. FM channel search should work now. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-07Add support for Pinnacle 310iHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> The driver supports analog TV, radio and DVB-T. It is based on the preliminary patch by Pierluigi Rolando. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-06Fix vivi compile on pariscMauro Carvalho Chehab
From: Matthew Wilcox <matthew@wil.cx> parisc (and several other architectures) don't have a dma_address in their sg list. Use the macro instead. Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-04merge: http://www.linuxtv.org/hg/~stoth/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-05Bugfix: Select the correct cx8802_dev when enumerating by CX88_MPEG_typeSteven Toth
From: Steven Toth <stoth@hauppauge.com> A bug in cx8802_get_driver() meant that in multiboard environments, when testing frontends on the non primary board, the incorrect device was returned resulting in "Unsupported value in .mpeg.." messages. Depending on the electrical design of the hardware (serial, parallel, rising/falling edge detect), transport would still be delivered and the problem went unnoticed. This patch ensures the correct instance of cx8802_dev is returned. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2006-10-04cx88: Add support for VIDIOC_INT_[SR]_REGISTER ioctlsTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> Add support for the advanced debugging ioctls, to allow access to the cx88 registers from userspace. Only i2c_id == 0 is supported, for access to the cx88 adapter itself. There isn't any support for access to I2C clients of the adapter. Most of them don't have R/W registers anyway, and its necessary to use i2c-dev to talk to them from userspace. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2006-10-04USB: Dealias -110 code (more complete)Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Apply the relevant parts of a patch from Pete Zaitcev <zaitcev@redhat.com> kernel-sync: Original description: The purpose of this patch is to split off the case when a device does not reply on the lower level (which is reported by HC hardware), and a case when the device accepted the request, but does not reply at upper level. This redefinition allows to diagnose issues easier, without asking the user if the -110 happened "immediately". The usbmon splits such cases already thanks to its timestamp, but it's not always available. I adjusted all drivers which I found affected (by searching for "urb"). Out of tree drivers may suffer a little bit, but I do not expect much breakage. At worst they may print a few messages. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-04[PATCH] Generic booleanMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Applied the relevant parts of Generic boolean patch from Richard Knutsson <ricknu-0@student.ltu.se> This patch defines: * a generic boolean-type, named 'bool' * aliases to 0 and 1, named 'false' and 'true' Removing colliding definitions of 'bool', 'false' and 'true'. kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-04i2c-algo-bit: Discard the mdelay data struct memberMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Apply the rellevant parts from i2c-algo-bit: Discard the mdelay data struct member, from Jean Delvare <khali@linux-fr.org>, that applies to V4L/DVB tree. kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-04Several typo fixes applied at kernel treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> This patch includes at the v4l-dvb tree several documentation fixes applied at kernel tree. kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-03merge: http://linuxtv.org/hg/~hverkuil/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-034linux: complete conversion to hotplug safe PCI APIMauro Carvalho Chehab
From: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-04Add tveeprom support for Philips FM1236/FM1216ME MK5Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Add new Philips tuners: Philips FM1236 MK5 and Philips FM1216ME MK5. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-10-03Merge with master repositoryHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-02Fix S-Video configuration for Pinnacle PCTV-SatMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> CC: Edgar Toernig <froese@gmx.de> Thanks to Edgar Toernig <froese@gmx.de> for pointing this. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-03SAA713x: fixed compile warning in SECAM fixupHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> The variable fixup could be used uninitialized. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-03Add support for the ASUS EUROPA2 OEM boardHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> This is a analog DVB-T hybrid board Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-03Asus P7131 Dual hybrid, set antenna input for DVB-THartmut Hackmann
From: Hermann Pitton <hermann-pitton@arcor.de> This patch forces the correct antenna input input in DVB-T mode for this card Signed-off-by: Hermann Pitton <hermann-pitton@arcor.de> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-03saa713x audio fixesHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> This change fixes the following issues: - resolve the SECAM D/K vs SECAM-L sound conflict It is now possible to select the SECAM version either by the VIDEOIOC_S_STD IO control or by the new secam= insmod option. The driver now adapts its audio standard search list to the selected standard. - don't trigger a sound standard search when a LINE input is selected. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-02merge: http://linuxtv.org/hg/~hverkuil/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-02Reinstate dropped line to set standard detectionHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The previous patch accidentally dropped a crucial line to set the msp standard detection. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-10-02merge: http://linuxtv.org/hg/~mkrufky/cx88-mpegMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>