summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2006-06-24make VIDEO_CX88_BLACKBIRD a separate build optionMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> This patch creates a new Kconfig menu option, entitled, "Blackbird MPEG encoder support (cx2388x + cx23416)" so that the cx88-blackbird mpeg encoder module can be chosen separately. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-24make VIDEO_CX2341X a selectable build optionMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> The cx2341x mpeg encoder module is used by cx88-blackbird, pvrusb2 and the external ivtv driver. This patch allows for cx2341x to be selected without having to also select cx88-blackbird. This will be needed to build the external ivtv driver or the standalone pvrusb2 driver against kernel 2.6.18 Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-24cx88: cleanupsMichael Krufky
From: Adrian Bunk <bunk@stusta.de> remove the following unused hooks: - cx88-blackbird.c: cx88_ioctl_hook() - cx88-blackbird.c: cx88_ioctl_translator() make the following needlessly global functions static: - cx88-tvaudio.c: cx88_detect_nicam() remove the following unused EXPORT_SYMBOL's: - cx88-cards.c: cx88_bcount - cx88-cards.c: cx88_subids - cx88-cards.c: cx88_idcount - cx88-cards.c: cx88_card_list - cx88-cards.c: cx88_card_setup - cx88-core.c: cx88_start_audio_dma - cx88-core.c: cx88_stop_audio_dma - cx88-i2c.c: cx88_i2c_init Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-24Whitespace cleanupsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-24Added some BTTV PCI IDs for newer boardsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-24Add blacklist capability to tuner.pl and remove TDA9887 from the cardlistMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> tda9887 is not really an independent tuner, but part of one. It shouldn't be ponted at a userlist. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23merge: http://linuxtv.org/hg/~mkrufky/mpeg-apiMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.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-06-23merge: http://linuxtv.org/hg/~hverkuil/mpeg-apiMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23Explicitly set the enum values.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> It's better to use explicit enums. It reduces the chance of someone inserting new enums in the middle which would break things. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-06-23merge: http://www.linuxtv.org/hg/~manu/v4l-algoMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23Fix use-after-free bug in cpia2 driverMauro Carvalho Chehab
From: Jesper Juhl <jesper.juhl@gmail.com> The coverity checker detected a use-after-free error in drivers/media/video/cpia2/cpia2_v4l.c::cpia2_close() (coverity error #1281). What happens is that we lock cam->busy_lock, then proceed to free resources, and in the case of (--cam->open_count == 0) we finish off by doing a kfree(cam) and then at the end of the function we do a mutex_unlock(&cam->busy_lock) which will explode since it'll dereference the free'd `cam' : ... mutex_lock(&cam->busy_lock); ... if (--cam->open_count == 0) { ... if (!cam->present) { video_unregister_device(dev); kfree(cam); } } mutex_unlock(&cam->busy_lock); <--- PROBLEM, cam no longer around. ... Since this only happens in the case of open_count going down to zero I don't see a problem with just releasing the mutex after unregistering the device and just before the kfree(). In this case there is nothing around that we can race against; we are in the release method, open_count is zero, (!cam->present) and the device has just been unregistered, so letting go of the mutex at this point looks safe to me. Patch below to implement that solution. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23Break make release into several lines keeping it work with make 3.81Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Also, fixes a trouble with make 3.81 introduced by the latest patch. make 3.81 doesn't work fine with something like: 'foo'\ It should be, instead: 'foo' \ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23Have config-compat.h, undefine options turned offMauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> Use a (make 3.81 safe!) in-line perl script to generate config-compat.h from .myconfig. The output will be more like the Kernel's output: Options set to 'm' will define CONFIG_WHATEVER_MODULE to 1, rather than define CONFIG_WHATEVER to m. Options set to 'y' to be defined to 1 instead of y. Options that are off will be #undef'ed, rather that omitted, so that they will override the settings from the kernel autoconf.h file. The last change will fix a problem where certain options, like CinergyT2 tuning and AV7110 firmware, wouldn't work properly if they were on in the kernel but off for v4l-dvb Hg. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23merge: 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-06-23fix up funky logic in dvbMauro Carvalho Chehab
From: Dave Jones <davej@redhat.com> Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23fix userbits debug printsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Previously, it were showing the pointer value, instead of the setted bits. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23drivers/media/video/pwc/: make code staticMauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de> This patch makes the following needlessly global code static: - pwc-ctrl.c: pwc_get_leds() - pwc_preferred_compression Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-23drivers/media/video/vivi.c: make 2 functions staticMauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de> Make two needlessly global functions static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-22cx88: clear EN_I2SIN_ENABLE bit for ASUS PVR-416 to enable audioMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> clear EN_I2SIN_ENABLE bit for ASUS PVR-416 to enable audio streaming in both raw video and blackbird mpeg encoder modes. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-22cx88-blackbird: always set encoder height based on tvnorm->idMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Removed the switch..case block in blackbird_probe for setting encoder height based on video standard. All blackbird devices can rely on tvnorm->id to retrieve this information from the cx2388x video decoder - tuner_formats should not be used to determine the encoding video standard. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-22merge: 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-06-22Improved message when only kernel headers are foundMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-22Have the commit auto-check code tell you when it does somethingMauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> When the make commit checks for whitespace errors, it will save a copy of the changes it makes to $(TMP)/v4l_hg_whitespace. The prep_commit_msg.pl script will look for this file and include a note in the prepared commit message with diffstat output. The changes that scripts/cardlist might make are not included, but that can be added later. The prep_commit_msg.pl script is effectively totally re-written. This one will try some extra stuff to some up with the user's e-mail, such as looking in the ~/.hgrc file. The Makefile is changed so that temporary files created by make commit and make whitespace will honor the $TMP environment variable, if set. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-22Adjust filenames in the strip whitespace script outputMauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> Before: --- Makefile +++ - 2006-06-20 22:16:36.320564000 -0700 Now: --- Makefile +++ Makefile patch handles both correctly, but diffstat will use the "+++" filename rather than the "---" filename, making diffstat output rather useless. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-22The new POSIX backslash behavior on GNU make 3.81 breaks make releaseMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> On make 3.81, backslash isn't removed anymore when inside of a single quotted string. This makes make release to fail, since perl won't understand the backslash. This patch just make all script into one line. Bad to understand, but, at least, it will work fine with both GNU make 3.80 and make 3.81. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-21building system fix: miropcm20 depends on sound/oss/aci.hMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Most V4L/DVB hg tree users are just compiling using kernel headers. This is bad, due to: 1) the lack of support for make *config 2) the kernel itself have unknown patches from the distros Anyway, it is useful to provide they some support. This patch provides a "hack" for such users, by checking if the sound/oss/aci.h file is present under kernel tree. If not, it will disable miropcm20 and print a warning about the usage of a kernel-headers only package. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-22Add support for the DNTV Live! mini DVB-T card.Manu Abraham
From: Cameron Hutchinson <camh@xdna.net> Signed-off-by: Cameron Hutchinson <camh@xdna.net>
2006-06-22conditionally enable 5 byte diseqc commandsManu Abraham
From: Yeasah Pell <yeasah@schwide.net> Signed-off-by: Yeasah Pell <yeasah@schwide.net> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-06-22Static variables mustn't be EXPORT_SYMBOL 'edManu Abraham
From: Adrian Bunk <bunk@stusta.de> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-06-22The Coverity checker spotted that there was a memory leak if the second or ↵Manu Abraham
third kmalloc() failed. Besides this, i have also consolidated the three error handlings into one and removed the unneeded casts. From: Adrian Bunk <bunk@stusta.de> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-06-21CX2341X port was always set to 'memory', but 'streaming' is also possibleHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> ivtv uses the memory (DMA) interface with the CX2341X, while pvrusb2 and cx88-blackbird use the streaming interface. This setting is now selectable by the driver. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-06-22Comment out MMI functions for nowManu Abraham
From: Manu Abraham <abraham.manu@gmail.com> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-06-21Fix CA Info and Application InfoManu Abraham
From: Henrik Sjoberg <hsjo@epact.se> Signed-off-by: Henrik Sjoberg <hsjo@epact.se> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-06-21Some cleanups at the release scriptMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-21Option disabling should be recursive. Fixing it.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-21cx88: add support for FusionHDTV 3 Gold (original revision)Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Add support for FusionHDTV 3 Gold (original revision), using the card definition for FusionHDTV3 Gold-Q Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-21merge: http://linuxtv.org/hg/~rmcc/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-21Initial go at MMIManu Abraham
From: Manu Abraham <abraham.manu@gmail.com> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-06-21Some improvements at the building systemMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Building system now looks kernel config.h and autoconf.h files, seeking for the compiled options at kernel. If something is missing, it will disable compilation for that driver, printing a warning message. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-21VLF fixes for DCTManu Abraham
From: Manu Abraham <abraham.manu@gmail.com> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-06-21replace NEWTUNE with TS188Manu Abraham
From: Manu Abraham <abraham.manu@gmail.com> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-06-21DCTNEW and ATSC fixesManu Abraham
From: Manu Abraham <abraham.manu@gmail.com> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-06-21Bug-fix: Do not overflow kernel memory when more than BT878_MAX devices are ↵Manu Abraham
present From: Sigmund Augdal Helberg <sigmund@snap.tv> Signed-off-by: Sigmund Augdal Helberg <sigmund@snap.tv> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-06-21fix a bug in tuner detectionManu Abraham
From: Manu Abraham <abraham.manu@gmail.com> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-06-21distinguish between STV0299 and MB86A15 based NIM'sManu Abraham
From: Manu Abraham <abraham.manu@gmail.com> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-06-21dprintk macro beautificationManu Abraham
From: Manu Abraham <abraham.manu@gmail.com> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-06-21Remove spurious newlines in dprintk's. Add dst(card-num) as prefix in dprintkManu Abraham
From: Sigmund Augdal Helberg <sigmund@snap.tv> Signed-off-by: Sigmund Augdal Helberg <sigmund@snap.tv> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-06-21Fix Daughterboard detectionManu Abraham
From: Manu Abraham <abraham.manu@gmail.com> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-06-21ATSC typecheck bugfixManu Abraham
From: Bryan Scott <sirbryan@gmail.com> Signed-off-by: Bryan Scott <sirbryan@gmail.com> Signed-off-by: Manu Abraham <manu@linuxtv.org>