summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx23885
AgeCommit message (Collapse)Author
2008-05-28videodev: renamed the vidioc_*_fmt_* callbacksHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The naming for the callbacks that handle the VIDIOC_ENUM_FMT and VIDIOC_S/G/TRY_FMT ioctls was very confusing. Renamed it to match the v4l2_buf_type name. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-05-10xc5000: bug-fix: allow multiple devices in a single systemMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> The current code passes a context pointer in the xc5000_config struct. This context pointer is used in the tuner_callback function, used to reset the device after firmware download. The xc5000_config struct is a static structure, whose .priv member was being assigned before calling xc5000_attach(). If there are more than one of the same device type installed on a single system, the last one to assign xc5000_config.priv will "win", and all others will cease to function properly. This patch passes the context pointer in xc5000_attach() rather that storing it within the static struct xc5000_config. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-05-06Fix FW_LOADER depencency at v4l/dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Since: 1) FW_LOADER is defined as: config FW_LOADER tristate "Userspace firmware loading support" depends on HOTPLUG 2) several V4L/DVB driver just selects it; 3) select is not smart enough to auto-select HOTPLUG, if select FW_LOADER. So, All drivers that select FW_LOADER should also depend on HOTPLUG. An easier solution (for the end-user perspective) would be to "select HOTPLUG". However, live is not simple. This would cause recursive dependency issues like this one: drivers/usb/Kconfig:62:error: found recursive dependency: USB -> USB_OHCI_HCD -> I2C -> MEDIA_TUNER -> MEDIA_TUNER_XC2028 -> HOTPLUG -> PCCARD -> PCMCIA -> USB_ARCH_HAS_HCD -> MOUSE_APPLETOUCH -> USB Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-05-06Re-creates VIDEO_TUNERMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> VIDEO_TUNER is responsible for compilation of tuners.ko module. This were the previous behaviour before the creation of MEDIA_TUNER. Before this patch, tuner.ko were created even for drivers that don't need a tuner (like webcam drivers). Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-05-02cx23885: remove remaining references to dvb-pllMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> The cx23885 driver used to use dvb-pll for LG-TDVS-H064F support on the FusionHDTV5 Express. This has since been converted to use tuner-simple instead, once digital tuning support was added to tuner-simple. Since cx23885 no longer uses dvb-pll, remove the #include "dvb-pll.h", and the DVB_PLL Kconfig selection. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-05-02cx23885: update model matrix for Hauppauge WinTV HVR-1200 & WinTV HVR-1700Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-05-02cx23885: add missing subsystem ID for Hauppauge HVR-1200 OEMMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-04-30 cx23885: fix kbuild dependenciesMauro Carvalho Chehab
From: Michael Krufky <mkrufky@linuxtv.org> Thanks to Ingo Molnar for finding this. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-30Use the same name convention for all tuners under common/tunersMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Auto generated by this script: for i in `find drivers/media/ -name Kconfig`; do cat $i |\ sed s,DVB_CORE_ATTACH,MEDIA_ATTACH,g |\ sed s,VIDEO_TUNER,MEDIA_TUNER,g |\ sed s,TUNER_SIMPLE,MEDIA_TUNER_SIMPLE,g |\ sed s,TUNER_TDA8290,MEDIA_TUNER_TDA8290,g |\ sed s,DVB_TDA827X,MEDIA_TUNER_TDA827X,g |\ sed s,DVB_TDA18271,MEDIA_TUNER_TDA18271,g |\ sed s,TUNER_TDA9887,MEDIA_TUNER_TDA9887,g |\ sed s,TUNER_TEA5761,MEDIA_TUNER_TEA5761,g |\ sed s,TUNER_TEA5767,MEDIA_TUNER_TEA5767,g |\ sed s,TUNER_MT20XX,MEDIA_TUNER_MT20XX,g |\ sed s,DVB_TUNER_MT2060,MEDIA_TUNER_MT2060,g |\ sed s,DVB_TUNER_MT2266,MEDIA_TUNER_MT2266,g |\ sed s,DVB_TUNER_MT2131,MEDIA_TUNER_MT2131,g |\ sed s,DVB_TUNER_QT1010,MEDIA_TUNER_QT1010,g |\ sed s,TUNER_XC2028,MEDIA_TUNER_XC2028,g |\ sed s,DVB_TUNER_XC5000,MEDIA_TUNER_XC5000,g >/tmp/temp_mv$$ mv /tmp/temp_mv$$ $i done for i in `find drivers/media/ -type f`; do cat $i |\ sed s,CONFIG_DVB_CORE_ATTACH,CONFIG_MEDIA_ATTACH,g |\ sed s,CONFIG_VIDEO_TUNER,CONFIG_MEDIA_TUNER,g |\ sed s,CONFIG_TUNER_SIMPLE,CONFIG_MEDIA_TUNER_SIMPLE,g |\ sed s,CONFIG_TUNER_TDA8290,CONFIG_MEDIA_TUNER_TDA8290,g |\ sed s,CONFIG_DVB_TDA827X,CONFIG_MEDIA_TUNER_TDA827X,g |\ sed s,CONFIG_DVB_TDA18271,CONFIG_MEDIA_TUNER_TDA18271,g |\ sed s,CONFIG_TUNER_TDA9887,CONFIG_MEDIA_TUNER_TDA9887,g |\ sed s,CONFIG_TUNER_TEA5761,CONFIG_MEDIA_TUNER_TEA5761,g |\ sed s,CONFIG_TUNER_TEA5767,CONFIG_MEDIA_TUNER_TEA5767,g |\ sed s,CONFIG_TUNER_MT20XX,CONFIG_MEDIA_TUNER_MT20XX,g |\ sed s,CONFIG_DVB_TUNER_MT2060,CONFIG_MEDIA_TUNER_MT2060,g |\ sed s,CONFIG_DVB_TUNER_MT2266,CONFIG_MEDIA_TUNER_MT2266,g |\ sed s,CONFIG_DVB_TUNER_MT2131,CONFIG_MEDIA_TUNER_MT2131,g |\ sed s,CONFIG_DVB_TUNER_QT1010,CONFIG_MEDIA_TUNER_QT1010,g |\ sed s,CONFIG_TUNER_XC2028,CONFIG_MEDIA_TUNER_XC2028,g |\ sed s,CONFIG_DVB_TUNER_XC5000,CONFIG_MEDIA_TUNER_XC5000,g >/tmp/temp_mv$$ mv /tmp/temp_mv$$ $i done Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-26From: Mauro Carvalho Chehab <mchehab@infradead.org>Mauro Carvalho Chehab
Move tuners to common/tuners There were several issues in the past, caused by the hybrid tuner design, since now, the same tuner can be used by drivers/media/dvb and drivers/media/video. This patch moves those common tuners into a common dir. It also moves saa7146 driver into drivers/media/video, where other hybrid drivers are placed. Kconfig items were rearranged, to split V4L/DVB core from their drivers. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-25 xc3028_{agc,bw}_config namespace fixMauro Carvalho Chehab
From: Adrian Bunk <bunk@kernel.org> This patch fixes the following build error: <-- snip --> ... LD drivers/media/built-in.o drivers/media/dvb/built-in.o:(.data+0x1be6c): multiple definition of `xc3028_agc_config' drivers/media/video/built-in.o:(.data+0x36500): first defined here drivers/media/dvb/built-in.o:(.data+0x1be9c): multiple definition of `xc3028_bw_config' drivers/media/video/built-in.o:(.data+0x36530): first defined here make[3]: *** [drivers/media/built-in.o] Error 1 <-- snip --> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-23merge: http://linuxtv.org/hg/~mkrufky/cx23885Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-22cx23885: Add support for the Hauppauge HVR1400Mauro Carvalho Chehab
From: Steven Toth <stoth@hauppauge.com> DVB-T mode is now supported using the DiBcom dib7000p demodulator and the Xceive xc3028L silicon tuner. Analog mode is not supported. Signed-off-by: Steven Toth <stoth@hauppauge.com> Reviewed-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-21tuner-xc2028: Several fixes to SCODEMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> This patch fixes several issues on SCODE: 1) The extracting tool weren't generating the proper tags for SCODE. This has almost no effect, since those tags shouldn't be used; 2) DIBCOM52 were using a wrong IF. It should be 5200, instead of 5700; 3) seek_firmware were wanting an exact match for firmware type. This is wrong. As result, no SCODE firmware were loaded; 4) A few files were including the wrong file for seeking demod firmwares; 5) XC3028_FE_DEFAULT can be used, if user doesn't want to load a firmware. However, this weren't documentated. This feature require more testing. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-18cx23885: Load any module dependencies accordingly.Steven Toth
From: Steven Toth <stoth@hauppauge.com> For boards that require the avcore (cx25840) to be active, ensure it gets loaded. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-04-18Add support for the Hauppauge HVR-1700 digital modeSteven Toth
From: Steven Toth <stoth@hauppauge.com> This adds support for DVB-T mode only, analog is not supported. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-04-18Add support for the Hauppauge HVR-1200Steven Toth
From: Steven Toth <stoth@hauppauge.com> This adds support for DVB-T mode only, analog mode is not supported. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-04-09Adds selectable adapter numbers as per module optionMichael Krufky
From: Janne Grunau <janne-dvb@grunau.be> The adapter_nr module options can be used to allocate static adapter numbers on a driver level. It avoids problems with changing DVB apapter numbers after warm/cold boot or device unplugging and repluging. Each driver holds DVB_MAX_ADAPTER long array of the preferred order of adapter numbers. options dvb-usb-dib0700 adapter_nr=7,6,5,4,3,2,1,0 would result in a reversed allocation of adapter numbers. With adapter_nr=2,5 it tries first to get adapter number 2 and 5. If both are already in use it will allocate the lowest free adapter number. Signed-off-by: Janne Grunau <janne-dvb@grunau.be> Acked-by: Hermann Pitton <hermann.pitton@arcor.de> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-04-08media/video/cx23885 replace remaining __FUNCTION__ occurrencesMichael Krufky
From: Harvey Harrison <harvey.harrison@gmail.com> __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-03-29Avoid minor model number warning when an OEM HVR1250 board is detected.Steven Toth
From: Steven Toth <stoth@hauppauge.com> Avoid minor model number warning when an OEM HVR1250 board is detected. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-03-29Fix eeprom parsing and errors on the HVR1800 products.Steven Toth
From: Steven Toth <stoth@hauppauge.com> On some models, the valid Hauppauge eeprom data begins at a different offset. This patch avoid unfriendly 'corrupt' eeprom errors during driver load. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-03-29Convert driver to use a single SRAM memory map.Steven Toth
From: Steven Toth <stoth@hauppauge.com> This reduces the memory footprint and removes the need to manually configure each map, which lead to a bug where the Fusion EXP 5 board broke for a while. This also fixes digital support again for the DViCO FusionHDTV5Express. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-03-25merge: http://linuxtv.org/hg/~mkrufky/tda18271c2Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-03-23tda18271: allow device-specific configuration of rf agc topMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> allow device-specific configuration of rf agc rf top and if top Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-03-23tda18271: allow device-specific configuration of IF levelMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-03-18merge: http://linuxtv.org/hg/~mkrufky/tda18271Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-03-16tda18271: store agc_mode configuration independently of std_bitsMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-03-14Fix left-overs from the videobuf-dma-sg.c conversion to generic DMAMauro Carvalho Chehab
From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> The dev element of the struct videobuf_queue is now of type struct device implicitly. Fix left-over casts. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-02-10use tuner-simple for LG TDVS-H06xF digital tuning supportMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Convert cx88-dvb, dvb-bt8xx, b2c2-flexcop, cxusb and cx23885 to use tuner-simple instead of dvb-pll for LG TDVS-H06xF Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-03-21Removes video_dev from tuner-xc2028 config structMauro Carvalho Chehab
The video_dev parameter, on tuner-xc2028 were used to pass i2c private data to tuner_callback. Since the driver already have a pointer to i2c_adap->algo_data, uses this instead. This parameter were used also as a magic number to idenfity if two drivers are trying to register the same xc3028 tuner. This occurs with boards with DVB support, where both DVB and V4L drivers will share the same tuner. Instead of using the algo_data as a private number, after this patch, the driver will use i2c_adap->dev, with seems more consistent. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-02-25From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>Mauro Carvalho Chehab
Subject: Convert videobuf-dma-sg to generic DMA API Date: Tue, 19 Feb 2008 13:40:54 +0100 (CET) videobuf-dma-sg does not need to depend on PCI. Switch it to using generic DMA API, convert all affected drivers, relax Kconfig restriction, improve compile-time type checking, fix some Coding Style violations while at it. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-01-27[PATCH] static memoryDouglas Schilling Landgraf
From: Douglas Schilling Landgraf <dougsland@gmail.com> - Static memory is always initialized with 0. - Replaced in some cases C99 comments for /* */ Signed-off-by: Douglas Schilling Landgraf <dougsland@gmail.com>
2008-01-13cx23885: Enable cx23417 support on the HVR1800Steven Toth
From: Steven Toth <stoth@hauppauge.com> cx23885: Enable cx23417 support on the HVR1800 Signed-off-by: Steven Toth <stoth@hauppauge.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-01-13cx23885: Add generic cx23417 hardware encoder support.Steven Toth
From: Steven Toth <stoth@hauppauge.com> cx23885: Add generic cx23417 hardware encoder support. Signed-off-by: Steven Toth <stoth@hauppauge.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-01-05xc5000: Small amount of cleanup and commenting.Steven Toth
From: Steven Toth <stoth@hauppauge.com> xc5000: Small amount of cleanup and commenting, just for clarification. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-01-05XC5000: Fix support for HVR1500Q broken by patch 1Steven Toth
From: Steven Toth <stoth@hauppauge.com> From Zhang: This patch fixes support for the HVR1500Q which was broken when the xc5000 analog patch was added. Signed-off-by: Chaogui Zhang <czhang1974@gmail.com> Patch committed as-is, cleanups to follows .... Steve Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-01-15s5h1409: Bug fix for parallel support.Steven Toth
From: Steven Toth <stoth@hauppauge.com> Parallel support was not working with the s5h1409 and the Pinnacle HD800i. This patch fixes the demodulator driver and ensures that all existing s5h1409 based products configure the demodulator correctly. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-01-12cx23885: dprintk macro cleanupSteven Toth
From: Steven Toth <stoth@hauppauge.com> Added missing do { } while (0) Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-01-10cx23885: Cleanup of compiler defines and warningsSteven Toth
From: Steven Toth <stoth@hauppauge.com> Portions of the code are if 0'd out but these are placeholders for work already in progress, these will be activiated very shortly. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-01-10cx23885: Small cleanupSteven Toth
From: Steven Toth <stoth@hauppauge.com> cx23885: Small cleanup Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-01-10cx23885: Video and VBI related files.Steven Toth
From: Steven Toth <stoth@hauppauge.com> cx23885: Video and VBI related files. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-01-10cx23885: Add basic video support for the HVR1800Steven Toth
From: Steven Toth <stoth@hauppauge.com> This enabled basic preview NTSC and PAL support for the HVR1800. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-01-10cx23885: Track the board clock frequency and allow overrides.Steven Toth
From: Steven Toth <stoth@hauppauge.com> The cx23885/6/8 all have different clock rates, this patch allows the core to compensate, and developers to allow vendor specific overrides. This patches will be used by future analog video and encoder patches. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-01-10cx23885: SRAM reallocation prior to analog video implementation.Steven Toth
From: Steven Toth <stoth@hauppauge.com> We need to clear space large enough for the video and encoder fifos. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-01-10cx23885: Ensure HVR1800 TDA8295A is reset fully on module load.Steven Toth
From: Steven Toth <stoth@hauppauge.com> Failure to do this means that a full system reboot is required if the part hangs. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-01-10cx23885: Add support for device revision detectionSteven Toth
From: Steven Toth <stoth@hauppauge.com> Each version of the cx23885/7/8 silicon has different build revs. We'll use this internal revision to work around bugs and known issues in the video and encoder related patches. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2008-01-02tda18271: store IF frequency in a u16 instead of u32Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Store IF Frequency in a u16 instead of a u32. Multiply by 1000 before use. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-01-02tda18271: allow device-specific configuration of IF frequency and std bitsMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Allow drivers to pass device-specific configuration parameters during attach. If these parameters are omitted, default values will be used. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-12-28merge: http://linuxtv.org/hg/~mkrufky/cx23885Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-12-27cx23885: update model matrix for Hauppauge HVR1500Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>