summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
AgeCommit message (Collapse)Author
2007-02-19compat: Fix compat stuff for usbvision and zr364xxTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> compat.h was missing from usbvideo-i2c.c and zr364xx.c zr364xx.c needed the struct semaphore -> struct mutex compat check. Added an old i2c id to compat.h. These could be added to the Hg copy of linux/i2c-id.h instead? There's just this one so far. zr364xx needs 2.6.15 because of vm_insert_page(), so add to versions.txt Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2007-02-19zr364xx: Automatic whitespace cleanupTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> File wasn't passed through whitespace script when it was checked in. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2007-02-19compat: Add -include linux/version.h to cflagsTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> Add -include linux/version.h to the cflags. Now code can have backward compatibility test without including compat.h first. Linux headers included from compat.h are removed, so that code will get the same headers when compiling in v4l-dvb as it does in the kernel. Many drivers have compat.h moved to the end of their include list, as this lets compat.h do things it can't do at the beginning. Such as test of something is defined to include compat code, or to put a wrapper around a function without changing the function's name. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2007-02-19compat: Add code to compat.h for try_to_sleep()Trent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> Compat.h used to have an argument, now it doesn't. There was also some code: if (current->flags & PF_FREEZE) { refrigerator(PF_FREEZE); } which is the same as try_to_freeze(), and so can be replaced by it. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2007-02-18merge: http://linuxtv.org/hg/~mkrufky/cx88-blackbirdMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-18merge: http://linuxtv.org/hg/~mkrufky/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-18USB: add zr364xx V4L2 driverMauro Carvalho Chehab
From: Antoine Jacquet <royale@zerezo.com> This patch adds a V4L2 driver giving support for USB webcams based on the zr364xx chipsets. Signed-off-by: Antoine Jacquet <royale@zerezo.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-18cx88-blackbird: allow usage of both 376836 and 262144 sized firmware imagesMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> This updates the cx88-blackbird driver to be able to use the new cx23416 firmware image released by Hauppauge Computer Works, while retaining compatibility with the older firmware images. cx2341x firmware can be downloaded at: http://dl.ivtvdriver.org/ivtv/firmware/ Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-02-18Add VIDIOC_TRY_ENCODER_CMD and VIDIOC_ENCODER_CMD ioctls.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Add support for starting, stopping, pausing and resuming an MPEG (or similar compressed stream) encoder. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-02-18Add VIDIOC_G_ENC_INDEX ioctlHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The VIDIOC_G_ENC_INDEX ioctl can obtain the MPEG index from an MPEG encoder. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-02-18Add support for three new MPEG controls.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Added V4L2_CID_MPEG_AUDIO_MUTE, V4L2_CID_MPEG_VIDEO_MUTE and V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS controls together with their implementation in the cx2341x module. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-02-17some saa7134 cleanupsHartmut Hackmann
From: Heikki Orsila <shdl@zakalwe.fi> - use generic sort instead of bubblesort - removed useless saa7134_video_fini function - small coding style changes Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-02-17merge with main repositoryHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-02-17removed outdated comment in saa7134-core.cHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> No functional changes Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-02-16merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb2Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-16Allow to set tuner_config in attach informHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> This patch move the assignment of the tuner config and the callback before the check whether it is called in the attach inform. This solves a module load order issue Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-02-15Fix cx25840 firmware loading.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Due to changes in the i2c handling in 2.6.20 this cx25840 bug surfaced, causing the firmware load to fail for the ivtv driver. The correct sequence is to first attach the i2c client, then use the client's device to load the firmware. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Acked-by: Mike Isely <isely@pobox.com>
2007-02-15saa7134 2.6.20 compat patchHartmut Hackmann
From: Markus Rechberger <markus.rechberger@amd.com> saa7134 2.6.20 compat patch Signed-off-by: Markus Rechberger <markus.rechberger@amd.com> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-02-15this patch fixes request_module_depend()Hartmut Hackmann
From: Markus Rechberger <markus.rechberger@amd.com> this patch fixes request_module_depend() Signed-off-by: Markus Rechberger <markus.rechberger@amd.com> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-02-15updated support for tuner callbacksHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> This change supplies a more generic version of the tuner callback. The tuner struct now has a function pointer int (*tuner_callback) (void *dev, int command, int arg) additionally to a int config parameter. both can be set through the TUNER_SET_TYPE_ADDR client call. Note that the meaning of the parameters depend on the tuner type. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-02-13cafe_ccic: fix compiler warningMichael Krufky
From: Jean Delvare <khali@linux-fr.org> Fix the following warning: drivers/media/video/cafe_ccic.c: In function `cafe_vidioc_reqbufs': drivers/media/video/cafe_ccic.c:1197: warning: 'ret' might be used uninitialized in this function Probably not a real bug, but the warning can be avoided easily. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-02-13fix compiler warning in vivi.cMarcel Siegert
From: Marcel Siegert <mws@linuxtv.org> the result of copy_to_user was not used, so the compiler complained now a warning will be issued if copy_to_user fails Signed-off-by: Marcel Siegert <mws@linuxtv.org>
2007-02-12Backport header fix from kernelMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Original patch from Al Viro <viro@ftp.linux.org.uk> usbvision missing __user Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-12Removed board naming code in saa7134-dvbHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> This is for better consistency with other drivers Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-02-07pvrusb2: Register I2C adapter (more) correctlyMike Isely
From: Mike Isely <isely@pobox.com> An I2C adapter needs to register an association with the actual parent device. Until 2.6.20, not doing this was a benign problem; now it causes an ugly warning in the system log. This 1-line patch corrects that oversight. Signed-off-by: Mike Isely <isely@pobox.com>
2007-02-07pvrusb2: Be more forgiving about encoder firmware sizeMike Isely
From: Mike Isely <isely@pobox.com> The pvrusb2 driver previously rejected encoder firmware whose size was not a multiple of 8192. But this is a false check because it's possible to find cx23416 firmware whose size doesn't conform to this limit. So change the firmware loader implementation to be more forgiving of the image size. Signed-off-by: Mike Isely <isely@pobox.com>
2007-02-07pvrusb2: Follow coding style convention for "#if 0" blocksMike Isely
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
2007-02-07pvrusb2: Fix printk format typoMike Isely
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
2007-02-07Usbvision: set alternate interface modificationMauro Carvalho Chehab
From: Thierry MERLE <thierry.merle@free.fr> - usb alternate selection modified to get the biggest endpoint packet size. - fix sysfs get values for brightness/contrast/hue/saturation Signed-off-by: Thierry MERLE <thierry.merle@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-07Usbvision: dynamic allocation for framesMauro Carvalho Chehab
From: Thierry MERLE <thierry.merle@free.fr> - fix decoder route output - dynamic frame buffer allocation Signed-off-by: Thierry MERLE <thierry.merle@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-07Reverting patch d1bfc4440540ee9f86bff20850ed205d0ddad1bfMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Patch broke pvrusb2 driver. Reverting it. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06From: Adrian Bunk <bunk@stusta.de>Mauro Carvalho Chehab
v4l_printk_ioctl_arg() is no longer used. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06Cx88-video.c: remove struct radionormsMauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de> This patch removes the unused struct radionorms. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06Cafe_ccic.c fix warningMauro Carvalho Chehab
From: Jonathan Corbet <corbet@lwn.net> Quiet a spurious gcc warning. Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06Convert to generic boolean-valuesMauro Carvalho Chehab
From: Richard Knutsson <ricknu-0@student.ltu.se> Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06VIDEO_BUF depends on PCIMauro Carvalho Chehab
From: Andrew Morton <akpm@osdl.org> m68k allmodconfig: drivers/media/video/video-buf.c: In function 'videobuf_queue_pci': drivers/media/video/video-buf.c:396: error: 'pci_map_sg' undeclared (first use in this function) drivers/media/video/video-buf.c:396: error: (Each undeclared identifier is reported only once drivers/media/video/video-buf.c:396: error: for each function it appears in.) drivers/media/video/video-buf.c:399: error: 'pci_dma_sync_sg_for_cpu' undeclared (first use in this function) drivers/media/video/video-buf.c:401: error: 'pci_unmap_sg' undeclared (first use in this function) drivers/media/video/video-buf.c: In function 'videobuf_pci_dma_map': Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-05cx25840 request_firmware failed due to wrong device.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Due to changes in the /sys directory structure a bug in the cx25840 firmware load surfaced in 2.6.20: the device passed to request_firmware was wrong: instead of the i2c device the i2c adapter was passed. Because of this an attemp was made to create a kobject with the adapter name inside the adapter directory, but a kobject with that name already exists. Now pass the i2c device itself so that the correct /sys directory is used. This way the firmware can be loaded again. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-02-04saa7134-dvb: initialize the dvb frontend in dvb_initHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> The hardware is completely initialized afterwards, especially the tda10046 has its firmware - which is also necessary in analog mode of some hybrid boards. Calling the sleep function afterwards saves power and definitely puts hybrid boards into analog mode without additional code elsewere. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-02-04Fix tda8290 code for tda827x moduleHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> During tuner attach, the pointers to host dev structure are not set yet, so the I2c adapter needs to be accessed differently. This patch also does some minor cleanup in the saa7134-dvb module. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-02-03Create tda827x dvb tuner moduleHartmut Hackmann
From: Michael Krufky <mkrufky@linuxtv.org> The patch moves the tda827x dvb tuning code to a separate module Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-02-03Fix CC handling in VIDIOC_INT_G_VBI_DATAHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> When capturing a 60 Hz input the internal field ID is inverted. The VIDIOC_INT_G_VBI_DATA didn't take that into account and so returned XDS instead of CC and vice versa. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-02-03Fix cx2584x revision reporting.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Revisions >= 23 were always reported as revision 23. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-01-25Add radio support for the Lifeview FlyDVB-T DuoHartmut Hackmann
From: Peter Missel <peter.missel@onlinehome.de> There are card variants supporting FM radio through tda8275. Signed-off-by: Peter Missel <peter.missel@onlinehome.de> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-01-23Added support for tda827x tuners with preamlifiersHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> This patch contains - new tuning code for the tda827xa silicon tuner. - controls the preamplifier of some boards with this tuner. - support for the Philips Tiger S hybrid DVB-T reference design. - reworked the saa7134-dvb modulue to get rid of most of the small board specific functions. It depends on the changesets: 5119:9e5c364c59bb 5120:2c31f2803f53 and 5121:8b0ffe2a46a7 Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-01-23Added a config entry and a gpio function pointer to the tuner structHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> These entries mainly are to support configurations of the tda827x silicon tuner with a preamplifier. The values can be set throgh the attach inform or through the extended TUNER_SET_TYPE_ADDR client call. The function pointer will only be updated if the parameter is not NULL. Since a typecast is necessary to set the pointer, i added a typedef for this pointer (tuner_gpio_func_t) in tuner.h Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-01-22saa713x: added a GPIO handler functionHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> This function allows to set, clear and tristate the GPIO ports. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-01-22tda1004x driver updatesHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> There are the following changes: - separate configuration of IF and GPIOs. - set GPIOs before firmware load. This helps to avoid I2C address collisions. - if desired invert GPIOs at sleep (automatic return to analog mode of card). - added 3 tuner configuration bytes to config stuct. - added i2c gate address to config struct. - moved _state struct declaration to header file to make it accessible on board layer. - added "conf_probed" to the state struct to allow i.e. probing for correct tuner version. - changed firmware load mechanism to always: + check if already loaded + try to boot from eeprom + try downlad from host - corrected name of tda10046 firmware image (backward compatible). Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2007-01-21Fix: VIDIOC_G_TUNER were returning an endless number of tunersMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> pvrusb2 have only one tuner inside. However, as it were not handling index, a call to v4l-info were returning as if it were an infinite number of tuners: $ v4l-info|grep VIDIOC_G_TUNER |head -5 VIDIOC_G_TUNER(0) VIDIOC_G_TUNER(1) VIDIOC_G_TUNER(2) VIDIOC_G_TUNER(3) VIDIOC_G_TUNER(4) CC: Mike Isely <isely@isely.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-01-21Remove some warnings when compiling on x86_64Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> pvrusb2-encoder.c: In function 'pvr2_encoder_cmd': pvrusb2-encoder.c:195: warning: format '%u' expects type 'unsigned int', but argument 3 has type 'long unsigned int' pvrusb2-encoder.c:205: warning: format '%u' expects type 'unsigned int', but argument 3 has type 'long unsigned int' pvrusb2-encoder.c: In function 'pvr2_encoder_vcmd': pvrusb2-encoder.c:303: warning: format '%u' expects type 'unsigned int', but argument 3 has type 'long unsigned int' CC: Mike Isely <isely@isely.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-01-21merge: http://linuxtv.org/hg/~mkrufky/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>