summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/em28xx
AgeCommit message (Collapse)Author
2007-05-13Backport kernel changeset 59c51591a0ac7568824f541f57de967e88adaa07Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: The original patch is from Michael Opdenacker <michael@free-electrons.com> Fix occurrences of "the the " Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-13Backport kernel changeset beb7dd86a101263bf63a78c7c6d4da3849b35bd6Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: The original patch is from Robert P. J. Day <rpjday@mindspring.com>: Fix misspellings collected by members of KJ list. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-13backport mainstream changeset 6473d160b4aba8023bcf38519a5989694dfd51a7Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: The original kernel patch is from Jean Delvare <khali@linux-fr.org> PCI: Cleanup the includes of <linux/pci.h> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-09Fix: em28xx currently doesn't require VIDEO_BUFMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Fix a bad dependency, as pointed by Geert Uytterhoeven <geert@linux-m68k.org>: | drivers/media/video/video-buf.c: In function 'videobuf_queue_pci': | drivers/media/video/video-buf.c:399: error: 'pci_map_sg' undeclared (first use in this function) Probably some new driver does a select VIDEO_BUF, which overrides that VIDEO_BUF depends on PCI? Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-02Use menuconfig objects II - V4LMauro Carvalho Chehab
From: Jan Engelhardt <jengelh@linux01.gwdg.de> Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-03Backed out changeset d130e8e1eb762e055371d5e3e1724d7735bad244Mauro Carvalho Chehab
Also reverting this one. V4L/DVB building system can't handle menuconfig and if/endif Kconfig items. We should first patch the building system before reapplying those two patches. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-05-02Use menuconfig objects II - V4LMauro Carvalho Chehab
From: Jan Engelhardt <jengelh@linux01.gwdg.de> Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-03-29Use ARRAY_SIZE instead of a magic numberMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-21Backport of git changeset cd354f1ae75e6466a7e31b727faede57a1f89ca5Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Backport a changeset from Schmielau <tim@physik3.uni-rostock.de> that removes uneeded includes for linux/sched.h Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-21Backport: make file_operations constMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Backport a kernel patch by Arjan van de Ven <arjan@linux.intel.com> that made all file_operations instances const. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-19compat: Add compat code for vm_insert_page()Trent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> Add an inline versin of vm_insert_page() that uses remap_pfn_range() to compat.h. Remove compat code from em28xx-video.c, sn9c102_core.c, and usbvision-video.c since compat.h is now doing the same thing. USB_ZC0301, USB_ET61X251, and USB_ZR364XX will now compile under 2.6.12. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2006-12-27Allyesconfig build fixes on some non x86 archMauro Carvalho Chehab
From: David Brownell <david-b@pacbell.net> - CAFE_CCIC needs to depend on PCI, else "allyesconfig" breaks on systems without PCI - em28xx-video can't udelay(2500) else "allyesconfig" breaks on systems that refuse to spin that long (I saw it on ARM) Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-21Two cleanups made at kernel treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-21IRQ: Maintain regs pointer globally rather than passing to IRQ handlersMauro Carvalho Chehab
Kernel-sync: This patch is required to allow compilation of the tree with kernel 2.6.19. This is the original description of the original patch, signed by David Howells <dhowells@redhat.com>: Maintain a per-CPU global "struct pt_regs *" variable which can be used instead of passing regs around manually through all ~1800 interrupt handlers in the Linux kernel. The regs pointer is used in few places, but it potentially costs both stack space and code to pass it around. On the FRV arch, removing the regs parameter from all the genirq function results in a 20% speed up of the IRQ exit path (ie: from leaving timer_interrupt() to leaving do_IRQ()). Where appropriate, an arch may override the generic storage facility and do something different with the variable. On FRV, for instance, the address is maintained in GR28 at all times inside the kernel as part of general exception handling. Having looked over the code, it appears that the parameter may be handed down through up to twenty or so layers of functions. Consider a USB character device attached to a USB hub, attached to a USB controller that posts its interrupts through a cascaded auxiliary interrupt controller. A character device driver may want to pass regs to the sysrq handler through the input layer which adds another few layers of parameter passing. I've build this code with allyesconfig for x86_64 and i386. I've runtested the main part of the code on FRV and i386, though I can't test most of the drivers. I've also done partial conversion for powerpc and MIPS - these at least compile with minimal configurations. This will affect all archs. Mostly the changes should be relatively easy. Take do_IRQ(), store the regs pointer at the beginning, saving the old one: struct pt_regs *old_regs = set_irq_regs(regs); And put the old one back at the end: set_irq_regs(old_regs); Don't pass regs through to generic_handle_irq() or __do_IRQ(). In timer_interrupt(), this sort of change will be necessary: - update_process_times(user_mode(regs)); - profile_tick(CPU_PROFILING, regs); + update_process_times(user_mode(get_irq_regs())); + profile_tick(CPU_PROFILING); I'd like to move update_process_times()'s use of get_irq_regs() into itself, except that i386, alone of the archs, uses something other than user_mode(). Some notes on the interrupt handling in the drivers: (*) input_dev() is now gone entirely. The regs pointer is no longer stored in the input_dev struct. (*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does something different depending on whether it's been supplied with a regs pointer or not. (*) Various IRQ handler function pointers have been moved to type irq_handler_t. Signed-Off-By: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-08-26Add u32 argument to VIDIOC_INT_RESET.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The extra argument makes it possible to reset subsystems of a chip if that is supported. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-08-22Allow manually selecting the proper helper driversMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> There are several boards on V4L that can work with several different helper modules for audio/video encoding/decoding and similar stuff. This patch adds the capability of choicing between autoselecting the pertinent helper modules for each driver, or to manually selecting them. Acked-by: Michael Krufky <mkrufky@linuxtv.org> Acked-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-08-18Make tvp5150 an independent Kconfig itemMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-08-07Add missing include linux/mm.h to some compat codeTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> Some compat functions for kernel < 2.6.15 needed linux/mm.h, which wasn't included. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2006-06-26Remove all instances of request_module("tda9887")Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> We should no longer try to load the tda9887 module, because it no longer exists. The tda9887 driver has been merged into the tuner module. This patch removes all instances of request_module("tda9887") from the following video4linux drivers: bttv, cx88, em28xx and saa7134. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-23Merge tda9887 module into tuner.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Most uses a tda988[5/6/7] IF demodulator as part of the device. Having this as a separate stuff makes harder to configure it, since there are some tda9887 options that are tuner-dependent and should be bound into tuner-types structures. This patch merges tda9887 module into tuner. More work is required to make tuner-types to properly use it. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-05-18merge: from masterrmcc@localhost.localdomain
From: Ricardo Cerqueira <v4l@cerqueira.org> merging master changes Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
2006-04-28Em28xx/: possible cleanupsMauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de> This patch contains the following possible cleanups: - make the following needlessly global functions static: - em28xx-core.c: em28xx_accumulator_set() - em28xx-core.c: em28xx_capture_area_set() - em28xx-core.c: em28xx_scaler_set() - em28xx-core.c: em28xx_isocIrq() - remove the following unused EXPORT_SYMBOL's: - em28xx-cards.c: em28xx_boards - em28xx-cards.c: em28xx_bcount - em28xx-cards.c: em28xx_id_table Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-11Use after free in drivers/media/video/em28xx/em28xx-video.cMauro Carvalho Chehab
From: Eric Sesterhenn <snakebyte@gmx.de> In several places we use dev->devno right after we kfree() dev. This fixes coverity bug id #1065 Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-11Merge: from V4L1 treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
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-04-03Change all emails to the currently used one.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-02Fix video input setting of em28xx, use _INT_S_VIDEO_ROUTING in tvp5150Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> - Use new routing input defines in em28xx-cards.c - Fix S-Video settings for tvp5150-based cards (input was copied from saa7115 based cards and worked only because S-Video was selected in the default: case) - Replace VIDIOC_S_INPUT by VIDIOC_INT_S_VIDEO_ROUTING in em28xx-video.c - Remove the now obsolete VIDIOC_S_INPUT handler in saa7115.c - Add VIDIOC_INT_G/S_VIDEO_ROUTING in tvp5150.c - Add new media/tvp5150.h with the routing defines. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-01Make msp3400 routing defines more consistentHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Renamed various msp3400 routing defines to be more consistent and less confusing. Esp. the MSP_DSP_OUT defines were confusing since it is really a DSP input. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-01Remove obsolete commands from tvp5150.cHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> - Remove old DECODER_ commands from tvp5150.c, replacing them with newer ones if appropriate. - Small VIDIOC_G_TUNER fixes in msp3400 and tuner. - Fix VIDIOC_S_TUNER support in em28xx. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-03-26Subject: Pinnacle PCTV grey remote control supportRicardo Cerqueira
From: Sylvain Pasche <sylvain.pasche@gmail.com> This adds support for the older (?) Pinnacle PCTV remotes (with all buttons colored in grey). There's no autodetection for the type of remote, though; saa7134 defaults to the colored one, to use the grey remote the "pinnacle_remote=1" option must be passed to the saa7134 module Signed-off-by: Sylvain Pasche <sylvain.pasche@gmail.com> Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
2006-03-19Implement correct msp3400 input/output routingHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> - implement VIDIOC_INT_S_AUDIO_ROUTING for msp3400 and tvaudio - use the new command in bttv, pvrusb2 and em28xx. - remove the now obsolete MSP_SET_MATRIX from msp3400 (yeah!) - remove the obsolete VIDIOC_S_AUDIO from msp3400. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-03-19Add new media/msp3400.h header containing the routing macrosHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Moved msp3400.h to msp3400-driver.h. Created media/msp3400.h with the new routing defines and lots of comments. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-03-16Kconfig: add menu items for saa7115 decoder and saa7127 encoder modulesMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - created Kconfig menu item, VIDEO_SAA711X, for the saa7115 module, which supports SAA7113, SAA7114 and SAA7115 video decoders. - created Kconfig menu item, VIDEO_SAA7127, for the saa7127 module, which supports SAA7127 and SAA7129 digital video encoders. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-15Merging mchehab saa7115 treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> merge: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-14Fix a bug when more than MAXBOARDS were plugged on em28xxMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Coverity reported a bug at checking max number of supported boards by em28xx init code. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-13Remove saa711x driverMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Now, em28xx uses saa7115 instead of saa711x. saa7115 driver is capable of handling saa 7113, 7114 and 7115. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-08XC3028 code marked with an special define optionMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> - Current xc3028 support is still experimental, requiring more work to be sent to mainstream. So, it was marked inside some defines, in order to be removed by gentree.pl stript. Script also updated to remove it. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-07Adding support for Terratec Prodigy XSMarkus Rechberger
From: Markus Rechberger <mrechberger@gmail.com> Adding support for Terratec Prodigy XS Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
2006-02-06sem2mutex: drivers/media/, #2Mauro Carvalho Chehab
Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Kernel-sync from patch 3318b Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-05Fixed em28xx based system lockup Markus Rechberger
From: Markus Rechberger <mrechberger@gmail.com> fixed em28xx based system lockup, device needs to be initialized before starting the isoc transfer otherwise the system will completly lock up. Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
2006-02-03fixed i2c return value, conversion mdelay to msleepMarkus Rechberger
From: Markus Rechberger <mrechberger@gmail.com> fixed i2c return value, conversion mdelay to msleep Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
2006-02-01fixed amux hauppauge hvr900/terratec hybrid xsMarkus Rechberger
From: Markus Rechberger <mrechberger@gmail.com> fixed amux hauppauge hvr900/terratec hybrid xs Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
2006-02-01fixed xc3028 firmware extractor, added terratec fw supportMarkus Rechberger
From: Markus Rechberger <mrechberger@gmail.com> fixed xc3028 firmware extractor for terratec's emBDA.sys firmware fixed delay in firmwareupload, now terratec's firmware also works Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
2006-02-01added support for xc3028 analogue tuner (Hauppauge HVR900, Terratec Hybrid XS)Markus Rechberger
From: Markus Rechberger <mrechberger@gmail.com> added support for xc3028 to v4l which adds support for: * Terratec Hybrid XS (analogue) * Hauppauge HVR 900 (analogue) Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
2006-01-31Changed description of KWorld PVR TV 2800RF Markus Rechberger
From: Markus Rechberger <mrechberger@gmail.com> Changed description of KWorld PVR TV 2800RF Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
2006-01-31added terratec hybrid xs and kworld 2800rf supportmrechberger
From: Markus Rechberger <mrechberger@gmail.com> added terratec hybrid xs product/vendorid added gpio audio initialization for kworld pvr 2800rf Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
2006-01-22Hauppauge HVR 900 Composite supportMarkus Rechberger
From: Markus Rechberger <mrechberger@gmail.com> Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
2006-01-22fixed spelling error, exectuted --> executed.Michael Krufky
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2006-01-22CodingStyle fixes.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> - CodingStyle fixes. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-01-22Implemented VIDIOC_G_FMT/S_FMT for sliced VBIMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> - Implemented VIDIOC_G_FMT/S_FMT for sliced VBI - VIDIOC_S_FMT now calls a function Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>