summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-03-09merge: http://linuxtv.org/hg/~awalls/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> commit && make && hg push Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-09merge: 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-08dvb/frontends: fix duplicate 'debug' symbolMauro Carvalho Chehab
From: Randy Dunlap <randy.dunlap@oracle.com> Fix dvb frontend debug variable to be static, to avoid linker errors: drivers/built-in.o:(.data+0xf4b0): multiple definition of `debug' arch/x86/kernel/built-in.o:(.kprobes.text+0x90): first defined here ld: Warning: size of symbol `debug' changed from 85 in arch/x86/kernel/built-in.o to 4 in drivers/built-in.o It would also be Good if arch/x86/kernel/entry_32.S didn't have a non-static 'debug' symbol. OTOH, it helps catch things like this one. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-08get rid of disabling DVB_FE_CUSTOMISE on kconfigMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Since make allmodconfig enables all DVB options, DVB_FE_CUSTOMISE is needed, otherwise the building system gots confused. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-08Kconfig workaround: enable FE_CUSTOMISE by defaultMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-05zoran: Change first argument to zoran_v4l2_buffer_statusTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> It was a struct file *, but all that function wants is the struct zoran_fh from the file's private data. Since every caller already has this, just pass the zoran_fh instead. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-03-05compat: Add INIT_DELAYED_WORKTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> Turn it into INIT_WORK for pre 2.6.20. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-03-04dib0700: Fixes the usb_id_tableMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> As noticed by Pascal Terjan <pterjan@mandriva.com>: The merge seems wrong: > +/* 45 */{ USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_PD378S) }, > + { &dib0700_usb_id_table[44], NULL }, Should be 45 Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-04dm1105: uses ir_* functions, select VIDEO_IRMauro Carvalho Chehab
From: Randy Dunlap <randy.dunlap@oracle.com> dm1105 uses the ir_*() functions, so it needs to select VIDEO_IR to avoid build errors: dm1105.c:(.text+0x26b7ac): undefined reference to `ir_input_keydown' dm1105.c:(.text+0x26b7bc): undefined reference to `ir_input_nokey' (.devinit.text+0x29982): undefined reference to `ir_codes_dm1105_nec' (.devinit.text+0x2998a): undefined reference to `ir_input_init' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.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-03Drop I2C_M_IGNORE_NAK compatibility bitMauro Carvalho Chehab
From: Jean Delvare <khali@linux-fr.org> I2C_M_IGNORE_NAK is defined since kernel 2.5.54 so we don't need to declare it in the compatibility header. Signed-off-by: Jean Delvare <khali@linux-fr.org> 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-01cx18: Add interlock so sliced VBI insertion only happens for an MPEG PSAndy Walls
From: Andy Walls <awalls@radix.net> The cx18 private packet insertion code only expects to operate on an MPEG PS when inserting private packets of sliced VBI data. This patch keeps the cx18 driver from corrupting the MPEG TS or other non-PS stream types, in case the user enables sliced VBI insertion for these MPEG stream types. Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2009-02-28cx18: Fix VPS service register codesAndy Walls
From: Andy Walls <awalls@radix.net> Based on a documentation clarification from Conexant, fix the register code used for sliced VBI VPS service. Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
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-28cx18: Correct comments about vertical and horizontal blanking timingsAndy Walls
From: Andy Walls <awalls@radix.net> This change only affects comments. Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2009-02-28cx18: Fix s-parse warnings and a logic error about extracting the VBI PTSAndy Walls
From: Andy Walls <awalls@radix.net> My s-parse builds never griped about be32_to_cpu() casting to __be32, but Hans' builds did. This change explictly declares the pointer into the VBI buffer header as __be32, which is the correct thing to do as the data is always big endian when we go to fetch it. Hopefully this will quiet s-parse warnings. Also corrected a misplaced parenthesis logic error in checking for the VBI header magic number. Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2009-02-28cx18: Include cx18-audio.h in cx18-audio.c to eliminate s-parse warningAndy Walls
From: Andy Walls <awalls@radix.net> Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2009-02-28cx18: Fix a video scaling check problem introduced by sliced VBI changesAndy Walls
From: Andy Walls <awalls@radix.net> Fix a scaling check that was failing, due to a magic number I missed fixing during previous slice VBI changes. Now $ v4l2-ctl -v width=480,height=480,pixelformat=MPEG yields proper visual results again. Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2009-02-28cx18: Use strlcpy() instead of strncpy() for temp eeprom i2c_client setupAndy Walls
From: Andy Walls <awalls@radix.net> Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
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-02-28saa7146: Clean-up i2c error handlingMauro Carvalho Chehab
From: Oliver Endriss <o.endriss@gmx.de> saa7146: Clean-up i2c error handling Simplify i2c error handling and fix incorrect handling of address errors in poll mode. Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-08Adds some missing frontend select for saa7134 and dvb-usbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-08Improve script to automatically adjust the Kconfig filesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> There are still some more hacking to do, in order to use this automatically, since more logic is needed for dibcom and av7110 stuff. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-08em28xx-dvb: Remove an unused headerMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-08Add a tool to identify if the frontend selects are fineMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-08get rid of the other occurrences of DVB_FE_CUSTOMIZE typoMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-06Kconfig: only open the customise menu if selectedMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Instead of asking a lot of questions for the poor users, let's just hide the frontend customise menu, if the user doesn't want to customise. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-06Kconfig: replace DVB_FE_CUSTOMIZE to DVB_FE_CUSTOMISEMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> The name of the option is DVB_FE_CUSTOMISE. However, on a few places, a wrong name were used, due to a typo (DVB_FE_CUSTOMIZE). Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-06Kconfig: Add some missing selects for a required frontendsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-05zoran: auto-select bt866 for AverMedia 6 EyesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> AFAIK, the bt866 is only seen on AverMedia 6 Eyes. However, no module selects it. Adds a proper select for this driver. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-26Add ids for Yuan PD378S DVB adapterMauro Carvalho Chehab
From: Pascal Terjan <pterjan@mandriva.com> Signed-off-by: Arnaud Patard <apatard@mandriva.com> Signed-off-by: Pascal Terjan <pterjan@mandriva.com> CC: Patrick Boettcher <patrick.boettcher@desy.de> [mchehab@redhat.com: Fixed a small merge conflict] Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-24Add "Sony PlayTV" to dibcom driverMauro Carvalho Chehab
From: sebastian.blanes@gmail.com <sebastian.blanes@gmail.com> This patch introduces support for DVB-T for the following dibcom based card: Sony PlayTV (USB-ID: 1415:0003) Signed-off-by: Sebastián Blanes <sebastian.blanes@gmail.com> CC: Patrick Boettcher <patrick.boettcher@desy.de> 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-02-24Add support for Zarlink ZL10036 DVB-S tuner.Mauro Carvalho Chehab
From: Matthias Schwarzott <zzam@gentoo.org> This driver is based on initial work by Tino Reichardt and was heavily changed. The datasheet of the zl10036 can be found here and on other places on the net: http://www.mcmilk.de/projects/dvb-card/datasheets/ZL10036.pdf The zl10038 is similar to the zl10036, so it is maybe possible to write a common driver of necessary. Signed-off-by: Matthias Schwarzott <zzam@gentoo.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-03-04merge: 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-04merge: 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-04Fix typo in lnbp21.cIgor M. Liplianin
From: Igor M. Liplianin <liplianin@netup.ru> It was a typo in the function name, it should be lnbh24_attach, and not lnbp24_attach. Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
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-03saa7146: some small fixesTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> vidioc_enum_fmt_vid_overlay() did nothing but call vidioc_enum_fmt_vid_cap(), so just make saa7146_video_ioctl_ops.vidioc_enum_fmt_vid_overlay point to vidioc_enum_fmt_vid_cap() and get ride of vidioc_enum_fmt_vid_overlay(). Have gparm use v4l2_video_std_frame_period to fill in the frame period instead of just assuming PAL. 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-03build: fix fix_kconfig.plTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> It didn't work and would erase your config file. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>