From 83fb6c87a9c82a47fd57ffaed422eba87114dbb1 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 28 Sep 2007 10:55:54 -0300 Subject: compat: allow compililation with kernels with updated sound drivers From: Mauro Carvalho Chehab A few distro kernels, like Mandriva 2.6.22.9-desktop-1mdv are starting to be shipped with the newer alsa drivers. This patch changes the compat code for older kernels in a way that it will be compatible also with those distro kernels. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/gentree.pl | 3 +++ v4l/scripts/make_config_compat.pl | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) (limited to 'v4l') diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl index cfff178b1..a10738648 100755 --- a/v4l/scripts/gentree.pl +++ b/v4l/scripts/gentree.pl @@ -62,9 +62,12 @@ my %defs = ( 'I2C_PEC' => 1, 'I2C_DF_DUMMY' => 0, 'CONFIG_XC3028' => 0, + 'HAVE_XC2028'=> 0, + 'HAVE_XC3028' => 0, 'I2C_CLASS_TV_ANALOG' => 1, 'I2C_CLASS_TV_DIGITAL' => 1, 'OLD_XMIT_LOCK' => 0, + 'COMPAT_SND_CTL_BOOLEAN_MONO' => 0, 'CONFIG_VIVI_SCATTER' => 0, 'CONFIG_BIGPHYS_AREA' => 0, 'BUZ_USE_HIMEM' => 1, diff --git a/v4l/scripts/make_config_compat.pl b/v4l/scripts/make_config_compat.pl index be577d247..21dce0126 100644 --- a/v4l/scripts/make_config_compat.pl +++ b/v4l/scripts/make_config_compat.pl @@ -26,9 +26,29 @@ sub check_spin_lock() close INNET; } +sub check_snd_ctl_boolean_mono_info() +{ + my $file = "$kdir/include/sound/control.h"; + my $old_syntax = 1; + + open INNET, "<$file" or die "File not found: $file"; + while () { + if (m/snd_ctl_boolean_mono_info/) { + $old_syntax = 0; + last; + } + } + + if ($old_syntax) { + $out.= "\n#define COMPAT_SND_CTL_BOOLEAN_MONO 1\n"; + } + close INNET; +} + sub check_other_dependencies() { check_spin_lock(); + check_snd_ctl_boolean_mono_info(); } # Do the basic rules -- cgit v1.2.3