- Small changes to make easier to generate kernel patches.

6 files changed, 55 insertions, 13 deletions

diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 8c88f8f90..b13583860 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -1010,7 +1010,7 @@ static int msp34xx_modus(int norm)
 {
 	switch (norm) {
 	case VIDEO_MODE_PAL:
-#if 1
+#if 1 /*KEEP*/
 		/* experimental: not sure this works with all chip versions */
 		return 0x7003;
 #else
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index 8c88f8f90..b13583860 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -1010,7 +1010,7 @@ static int msp34xx_modus(int norm)
 {
 	switch (norm) {
 	case VIDEO_MODE_PAL:
-#if 1
+#if 1 /*KEEP*/
 		/* experimental: not sure this works with all chip versions */
 		return 0x7003;
 #else
diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c
index f0d784478..a2e001fb2 100644
--- a/linux/drivers/media/video/tvaudio.c
+++ b/linux/drivers/media/video/tvaudio.c
@@ -318,7 +318,6 @@ static int chip_thread(void *data)
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
 		try_to_freeze();
 #endif
-
 		if (chip->done || signal_pending(current))
 			break;
 		tvaudio_dbg("%s: thread wakeup\n", i2c_clientname(&chip->c));
diff --git a/linux/include/media/video-buf-dvb.h b/linux/include/media/video-buf-dvb.h
index 848459f79..94d16e0ed 100644
--- a/linux/include/media/video-buf-dvb.h
+++ b/linux/include/media/video-buf-dvb.h
@@ -1,7 +1,4 @@
-/*
- * $Id: video-buf-dvb.h,v 1.7 2005/06/18 04:00:19 mkrufky Exp $
- */
-
+/* $Id: video-buf-dvb.h,v 1.8 2005/09/04 11:45:19 mchehab Exp $  */
 #include <dvbdev.h>
 #include <dmxdev.h>
 #include <dvb_demux.h>
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 0b13fa6a9..d6e32c2bc 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,17 @@
+2005-09-04 11:40  mchehab
+
+	* msp3400.c: (msp34xx_modus):
+	- Add KEEP comment on #if 1 to allow it to go to mainstream
+	* tvaudio.c, video-buf-dvb.h:
+	- Changes to eliminate dumb differences from kernel and to 
+	  eliminate $Id from Mainstream.
+	* scripts/buildpatch:
+	- Improved to allow keeping some #if 1 comments go to mainsteam
+	- Don't generate diffstat for empty changes.
+	- Remove $Id when generating patches.
+
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
 2005-09-02 21:57  mchehab
 
 	* cx88-input.c: (cx88_ir_init):
diff --git a/v4l/scripts/buildpatch b/v4l/scripts/buildpatch
index beeba862a..ab091bca0 100644
--- a/v4l/scripts/buildpatch
+++ b/v4l/scripts/buildpatch
@@ -82,6 +82,10 @@ sub filter_source ($$) {
 			print OUT "/* BP #if $if ($line) */\n" if $DEBUG;
 			next;
 		}
+		if ($line =~ /^#if 1 .*KEEP.*/) {
+			print OUT "#if 1\n";
+			next;
+		}
 		if ($line =~ /^#if 1/) {
 			chomp($line);
 			$state = "if";
@@ -134,6 +138,29 @@ sub filter_source ($$) {
 	close OUT;
 }
 
+sub filter_dest ($$) {
+	my ($in,$out) = @_;
+	my ($line,$if,$state,$mmkernel);
+
+	if (-e $LINUX . "/.mm") {
+		$mmkernel = 1;
+	} else {
+		$mmkernel = 0;
+	}
+
+	open IN,  "<$in";
+	open OUT, ">$out";
+
+	while ($line = <IN>) {
+		if ($line =~ m/\$Id: buildpatch,v 1.9 2005/09/04 11:45:20 mchehab Exp $/) {
+			next;
+		}
+		print OUT $line;
+	}
+	close IN;
+	close OUT;
+}
+
 
 #################################################################
 # build diffs
@@ -142,13 +169,16 @@ sub makediff ($$) {
 	my ($here,$kernel) = @_;
 	my ($line1,$line2,$file1,$file2);
 	my $tmp = "/tmp/src.$$";
+	my $tmp2 = "/tmp/dst.$$";
+
+	filter_source("$here","$tmp");
 
-	filter_source($here,"$tmp");
 	if (-f "$LINUX/$kernel") {
-		open DIFF, "diff -u $LINUX/$kernel $tmp|";
+		filter_dest("$LINUX/$kernel","$tmp2");
+		open DIFF, "diff -up $tmp2 $tmp|";
 	} else {
 		# new file
-		open DIFF, "diff -u /dev/null $tmp|";
+		open DIFF, "diff -up /dev/null $tmp|";
 	}
 
 	# header
@@ -226,6 +256,8 @@ while (my $line = <CONFIG>) {
 close(PATCHTMP);
 select(STDOUT);
 
-system "diffstat -p0 -w72 $patchtmploc";
-print "\n",readfile($patchtmploc);
-unlink $patchtmploc;
+if (-s "$patchtmploc") {
+	system "diffstat -p0 -w72 $patchtmploc";
+	print "\n",readfile($patchtmploc);
+	unlink $patchtmploc;
+}