summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88
AgeCommit message (Collapse)Author
2006-05-15merge: http://linuxtv.org/hg/~mkrufky/cx88Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-05-13Fix cx24123 diseqcAndrew de Quincey
From: Andrew de Quincey <adq_dvb@lidskialf.net> Rework diseqc support to be more in line with the other demod drivers. Fix Nova-S-Plus/Nova-SE2 diseqc. Cleanup API. Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
2006-05-11Adjust VBI offset to match value reported in VBI formatMauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> The actual offset of the start of VBI data is incorrectly documented for both the cx2388x and bt8x8. For the cx2388x, it appears to be about 220 to 224 + VBI_V_DEL*2. The driver has been incorrectly reporting an offset of 244. This patch adjusts VBI_V_DEL to 10, so that the offset of 244 is correct. This is the same offset as the bttv driver, and expected by some software. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-05-09cx88-blackbird: add support for ProLink Pixelview Playtv@P7000Michael Krufky
From: Angelo Marconi <am@massalombarda.net> - Add support for ProLink Pixelview Playtv@P7000 Raw video and MPEG encoded video confirmed to work properly. SVideo, Composite and FM inputs are untested - disabled for now. Signed-off-by: Angelo Marconi <am@massalombarda.net> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-05-09Cx88 NTSC VBI fixesMauro Carvalho Chehab
From: Michael Schimek <mschimek@gmx.at> Hi, VBI (Closed Caption, CC) capturing never worked in NTSC mode with the cx88 driver. They were tested with libzvbi and a patched version of tvtime. Signed-off-by: Michael H. Schimek <mschimek@gmx.at> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-05-06cx88: add autodetection for another Twinhan VP-3054 board.Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Added autodetection for PCI subsystem id 1822:0019 to use the card definition for CX88_BOARD_DNTV_LIVE_DVB_T_PRO Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-05-04cx88-blackbird: use encoder firmware filename defined in cx2341x.hMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Since the filename of the cx23416 encoder firmware image is defined in cx2341x.h, we don't need to explicitly define it in cx88-blackbird.c anymore. This changeset removes BLACKBIRD_FIRM_ENC_FILENAME, replacing all occurrances with CX2341X_FIRM_ENC_FILENAME. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-05-03fix build for older gcc's that dont support compiler macros in a function callMichael Krufky
From: Julian Scheel <julian@jusst.de> This patch fixes the build when using older gcc-versions which do not support compiler-macros in a function-call. Signed-off-by: Julian Scheel <julian@jusst.de> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-05-03[ALSA] add __devinitdata to all pci_device_idMauro Carvalho Chehab
From: Henrik Kretzschmar <henne@nachtwindheim.de> kernel-sync: Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-30cx88-blackbird: pause the encoder during frequency changeMichael Krufky
From: Valentin Zagura <puthre@gmail.com> Added code to cx88-blackbird.c to treat the VIDIOC_S_FREQUENCY ioctl to stop mpeg stream before changing the frequency and restart it after. It seems that the mpeg stream needs to be paused while changing the channel frequency, otherwise the mpeg encoder enters into a bad state, producing artifacts. Signed-off-by: Valentin Zagura <puthre@gmail.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-28merge: from ~mkrufky/blackbird.fwMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-27v4l: rename TUNER_LG_TDVS_H062F to TUNER_LG_TDVS_H06XFMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-24rename fe_lgh06xf.h to lg_h06xf.hMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-24merge: http://linuxtv.org/hg/~quincy/v4l-dvb-tuner-refactorMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-20cx88-blackbird: clean up the buffers when closing the MPEG streamMichael Krufky
From: Valentin Zagura <puthre@gmail.com> This patch cleans up the buffer queue when the MPEG stream is closed, preventing the message, 'cx8802_timeout' Signed-off-by: Valentin Zagura <puthre@gmail.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-19Fix tda10046 tuningAndrew de Quincey
From: Andrew de Quincey <adq_dvb@lidskialf.net> I'd missed the i2c gate ctrl function out of the tda10046, so tuning didn't work Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
2006-04-18Convert cx88-dvb to refactored tuner codeAndrew de Quincey
From: Andrew de Quincey <adq_dvb@lidskialf.net> Rename pll calls to appropriate tuner calls. Remove pll functions from demod structures. Hook tuner call into tuner_ops. Attach dvb-pll where possible. Add pll gate control calls where appropriate. Sort out the hybrid cards to work with the revamped mt352/sl10353 demods supporting external tuners. Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
2006-04-18cx88-dvb: use fe_lgh06xf.hMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - removed duplicated tuning code for LG TDVS H062F/H064F Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-17KWorld HardwareMpegTV XPert: set encoder video standard based on tvnormMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> The KWorld HardwareMpegTV XPert uses a multistandard tuner, tda8290 + tda8275. Without checking the video standard in blackbird_probe, the encoder defaults to PAL, even if the incoming video stream is NTSC. This patch checks the video standard set by the cx2388x decoder, and sets the encoding height and frame accordingly. This patch is designed to only affect the KWorld HardwareMpegTV XPert. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-17cx88-blackbird: revert video standard detection patchMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> This patch reverts changeset 328131dbb141 This patch was wrong... a better solution will come shortly. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-16KWorld HardwareMpegTV XPert: Enable Blackbird MPEG encoder supportMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - clear I2SIN to deliver the audio stream to the cx23416 mpeg encoder. - enable blackbird support on the KWorld HardwareMpegTV XPert Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-14cx88-blackbird: use standard filename for cx23416 encoder firmwareMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> cx88-blackbird uses the same encoder firmware for the cx23416 chip that is used by ivtv and pvrusb2. This patch alters the driver to expect the cx23416 encoder firmware to be located in the file, "v4l-cx2341x-enc.fw", instead of using "blackbird-fw-enc.bin" Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-14cx88-blackbird: use firmware api commands defined in cx2341x.hMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> This patch removes all of the BLACKBIRD_API #define's, instead using the equivalent CX2341X_ENC #define's in cx2341x.h Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-13cx88-blackbird: fix typoMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> BLACKBIRD_FIELD1_SAA7115 was repeated. Corrected version reads: blackbird_api_cmd(dev, BLACKBIRD_API_SET_CAPTURE_LINES, 2, 0, BLACKBIRD_FIELD1_SAA7115, BLACKBIRD_FIELD2_SAA7115 ) Thanks-to: Valentin Zagura <puthre@gmail.com> for pointing this out. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-13cx88-blackbird: allow proper detection of PAL vs. NTSC video standardMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - removed test for CX88_BOARD_HAUPPAUGE_ROSLYN prior to determining whether the video standard in use is NTSC or PAL. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-13KWorld HardwareMpegTV XPert: update GPIO for s-video and compositeMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - updated s-video and composite input GPIO settings. Thanks-to: Todd Duffin <nospam@tippyturtle.com> - s-video and composite inputs are still #if 0'd until we can get audio working properly on those inputs. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-13cx88-tvaudio: replace 'if' with 'switch..case'Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> This patch cleans up a potential mess that has yet to occur in the card-specific part of cx88-tvaudio.c that sets sound input from external adc. It may be a good idea to move this setting into cx88-cards.c in the future. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-13cx88: added support for KWorld MCE 200 DeluxeMichael Krufky
From: Valentin Zagura <puthre@gmail.com> This patch adds support for KWorld MCE 200 Deluxe. Raw video is working perfectly, MPEG capture using cx88-blackbird is also working, but the quality could be improved. FIXME: tested TV input only, disabled composite, svideo and radio until they can be tested also. Signed-off-by: Valentin Zagura <puthre@gmail.com> 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-11Correct buffer size calculations in cx88-core.cMauro Carvalho Chehab
From: Duncan Sands <duncan.sands@math.u-psud.fr> The computation in cx88_risc_buffer suffers from the mistake: a non-zero padding value can cause more page borders to be crossed, leading to big buffer over-runs. This patch changes the additive constant from 3 + 4 to 4 It also changees the constant in cx88_risc_databuffer from 3 + 4 to 2, because 2 dwords are the correct vaule. Signed-off-by: Duncan Sands <baldrick@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-10bug fix: Wrong tuner was used pcHDTV HD-3000 cardMichael Krufky
From: Trent Piepho <xyzzy@speakeasy.org> It looks like the HD3000 was prototyped with the 7610 tuner when the driver was developed, but the cards appear to have always shipped with the 7612 tuner and the driver was never adjusted for it. The definition needs to be corrected. - The HD-3000 was prototyped with a Thomson DTT7610, but production versions used a DTT7612 tuner. - This patch changes both dvb-pll settings and V4L tuner type. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.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-10Silence some dprintk's in cx88-mpegAndrew de Quincey
From: Trent Piepho <xyzzy@speakeasy.org> Changeset 395c7c4d8f0c changed several dprintks from level 1 to level 0 (always on). They generate four lines every time DMA starts, which don't containing any information with a use outside of debugging. This turns them back to level 1. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2006-04-07Merge from http://linuxtv.org/hg/~mkrufky/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> merge: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-07cx88 cleanup: move CX88_BOARD_PCHDTV_HD5500 to the end of the cards arrayMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - new cards should always be added to the end of the list. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-07Add support for pcHDTV HD5500 ATSC/QAMRusty Scott
From: Rusty Scott <rustys@ieee.org> Added card definitions for the pcHDTV HD5500 ATSC/QAM card Signed-off-by: Rusty Scott <rustys@ieee.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.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-04-03Change all emails to the currently used one.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-01Kconfig: fix VP-3054 Secondary I2C Bus build configuration menu dependenciesMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> This patch fixes a dependency problem that affected the indentation order within the individual frontend selection support menus for cx88-dvb. - created a boolean dependency link for VIDEO_CX88_VP3054, so that it's tristate value will be the same as that of VIDEO_CX88_DVB. - VIDEO_CX88_VP3054 is automatically selected by VIDEO_CX88_DVB_ALL_FRONTENDS, but is otherwise selected by VIDEO_CX88_DVB_VP3054, offered as an option under VIDEO_CX88_DVB_MT352 Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-29Kconfig: Fix PCI ID typo in VIDEO_CX88_ALSA help textMichael Krufky
From: Trent Piepho <xyzzy@speakeasy.org> - Fixed PCI ID typo in VIDEO_CX88_ALSA help text Signed-off-by: Trent Piepho <xyzzy@speakeasy.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-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-19Merge from masterHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> 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-18Kconfig: fix title and description for VIDEO_CX88_ALSAMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
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-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-15Kconfig: swap VIDEO_CX88_ALSA and VIDEO_CX88_DVBMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> VIDEO_CX88_ALSA should not be between VIDEO_CX88_DVB and VIDEO_CX88_DVB_ALL_FRONTENDS When cx88-alsa was added to cx88/Kconfig, it was added in between VIDEO_CX88_DVB and VIDEO_CX88_DVB_ALL_FRONTENDS. This caused undesireable effects to the appearance of the menu options in menuconfig. This fix reorders cx88-alsa and cx88-dvb in Kconfig, to match saa7134, and restore the correct menuconfig appearance. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>