summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88
AgeCommit message (Collapse)Author
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-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-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>
2006-03-14Snd_cx88_create: don't dereference NULL coreMauro Carvalho Chehab
From: Duncan Sands <duncan.sands@math.u-psud.fr> If the call to cx88_core_get returns a NULL value, it is dereferenced by cx88_reset, and perhaps by cx88_core_put. Spotted by the Coverity checker. Signed-off-by: Duncan Sands <baldrick@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.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-13cleanup mangled whitespaceMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-12Cx88 default picture controls valuesMauro Carvalho Chehab
From: Marcin Rudowski <mar_rud@poczta.onet.pl> This patch fixes default values for some picture controls: - brightness set to 50% by default (now is 0%) - hue set to 50% by default (now is 0%) - sets saturation to datasheet value - volume set to 0dB (now is -32dB) and some left small fixes: - twice offset adding - balance didn't follow datasheet (bits[0:5] = attenuation; bit[6] = channel to provide attenuation) Signed-off-by: Marcin Rudowski <mar_rud@poczta.onet.pl> Signed-off-by: Ian Pickworth <ian@pickworth.me.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-11Cx88-input.c: add IR remote control support to CX88_BOARD_PROLINK_PLAYTVPVRMauro Carvalho Chehab
From: Matheus Izvekov <mizvekov@gmail.com> This patch adds support for the IR remote control found in the card CX88_BOARD_PROLINK_PLAYTVPVR. Signed-off-by: Matheus Izvekov <mizvekov@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-11Cx88-cards.c: fix values of gpio0 for card CX88_BOARD_PROLINK_PLAYTVPVRMauro Carvalho Chehab
From: Matheus Izvekov <mizvekov@gmail.com> This patch changes the gpio0 values for the card CX88_BOARD_PROLINK_PLAYTVPVR to the ones observed using RegSpy from the dscaler project. Signed-off-by: Matheus Izvekov <mizvekov@gmail.com> 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-09PATCH cx88-mpeg: cx8802_restart_queue() for blackbirdMauro Carvalho Chehab
Fixes "cx8802_restart_queue: queue is empty" storm in syslog =============================================================================== Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-09Correct gpio values for Aver 303 Studio in v4l-dvb treeMauro Carvalho Chehab
From: Marcin Rudowski <mar_rud@poczta.onet.pl> Old values generally works in A2 mono, but new ones allows: - detect and use Nicam stereo - mute in tv - use radio FM Signed-off-by: Marcin Rudowski <mar_rud@poczta.onet.pl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-09Cx88 balance change errore messages - fixMauro Carvalho Chehab
There is an error in the cx88 code that causes this message in the syslog when balance is changed at full volume: Mar 4 18:35:08 ian2 kernel: cx88[0]: irq pci [0x1] vid* Mar 4 18:35:39 ian2 last message repeated 348 times Mar 4 18:36:01 ian2 last message repeated 564 times ... and so on The attached patch cures this problem. Signed-off-by: Ian Pickworth <ian@pickworth.me.uk> Signed-off-by: Marcin Rudowski <mar_rud@poczta.onet.pl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-28FE6600 is a Thomson tunerMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - The tuner used in DViCO FusionHDTV DVB-T hybrid is made by Thomson - renamed tuner and dvb_pll structs accordingly Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-01Move DViCO hybrid initialisation data from stack.Chris Pascoe
From: Chris Pascoe <c.pascoe@itee.uq.edu.au> The init_data array is never changed and need not be on the stack. Turn it into a static variable. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
2006-02-28Kconfig: fix in-kernel build for cx88-dvb: zl10353 frontendMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - VIDEO_CX88_DVB_ALL_FRONTENDS should select DVB_ZL10353 - created VIDEO_CX88_DVB_ZL10353, for selective zl10353 support in cx88-dvb. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-28DViCO FusionHDTV DVB-T Hybrid and ZL10353-based FusionHDTV DVB-T Plus supportChris Pascoe
From: Chris Pascoe <c.pascoe@itee.uq.edu.au> Add support for the FE6600 tuner used on the DVB-T Hybrid board. Add support for the Zarlink ZL10353 DVB-T demodulator, which supersedes the MT352, used on the DViCO FusionHDTV DVB-T Hybrid and later model Plus boards. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
2006-02-26bttv: correct bttv_risc_packed buffer sizeMauro Carvalho Chehab
From: Duncan Sands <duncan.sands@math.u-psud.fr> This patch fixes the strange crashes I was seeing after using bttv card, caused by a buffer overflow in bttv_risc_packed. The instruction buffer size calculation contains two errors: (a) a non-zero padding value can push the start of the next bpl section to just before a page border, leading to more scanline splits and thus additional instructions. (b) the first DMA region can be smaller than one page, so there can be a scanline split even if bpl*lines is smaller than PAGE_SIZE. For example, consider the case where offset is 0, bpl is 2, padding is 4094, lines is smaller than 2048, the first DMA region has size 1 and all others have size PAGE_SIZE, assumed to equal 4096. Then all bpl regions cross page borders and the number of instructions written is 2*lines+2, rather than lines+2 (the current estimate). With this patch the number of instructions for this example is estimated to be 2*lines+3. Also, the BUG_ON that was supposed to catch buffer overflows contained a thinko causing it fire only if the buffer was overrun by a factor of 16 or more, so it fixes the the BUG_ON's (using sizeof rather than "4"). Signed-off-by: Duncan Sands <baldrick@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-26cx88: reduce excessive loggingMichael Krufky
From: Ian Pickworth <ian@pickworth.me.uk> - fix temporary debug code by changing printk to dprintk at level 1. - move CORE_IOCTL messages from level 1 to level 2. - this should help with selective debugging, while not filling people's logs up during normal use. Signed-off-by: Ian Pickworth <ian@pickworth.me.uk> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
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-16KWorld HardwareMpegTV XPert: update commentsMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Standard video using the cx88 broadcast decoder is working, but blackbird isn't working yet, audio is only working correctly for television mode. S-Video and Composite are working for video-only, so I have them disabled for now. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-11KWorld HardwareMpegTV XPert must set gpio2Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - KWorld HardwareMpegTV XPert must set gpio2 Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>