summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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-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-21merge: masterMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-21Fixes circular dependencies at building systemMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> There were a circular dependency at scripts/make_makefile.pl that were affecting mostly building with GNU make 3.81. Also, scripts/make_noconfig.pl is, in fact, building .myconfig file, so, better to name it as make_myconfig.pl. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-20Adjust distclean target to clean a few more filesMauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> distclean was not cleaning the v4l/.myconfig file, or the symlinks made for the lxdialog program. This caused problems especially if you were switching between different kernel versions for testing. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-20kconfig: saa7115 depends on VIDEO_DEV, not VIDEO_V4l1Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> ... another leftover bug from a previous merge Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-20Kconfig: fix description for saa7115 moduleMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> This Kconfig description is incorrect, due to a previous merge a while back. CONFIG_SAA711X builds module saa7115, which is the newer module, and is not obsoleted. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-20merge: http://linuxtv.org/hg/~mkrufky/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-20Ovcamship position at Kconfig changedMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Ovcamship is used only on some USB webcams (OV511 and W9968CF) Bettet to leave this item just after those webcams. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-20Makefile.media were rewritten even when not required.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> make 3.81 were suffering some endless loop that might be caused by Makefile.media rewrites. After this patch, make_makefile will only write Makefile.media if needed. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-20lgdt330x: fix missing line in VSB snr decoding logicMichael Krufky
From: Mac Michaels <wmichaels@earthlink.net> - fix missing line in VSB snr decoding logic for lgdt3303 Signed-off-by: Mac Michaels <wmichaels@earthlink.net> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-20update cardlist documentationMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-20Whitespace cleanupsMauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-20Faster strip whitespace cleaning scriptMauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> Faster script that doesn't use any temporary files. The old one would also miss cleaning four spaces in a row in places where it would clean one to eight spaces. Has two options: fast Only clean whitespace in files Hg thinks are modified or added. Used by make whitespace and much (about 100x) faster. manifest Clean all files controlled by Hg, using "hg manifest" The default with no options is the old behaviour, clean all files under the linux directory, except CVS files. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-19Improved to accept also patches from akpm.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-19saa7134 card (LifeView3000 NTSC)Mauro Carvalho Chehab
From: Zac Bowling <zac@zacbowling.com> Add detection for the LifeView3000 NTSC model (right now the PAL version is the only one in there, which is sort of annoying for me living in the US and all.. sigh...) This is one of those things that I like to classify "as a works for me so take it or leave it" :-) . Not that worried because its an $18 video capture card that didn't look it was selling to well in the US, but then again who knows. The documentation needs updating too I bet but its behind anyways usually to what is in the code. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Zac Bowling <zac@zacbowling.com> Signed-off-by: Andrew Morton <akpm@osdl.org>
2006-06-19cx88-tvaudio.c must #include <linux/config.h>Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-06-19Backed out changeset e3215d345e206c37b4a72a6f41d0a8c6696de3faMichael Krufky
2006-06-19hex defaults in Kconfig sometimes have "0x", sometimes don'tMauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> A check of the current Linux 2.6 kernel reveals that the default values for hex options sometimes have the form "0x1f0" and sometimes "1f0", with the former being more common. Adjust the make_kconfig.pl script so it can understand both. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-18Use saner defaults for cx88 contrastRicardo Cerqueira
From: Ricardo Cerqueira <v4l@cerqueira.org> The default value for contrast in cx88 cards was 25%; this worked OK, except when applications enforced their own defaults (like MythTV), and it was different from other defaults (Hue/Brightness/Saturation) that used 50%. The value for contrast has been offset so the default is now 50% (as with other controls), giving the same result as the previous 25% setting. Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
2006-06-18Don't kill cx88 DMA sound on channel changeRicardo Cerqueira
From: Ricardo Cerqueira <v4l@cerqueira.org> There's a call at cx88-tvaudio to reset DMA sound on channel change; that call was killing cx88-alsa whenever the channel was changed, resulting in no sound. Remove those calls if cx88-alsa is selected to be compiled. Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
2006-06-18Fix cx88-alsa vs IRQ remote conflictRicardo Cerqueira
From: Ricardo Cerqueira <v4l@cerqueira.org> cx88-alsa was resetting the card on load, causing the IRQ IR handler to go away (maybe others, too). There's no actual need to reset the card, though, so that line was removed Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
2006-06-18Fix card cx88 #50 remoteRicardo Cerqueira
From: Ricardo Cerqueira <v4l@cerqueira.org> There was an unmasked bit in the keycodes that was causing random behaviour (the code could be N or N+1). Masked that bit now. Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
2006-06-17Add v4lgrab.c to test dirMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> v4lgrab.c example is also under Documentation. This is a working copy inside test dir, to allow testing using read() method. It still uses V4L1 ioctls. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-17Fix: videodev.c were cleaning the pointer, not the valuesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-17Hex handling is different from intMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Kernel handling of hex type passes those values prefixed with 0x to the modules. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-17Small bug in saa7127.cMauro Carvalho Chehab
From: Jose Alberto Reguero <jareguero@telefonica.net> Fix wrong wss debug info. Signed-off-by: Jose Alberto Reguero <jareguero@telefonica.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-17Remove some bad dependencies at userspaceMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Now, #define __user is not needed at userspace. Also, including linux/types.h is already inside videodev2. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-17Fixes some userspace dependencies at V4L2 public api headerMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Make life easier for distro guys, by removing the need of including #define __user at the userspace header. Also, linux/compiler.h is not needed at userspace. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-17integer/hex/string options need to appear in .myconfigMauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> integer/hex/string options were getting omitted from .myconfig, produced by make_noconfig.pl. They don't need to be there for the Makefile that includes .myconfig, it only uses the bool/tristate options. They need to be there for compat-config.h, which is generated from .myconfig and so will only have the #define statements for options that appear in .myconfig. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-17Fix problems with AV7110 firmware buildingMauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> Fix missing $() on variable name in dvb/ttpci/Makefile, prevented AV7110 firmware from building. Remove unnecessary and problematic defines in cflags from v4l/Makefile, they conflict with the kernel's autoconf.h and are are overridden by v4l/config-compat.h anyway. Fix AV7110 firmware dependencies so that parallel builds work correctly. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-17Remove non-functional local version of v4l_printk_ioctl()Mauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> Remove code that tries to handle backward compatibility for v4l_printk_ioctl(), but ironically has the opposite effect. For kernels < 2.6.16, a local version of v4l_printk_ioctl(), which doesn't even compile, is removed. For kernels >= 2.6.16, the unnecessary extern prototype is removed, as the function is prototyped in media/v4l2-common.h. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-17default "yes", no. default y, yes.Mauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> The Kernel config programs expect 'default y' and don't understand 'default "yes"'. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-13rmmod syntax works only on newer mod-utils packagesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> rmmod <file> doesn't work with rmmod version 3.2.2. This patch uses rmmod <module> instead. This should work with older mod-utils. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-12mailimport improved to accept "hg export" patchesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Now, script will detect "hg export" patches inside emails, removing non-pertinent headers, keeping only the original commit message and the patch. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>