Rediff against 0.15.0.rc3, add man page modifications.

1 files changed, 53 insertions, 12 deletions

diff --git a/patches/em8300-adv7170-wss.patch b/patches/em8300-adv7170-wss.patch
index e2e6e5c..0d17e2f 100644
--- a/patches/em8300-adv7170-wss.patch
+++ b/patches/em8300-adv7170-wss.patch
@@ -11,7 +11,7 @@ RCS file: /cvsroot/dxr3/em8300/em8300setup/em8300setup.c,v
 retrieving revision 1.3
 diff -u -r1.3 em8300setup.c
 --- em8300setup/em8300setup.c	8 Mar 2005 01:14:31 -0000	1.3
-+++ em8300setup/em8300setup.c	8 Mar 2005 20:47:06 -0000
++++ em8300setup/em8300setup.c	29 Apr 2005 13:36:15 -0000
 @@ -112,7 +112,7 @@
  	char ucode_file[200]; // bad hardcoded value ;-)
  
@@ -86,7 +86,7 @@ RCS file: /cvsroot/dxr3/em8300/include/linux/em8300.h,v
 retrieving revision 1.37
 diff -u -r1.37 em8300.h
 --- include/linux/em8300.h	27 Oct 2004 00:03:14 -0000	1.37
-+++ include/linux/em8300.h	8 Mar 2005 20:47:07 -0000
++++ include/linux/em8300.h	29 Apr 2005 13:36:16 -0000
 @@ -80,6 +80,7 @@
  #define EM8300_IOCTL_SCR_SETSPEED _IOW('C',17,unsigned)
  #define EM8300_IOCTL_FLUSH _IOW('C',18,int)
@@ -123,10 +123,10 @@ diff -u -r1.37 em8300.h
 Index: modules/adv717x.c
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/modules/adv717x.c,v
-retrieving revision 1.43
-diff -u -r1.43 adv717x.c
---- modules/adv717x.c	7 Mar 2005 00:29:55 -0000	1.43
-+++ modules/adv717x.c	8 Mar 2005 20:47:08 -0000
+retrieving revision 1.45
+diff -u -r1.45 adv717x.c
+--- modules/adv717x.c	9 Apr 2005 20:23:54 -0000	1.45
++++ modules/adv717x.c	29 Apr 2005 13:36:16 -0000
 @@ -112,6 +112,7 @@
  	int pp_ntsc;
  	int pd_adj_pal;
@@ -207,7 +207,7 @@ diff -u -r1.43 adv717x.c
  
  	adv717x_setmode(ENCODER_MODE_PAL60, client);
  
-@@ -547,6 +606,42 @@
+@@ -549,6 +608,42 @@
  		data->enableoutput = (long int) arg;
  		adv717x_update(client);
  		break;
@@ -253,10 +253,10 @@ diff -u -r1.43 adv717x.c
 Index: modules/em8300_ioctl.c
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/modules/em8300_ioctl.c,v
-retrieving revision 1.45
-diff -u -r1.45 em8300_ioctl.c
---- modules/em8300_ioctl.c	2 May 2004 22:15:01 -0000	1.45
-+++ modules/em8300_ioctl.c	8 Mar 2005 20:47:08 -0000
+retrieving revision 1.46
+diff -u -r1.46 em8300_ioctl.c
+--- modules/em8300_ioctl.c	9 Apr 2005 21:50:57 -0000	1.46
++++ modules/em8300_ioctl.c	29 Apr 2005 13:36:17 -0000
 @@ -178,6 +178,18 @@
  		}
  		break;
@@ -335,7 +335,7 @@ RCS file: /cvsroot/dxr3/em8300/modules/encoder.h,v
 retrieving revision 1.8
 diff -u -r1.8 encoder.h
 --- modules/encoder.h	14 Jan 2002 21:41:31 -0000	1.8
-+++ modules/encoder.h	8 Mar 2005 20:47:08 -0000
++++ modules/encoder.h	29 Apr 2005 13:36:17 -0000
 @@ -13,6 +13,15 @@
  
  #define ENCODER_CMD_SETMODE      1
@@ -352,3 +352,44 @@ diff -u -r1.8 encoder.h
  
  #endif
  
+Index: em8300setup/em8300setup.1
+===================================================================
+RCS file: /cvsroot/dxr3/em8300/em8300setup/em8300setup.1,v
+retrieving revision 1.2
+diff -u -r1.2 em8300setup.1
+--- em8300setup/em8300setup.1	28 Apr 2005 23:18:33 -0000	1.2
++++ em8300setup/em8300setup.1	29 Apr 2005 13:36:15 -0000
+@@ -27,6 +27,33 @@
+ \fB-o\fR, \fB-w\fR
+ Set aspect ratio to respectively normal (4:3) or wide-screen (16:9).
+ .TP
++\fB-z0\fR
++Set WSS to disabled.
++.TP
++\fB-z1\fR
++Set WSS to 4:3.
++.TP
++\fB-z2\fR
++Set WSS to 14:9.
++.TP
++\fB-z2l\fR
++Set WSS to 14:9 letterbox.
++.TP
++\fB-z2t\fR
++Set WSS to 14:9 letterbox top.
++.TP
++\fB-z3\fR
++Set WSS to 16:9.
++.TP
++\fB-z3l\fR
++Set WSS to 16:9 letterbox.
++.TP
++\fB-z3t\fR
++Set WSS to 16:9 letterbox top.
++.TP
++\fB-z3p\fR
++Set WSS to >16:9 letterbox.
++.TP
+ \fB-S\fR, \fB-s\fR
+ Set sub-pictures respectively on or off.
+ .TP