Update for em8300-0.15.2rc1.old-main

1 files changed, 46 insertions, 48 deletions

diff --git a/patches/em8300-adv7170-wss.patch b/patches/em8300-adv7170-wss.patch
index 4549676..29bb524 100644
--- a/patches/em8300-adv7170-wss.patch
+++ b/patches/em8300-adv7170-wss.patch
@@ -1,18 +1,14 @@
-Wide screen signaling (WSS) patch for the em8300 driver by Seppo Ingalsuo.
-Apply to: em8300 driver sources
-More info: http://sf.net/mailarchive/forum.php?thread_id=6061108&forum_id=7173
-Note: you'll probably want to apply vdr-dxr3-wss.patch too
-  in order to get VDR(-dxr3) to use this functionality.
-
+http://sourceforge.net/mailarchive/forum.php?thread_id=6061108&forum_id=7173
+Updated to apply cleanly as of 0.15.2rc1.
 
 Index: em8300setup/em8300setup.c
 ===================================================================
 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	24 May 2005 14:03:31 -0000
-@@ -112,7 +112,7 @@
+retrieving revision 1.5
+diff -u -r1.5 em8300setup.c
+--- em8300setup/em8300setup.c	19 Oct 2005 22:15:16 -0000	1.5
++++ em8300setup/em8300setup.c	5 Nov 2005 08:32:24 -0000
+@@ -114,7 +114,7 @@
  	char ucode_file[200]; // bad hardcoded value ;-)
  
  	/* Vars to hold desired setings - init to -1 so we can see which were requested to be set explicitly by the user and which should be left alone */
@@ -21,7 +17,7 @@ diff -u -r1.3 em8300setup.c
  
  
  	char * devs[] = {"/dev/em8300-0","/dev/em8300-1","/dev/em8300-2","/dev/em8300-3"};
-@@ -175,12 +175,45 @@
+@@ -177,12 +177,45 @@
  							upload=1;
  							printf("Using microcode file %s\n",ucode_file);
  							break;
@@ -65,9 +61,9 @@ diff -u -r1.3 em8300setup.c
 +							printf("  -z3t\t\tSet WSS to 16:9 letterbox top\n");
 +							printf("  -z3p\t\tSet WSS to >16:9 letterbox\n");
  							printf("  -S, -s\tSet spu mode On(S), Off(s)\n");
- 							printf("  -f <filename>\tSpecify alternate location of microcode\n\t\t(Defaults to /usr/share/misc/em8300.uc)\n");
+ 							printf("  -f <filename>\tSpecify alternate location of microcode\n\t\t(Defaults to " FIRMWARE_DIR "/em8300.bin)\n");
  							printf("  -q\t\tQuery the current settings for all of the above and\n\t\texit without making any changes\n");
-@@ -270,6 +303,12 @@
+@@ -272,6 +305,12 @@
  			if(ioctl(DEV, EM8300_IOCTL_SET_ASPECTRATIO, &aspect) == -1) 
  				check_errno("Unable to set aspect ratio");
  		}
@@ -83,10 +79,10 @@ diff -u -r1.3 em8300setup.c
 Index: include/linux/em8300.h
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/include/linux/em8300.h,v
-retrieving revision 1.38
-diff -u -r1.38 em8300.h
---- include/linux/em8300.h	17 May 2005 19:25:53 -0000	1.38
-+++ include/linux/em8300.h	24 May 2005 14:03:32 -0000
+retrieving revision 1.39
+diff -u -r1.39 em8300.h
+--- include/linux/em8300.h	19 Oct 2005 22:15:16 -0000	1.39
++++ include/linux/em8300.h	5 Nov 2005 08:32:24 -0000
 @@ -80,6 +80,7 @@
  #define EM8300_IOCTL_SCR_SETSPEED _IOW('C',17,unsigned)
  #define EM8300_IOCTL_FLUSH _IOW('C',18,int)
@@ -112,7 +108,7 @@ diff -u -r1.38 em8300.h
  #define EM8300_VIDEOMODE_PAL	0
  #define EM8300_VIDEOMODE_PAL60	1
  #define EM8300_VIDEOMODE_NTSC	2
-@@ -454,6 +465,7 @@
+@@ -455,6 +466,7 @@
  int em8300_control_ioctl(struct em8300_s *em, int cmd, unsigned long arg);
  int em8300_ioctl_setvideomode(struct em8300_s *em, int mode);
  int em8300_ioctl_setaspectratio(struct em8300_s *em, int ratio);
@@ -123,11 +119,11 @@ diff -u -r1.38 em8300.h
 Index: modules/adv717x.c
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/modules/adv717x.c,v
-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	24 May 2005 14:03:34 -0000
-@@ -112,6 +112,7 @@
+retrieving revision 1.49
+diff -u -r1.49 adv717x.c
+--- modules/adv717x.c	5 Nov 2005 01:12:13 -0000	1.49
++++ modules/adv717x.c	5 Nov 2005 08:32:25 -0000
+@@ -192,6 +192,7 @@
  	int pp_ntsc;
  	int pd_adj_pal;
  	int pd_adj_ntsc;
@@ -135,10 +131,10 @@ diff -u -r1.45 adv717x.c
  
  	unsigned char config[32];
  	int configlen;
-@@ -298,6 +299,63 @@
- 		if (data->rgbmode) {
- 			tmpconfig[3] |= 0x10;
- 		}
+@@ -398,6 +399,63 @@
+ 		/* ADV7170/1 RGB sync: MR42 (register 4, bit 2) */
+ 		SET_REG(tmpconfig[ADV7170_REG_MR4], 2,
+ 				ModeInfo[data->out_mode].sync_all);
 +
 +		switch (data->wsscode) {
 +		case 0x08:
@@ -198,16 +194,16 @@ diff -u -r1.45 adv717x.c
 +
  		break;
  	}
- 
-@@ -440,6 +498,7 @@
- 	data->bars = color_bars[em->card_nr];
- 	data->rgbmode = 0;
- 	data->enableoutput = 0;
+ 	/* ADV7170/1/5A/6A non-interlace: MR10 (register 1, bit 0) */
+@@ -559,6 +617,7 @@
+ 	data->out_mode = output_mode_nr[em->card_nr];
+ 	if (data->out_mode < 0 || data->out_mode >= MODE_MAX)
+ 		data->out_mode = 0;
 +	data->wsscode = 0;
  
  	adv717x_setmode(ENCODER_MODE_PAL60, client);
  
-@@ -549,6 +608,42 @@
+@@ -664,6 +723,42 @@
  		data->enableoutput = (long int) arg;
  		adv717x_update(client);
  		break;
@@ -253,15 +249,17 @@ diff -u -r1.45 adv717x.c
 Index: modules/em8300_ioctl.c
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/modules/em8300_ioctl.c,v
-retrieving revision 1.48
-diff -u -r1.48 em8300_ioctl.c
---- modules/em8300_ioctl.c	23 May 2005 23:44:12 -0000	1.48
-+++ modules/em8300_ioctl.c	24 May 2005 14:03:35 -0000
-@@ -188,6 +188,18 @@
+retrieving revision 1.49
+diff -u -r1.49 em8300_ioctl.c
+--- modules/em8300_ioctl.c	19 Oct 2005 22:15:16 -0000	1.49
++++ modules/em8300_ioctl.c	5 Nov 2005 08:32:25 -0000
+@@ -204,6 +204,20 @@
  		}
  		break;
  
 +	case _IOC_NR(EM8300_IOCTL_SET_WSS):
++		em8300_require_ucode(em);
++
 +		if (!em->ucodeloaded) {
 +			return -ENOTTY;
 +		}
@@ -274,9 +272,9 @@ diff -u -r1.48 em8300_ioctl.c
 +		break;
 +
  	case _IOC_NR(EM8300_IOCTL_GET_AUDIOMODE):
- 		if (!em->ucodeloaded) {
- 			return -ENOTTY;
-@@ -539,6 +551,52 @@
+ 		em8300_require_ucode(em);
+ 
+@@ -590,6 +604,52 @@
  	return 0;
  }
  
@@ -335,7 +333,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	24 May 2005 14:03:35 -0000
++++ modules/encoder.h	5 Nov 2005 08:32:25 -0000
 @@ -13,6 +13,15 @@
  
  #define ENCODER_CMD_SETMODE      1
@@ -355,11 +353,11 @@ diff -u -r1.8 encoder.h
 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	24 May 2005 14:03:31 -0000
-@@ -27,6 +27,33 @@
+retrieving revision 1.3
+diff -u -r1.3 em8300setup.1
+--- em8300setup/em8300setup.1	19 Oct 2005 22:15:16 -0000	1.3
++++ em8300setup/em8300setup.1	5 Nov 2005 08:32:24 -0000
+@@ -26,6 +26,33 @@
  \fB-o\fR, \fB-w\fR
  Set aspect ratio to respectively normal (4:3) or wide-screen (16:9).
  .TP