From 3748353865894bac0f288d56a7ae881854cd1c87 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 20 Nov 2008 14:53:42 -0200 Subject: Fix Ubuntu module removal script From: Devin Heitmueller The generated Makefile.media had entries in it's remove list for Ubuntu that were concatenated together. Add a space when concatenating together the various lists (so there is a space between the lists) Thanks for Mike Krufky for pointing this out and testing the fix. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_makefile.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl index ce6f00516..43c563d47 100755 --- a/v4l/scripts/make_makefile.pl +++ b/v4l/scripts/make_makefile.pl @@ -166,10 +166,10 @@ sub removeubuntu() my $filelist; while ( my ($dir, $files) = each(%instdir) ) { - $filelist .= join(' ', keys %$files); + $filelist .= ' '. join(' ', keys %$files); } while ( my ($dir, $files) = each(%obsolete) ) { - $filelist .= join(' ', keys %$files); + $filelist .= ' ' . join(' ', keys %$files); } $filelist =~ s/\s+$//; -- cgit v1.2.3 From 76b6f5c5b37d1795e744a8f0347f7e80fd1cd434 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 22 Nov 2008 11:39:10 -0200 Subject: Improve compatibility with RHEL kernels From: Mauro Carvalho Chehab Priority: normal Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_config_compat.pl | 60 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_config_compat.pl b/v4l/scripts/make_config_compat.pl index bd34e7193..f681baf3e 100755 --- a/v4l/scripts/make_config_compat.pl +++ b/v4l/scripts/make_config_compat.pl @@ -102,6 +102,63 @@ sub check_bool() close INDEP; } +sub check_is_singular() +{ + my $file = "$kdir/include/linux/list.h"; + my $need_compat = 1; + + open INNET, "<$file" or die "File not found: $file"; + while () { + if (m/list_is_singular/) { + $need_compat = 0; + last; + } + } + + if ($need_compat) { + $out.= "\n#define NEED_IS_SINGULAR 1\n"; + } + close INNET; +} + +sub check_clamp() +{ + my $file = "$kdir/include/linux/kernel.h"; + my $need_compat = 1; + + open INNET, "<$file" or die "File not found: $file"; + while () { + if (m/define\s+clamp/) { + $need_compat = 0; + last; + } + } + + if ($need_compat) { + $out.= "\n#define NEED_CLAMP 1\n"; + } + close INNET; +} + +sub check_proc_create() +{ + my $file = "$kdir/include/linux/proc_fs.h"; + my $need_compat = 1; + + open INNET, "<$file" or die "File not found: $file"; + while () { + if (m/proc_create/) { + $need_compat = 0; + last; + } + } + + if ($need_compat) { + $out.= "\n#define NEED_PROC_FS 1\n"; + } + close INNET; +} + sub check_other_dependencies() { check_spin_lock(); @@ -109,6 +166,9 @@ sub check_other_dependencies() check_snd_ctl_boolean_mono_info(); check_snd_pcm_rate_to_rate_bit(); check_bool(); + check_is_singular(); + check_clamp(); + check_proc_create(); } # Do the basic rules -- cgit v1.2.3 From 431a2d54bfc4ff45db203d48565c0557792a5fcb Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 22 Nov 2008 20:54:45 -0200 Subject: Fix compat code for proc_create From: Mauro Carvalho Chehab Thanks to Andy Walls for warning me Priority: normal Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_config_compat.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_config_compat.pl b/v4l/scripts/make_config_compat.pl index f681baf3e..fdbc5eaba 100755 --- a/v4l/scripts/make_config_compat.pl +++ b/v4l/scripts/make_config_compat.pl @@ -154,7 +154,7 @@ sub check_proc_create() } if ($need_compat) { - $out.= "\n#define NEED_PROC_FS 1\n"; + $out.= "\n#define NEED_PROC_CREATE 1\n"; } close INNET; } -- cgit v1.2.3 From 7dddcd8c1610cacae33a0ee67971d597c4bdaffb Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 24 Nov 2008 09:45:57 -0200 Subject: em28xx-alsa: implement another locking schema From: Mauro Carvalho Chehab Instead of using a spinlock, it is better to call the proper pcm stream locking schema. Priority: normal Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/gentree.pl | 1 + v4l/scripts/make_config_compat.pl | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) (limited to 'v4l/scripts') diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl index fccaedff4..d84608aa1 100755 --- a/v4l/scripts/gentree.pl +++ b/v4l/scripts/gentree.pl @@ -73,6 +73,7 @@ my %defs = ( 'BUZ_USE_HIMEM' => 1, 'NEED_SOUND_DRIVER_H' => 0, 'TTUSB_KERNEL' => 1, + 'NO_PCM_LOCK' => 0, ); ################################################################# diff --git a/v4l/scripts/make_config_compat.pl b/v4l/scripts/make_config_compat.pl index fdbc5eaba..3aac7e3b3 100755 --- a/v4l/scripts/make_config_compat.pl +++ b/v4l/scripts/make_config_compat.pl @@ -159,6 +159,25 @@ sub check_proc_create() close INNET; } +sub check_pcm_lock() +{ + my $file = "$kdir/include/sound/pcm.h"; + my $need_compat = 1; + + open INNET, "<$file" or die "File not found: $file"; + while () { + if (m/pcm_stream_lock/) { + $need_compat = 0; + last; + } + } + + if ($need_compat) { + $out.= "\n#define NO_PCM_LOCK 1\n"; + } + close INNET; +} + sub check_other_dependencies() { check_spin_lock(); @@ -169,6 +188,7 @@ sub check_other_dependencies() check_is_singular(); check_clamp(); check_proc_create(); + check_pcm_lock(); } # Do the basic rules -- cgit v1.2.3 From 564d21054d1f61d9448a93b3fa8a254a29713d26 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 25 Nov 2008 09:07:00 -0200 Subject: fix boards for kernels with algo_control From: Mauro Carvalho Chehab changeset 4ecae6da8244 removed algo_control from i2c drivers. However, on older kernels, a dummy function to implement algo_control is required, otherwise, an OOPS is generated. This patch adds a backport for all i2c drivers that defines an i2c_algorithm, except for cafe_ccic, since OLPC hardware only works for kernels newer than 2.6.19. Some of the backported drivers would need also extra changes to work with older kernels, as specified on v4l/versions.txt. Yet, I decided to add the backport for those drivers also, since the lack of algo_control doesn't generate any compilation error, but it is enough to break the driver. So, better to all for all boards than to allow compiling a kernel backported that just generates OOPS. Priority: normal Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/gentree.pl | 1 + v4l/scripts/make_config_compat.pl | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) (limited to 'v4l/scripts') diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl index d84608aa1..1968bb334 100755 --- a/v4l/scripts/gentree.pl +++ b/v4l/scripts/gentree.pl @@ -74,6 +74,7 @@ my %defs = ( 'NEED_SOUND_DRIVER_H' => 0, 'TTUSB_KERNEL' => 1, 'NO_PCM_LOCK' => 0, + 'NEED_ALGO_CONTROL' => 0, ); ################################################################# diff --git a/v4l/scripts/make_config_compat.pl b/v4l/scripts/make_config_compat.pl index 3aac7e3b3..3a8bdd81e 100755 --- a/v4l/scripts/make_config_compat.pl +++ b/v4l/scripts/make_config_compat.pl @@ -178,6 +178,25 @@ sub check_pcm_lock() close INNET; } +sub check_algo_control() +{ + my $file = "$kdir/include/linux/i2c.h"; + my $need_compat = 0; + + open INNET, "<$file" or die "File not found: $file"; + while () { + if (m/algo_control/) { + $need_compat = 1; + last; + } + } + + if ($need_compat) { + $out.= "\n#define NEED_ALGO_CONTROL 1\n"; + } + close INNET; +} + sub check_other_dependencies() { check_spin_lock(); @@ -189,6 +208,7 @@ sub check_other_dependencies() check_clamp(); check_proc_create(); check_pcm_lock(); + check_algo_control(); } # Do the basic rules -- cgit v1.2.3 From cdd1295a9bfd3f1f39ba27702a1428a2a4691b19 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 19 Dec 2008 11:18:38 +0100 Subject: bt832: remove this driver From: Hans Verkuil The bt832 i2c driver was never used or even compiled and is no longer maintained. It is now removed completely. Priority: normal Signed-off-by: Hans Verkuil --- v4l/scripts/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/release.sh b/v4l/scripts/release.sh index 4e9c810bc..5055675d6 100755 --- a/v4l/scripts/release.sh +++ b/v4l/scripts/release.sh @@ -16,7 +16,7 @@ files_common="$files_v4l $files_tuner $files_i2c doc" files_ir="ir-common.[ch]" files_audio="msp3400.[ch] tvaudio.[ch] tvmixer.[ch]" -files_bttv="bt848.h btcx*.[ch] bttv*.[ch] bt832.[ch] ir-kbd*.c" +files_bttv="bt848.h btcx*.[ch] bttv*.[ch] ir-kbd*.c" files_saa="saa7134*.[ch] saa6752hs.[ch] ir-kbd-i2c.c" files_cx="btcx*.[ch] cx*.[ch]" -- cgit v1.2.3