summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2006-10-04Fix warning when compiling on x86_i64Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> drivers/media/dvb/dvb-usb/usb-urb.c: In function 'usb_allocate_stream_buffers': drivers/media/dvb/dvb-usb/usb-urb.c:125: warning: format '%u' expects type 'unsigned int', but argument 4 has type 'long long unsigned int' Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-04Radio: No need to return voidMauro Carvalho Chehab
From: Tobias Klauser <tklauser@distanz.ch> The module_exit function has return-type void and pci_unregister_driver() returns void anyway. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-04Dev2: handle __must_checkMauro Carvalho Chehab
From: Andrew Morton <akpm@osdl.org> We get hundreds of these: include/media/v4l2-dev.h:348: warning: ignoring return value of 'class_device_create_file', declared with attribute warn_unused_result Handle it, and propagate the __must_check back a level. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-03merge: http://linuxtv.org/hg/~hverkuil/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-034linux: complete conversion to hotplug safe PCI APIMauro Carvalho Chehab
From: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-04Add tveeprom support for Philips FM1236/FM1216ME MK5Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Add new Philips tuners: Philips FM1236 MK5 and Philips FM1216ME MK5. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-10-032.6.18: Do not enable VIDEO_V4L2 unconditionallyMauro Carvalho Chehab
From: Maciej W. Rozycki <macro@linux-mips.org> The VIDEO_V4L2 config setting is enabled unconditionally, even for configurations with no support for this subsystem whatsoever. The following patch adds the necessary dependency. patch-mips-2.6.18-20060920-video-v4l2-0 Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-03Merge with master repositoryHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-02merge: http://www.linuxtv.org/hg/~stoth/dvbsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-02Fix S-Video configuration for Pinnacle PCTV-SatMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> CC: Edgar Toernig <froese@gmx.de> Thanks to Edgar Toernig <froese@gmx.de> for pointing this. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-02CX24109 patch to eliminate the weird mis-tuningsSteven Toth
From: Steven Toth <stoth@hauppauge.com> A number of people have been reporting wierd tuning problems with various cards. Yeasah tracked down the problem to a miss-read datasheet. This resolves the problems. Signed-off-by: Yeasah Pell <yeasah@schwide.net> Signed-off-by: Steven Toth <stoth@hauppauge.com>
2006-10-03SAA713x: fixed compile warning in SECAM fixupHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> The variable fixup could be used uninitialized. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-03Add support for the ASUS EUROPA2 OEM boardHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> This is a analog DVB-T hybrid board Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-03Asus P7131 Dual hybrid, set antenna input for DVB-THartmut Hackmann
From: Hermann Pitton <hermann-pitton@arcor.de> This patch forces the correct antenna input input in DVB-T mode for this card Signed-off-by: Hermann Pitton <hermann-pitton@arcor.de> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-03saa713x audio fixesHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> This change fixes the following issues: - resolve the SECAM D/K vs SECAM-L sound conflict It is now possible to select the SECAM version either by the VIDEOIOC_S_STD IO control or by the new secam= insmod option. The driver now adapts its audio standard search list to the selected standard. - don't trigger a sound standard search when a LINE input is selected. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-10-02merge: http://linuxtv.org/hg/~tap/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-02merge: http://linuxtv.org/hg/~hverkuil/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-02Check for Kernel OSS includes for aci.cTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> aci.c needs some OSS include files from the kernel to compile. Typical kernel-headers packages don't have these include files, and so aci.c fails to compile. Have make_kconfig.pl check for the headers, and disable aci if they aren't there. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2006-10-02Reinstate dropped line to set standard detectionHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The previous patch accidentally dropped a crucial line to set the msp standard detection. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-10-02merge: http://linuxtv.org/hg/~mkrufky/cx88-mpegMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-10-01Fix msp343xG handling (regression from 2.6.16)Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The msp3430G and msp3435G models cannot do Automatic Standard Detection. So these should be forced to BTSC. These chips are early production versions for the msp34xxG series and are quite rare. The workaround for kernel 2.6.18 is to use 'standard=32' as msp3400 module option. Due to broken handling of the 'standard' option in 2.6.17 there is no workaround possible for that kernel. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-09-30merge: http://linuxtv.org/hg/~mkrufky/cxusbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-09-30fix compiler warning in drivers/media/video/video-buf.cMauro Carvalho Chehab
From: Sujoy Gupta <sujoy@google.com> Using a double cast to avoid compiler warnings when building for PAE. Compiler doesn't like direct casting of a 32 bit ptr to 64 bit integer. Signed-off-by: Martin J. Bligh <mbligh@google.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-09-29Add WinTV-HVR3000 DVB-T supportSteven Toth
From: Steven Toth <stoth@hauppauge.com> The WinTV-HVR3000 is currently defined for analog support only. This patch adds full DVB-T support. (DVB-S support will be added soon) Signed-off-by: Steven Toth <stoth@hauppauge.com>
2006-09-29Remove the cx8802_dev driver lock and use the core mutexSteven Toth
From: Steven Toth <stoth@hauppauge.com> The cx8802_dev semaphore was unnecessary. This patch removes is and uses the existing core mutex. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2006-09-29Force all cx88 DVB frontends to request bus access.Steven Toth
From: Steven Toth <stoth@hauppauge.com> Force all cx88 DVB frontends to request bus access. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2006-09-29Adding support for Nova-T-PCI PCI ID 0070:9000Steven Toth
From: Steven Toth <stoth@hauppauge.com> Adding support for Nova-T-PCI PCI ID 0070:9000 Signed-off-by: Steven Toth <stoth@hauppauge.com>
2006-09-29drivers/media/video/cx88: Remove unused defined FALSE/TRUEMauro Carvalho Chehab
From: Richard Knutsson <ricknu-0@student.ltu.se> Remove defines of FALSE/TRUE because they are not used. Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-09-29norm_notchfilter is used on just one point and argument is bogusMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Removed norm_notchfilter function. All the code is bound to 4 x FSC, so, any other filter won't work fine. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-09-29merge: http://linuxtv.org/hg/~mkrufky/cx88Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-09-28merge: http://www.linuxtv.org/hg/~stoth/hvr1300-dvbtonlyMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-09-28Fix some errors at cx88-mpegMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> The previous cx88-mpeg patch introduced those errors while compiling: CC [M] /home/v4l/master2/v4l/cx88-mpeg.o /home/v4l/master2/v4l/cx88-mpeg.c: In function 'cx8802_request_acquire': /home/v4l/master2/v4l/cx88-mpeg.c:645: warning: comparison between pointer and integer /home/v4l/master2/v4l/cx88-mpeg.c:645: error: called object '"<7>%s/2-mpeg: "' is not a function /home/v4l/master2/v4l/cx88-mpeg.c: In function 'cx8802_request_release': /home/v4l/master2/v4l/cx88-mpeg.c:660: warning: comparison between pointer and integer /home/v4l/master2/v4l/cx88-mpeg.c:660: error: called object '"<7>%s/2-mpeg: "' is not a function Also, at cx88.h, it is reintroducing this prototype: extern void cx88_print_ioctl(char *name, unsigned int cmd) This function were removed in the past, since it were replaced by a more generic one on v4l2-common.c. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-09-28merge: http://www.linuxtv.org/hg/~stoth/hvr1300-finalMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-09-28pvrusb2: Fix VIDIOC_INT_[G|S]_REGISTER so that it actually works nowMike Isely
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
2006-09-28use NULL instead of 0 for ptrsMauro Carvalho Chehab
From: Randy Dunlap <rdunlap@xenotime.net> Use NULL instead of 0 for pointer value, eliminate sparse warnings. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-09-28Mark the two newer ioctls as experimentalMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> VIDIOC_ENUM_FRAMESIZES and VIDIOC_ENUM_FRAMEINTERVALS ioctls are meant to be used to provide better support for webcams. Currently, it is not yet used on kernel drivers. Better to keep it marked as experimental, until we have several kernel drivers supporting those features. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-09-28Frame format enumeration (1/2)Mauro Carvalho Chehab
From: Laurent Pinchart <laurent.pinchart@skynet.be> Add VIDIOC_ENUM_FRAMESIZES and VIDIOC_ENUM_FRAMEINTERVALS ioctls to enumerate supported frame sizes and frame intervals. Signed-off-by: Martin Rubli <martin.rubli@epfl.ch> Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-09-28cxusb: add support for DViCO FusionHDTV DVB-T Dual Digital 2Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> add support for DViCO FusionHDTV DVB-T Dual Digital 2 USB, which is identical to the usb portion of DViCO FusionHDTV DVB-T Dual Digital 1. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-09-27Dynamic cx88 mpeg port management for HVR1300 MPEG2/DVB-T support. Steven Toth
From: Steven Toth <stoth@hauppauge.com> A series of patches to change the cx88 framework to allow the PCI mpeg port to be shared dynamically between different types of drivers or applications. This patch changes the cx88-dvb and cx88-blackbird drivers to become 'sub drivers' of a higher single cx88-mpeg driver. The cx88-mpeg driver is a superset of the previous cx88-mpeg/blackbird drivers and now owns the IRQ. cx88-dvb/blackbird now become mini drivers, registering themselves with cx88-mpeg through a standard interface with callbacks. Sub drivers request access to hardware via the cx88-mpeg driver. In turn the cx88-mpeg driver determines whether the hardware is busy and accepts or refuses the request, grant access using callbacks into the sub drivers. The net effect is that you are no longer able to tamper with the mpeg port from multiple different applications at the same time, potentially breaking a live mpeg2 hardware encoding or dvb stream. The mechanism extends to enable multiple dvb frontends to be registered and share the single resource. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2006-09-27Fix for NULL pointer dereference oops during boot.Steven Toth
From: Steven Toth <stoth@hauppauge.com> A fix for intermittent oops's during boot which occurs in cx88_call_i2c_clients when dvb_attach is bringing up the frontend. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2006-09-26Support for SAA7134-based AVerTV Hybrid A16ARMauro Carvalho Chehab
From: Petr Baudis <pasky@ucw.cz> This adds support for a hybrid PAL/DVB/FM card. Unfortunately I tested only the DVB since I don't have any proper antenna available and I can receive even the DVB just barely so; I can hear noise in the FM part but I couldn't catch any station, then again I don't have an FM antenna either. The PAL/FM and IR control data are based on what I harvested on the 'net. Perhaps I or someone else will fix them if they turn out to be wrong. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-09-26Allow RC5 codes 64 - 127 in ir-kbd-i2c.cMauro Carvalho Chehab
From: David Hardeman <david@hardeman.nu> The RC5 coding has for a long time supported commands 64-127 in addition to 0-63. This is controlled by the second bit of the RC5 packet (see The attached patch modifies ir-kbd-i2c.c to allow for commands 64-127, tested with a PVR350 card in combination with a programmable remote. Signed-off-by: David Hardeman <david@hardeman.nu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-09-25cx88: fix analog capture notch filterMichael Krufky
From: Lars Gjesse Kjellberg <lars.g.kjellberg@get2net.dk> This patch changes the setting of the cx2388x notch filter to match that of the video capture sample frequency, removing some annoying interference lines THAT would appear when capturing composite video. This has been tested in PAL and NTSC TV norms. It sets the Y/C separation luma notch filter, which removes the chroma signal from the luma signal when using a composite input. The luma notch filter operates at the video decoder's frequency, not the ADC's frequency or at the frequency of the scaled video. Y/C separation happens after the sample rate converter, before video scaling. The datasheet provides plots of the filter response for three _video decoder_ frequencies, 4x Fsc, square pixel, and ccir601. These are the same three frequencies for the notch filter control. It seems pretty clear that this filter should be set based on the video decoder frequency. The cx88 driver always uses a video decoder frequency of 4xFsc. Signed-off-by: Lars Gjesse Kjellberg <lars.g.kjellberg@get2net.dk> Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-09-25cx88: autodetect Club3D Zap TV2100 by subsystem id 12ab:2300Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> The Club3D Zap TV2100 has been reported to be a clone of the Yuan PG300 and KWorld/VStream XPert DVB-T with cx22702 Thanks-to: Lars Gjesse Kjellberg <lars.g.kjellberg@get2net.dk> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-09-25cx88: rename mpeg capability flags from CX88_BOARD_FOO to CX88_MPEG_FOOMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> The flags for mpeg capabilities are sub-optimally named as CX88_BOARD_DVB and CX88_BOARD_BLACKBIRD, which creates some confusion. This patch renames the above to CX88_MPEG_DVB and CX88_MPEG_BLACKBIRD. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> CC: Steven Toth <stoth@hauppauge.com> Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2006-09-25Changed cx88_board .dvb and .register to an enum.Steven Toth
From: Steven Toth <stoth@hauppauge.com> Some basic cleanup in preperation for a future patch where the cx88-mpeg functions have to deal with the port being used by multiple frontends in (mpeg2 hw encoder and dvb demod). Signed-off-by: Steven Toth <stoth@hauppauge.com>
2006-09-25Ensure the WM8775 driver is loaded generically for any board.Steven Toth
From: Steven Toth <stoth@hauppauge.com> A generic change to cards to allow any board to specify whether it needs the wm8775 module loaded (by the core) or not. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2006-09-25Add frontend structure callback for bus acquisition.Steven Toth
From: Steven Toth <stoth@hauppauge.com> This patch enables generic bus arbitration callbacks enabling dvbcore frontend_open and frontend_release to pass 'acquire' and 'release' hardware messages back into the DVB bridge frameworks. Frameworks like cx88 can then implement single bus multiple demod card sharing features, which would prohibit two frontends from attempting to use a single transport bus at the same time. Signed-off-by: Steven Toth <stoth@hauppauge.com>
2006-09-23pvrusb2: Don't use videodev.h; use v4l2-dev.h in its placeMike Isely
From: Mike Isely <isely@pobox.com> The function prototype needed in pvrusb2-v4l2.c has been moved to v4l2-dev.h. Track that change. Signed-off-by: Mike Isely <isely@pobox.com>
2006-09-23pvrusb2: Get rid of private global context array brain damageMike Isely
From: Mike Isely <isely@pobox.com> A previous attempt to deal with the upcoming loss of video_set_drvdata() and video_get_drvdata() resulted in logic which causes a circular locking dependency - also known as a deadlock. This changeset attacks the problem in a different manner, using a technique that no longer requires the problematic mutex (or that private global array either). Signed-off-by: Mike Isely <isely@pobox.com>