summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134
AgeCommit message (Collapse)Author
2006-04-20saa7134: Missing 'break' in Terratec Cinergy 400 TV initializationMichael Krufky
From: Mikhail Gusarov <dottedmag@dottedmag.net> There is a missing break in card initialization function. Might screw up initialization of Terratec Cinergy 400 TV. Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-11Merge: from V4L1 treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-11Since we are not using CVS, $Id makes no sense anymoreMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-10Add sysfs device links to dvb devicesAndrew de Quincey
From: Andrew de Quincey <adq_dvb@lidskialf.net> Currently in /sys/class/dvb/dvbX.demuxY/ we have: dev uevent With the patch, we have (for a PCI DVB device): dev device -> ../../../devices/pci0000:00/0000:00:1e.0/0000:03:0d.0 uevent So userspace tools can (finally) work out which physical device a DVB adapter refers to. Previously you had to kinda look through dmesg and hope that it hadn't been dumped out of the buffer. This makes debugging a lot easier if the system has been up for a long time! This is done by adding an extra 'struct device *' parameter to dvb_register_adapter(). It will work with any kind of standard linux 'device'. Additionally, if someone has an embedded system which does things differently, they can simply supply 'NULL' and the behaviour will be as before - the link will simply not appear. Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net> Ack'd-by: Manu Abraham <manu@linuxtv.org> Acked-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-07Saa7134: Fix oops with disable_ir=1Mauro Carvalho Chehab
From: Sergey Vlasov <vsu@altlinux.ru> When disable_ir=1 parameter is used, or when saa7134_input_init1() fails for any other reason, dev->remote will remain NULL, and the driver will oops in saa7134_hwinit2(). Therefore dev->remote must be checked before dereferencing. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-04kbuild: fix unneeded rebuilds in drivers/media/video after moving source treeMichael Krufky
From: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Date: Mon, 3 Apr 2006 22:35:36 +0000 (+0200) Subject: kbuild: fix unneeded rebuilds in drivers/media/video after moving source tree X-Git-Url: http://kernel.org/git/?p=linux/kernel/git/sam/kbuild-bugfix.git;a=commitdiff;h=8036dc6bdca0faa981be01377728678a6f6f3fde kbuild: fix unneeded rebuilds in drivers/media/video after moving source tree This fixes some uneeded rebuilds under drivers/media/video after moving the source tree. The makefiles used $(src) and $(srctree) for include paths, which is unnecessary. Changed to use relative paths. Compile tested, produces byte-identical code to the previous makefiles. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-28Wrong version testing... fixed.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-28Make code sync with recent ALSA changes on -gitMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-28Only saa7134-dvb depends on FW_LOADER. Fixing.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-28Added support for the new Lifeview hybrid cardbus modulesHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> There seem to be many variants of this cards with different feature sets. This entry supports analog TV, CVBS and s-video input, FM radio and DVB-T if they are supported by the hardware. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-03-28Corrected CVBS input for the AVERMEDIA 777 DVB-THartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> The .vmux entry needs to be 1 instead of 0 Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-03-28Added PCI IDs of 2 LifeView CardsHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> Added ID entries for the Genius VideoWonder DVB-T and the LifeView FlyTV Platinum Gold Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-03-25Saa7134: select FW_LOADERMauro Carvalho Chehab
From: maximilian attems <maks@sternwelten.at> The saa7134 drivers uses request_firmware() and thus needs to select FW_LOADER. Signed-off-by: maximilian attems <maks@sternwelten.at> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-23Merge from master.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-03-20Fixed a wrong printk message at saa7134Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-19Implement V4L2_TUNER_MODE_LANG1_LANG2 audio modeHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Add a new audio mode V4L2_TUNER_MODE_LANG1_LANG2 (used by VIDIOC_G/S_TUNER). This mode allows the user to select both languages of a bilingual transmission, one language on the left, one on the right audio channel. If there is no bilingual transmission, or it is not supported, then this mode should act like V4L2_TUNER_MODE_STEREO. This mode is introduced for PVR-like drivers where it is useful to be able to record both languages of a bilingual broadcast. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-03-19Cleanup audio input handlingHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Cleanup audio input handling in bttv and tvaudio: - inputs were specified that were never used - mute was handled as a special input which led to confusing code - confusing naming made it difficult to see if the setting was for i2c or gpio. The old audiochip.h input names moved to tvaudio.h. Currently this is used both by tvaudio and msp3400 until the msp3400 implements the new msp3400-specific inputs. Detect in bttv the tvaudio and msp3400 i2c clients and use these client pointers to set the inputs directly instead of broadcasting the command. Removed AUDC_SET_INPUT. Now replaced by VIDIOC_S_AUDIO. This will be replaced again later by the new ROUTING commands. Removed VIDIOC_G_AUDIO implementations in i2c drivers: this command is a user level command and not to be used internally. It wasn't called at all anyway. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-03-18Implement V4L2_TUNER_MODE_LANG1_LANG2 audio modeHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Add a new audio mode V4L2_TUNER_MODE_LANG1_LANG2 (used by VIDIOC_G/S_TUNER). This mode allows the user to select both languages of a bilingual transmission, one language on the left, one on the right audio channel. If there is no bilingual transmission, or it is not supported, then this mode should act like V4L2_TUNER_MODE_STEREO. This mode is introduced for PVR-like drivers where it is useful to be able to record both languages of a bilingual broadcast. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-03-17Fixed no_overlay option and quirks on saa7134 driverMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Some chipsets have several problems when pci to pci transfers are activated on overlay mode. the option no_overlay allows disabling such feature of the driver, in favor of keeping the system stable. The default is to use pcipci_fail flag defined on drivers/pci/quirks.c. It also allows the user to override it by forcing disable overlay or forcing enable. Forcing enable may generate PCI transfer corruption, including disk mass corruption, so should be used with care. Added a text description to this option and make messages looks the same at both bttv and saa7134 drivers. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-15Merging from mchehab vivi branchMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> merge: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-14Medion 7134: Autodetect second bridge chip; Warn that only first decoder is ↵Michael Krufky
supported From: Michael Krufky <mkrufky@linuxtv.org> The device, Medion 7134, has two saa7134 chips on it, but only one of them is functional in the current saa7134 driver. This patch adds autodetection for the second, unsupported saa7134 chip, as SAA7134_BOARD_MD7134_BRIDGE_2, and displays a message to the user (in dmesg) indicating that the second chip isn't yet functional. This is useful for users, since two instances of the saa7134 driver will spawn. This patch will prevent confusion by warning the user that only one of the chips on the board are functional. There are other versions of the SAA7134_BOARD_MD7134 with only a single saa7134 bridge/decoder -- those devices will not be affected by this patch. Only devices containing the second chip will display the warning. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-14whitespace: fix incorrect indentation of curly bracketMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-14saa7134: make unsupported secondary decoder message genericMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> There are already some supported devices that contain two saa713x chips on-board, where only one of these chips is currently functional in the driver. We are already printing a warning message for the second saa7134 decoder in SAA7134_BOARD_AVERMEDIA_A169_B. This patch alters that case to make it generic, so that other cards in the same situation can use it. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-13BUG_ON() Conversion in drivers/video/mediaMauro Carvalho Chehab
From: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-11saa7134: add support for AVerMedia A169 Dual Analog tuner cardMichael Krufky
From: Rickard Osser <ricky@osser.se> - Added support for AVerMedia A169 Dual Analog tuner card (dual saa7134 decoders - only 1 working right now) - Added autodetection for both parts of the card. It shows up like 2 cards, B1 and B - Enabled tuner B1, SVIDEO on B1 and composite1 through SVIDEO, FIXME: B is more or less dead at this point and I suspect the FM-radio is on the B part of the board Signed-off-by: Rickard Osser <ricky@osser.se> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-11LG TALN series: add PAL / SECAM supportMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - added tuner_lg_taln_pal_secam_ranges - renamed tuner 66 from TUNER_LG_NTSC_TALN_MINI to TUNER_LG_TALN - updated FlyTV mini Asus Digimatrix with new tuner Thanks-to: Rickard Osser <ricky@osser.se> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-11saa7134: small whitespace cleanupMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - matched indents on quotes within a printk Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-10Added no_overlay option and quirks to saa7134Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Some chipsets have several problems when pci to pci transfers are activated on overlay mode. the option no_overlay allows disabling such feature of the driver, in favor of keeping the system stable. The default is to use pcipci_fail flag defined on drivers/pci/quirks.c. It also allows the user to override it by forcing disable overlay or forcing enable. Forcing enable may generate PCI transfer corruption, including disk mass corruption, so should be used with care. Added a text description to this option and make messages looks the same at both bttv and saa7134 drivers. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-10Make video_buf more genericMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Video_buf were concerned to allow PCI devices to be used as video capture devices. This patch extends video_buf features by virtualizing pci-dependent functions and allowing other type of devices to use it. It is still DMA centric, although it may be used also by devices that emulates scatter/gather behavior or a DMA device Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-08Saa7134: document that there's also a 220RF from KWorldAdrian Bunk
I have the same card with the same PCI id, but from KWorld. The patch documents that this is the same card. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-28Coding style fixes in saa7134-dvb.cHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> deleted 2 semicolons at end of functions Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-02-28Fixes for Lifeview Trio non fatal bugsHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> - Init message was sent to wrong slave address - Deleted outdated comment Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-02-27ELSA EX-VISION 500TV: fix incorrect PCI subsystem IDMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - ELSA EX-VISION 500TV was incorrectly programmed to have the same subsystem ID as ELSA EX-VISION 300TV, (1048:226b) - This changeset replaces the incorrect subsystem ID (1048:226b) with the correct one (1048:226a) for the ELSA EX-VISION 500TV. Thanks-to: TAMUKI Shoichi <tamuki@linet.gr.jp> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-27ELSA EX-VISION 700TV: fix incorrect PCI subsystem IDMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - Corrected autodetection for saa7130 card: subsystem: 1048:226c, board: ELSA EX-VISION 700TV Thanks-to: Gunther Mayer <gunther.mayer@gmx.net> Signed-off-by: TAMUKI Shoichi <tamuki@linet.gr.jp> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-26Merge hhackmann treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Also fixed a missing ; at the end of a function Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-24Merging hhackmann tree.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> merge: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-23Add DVB-T support for the LifeView DVB Trio PCI cardHartmut Hackmann
From: Nico Sabbi <nsabbi@tiscali.it> This patch adds DVB-T support, no DVB-S yet Signed-off-by: Nico Sabbi <nsabbi@tiscali.it> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-02-23Fixed Pinnacle 300i DVB-T support Hartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> - fixed tda9886 port 2 setting - turned remote control receiver off via saa7134 GPIO to avoid i2c hangs - modified tda9886 client calls to direct i2c access to allow proper return to analog mode - allow mode change to V4L2_TUNER_DIGITAL_TV in tuner VIDIOC_S_FREQUENCY client call Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-02-22Restore power on defaults of tda9887 after tda8290 probeHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> The probing code for tda8290 changes the state of the tda9887 GP ports. The patch assumes that if probing for tda8290 failed, this must be a tda9887 and restores its power on defaults. This should solve the module load order issue with some pinnacle cards. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-02-19TUV1236d: declare buffer as static constMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> On 2/17/06, Darren Salt <linux@youmustbejoking.demon.co.uk> wrote: > + u8 buffer [] = { 0x10,0x12,0x13,0x04,0x16,0x00,0x14,0x04,0x017,0x00 }; > Shouldn't buffer be declared static const? Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-17Merge from mkrufky tree.Mauro Carvalho Chehab
Some small updates in the comments for KWorld HardwareMpegTV XPert. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-17LifeView FlyDVB-T Duo: add support for remote controlMichael Krufky
From: Rudo Thomas <rudo@matfyz.cz> The remote controller on the LifeView FlyDVB-T Duo card work flawlessly with the same settings as the LifeView FlyDVB-T LR301 card. Signed-off-by: Rudo Thomas <rudo@matfyz.cz> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-17Kworld ATSC110: initialize the tuner for analog mode on module loadMichael Krufky
From: Curt Meyers <cmeyers@boilerbots.com> - Enable the tuv1236 tuner on the Kworld-ATSC110 card so that the tuner can be identified when tuners.ko loads. - With this change it is no longer necessary to remove and reload the tuner module in order to get the tuv1236 identified. - This code was copied from the ATI HDTV Wonder init routine (in cx88-cards.c) which also uses the TUV1236D. Signed-off-by: Curt Meyers <cmeyers@boilerbots.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-16Kworld ATSC110: cleanupsMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - There is no radio with this tuner card... Thanks-to: Dwaine Garden <DwaineGarden@rogers.com> - fixed capitalization in card name. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-15Kworld ATSC110: enable composite and svideo inputsMichael Krufky
From: Curt Meyers <cmeyers@boilerbots.com> - corrected composite input. - verified s-video input. Signed-off-by: Curt Meyers <cmeyers@boilerbots.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-15KWorld ATSC110: implement set_pll_inputMichael Krufky
From: Curt Meyers <cmeyers@boilerbots.com> - When tuning VSB, use ANT input - When tuning QAM, use CABLE input Signed-off-by: Curt Meyers <cmeyers@boilerbots.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-15Add support for Kworld ATSC110Michael Krufky
From: Andrew Burri <andrew.burri@gmail.com> Signed-off-by: Andrew Burri <andrew.burri@gmail.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-13Merging rmcc tree.Mauro Carvalho Chehab
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-13Pinnacle PCTV 40i: add filtered Composite2 input for Composite signals on ↵Michael Krufky
S-Video From: Karsten Suehring <ksuehring@gmx.net> This patch adds another composite input to the Pinnacle PCTV 100i definition which filters the chrominace signal from the luma input. This improves video quality for Composite signals on the S-Video connector of the card. In addition the name string of the card is changed to include PCTV 40i and 50i since these cards are identical. Signed-off-by: Karsten Suehring <ksuehring@gmx.net> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-13Add saa713x card: ELSA EX-VISION 700TV (saa7130)Michael Krufky
From: Tamuki Shoichi <tamuki@linet.gr.jp> Add support for ELSA EX-VISION 700TV, which is the ELSA Japan's flagship model of the software encoding TV capture card. All inputs (Television, Composite1 and S-Video) have been tested. Signed-off-by: TAMUKI Shoichi <tamuki@linet.gr.jp> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>