summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134
AgeCommit message (Collapse)Author
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>
2006-02-12Fixed saa7134 ALSA initialization with multiple cardsRicardo Cerqueira
From: Ricardo Cerqueira <v4l@cerqueira.org> When multiple cards were installed, only the first card would have audio initialized, because only the first position in the array parameter defaulted to "1" To make things worse, the "enable" parameter wasn't enabled, so there was no workaround. Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
2006-02-06sem2mutex: drivers/media/, #2Mauro Carvalho Chehab
Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Kernel-sync from patch 3318b 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>
2006-02-06Added support for the Tevion DVB-T 220RF cardHartmut Hackmann
From: Peter Hartshorn <p3r@users.sourceforge.net> This is a analog / digital hybrid card Signed-off-by: Peter Hartshorn <p3r@users.sourceforge.net> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-02-03Added support for the ADS Instant TV DUO Cardbus PTV331Hartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> Analog and DVB-T are working, Remote not yet. This card is based on the new LifeView design, there should be many variants. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-02-03Added support for the LifeView FlyDVB-T LR301 cardHartmut Hackmann
From: Giampiero Giancipoli <gianci@libero.it> Additionally to the card support, this changeset adds the option tda10046lifeview to get_dvb_firmware to download tda10046 firmware from LifeView's site. Signed-off-by: Giampiero Giancipoli <gianci@libero.it> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-01-31Allow SAA7134 to fall back to AM sound when there is NICAM-L Hartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> This patch allows to select AM sound even if NICAM is detected. Proposed by Alain Frappin Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-01-31Updated Avermedia 777 DVB-T to use dvb-pllHartmut Hackmann
From: Jose Alberto Reguero <jareguero@telefonica.net> linux/drivers/media/dvb/frontends/dvb-pll.c linux/drivers/media/dvb/frontends/dvb-pll.h - added td1316 tuner linux/drivers/media/video/saa7134/saa7134-dvb.c - changed tuning code for AverTV 777 to use dvb-pll Signed-off-by: Jose Alberto Reguero <jareguero@telefonica.net> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-01-30Add support for the Avermedia 777 DVB-T cardHartmut Hackmann
From: Jose Alberto Reguero <jareguero@telefonica.net> Signed-off-by: Jose Alberto Reguero <jareguero@telefonica.net> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-01-19Mark Typhoon cards as Lifeview OEM'sNickolay V. Shmyrev
From: Peter Missel <peter.missel@onlinehome.de> * linux/Documentation/video4linux/CARDLIST.saa7134: * linux/drivers/media/video/saa7134/saa7134-cards.c: (saa7134_board_init1): * linux/drivers/media/video/saa7134/saa7134-dvb.c: (dvb_init): * linux/drivers/media/video/saa7134/saa7134.h: - mark Typhoon cards as OEM of Lifeview. Signed-off-by: Peter Missel <peter.missel@onlinehome.de> Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
2006-01-18Remove duplicated Avermedia keymaps.Nickolay V. Shmyrev
From: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
2006-01-18Remove duplicated keymaps and add keymap for KWorld LTV883IR.Nickolay V. Shmyrev
From: Nickolay V. Shmyrev <nshmyrev@yandex.ru> * linux/drivers/media/common/ir-keymaps.c: * linux/drivers/media/video/bttv-input.c: (bttv_input_init): * linux/drivers/media/video/cx88/cx88-input.c: (cx88_ir_init): * linux/drivers/media/video/saa7134/saa7134-input.c: (saa7134_input_init1): * linux/include/media/ir-common.h: - Remove duplicated keymaps and add keymap for KWorld LTV883IR. Thanks to Jon Ferguson <jon@sd-6.org>. Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
2006-01-17IR cleanups and consistency adjustmentsRicardo Cerqueira
From: Ricardo Cerqueira <v4l@cerqueira.org> Changed all IR codes to hex, all, keymaps were renamed to ir_codes_<model>, and cleaned a duplicate entry Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
2006-01-17IR keymaps are exported by the ir-common module nowRicardo Cerqueira
From: Ricardo Cerqueira <v4l@cerqueira.org> Moved keymaps to the ir-common module, and export them from there, instead of #including them in each module Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
2006-01-17Move all IR keymaps to a single header fileRicardo Cerqueira
From: Ricardo Cerqueira <v4l@cerqueira.org> All the keymaps have the same structure, and can be shared between different chips, so it makes no sense having them scattered between the input files. This aggregates them all in a new header. Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
2006-01-15Semaphore to mutex conversion on drivers/mediaMauro Carvalho Chehab
From: Ingo Molnar <mingo@elte.hu> 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>
2006-01-14Turn frame locked sound on, basic support for FM radio with TDA8275(a)Hartmut Hackmann
- 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>
2006-01-12removed uneeded init on structs like static int foo=0Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> - static vars are equal to zero by default. Removed unnecessary =0 from them, saving some data space; - Fixed compiling against kernels bellow 2.6.13. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-01-12VIDEO_SAA7134_ALSA shouldn't select SND_PCM_OSSMauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de> 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>
2006-01-11From: Panagiotis Issaris <takis@issaris.org>Mauro Carvalho Chehab
Conversions from kmalloc+memset to k(z|c)alloc Conversions from kmalloc+memset to k(z|c)alloc. kernel-sync 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>