summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'work'Mauro Carvalho Chehab2006-01-1511-83/+180
|\
| * V4L/DVB (3390): Added remote control support for pinnacle pctvMarkus Rechberger2006-01-151-0/+77
| | | | | | | | | | | | | | | | - Added remote control support for pinnacle pctv Signed-off-by: Markus Rechberger <mrechberger@gmail.com> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * V4L/DVB (3386): fix some sound quality & distortion problems.Ricardo Cerqueira2006-01-151-2/+2
| | | | | | | | | | | | | | | | - Fix some sound quality & distortion problems. Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * V4L/DVB (3385): Return -EINVAL for unknown commands in msp3400 module.Hans Verkuil2006-01-151-2/+2
| | | | | | | | | | | | | | - Return -EINVAL for unknown commands. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * V4L/DVB (3384): Separate tv & radio freqs, fix cb/freq transmit order for ↵Hans Verkuil2006-01-158-79/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tuners that need this. - Moved MSP_SET_MATRIX to v4l2-common.h - Fix typos and integer overflows in tea5767.c - Split old freq field into a tv_freq and a radio_freq. Prevents that a radio tuner is initialized with a tv frequency or vice versa. - When switching to radio mode initialize the tuner with the last used radio frequency (this was already done for the TV mode). As a result of these changes the tuner module now remembers the last set radio and TV frequencies, which is what you would expect to happen. - Move out of range frequencies to the closest valid frequency as per v4l2 API spec. - Fix incorrect initial radio frequency (multiplier is 16000, not 16) - Add boundary check for out of range frequencies. - Use new flag to check if the order of the CB and freq. depends on the last set frequency. That is needed for some tuners or you can get static as a result. The flag is added for those tuners where I know that the datasheet indicates that this is necessary. - For this new check use the last set div value, not the last frequency as radio frequencies are always much higher due to the 16000 multiplier. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | Merge branch 'work'Mauro Carvalho Chehab2006-01-1511-41/+58
|\|
| * V4L/DVB (3375): git dvb callbacks fixAndrew Morton2006-01-151-1/+0
| | | | | | | | | | | | | | - Not sure what went wrong here, but SND_PCI_PM_CALLBACKS got deleted. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * V4L/DVB (3380): Semaphore to mutex conversion on drivers/mediaIngo Molnar2006-01-154-32/+34
| | | | | | | | | | | | | | | | | | | | - Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * V4L/DVB (3378): Fix for lack of analog output on some cx88 boardsPanagiotis Christeas2006-01-151-1/+7
| | | | | | | | | | | | | | | | | | - Workaround to fix a known regression at cx88-tvaudio.c - provide a module parameter workaround to always enable analog output. Signed-off-by: Panagiotis Christeas <p_christ@hol.gr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * V4L/DVB (3377): make some code staticAdrian Bunk2006-01-152-2/+2
| | | | | | | | | | | | | | - This patch makes some needlessly global code static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * V4L/DVB (3376): cx88 Kconfig fixes for cx88-alsaMauro Carvalho Chehab2006-01-151-2/+1
| | | | | | | | | | | | | | - Cx88 alsa is experimental. - Removed need of PCM OSS for an ALSA module. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * V4L/DVB (3371): Turn frame locked sound on, basic support for FM radio with ↵Hartmut Hackmann2006-01-152-3/+14
| | | | | | | | | | | | | | | | | | | | TDA8275(a) - Enabled audio PLL. This is mandatory for NICAM sound - modify FM IF frequency to 5.5MHz for SAA7133/35 if tuner is tda8290 Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6Mauro Carvalho Chehab2006-01-154-6/+28
|\ \ | |/ |/|
| * [PATCH] Fix zoran_card compilation warningJean Delvare2006-01-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Fix the following warning which was introduced in 2.6.15-git8 by commit 7408187d223f63d46a13b6a35b8f96b032c2f623: CC [M] drivers/media/video/zoran_card.o drivers/media/video/zoran_card.c: In function `zr36057_init': drivers/media/video/zoran_card.c:1053: warning: assignment makes integer from pointer without a cast Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] Unlinline a bunch of other functionsArjan van de Ven2006-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | Remove the "inline" keyword from a bunch of big functions in the kernel with the goal of shrinking it by 30kb to 40kb Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] Add bttv sub bus_type probe and remove methodsRussell King2006-01-132-2/+24
| | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | V4L/DVB (3363): Add support for Samsung tuner TCPN 2121P30AHans Verkuil2006-01-132-1/+25
| | | | | | | | | | | | | | | | - Add support for Samsung tuner TCPN 2121P30A, used in Hauppauge PVR-500 cards. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | V4L/DVB (3359): Redesign tuners struct for maximum flexibilityMichael Krufky2006-01-133-727/+1402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tunertype struct redefined to allow one or more tuner_params structs per tuner definition, one for each video standard. - Each tuner_params struct has an element containing an arbitrary amount of tuner_ranges. (this is needed for dvb tuners - to be handled later) - A tuner_range may be referenced by multiple tuner_params structs. There are many duplicates in here. Reusing tuner_range structs, rather than defining new ones for each tuner, will cut down on memory usage, and is preferred when possible. - tunertype struct contains an element, has_tda988x. We must set this for all tunertypes that contain a tda988x chip, and then we can remove this setting from the various card structs. - Improves tuners array memory usage efficiency. - Right now, all tuners are using the first tuner_params[] array element for analog mode. In the future, we will be merging similar tuner definitions together, such that each tuner definition will have a tuner_params struct for each available video standard. At that point, the tuner_params[] array element will be chosen based on the video standard in use. Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | V4L/DVB (3357): Build cx88-alsa when CONFIG_VIDEO_CX88_ALSA is selected.Michael Krufky2006-01-131-0/+1
| | | | | | | | | | | | | | - Build cx88-alsa when CONFIG_VIDEO_CX88_ALSA is selected. Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | V4L/DVB (3356): Include missing MODULE_* macrosMauro Carvalho Chehab2006-01-131-0/+4
| | | | | | | | | | | | | | - Include missing MODULE_* macros. - Fixed cx88_vp3054_i2c: module license 'unspecified' taints kernel. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | V4L/DVB (3354e): bttv semaphore to mutex conversionIngo Molnar2006-01-132-32/+33
| | | | | | | | | | | | | | | | | | | | | | | | Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. build-tested. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | V4L/DVB (3354a): Remove old MODULE_PARM in media/video/Eric Sesterhenn / snakebyte2006-01-134-11/+11
| | | | | | | | | | | | | | Changes MODULE_PARM usage to module_param Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | V4L/DVB (3355): removed uneeded init on structs like static int foo=0Mauro Carvalho Chehab2006-01-139-31/+30
|/ | | | | | | - Static vars are equal to zero by default. Removed unnecessary =0 from them, saving some data space Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3354): VIDEO_SAA7134_ALSA shouldn't select SND_PCM_OSSAdrian Bunk2006-01-121-1/+1
| | | | | | | | - There's no reason for an ALSA driver to select an OSS legacy userspace interface. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3352): Some fixes to compat_ioctl32Guy Martin2006-01-121-112/+259
| | | | | | | | | | | | | | - Adds suppport or fix support for VIDIOC_ENUMSTD, VIDIOC_ENUMINPUT, VIDIOC_G_TUNER and VIDIOC_S_TUNER. - Fix the warnings at compile time and add checks for the pointer validity using access_ok(). - v4l_print_ioctl() has also be added to identify possible missing ioctls. - Has been tested on sparc64 and amd64. Other arches such as mips and hppa are expected to work as sparc, but not tested yet. Signed-off-by: Guy Martin <gmsoft@tuxicoman.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3349): Add PCI ID for UltraView DVB-T Plus, rebranded DViCO ↵Michael Krufky2006-01-121-0/+5
| | | | | | | | | FusionHDTV DVB-T Plus - Add PCI ID for UltraView DVB-T Plus,rebranded DViCO FusionHDTV DVB-T Plus Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3348): debug renamed to cx25840_debugHans Verkuil2006-01-121-8/+8
| | | | | | | | - Debug var renamed to cx25840 to avoid conflicts with other var with the same name at kernel Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3347): Fixes some bad global variablesHans Verkuil2006-01-113-14/+14
| | | | | | | | - Debug global var is already used inside kernel, so renamed debug to tuner_debug for the tuner module Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3345): Fixes some bad global variablesMauro Carvalho Chehab2006-01-1110-179/+179
| | | | | | | | | - Debug global var is already used inside kernel. - v4l_dbg now expects the debug var - global vars inside msp34xx renamed to msp_* Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3344f): Stradis Kconfig url changedJiri Slaby2006-01-111-1/+1
| | | | | | | | http://www.stradis.com/decoder.html returns `No input file specified.' Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3344e): Stradis LindentJiri Slaby2006-01-111-414/+389
| | | | | | | | Stradis Lindent + some handwork Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3344d): Stradis video little cleanupJiri Slaby2006-01-111-102/+68
| | | | | | | | | | Unused function removed. Used container_of instead of for loop. Some small changes Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3344c): Pci probing for stradis driverJiri Slaby2006-01-112-85/+113
| | | | | | | | | | | | - Pci probing functions added, some functions were rewritten. - Use PCI_DEVICE macro. - dev_ used for printing when pci_dev available. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3344b): don't ignore return from i2c_add_driver() for tuner-3036Arthur Othieno2006-01-111-2/+1
| | | | | | | | | | | The call to i2c_add_driver() may actually fail, but tuner-3036 ignores this and always returns 0, regardless. Fix it up so it returns what i2c_add_driver() does, instead. Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3344a): Conversions from kmalloc+memset to k(z|c)allocPanagiotis Issaris2006-01-1159-186/+87
| | | | | | | | Conversions from kmalloc+memset to k(z|c)alloc. Signed-off-by: Panagiotis Issaris <takis@issaris.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3344): Enable microtune for Pinnacle 300i boardsRicardo Cerqueira2006-01-111-1/+1
| | | | | | | | - The Pinnacle 300i (like the PCTV Stereo) needs tda9887 port2 set to 1 for the tuner to work Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3342): More whitespace cleanup in bttv-cards.cMichael Krufky2006-01-111-1/+1
| | | | | | | - More whitespace cleanup in bttv-cards.c Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3341): whitespace cleanup: insert missing space before curly bracketsMichael Krufky2006-01-111-141/+141
| | | | | | | - whitespace cleanup: insert missing space before curly brackets Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3340): Add bttv card MagicTV (rebranded MachTV)Julian Calaby2006-01-113-0/+30
| | | | | | | | - Add bttv card MagicTV (rebranded MachTV) Signed-off-by: Julian Calaby <julian.calaby@gmail.com> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3339): Activate remote control on HVR1100Chris Pascoe2006-01-111-0/+1
| | | | | | | | - Add a missing case which was preventing the operation of the HVR1100 remote. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (3329): cx88_subids whitespace cleanupChris Pascoe2006-01-091-4/+4
| | | | | | | - Clean up a recently introduced spaces vs tabs whitespace problem. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
* V4L/DVB (3326): Fix stereo and standard reporting of msp3400 (esp. for radio)Hans Verkuil2006-01-094-59/+100
| | | | | | | | | | | - Add VIDIOC_LOG_STATUS to the radio device ioctl list. - Reduce the confusion between modes and standards - Fix stereo reporting for radio. - Don't set i2c configuration if the chip doesn't support it. - Fix reporting of current standard for radio. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
* V4L/DVB (3324): msp3400 audio handling bug fixes.Hans Verkuil2006-01-093-80/+156
| | | | | | | | | | | | | | | | | | | | | | | - Check capabilities for audio settings (volume, balance, bass, treble, loudness, mute) - added loudness support - added missing VIDEO_AUDIO_BALANCE flags for v4l1 compatibility - do not call msp_any_detect_stereo for non-autoselect chips to retrieve the current stereo setting: that will temporarily mute the sound. It is only needed when the stereo mode might be changed, and for autoselect msp processors that do not periodically need to update their stereo setting. - do not wake up the thread if the standard did not change. Prevents temporary audio drop-out if the standard is set to the same value. - fix confused stereo detect code where V4L2_TUNER_SUB_STEREO and V4L2_TUNER_MODE_STEREO values were used incorrectly. - stereo mode reporting was broken (v4l2 value used to index a string array expecting v4l1 mode values). - do not set dsp register 0x30 in the 3410d thread: that register does not exist for pre-'G' revision msp chips. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
* V4L/DVB (3317): msp3400: use v4l2_std_id and determine chip capabilities.Hans Verkuil2006-01-093-78/+98
| | | | | | | | | - Replace old norm by the v4l2_std_id values. - Add code to correctly detect the various capabilities of the various msp chips. It's not yet used, that's going to be the next step. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
* V4L/DVB (3315): Use correct AGC settings for DNTV Live! DVB-T ProChris Pascoe2006-01-091-3/+26
| | | | | | | | | - My original settings for this board were incorrect and resulted in an increased number of signal dropouts. Replace this with the settings from the Windows driver. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
* V4L/DVB (3311): DViCO FusionHDTV DVB-T Dual Digital PCI supportChris Pascoe2006-01-093-0/+58
| | | | | | | - Support for DVB reception on the PCI half of the DViCO DVB-T Dual Digital. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
* V4L/DVB (3309): SAA7134: GPIO IRQ improvementsPeter Missel2006-01-092-28/+72
| | | | | | | | | | | | | | | | | | | - Saa7134-core.c saa7134_irq(): Separate GPIO16 and GPIO18 handling. Call IR-remote-GPIO handler only if the GPIO IRQ is "owned" by it. Added infrastructure to branch out to a future I2C-IR IRQ handler. saa7134-core.c saa7134_hwinit2(): Enable only the one GPIO pin and edge to trigger an IRQ that is wired as keyup/keydown mask. IRQ will only be generated for an actual key-down event. saa7134-input.c flyvideo_codes[]: Replace numpad keys with normal ones. Put meaning to mystery keys. Change some key definitions to have their functions match their labels better. Fix typos. saa7134-input.c flydvb_codes[]: Added new table for the larger remote that comes with the LifeView FlyDVB series. saa7134-input.c build_key(): In IRQ mode, signal key-down and then key-up straight in one go. Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
* V4L/DVB (3307): Some cleanups at I2C modulesMauro Carvalho Chehab2006-01-0916-43/+30
| | | | | | | | - i2c names shorten - removed obsoleted flags on newer modules - small cleanups Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
* V4L/DVB (3305): Replaces old debug msgs to newer onesMauro Carvalho Chehab2006-01-092-52/+49
| | | | | | | - Replaces old debug msgs from bt832, tda743d and tda9875 to newer ones as defined under v4l2-common.h. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
* V4L/DVB (3303): Both AverTV Studio 303 cards #6 and #36 use the same IR ↵George Gazurkoff2006-01-091-0/+1
| | | | | | | | | | | programming. - Both AverTV Studio 303 cards, #6 and #36, use the same remote control programming. Signed-off-by: George Gazurkoff <gazurkoff@gmail.com> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>