summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx25840
AgeCommit message (Collapse)Author
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-29Reverted sliced VBI API changes made in videodev2.h.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The sliced VBI defines added in videodev2.h are removed. One define changed the meaning of a old define, thus breaking existing apps, another used more than 16 bits (the max size is u16), and many types were added that were untested and whose payload was undocumented. New types should be shown to exist 'in the wild' and the payload format must be documented in the V4L2 API spec. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-03-25Reduce FWSEND in cx25840 module due to certain I2C bus adapter limitsMike Isely
From: Mike Isely <isely@pobox.com> The FWSEND parameter controls the size of the firmware chunks sent down the I2C bus to the chip. Previously this had been set to 1024 but unfortunately some I2C implementations can't transfer data in such big gulps. Specifically, the pvrusb2 driver has a hard limit of around 60 bytes, due to the encapsulation there of I2C traffic into USB messages. So we have to significantly reduce this parameter. Acked-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mike Isely <isely@pobox.com>
2006-03-25Added the new routing commands to cx25840.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
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-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-17Fix saturation bug. Fix NTSC->PAL standard change. Detect NTSC-KR standard.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-03-13Kconfig: select VIDEO_CX25840 to build cx25840 a/v decoder moduleMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> The cx25840 module requires external firmware in order to function, so it must select FW_LOADER, but saa7115 and saa7129 do not require it. This patch creates VIDEO_CX25840, and alters VIDEO_DECODER to select it. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-16Fix maximum for the saturation and contrast controls.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-02-03Add V4L2_STD_NTSC_M_KR TV standard for South Korean NTSC-M using A2 audio.Hans Verkuil
From: Hans Verkuil South Korea uses NTSC-M but with A2 audio instead of BTSC. Several audio chips need this information in order to set the correct audio processing registers. Acked-by: Mauro Carvalho Chehab <mauro_chehab@yahoo.com.br> Signed-off-by: Hans Verkuil
2006-01-22audmode and rxsubchans fixes (VIDIOC_G/S_TUNER)Hans Verkuil
- audmode and rxsubchans fixes in msp3400, tuner, tvaudio and cx25840. - msp3400 cleanups Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-01-19Included new sliced VBI types to videodev2.h and tvp5150Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> - Added other sliced VBI types to videodev2.h - tvp5150 now uses standard V4L2 API codes from videodev2.h - Implemented VIDIOC_G_SLICED_VBI_CAP for tvp5150. This is dynamically filled based on defined VDP C-RAM values filled by the driver. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-01-15From: Adrian Bunk <bunk@stusta.de>Mauro Carvalho Chehab
make some code static 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>
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-12debug renamed to cx25840_debugMauro Carvalho Chehab
From: Hans Verkuil <hverkuil@xs4all.nl> - 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>
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>
2006-01-11Fixes some bad global variablesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@brturbo.com.br> - 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>
2006-01-08i2c fixes and cleanupsMauro Carvalho Chehab
- Miscelaneous i2c cleanups and fixes to work with kernel >2.6.15 - linux/sound/pci/bt87x.c updated to kernel version. kernel-sync Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-07Some cleanups at I2C modulesMauro Carvalho Chehab
- Latest patch reverted, since __stringfy seems to be needed for kernel < 2.6.15 - Applied kernel I2C cleanups from Jean Delaware. - driver names simplified to allow usage of newer printk macros at v4l2-common.h Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-03Fix signed/unsigned bug in brightness handling of cx25840Hans Verkuil
Fix signed/unsigned bug in brightness handling (set to 0 and 128 was returned). Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-01-03Fix signed/unsigned bug in hue handlingHans Verkuil
Fix signed/unsigned bug in hue handling (set to -127 and 129 was returned). Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-01-02Added VIDIOC_QUERYCTRL to cx25840.Hans Verkuil
- Added VIDIOC_QUERYCTRL - Removed unnecessary inlines. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-01-02convert diagnostics over to the new v4l2-common.h macros.Hans Verkuil
- convert diagnostics over to the new v4l2-common.h macros. - deprecated tuner_debug option, the new option is debug. - renamed cx25840_debug to debug. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2005-12-29When in radio mode ignore VIDIOC_G_TUNERHans Verkuil
- Detect when AUDC_SET_RADIO is called. - When in radio mode ignore VIDIOC_G_TUNER. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2005-12-28Generalized cx25840 video/audio input handlingHans Verkuil
- Added VIDIOC_S_AUDIO to set the audio inputs separately. - Removed AUDC_SET_INPUT. - Made the video inputs much more general. - Removed cardtype CID and replaced with a CID to enable the PVR150 workaround. The cardtype is no longer necessary with the general video input change. - Update VIDIOC_LOG_STATUS output to show the video and audio inputs separately. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2005-12-25replace <media/i2c-compat.h> with "i2c-compat.h"Michael Krufky
-#include <media/i2c-compat.h> +#include "i2c-compat.h" Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-12-22Calculate the saa7115 AMCLK regs instead of using fixed valuesHans Verkuil
- Calculate the audio master clock registers from the actual frequencies. This simplifies the code and it also prepares for adding CGC2 support. - VIDIOC_INT_AUDIO_CLOCK_FREQ now receives an u32 instead of an enum. It is more generic and actually easier to implement. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2005-12-20make cx25840 recover from some firmware load failuresTyler Trafford
From: Tyler Trafford <tatrafford@comcast.net> * linux/drivers/media/video/cx25840/cx25840-firmware.c: (fw_write): - In the rare event that a 333MHz i2c firmware load fails after writing some data, this fix makes the driver reset the DL_ADDR registers to the proper values before continuing on with 100MHz transfers. Signed-off-by: Tyler Trafford <tatrafford@comcast.net>
2005-12-18Fix a broken logic that didn't cover all standards.Mauro Carvalho Chehab
- Fix a broken logic that didn't cover all standards. - Fix compilation failure with gcc 2.95.3. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2005-12-18Fix a broken logic that didn't cover all standards.Mauro Carvalho Chehab
CC: Tyler Trafford <tatrafford@comcast.net> - Fix a broken logic that didn't cover all standards. - Fix compilation failure with gcc 2.95.3. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2005-12-17Reverted latest two patchesMauro Carvalho Chehab
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2005-12-17fix build error.Michael Krufky
- if (std & V4L2_STD_NTSC_M_443) { + if (std & V4L2_STD_NTSC_443) { Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-12-17Fix compilation failure with gcc 2.95.3 and corrected set video stdMauro Carvalho Chehab
From:: Jean Delvare <khali@linux-fr.org> - Fix compilation failure with gcc 2.95.3. - Corrected a bug at video std check at cx25840 module Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2005-12-11Makes v4l compile under 2.4 kernelsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@brturbo.com.br> kernel-sync - Makes V4L compile with kernel 2.4 - em28xx doesn't compile with 2.4 kernels. Additional work is necessary to make it compile. Thanks-to: Stefan Leichter <Stefan.Leichter@camLine.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2005-12-07kernel-sync patches.Mauro Carvalho Chehab
kernel-sync Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2005-11-26Add workaround for Hauppauge PVR150 hardware problem with certain NTSC tuner ↵Hans Verkuil
models. - add workaround for Hauppauge PVR150 hardware problem with tuner models 85, 99 and 112 (model numbers as reported by tveeprom). The audio standard autodetection does not always work correctly for these models. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2005-11-20some funcions now static and I2C hw code for IRMauro Carvalho Chehab
CC: Jean Delvare <khali@linux-fr.org> CC: LM Sensors <lm-sensors@lm-sensors.org> CC: Greg KH <gregkh@suse.de> - Some funcions are now declared as static - Added a I2C code for InfraRed. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2005-11-11Ensure consistent v4l firmware prefixes.Michael Krufky
From: Hans Verkuil <hverkuil@xs4all.nl> - Ensure consistent v4l firmware prefixes. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-11-10Fixes AuthorshipMauro Carvalho Chehab
From: Hans Verkuil Signed-off-by: Hans Verkuil
2005-11-09make cx25840 use firmware image named 'cx25840.fw'Tyler Trafford
From: Tyler Trafford <tatrafford@comcast.net> Change default filename of firmware image to 'cx25840.fw' Signed-off-by: Tyler Trafford <tatrafford@comcast.net>
2005-11-09Makefile fixesMauro Carvalho Chehab
- Makefile for cx25840 boards - included newer video decoders on make install Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2005-11-09Adds support for cx25840 video decoder.Mauro Carvalho Chehab
From: Hans Verkuil <hverkuil@xs4all.nl>, Chris Kennedy <c@groovy.org>, Tyler Trafford <tatrafford@comcast.net> - Adds support for cx25840 video decoder. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Chris Kennedy <c@groovy.org> Signed-off-by: Tyler Trafford <tatrafford@comcast.net> Thanks-to: Ulf Eklund <ivtv@eklund.to>. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>