From a8f908ae4e4df8c18b0fe87bfae722392b5429d8 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 10 Sep 2009 19:58:39 +0200 Subject: v4l: Merge drivers/staging/go7007 in v4l-dvb. From: Hans Verkuil Having go7007 as part of v4l-dvb makes it easier to continue developing this driver. Priority: normal Signed-off-by: Hans Verkuil --- v4l/scripts/make_kconfig.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index 4690f6ab4..fd6dbd739 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -585,6 +585,7 @@ EOF open_kconfig('../linux', '../linux/drivers/media/Kconfig'); open_kconfig('.', './Kconfig.sound'); +open_kconfig('.', './Kconfig.staging'); close OUT; # These options should default to off -- cgit v1.2.3 From fe1b63559744f62262a57748763586b4a97bed3b Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 14 Sep 2009 09:42:41 -0300 Subject: Add tm6000 and tuner-xc2028 drivers From: Mauro Carvalho Chehab Adds a V4L driver for Trident TV Master TM5600/TM6000 chips. Those USB devices are usually found with a Xceive XC2028/XC3028 tuner, although the firmware seems to be modified to work with those chips. Priority: normal Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_kconfig.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index fd6dbd739..764072101 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -593,6 +593,7 @@ disable_config('DVB_AV7110_FIRMWARE'); disable_config('DVB_CINERGYT2_TUNING'); disable_config('VIDEO_HELPER_CHIPS_AUTO'); disable_config('VIDEO_FIXED_MINOR_RANGES'); +disable_config('STAGING_BROKEN'); $intopt { "DVB_MAX_ADAPTERS" } = 8; # Check dependencies -- cgit v1.2.3 From 8cdbcfff94841040078b0f53189040cd4861eb2f Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 14 Sep 2009 13:06:46 -0300 Subject: Build system: disable staging files by default From: Mauro Carvalho Chehab Priority: normal Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_kconfig.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index 764072101..8e0504b61 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -593,6 +593,7 @@ disable_config('DVB_AV7110_FIRMWARE'); disable_config('DVB_CINERGYT2_TUNING'); disable_config('VIDEO_HELPER_CHIPS_AUTO'); disable_config('VIDEO_FIXED_MINOR_RANGES'); +disable_config('STAGING'); disable_config('STAGING_BROKEN'); $intopt { "DVB_MAX_ADAPTERS" } = 8; -- cgit v1.2.3 From f7eb0f58685eeff5c650e8f56f04064954fff087 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 14 Sep 2009 16:21:53 -0300 Subject: build: Don't copy data for staging builds From: Mauro Carvalho Chehab Having to copy all changes at staging Kconfig and Makefile's are unmaintainable. Instead, auto-generate Makefiles via script. In the case of Kconfig, however, since we may have broken drivers, it is better to just include the staging Kconfig sources at the proper places. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_makefile.pl | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl index 35ab7dddf..b49f960d1 100755 --- a/v4l/scripts/make_makefile.pl +++ b/v4l/scripts/make_makefile.pl @@ -1,5 +1,6 @@ #!/usr/bin/perl use FileHandle; +use File::Find; my %instdir = (); @@ -185,11 +186,23 @@ sub removeubuntu() print OUT " fi\n"; } +sub parse_dir() +{ + my $file = $File::Find::name; + + return if (!($file =~ /Makefile$/)); + open_makefile($file); +} + +############################################################################## + getobsolete(); open OUT, '>Makefile.media' or die 'Unable to write Makefile.media'; open_makefile('../linux/drivers/media/Makefile'); +find({wanted => \&parse_dir, no_chdir => 1}, '../linux/drivers/staging'); + # Creating Install rule print OUT "media-install::\n"; @@ -234,9 +247,12 @@ while ( my ($dir, $files) = each(%instdir) ) { print OUT " rm \$(DESTDIR)\$(KDIR26)/$dir/\$\$i.gz; fi; done; echo;\n\n"; } +my $mediadeps = join(" \\\n", map("\t../linux/drivers/media/$_/Makefile", keys %instdir)); +$mediadeps =~ s,\.\./linux/drivers/media/\.\.,..,g; + # Print dependencies of Makefile.media print OUT "Makefile.media: ../linux/drivers/media/Makefile \\\n"; print OUT "\tobsolete.txt \\\n"; -print OUT join(" \\\n", map("\t../linux/drivers/media/$_/Makefile", keys %instdir)); +print OUT $mediadeps; print OUT "\n"; close OUT; -- cgit v1.2.3 From 8ed9b0a29d5966db959676d8522476fbb5baae92 Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Sat, 9 May 2009 20:17:28 -0400 Subject: SAA7164: Add support for the NXP SAA7164 silicon From: Steven Toth This patch adds support for all of the known shipping Hauppauge HVR-2200 and HVR-2250 boards. Digital TV ATSC/QAM and DVB-T is enabled at this time. Both tuners are supported. Volatiles and typedefs need rework, the rest is coding style compliant. Priority: normal Signed-off-by: Steven Toth --- v4l/scripts/cardlist | 3 +++ v4l/scripts/fix_dvb_customise.pl | 3 ++- v4l/scripts/saa7164.pl | 57 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 v4l/scripts/saa7164.pl (limited to 'v4l/scripts') diff --git a/v4l/scripts/cardlist b/v4l/scripts/cardlist index 7c903539c..ebf372610 100755 --- a/v4l/scripts/cardlist +++ b/v4l/scripts/cardlist @@ -23,3 +23,6 @@ scripts/cx23885.pl ../linux/drivers/media/video/cx23885/cx23885.h ../linux/drive scripts/au0828.pl ../linux/drivers/media/video/au0828/au0828-cards.h ../linux/drivers/media/video/au0828/au0828-cards.c \ | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.au0828 + +scripts/saa7164.pl ../linux/drivers/media/video/saa7164/saa7164.h ../linux/drivers/media/video/saa7164/saa7164-cards.c \ + | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.saa7164 diff --git a/v4l/scripts/fix_dvb_customise.pl b/v4l/scripts/fix_dvb_customise.pl index 86a6bcf8c..04aa1350c 100755 --- a/v4l/scripts/fix_dvb_customise.pl +++ b/v4l/scripts/fix_dvb_customise.pl @@ -182,7 +182,8 @@ sub found_ref($$) my $ref = $driver_config{$n}; printf "$ref needs %s\n", $header if ($debug); - if ($ref =~ m/(PVRUSB2|CX23885|CX88|EM28XX|SAA3134)/) { + if ($ref =~ m/(PVRUSB2|CX23885|CX88|EM28XX|SAA3134 + |SAA7164)/) { $ref .="_DVB"; } diff --git a/v4l/scripts/saa7164.pl b/v4l/scripts/saa7164.pl new file mode 100644 index 000000000..95c5eb579 --- /dev/null +++ b/v4l/scripts/saa7164.pl @@ -0,0 +1,57 @@ +#!/usr/bin/perl -w +use strict; + +my %map = ( + "PCI_ANY_ID" => "0", +); + +sub fix_id($) { + my $id = shift; + $id = $map{$id} if defined($map{$id}); + $id =~ s/^0x//; + return $id; +} + +my $new_entry = -1; +my $nr = 0; +my ($id,$subvendor,$subdevice); +my %data; + +while (<>) { + # defines in header file + if (/#define\s+(SAA7164_BOARD_\w+)\s+(\d+)/) { + $data{$1}->{nr} = $2; + next; + } + # saa7164_boards + if (/\[(SAA7164_BOARD_\w+)\]/) { + $id = $1; + $data{$id}->{id} = $id; +# $data{$id}->{nr} = $nr++; + }; + next unless defined($id); + + if (!defined($data{$id}) || !defined($data{$id}->{name})) { + $data{$id}->{name} = $1 if (/\.name\s*=\s*\"([^\"]+)\"/); + } + + # saa7164_pci_tbl + $subvendor = fix_id($1) if (/\.subvendor\s*=\s*(\w+),/); + $subdevice = fix_id($1) if (/\.subdevice\s*=\s*(\w+),/); + if (/.card\s*=\s*(\w+),/) { + if (defined($data{$1}) && + defined($subvendor) && $subvendor ne "0" && + defined($subdevice) && $subdevice ne "0") { + push @{$data{$1}->{subid}}, "$subvendor:$subdevice"; + undef $subvendor; + undef $subdevice; + } + } +} + +foreach my $item (sort { $data{$a}->{nr} <=> $data{$b}->{nr} } keys %data) { + printf("%3d -> %-51s", $data{$item}->{nr}, $data{$item}->{name}); + printf(" [%s]",join(",",@{$data{$item}->{subid}})) + if defined($data{$item}->{subid}); + print "\n"; +} -- cgit v1.2.3