summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
AgeCommit message (Collapse)Author
2009-03-08v4l2-ioctl: fix partial-copy code.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The code to optimize the usercopy only checked the ioctl NR field. However, this code is also called for non-V4L2 ioctls (either private or ioctls from linux/dvb/audio.h and linux/dvb/video.h for decoder drivers like ivtv). If such an ioctl has the same NR as a V4L2 ioctl, then disaster strikes. Modified the code to check on the full command ID. Thanks to Martin Dauskardt for tracing the ivtv breakage to this particular change. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-03-07tlv320aic23b: use v4l2-i2c-drv.h instead of drv-legacy.hHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> This driver isn't used in any legacy mode, so no need for v4l2-i2c-drv-legacy.h. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-03-06cx88-alsa: fix compile warning for kernels <=2.6.20.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-03-06bttv: fix compile warnings for kernels < 2.6.20.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-03-06v4l2: fix compile warnings when printing u64 value.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-03-06vivi: fix compile warning.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-03-06videodev2.h: remove deprecated VIDIOC_G_CHIP_IDENT_OLDHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> As announced VIDIOC_G_CHIP_IDENT_OLD is now removed for 2.6.30. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-03-06tvmixer: remove last remaining references to this deleted module.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-03-04em28xx: enable Compro VideoMate ForYou soundMauro Carvalho Chehab
From: Vitaly Wool <vital@embeddedalley.com> Compro VideoMate uses an external audio DSP chip, controlled via tvaudio module (tda9874a). This patch improves em28xx infrastructure to support an external audio processor and fixes the Compro VideoMate entry to work with it. Signed-off-by: Vitaly Wool <vital@embeddedalley.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-03tvaudio: remove bogus checkMauro Carvalho Chehab
From: Vitaly Wool <vital@embeddedalley.com> The 'bytes' array is 64 bytes large but the easy standard programming (TDA9874A_ESP) has a number of 255, outside the shadow array size. This patch increases the size of the shadow array in order to accomodate this register. Signed-off-by: Vitaly Wool <vital@embeddedalley.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-03Support alternate resolutions for sq905Mauro Carvalho Chehab
From: Adam Baker <linux@baker-net.org.uk> Add support for the alternate resolutions offered by SQ-905 based cameras. As well as 320x240 all cameras can do 160x120 and some can do 640x480. Signed-off-by: Adam Baker <linux@baker-net.org.uk> Signed-off-by: Theodore Kilgore <kilgota@auburn.edu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-03Add support for GeoVision GV-800(S)Mauro Carvalho Chehab
From: Bruno Christo <brunochristo@gmail.com> Signed-off-by: Bruno Christo <bchristo@inf.ufsm.br> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-01cx88: Add IR support to pcHDTV HD3000 & HD5500Mauro Carvalho Chehab
From: Erik S. Beiser <erikb@bu.edu> cx88: Add IR support to pcHDTV HD3000 & HD5500 Signed-off-by: Erik S. Beiser <erikb@bu.edu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-24saa7134: add DVB support for Avermedia A700 cardsMauro Carvalho Chehab
From: Matthias Schwarzott <zzam@gentoo.org> Add DVB support for Avermedia DVB-S Pro and Avermedia DVB-S Hybrid+FM card both labled A700. They use zl10313 demod (driver mt312) and zl10036 tuner. Signed-off-by: Matthias Schwarzott <zzam@gentoo.org> [mchehab@redhat.com: change __FUNCTION__ into __func__] Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-03meye: Don't need to zero ioctl parameter fieldsTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> The v4l2 core code in v4l2_ioctl will zero out the structure the driver is supposed to fill in for read-only ioctls. For read/write ioctls, all the fields which aren't supplied from userspace will be zeroed out. Zeroing code is removed from querycap, enum_input, enum_fmt_vid_cap, and g_fmt_vid_cap. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-03-03gspca: Don't need to zero ioctl parameter fieldsTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> The v4l2 core code in v4l2_ioctl will zero out the structure the driver is supposed to fill in for read-only ioctls. For read/write ioctls, all the fields which aren't supplied from userspace will be zeroed out. Zeroing code is removed from g_audio, enum_input, g_parm and gmbuf. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-03-03usbvision: Don't need to zero ioctl parameter fieldsTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> The v4l2 core code in v4l2_ioctl will zero out the structure the driver is supposed to fill in for read-only ioctls. For read/write ioctls, all the fields which aren't supplied from userspace will be zeroed out. Zeroing code is removed from g_audio, queryctrl, and enum_fmt_vid_cap. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-03-03stkwebcam: Don't need to zero ioctl parameter fieldsTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> The v4l2 core code in v4l2_ioctl will zero out the structure the driver is supposed to fill in for read-only ioctls. For read/write ioctls, all the fields which aren't supplied from userspace will be zeroed out. Zeroing code is removed from enum_fmt_vid_cap, g_fmt_vid_cap, and g_parm. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-03-03cx88: Don't need to zero ioctl parameter fieldsTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> The v4l2 core code in v4l2_ioctl will zero out the structure the driver is supposed to fill in for read-only ioctls. For read/write ioctls, all the fields which aren't supplied from userspace will be zeroed out. Zeroing code is removed from enum_input and g_tuner. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-03-03bttv: Don't need to zero ioctl parameter fieldsTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> The v4l2 core code in v4l2_ioctl will zero out the structure the driver is supposed to fill in for read-only ioctls. For read/write ioctls, all the fields which aren't supplied from userspace will be zeroed out. Zeroing code is removed from enum_input and g_tuner. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-03-03v4l2: New function v4l2_video_std_frame_periodTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> Some code was calling v4l2_video_std_construct() when all it cared about was the frame period. So make a function that just returns that and have v4l2_video_std_construct() use it. At this point there are no users of v4l2_video_std_construct() left outside of v4l2-ioctl, so it could be un-exported and made static. Change v4l2_video_std_construct() so that it doesn't zero out the struct v4l2_standard passed in. It's already been zeroed out in the common ioctl code. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-03-03v4l2: Zero out read-only ioctls in one placeTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> If an ioctl is read-only then the driver fills in all the fields. Lots of times drivers only care about some fields so it's best if video_ioctl2 takes care of zeroing out the entire structure before handing it to the driver. This saves code in each driver to do it and driver authors often forget. The existing memset code in some of the read-only ioctl handlers can be deleted. Convert a case statement to a single if statement. Deleted a debug line from ENUMAUDOUT that was copy-and-pasted to G_AUDOUT by mistake. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-03-03videodev: only copy needed part of RW ioctl's parameterTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> There are many RW ioctls() in v4l2 where userspace only supplies one or two of the first fields in the structure passed to the ioctl. The driver then fills in the rest of the fields. Instead of copying the entire structure from userspace to the kernel we only need to copy those fields that userspace is actually supposed to supply. What's more, the fields that are meant to be only be output from the driver can be zeroed out in the videodev code, in case the driver doesn't fill them all in. Many of the ioctl handlers in v4l2_ioctl do this already, but my patch does this at one common point and so all the memsets for each ioctl can be deleted. For VIDIOC_G_SLICED_VBI_CAP, which has one input field ('type') and other output-only fields, the input field is near the end of the structure instead of at the beginning. So there is still a memset in it's ioctl handler to zero out the beginning of the struct. There were a couple mistakes with the existing code: For VIDIOC_G_AUDIO the index field was preserved, but G_AUDIO is a read only ioctl so nothing is copied from userspace to preserve. For VIDIOC_G_FREQUENCY the tuner field was not preserved like it should have been. This would be a problem if there was any hardware with more than one tuner/modulator. For VIDIOC_ENUM_FRAMESIZES and VIDIOC_ENUM_FRAMEINTERVALS, none of the fields were preserved even though each ioctl has several field that are supposed to be inputs to the driver! Obviously these ioctls don't get used much. The index field is needed if the driver has multiple discrete sizes/rates and other fields can be used too, e.g. if the size depends on pixel format or frame rate depends on image size for example. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-03-03merge: http://udev.netup.ru/hg/v4l-dvb-netupMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-03merge: http://linuxtv.org/hg/~tap/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-03merge: http://linuxtv.org/hg/~eandren/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-03v4l2: Move code to zero querybuf output struct to v4l2_ioctlTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> For VIDIOC_QUERYBUF only the first two fields, size and type, are used as input. The rest can be filled in by the driver as output. Most drivers do not actually use all the field and unused ones should be zeroed out. Some drivers have code to do this and some drivers should but don't. So put some zero out code in v4l2_ioctl so that all drivers using that system get it. The drivers that have zeroing code get that code removed. Some drivers checked that the type field was valid, but v4l2_ioctl already does this so those checks can be removed as well. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-03-03compat: rename struct delayed_work to work_struct on pre-2.6.20Trent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> In v2.6.19-rc6-118-g52bad64 struct work_struct was changed to be only for non-delayed work and struct delayed_work was created for delayed work. Instead of putting ifdefs in the drivers, we use compat.h to rename delayed_work to work_struct on pre-2.6.20 kernels. This will only be a problem if some driver decides to create identifiers named both work_struct and delayed_work in the same scope. There is one driver that has something named work_struct and none with anything named delayed_work, so I don't think will be a problem for as long as this compat code sticks around. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-03-03cx88: remove unnecessary forward declaration of cx88_coreTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> A recent patch added a forward declaration of cx88_core right before the main definition of that structure, which is obviously unneeded. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-03-03videodev: not possible to register NULL video_deviceTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> video_register_device_index() checks if it was passed a NULL video_device pointer (which isn't allowed) _after_ it has already dereferenced it with video_get_drvdata(vdev). The checks are clearly pointless and can be removed, as the function would have crashed before reaching them if vdev ever was NULL. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-03-03Add support for NetUP Dual DVB-S2 CI cardIgor M. Liplianin
From: Igor M. Liplianin <liplianin@netup.ru> Add support for NetUP Dual DVB-S2 CI card The card based on cx23885 PCI-e bridge, CiMax SP2 Common Interface chips, STM lnbh24 LNB power chip, stv6110 tuners and stv0900 demodulator. http://www.linuxtv.org/wiki/index.php/NetUP_Dual_DVB_S2_CI Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
2009-03-03Add CIMax(R) SP2 Common Interface code for NetUP Dual DVB-S2 CI cardAbylay Ospan
From: Abylay Ospan <aospan@netup.ru> Add CIMax2 Common Interface code for NetUP Dual DVB-S2 CI card. SmarDTV CIMax(R) SP2 is Dual CableCARD, DVB Common Interface and OpenCable Hardware Controller. Signed-off-by: Abylay Ospan <aospan@netup.ru> Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
2009-03-03Add EEPROM code for NetUP Dual DVB-S2 CI card.Abylay Ospan
From: Abylay Ospan <aospan@netup.ru> Signed-off-by: Abylay Ospan <aospan@netup.ru> Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
2009-03-03Add init code for NetUP Dual DVB-S2 CI cardAbylay Ospan
From: Abylay Ospan <aospan@netup.ru> Add init code for NetUP Dual DVB-S2 CI card The card based on cx23885 PCI-e bridge, CiMax SP2 Common Interface chips, STM lnbh24 LNB power chip, stv6110 tuners and stv0900 demodulator. Signed-off-by: Abylay Ospan <aospan@netup.ru> Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
2009-02-27Remove legacy pxa_camera.h and tvmixer.c filesMauro Carvalho Chehab
Those files were removed by some previous commit on -git kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-27Update dependencies of the modules converted to V4L2Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Several modules were converted to V4L2 API. Update their dependencies on Kconfig. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-27cx18 and saa7110: remove the fake v4l2_ctrl_query_fill calls for the proper onesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> During the patch merge, I've added a temporary fix for v4l2_ctrl_query_fill(), just to avoid the tree breakage. Replace those for the proper values. kernel-sync: Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-26cx18: Fix compilation and remove the obsoleted v4l2_ctrl_query_fill_std() callMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-26merge: http://linuxtv.org/hg/~awalls/cx18Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-26merge: http://www.linuxtv.org/hg/~dougsland/em28xxMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-26Get rid of video_decoder.h header were uneededMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Now, just a few modules are still dependent of this legacy header: $ grep -l DECODER_ `find linux/drivers/media/ -name '*.[ch]' -exec grep -l video_decoder '{}' \;` linux/drivers/media/video/v4l2-ioctl.c linux/drivers/media/video/indycam.c linux/drivers/media/video/saa7191.c linux/drivers/media/video/vino.c Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-26saa7110: get rid of the legacy v4l2_ctrl_query_fill_std()Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-26v4l2-common: Fix a merge conflict bad solvedMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-26merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-zoranMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-26merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-fill-stdMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-26merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-usbvisionMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-26merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-26merge: http://linuxtv.org/hg/~jfrancois/v4l-dvb/Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-26merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-25em28xx: Add Kaiser Baas Video to DVD maker supportDouglas Schilling Landgraf
From: Douglas Schilling Landgraf <dougsland@redhat.com> Added usb vendor/product id for Kaiser Baas Video to DVD maker. Thanks to Trevor Campbell <tca42186@bigpond.net.au> for providing all data and tests needed to add this card to em28xx driver. Priority: normal Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>