Merging mkrufky pvrusb2 tree

From: Mauro Carvalho Chehab <mchehab@infradead.org>

merge:

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

3 files changed, 204 insertions, 3 deletions

diff --git a/v4l/Makefile b/v4l/Makefile
index d90e4b8ae..cf22a1125 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -122,7 +122,7 @@ obj-$(CONFIG_DVB_FRONTENDS)	+= dvb-pll.o cx22702.o or51132.o lgdt330x.o \
 				   dib3000-common.o dib3000mb.o dib3000mc.o \
 				   ves1820.o cx22700.o tda8083.o ves1x93.o \
 				   stv0297.o sp8870.o l64781.o s5h1420.o \
-				   tda10021.o at76c651.o tda80xx.o
+				   tda10021.o at76c651.o tda80xx.o zl10353.o
 obj-$(CONFIG_DVB_CORE)		+= dvb-core.o
 obj-$(CONFIG_DVB_B2C2_FLEXCOP)	+= b2c2-flexcop.o
 obj-$(CONFIG_DVB_B2C2_FLEXCOP)	+= stv0297_cs2.o
@@ -187,6 +187,7 @@ ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
  EXTRA_CFLAGS += -DHAVE_OR51132=1
  EXTRA_CFLAGS += -DHAVE_LGDT330X=1
  EXTRA_CFLAGS += -DHAVE_MT352=1
+ EXTRA_CFLAGS += -DHAVE_ZL10353=1
  EXTRA_CFLAGS += -DHAVE_NXT200X=1
  EXTRA_CFLAGS += -DHAVE_CX24123=1
  EXTRA_CFLAGS += -DHAVE_VP3054_I2C=1
@@ -216,6 +217,11 @@ $(obj)/av7110_firm.h:	$(obj)/fdump
 EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_FIRMWARE_FILE
 endif
 
+ifeq ($(ARCH),)
+ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+				-e s/arm.*/arm/ -e s/sa110/arm/ \
+				-e s/s390x/s390/ -e s/parisc64/parisc/ )
+endif
 
 #################################################
 # compile modules
@@ -316,7 +322,7 @@ inst_frontends += nxt200x.ko cx24123.ko mt312.ko stv0299.ko
 inst_frontends += bcm3510.ko dib3000mb.ko dib3000mc.ko ves1820.ko 
 inst_frontends += cx22700.ko tda8083.ko ves1x93.ko stv0297.ko sp8870.ko 
 inst_frontends += l64781.ko s5h1420.ko tda10021.ko at76c651.ko tda80xx.ko
-inst_frontends += stv0297_cs2.ko
+inst_frontends += stv0297_cs2.ko zl10353.ko
 inst_dvb-core := dvb-core.ko
 inst_saa7146 := saa7146.ko saa7146_vv.ko
 inst_b2c2 := b2c2-flexcop.ko b2c2-flexcop-pci.ko b2c2-flexcop-usb.ko
@@ -345,6 +351,10 @@ all:: default
 default:: links .version
 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
 
+qconfig:: links .version
+	./scripts/make_kconfig.pl /usr/src/linux-2.6.14 $(ARCH)
+	$(KDIR)/scripts/kconfig/qconf Kconfig
+
 ivtv-checkout::
 	@if [ ! -d ivtv ]; then \
 		echo retrieving the latest ivtv sources from ivtvdriver.org; \
@@ -518,7 +528,9 @@ rmmodules::
 clean::
 	@find . -name '*.c' -type l -exec rm '{}' \;
 	@find . -name '*.h' -type l -exec rm '{}' \;
-	-rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump ivtv-svnversion.h
+	-rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \
+		ivtv-svnversion.h \
+		Kconfig Kconfig.kern .config .config.cmd
 
 distclean:: clean
 	-rm -f .version .*.o.flags .*.o.d
diff --git a/v4l/scripts/hghead.pl b/v4l/scripts/hghead.pl
new file mode 100755
index 000000000..ddaef0767
--- /dev/null
+++ b/v4l/scripts/hghead.pl
@@ -0,0 +1,152 @@
+#!/usr/bin/perl
+use strict;
+use Date::Parse;
+
+#################################################################
+# analyse diffs
+
+my $in = shift;
+my $line;
+my $subject;
+my $from=0;
+my $sub_ok=0;
+my $init=0;
+my $num=0;
+my $maint_ok=0;
+my $noblank=1;
+my $maintainer_name=$ENV{CHANGE_LOG_NAME};
+my $maintainer_email=$ENV{CHANGE_LOG_EMAIL_ADDRESS};
+my $from="";
+my $body="";
+my $signed="";
+my $fromname="";
+
+open IN,  "<$in";
+
+while ($line = <IN>) {
+	if ($line =~ m/Index.*/) {
+		last;
+	}
+	if ($line =~ m/^diff .*/) {
+		last;
+	}
+	if ($line =~ m/^\-\-\- .*/) {
+		last;
+	}
+	if ($line =~ m/^\-\-\-.*/) {
+		last;
+	}
+	if ($line =~ m/^\+\+\+ .*/) {
+		last;
+	}
+
+	if ($line =~ m/^Date:\s*(.*)/) {
+		my $time = str2time($1);
+#		my $timestr = gmtime($time);
+
+		if ($time) {
+			print "# Date: $time\n";
+		}
+		next;
+	}
+	if ($line =~ m/^From:/) {
+		if ($line =~ m/^From:[\s\"]*([^\"]*)[\s\"]*<(.*)>/) {
+			if ($1 eq "") {
+				next;
+			}
+			my $name=$1;
+			my $email=$2;
+			$name =~ s/\s+$//;
+			$email =~ s/\s+$//;
+			$fromname="$name <$email>";
+			$from= "From: $fromname\n";
+			next;
+		}
+		print "Bad: author line have a wrong syntax\n";
+		die;
+	}
+
+	if ($line =~ m/^Subject:\s*(.*\n)/) {
+		$subject=$1;
+		next;
+	}
+
+	if ($line =~ m;^ .*\/.*\| *[0-9]*;) {
+		next;
+	}
+	if ($line =~m/\d+\s*file.* changed, /) {
+		next;
+	}
+
+	if ($line =~ m/^Signed-off-by:.*/) {
+		$noblank=1;
+		if ($line =~ m/$maintainer_name/) {
+			$maint_ok=1;
+		}
+
+		$signed="$signed$line";
+		next;
+	}
+	if ($line =~ m/^Acked-by:.*/) {
+		$signed="$signed$line";
+		next;
+	}
+
+	if ($line =~ m/^[a-zA-Z\-]*:/) {
+		if ($line =~ m/Changeset:\s*(.*)\n/) {
+			$num=$1;
+		}
+		print "# $line";
+		next;
+	}
+
+	if ($line =~ m|^(V4L\/DVB\s*\(.+\)\s*:.*\n)|) {
+		$subject=$1;
+		$line="\n";
+	}
+
+	if ($sub_ok == 0) {
+		$sub_ok=1;
+		substr( $subject, 0, 1 ) = uc (substr ($subject, 0, 1));
+		if ($subject =~ m|V4L\/DVB\s*(.+)|) {
+			$subject=$1;
+		}
+		if ($line =~ m/^\n/) {
+			next;
+		}
+	}
+
+	if ($noblank) {
+		if ($line =~ m/^\n/) {
+			next;
+		}
+	}
+	if (!$init) {
+		$init=1;
+		$noblank=0;
+	}
+	$body="$body$line";
+}
+close IN;
+
+if ($from eq "") {
+	print "Bad: author doesn't exist!\n";
+	die;
+}
+
+if (!$maint_ok) {
+	$signed=$signed."Signed-off-by: $maintainer_name <$maintainer_email>\n";
+}
+
+if (!$signed =~ m/$from/) {
+	print "Bad: Author didn't signed his patch!\n";
+	die;
+}
+
+$body=~s/\n+$//;
+$body=~s/^\n+$//;
+
+# First from is used by hg to recognize commiter name
+print "#Committer: $maintainer_name <$maintainer_email>\n";
+print "$subject\n$from\n$body\n\n$signed";
+
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
new file mode 100755
index 000000000..f612e83db
--- /dev/null
+++ b/v4l/scripts/make_kconfig.pl
@@ -0,0 +1,37 @@
+#!/usr/bin/perl
+use FileHandle;
+
+my $KDIR=shift;
+my $ARCH=shift;
+
+sub open_kconfig($$) {
+	my ($dir,$file)=@_;
+	my $in = new FileHandle;
+
+print "opening $file\n";
+	open $in,"$file";
+	while (<$in>) {
+		if (m;^\s*source[\s\"]+drivers/media/(video|dvb)/Kconfig;) {
+			next;
+		}
+		if (m|^\s*source[\s\"]+([^\n\s\"]+)[\n\s\"]|) {
+			open_kconfig($dir,"$dir/$1");
+			next;
+		}
+		s/^main(menu\s\"[^\"]+)/\1 - DON'T CHANGE IT!/;
+		print OUT $_;
+	}
+	close $in;
+}
+
+open OUT,">Kconfig.kern";
+open_kconfig($KDIR,"$KDIR/arch/$ARCH/Kconfig");
+print OUT "endmenu\n";
+close OUT;
+
+open OUT,">Kconfig";
+print OUT "mainmenu \"V4L/DVB menu\"\n";
+open_kconfig ("../linux","../linux/drivers/media/video/Kconfig");
+open_kconfig ("../linux","../linux/drivers/media/dvb/Kconfig");
+print OUT "source Kconfig.kern\n";
+close OUT;