Update to apply in 0.16.2-rc1.

1 files changed, 27 insertions, 57 deletions

diff --git a/patches/em8300-adv7170-wss.patch b/patches/em8300-adv7170-wss.patch
index 29bb524..6b57e44 100644
--- a/patches/em8300-adv7170-wss.patch
+++ b/patches/em8300-adv7170-wss.patch
@@ -1,13 +1,8 @@
-http://sourceforge.net/mailarchive/forum.php?thread_id=6061108&forum_id=7173
-Updated to apply cleanly as of 0.15.2rc1.
+o http://thread.gmane.org/gmane.linux.vdr/17095
+  Updated to apply to em8300 driver version 0.16.2-rc1.
 
-Index: em8300setup/em8300setup.c
-===================================================================
-RCS file: /cvsroot/dxr3/em8300/em8300setup/em8300setup.c,v
-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
+--- em8300setup/em8300setup.c~	2005-10-20 01:15:16.000000000 +0300
++++ em8300setup/em8300setup.c	2007-04-04 03:07:38.000000000 +0300
 @@ -114,7 +114,7 @@
  	char ucode_file[200]; // bad hardcoded value ;-)
  
@@ -76,13 +71,8 @@ diff -u -r1.5 em8300setup.c
  		if(audio!=-1) {
  			printf("Setting audio = %i\n",audio);
  			if(ioctl(DEV, EM8300_IOCTL_SET_AUDIOMODE, &audio) == -1) 
-Index: include/linux/em8300.h
-===================================================================
-RCS file: /cvsroot/dxr3/em8300/include/linux/em8300.h,v
-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
+--- include/linux/em8300.h~	2007-03-17 00:08:39.000000000 +0200
++++ include/linux/em8300.h	2007-04-04 03:07:40.000000000 +0300
 @@ -80,6 +80,7 @@
  #define EM8300_IOCTL_SCR_SETSPEED _IOW('C',17,unsigned)
  #define EM8300_IOCTL_FLUSH _IOW('C',18,int)
@@ -108,7 +98,7 @@ diff -u -r1.39 em8300.h
  #define EM8300_VIDEOMODE_PAL	0
  #define EM8300_VIDEOMODE_PAL60	1
  #define EM8300_VIDEOMODE_NTSC	2
-@@ -455,6 +466,7 @@
+@@ -486,6 +497,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);
@@ -116,14 +106,9 @@ diff -u -r1.39 em8300.h
  int em8300_ioctl_getstatus(struct em8300_s *em, char *usermsg);
  int em8300_ioctl_init(struct em8300_s *em, em8300_microcode_t *useruc);
  void em8300_ioctl_enable_videoout(struct em8300_s *em, int mode);
-Index: modules/adv717x.c
-===================================================================
-RCS file: /cvsroot/dxr3/em8300/modules/adv717x.c,v
-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 @@
+--- modules/adv717x.c~	2007-03-09 01:48:00.000000000 +0200
++++ modules/adv717x.c	2007-04-04 03:07:34.000000000 +0300
+@@ -218,6 +218,7 @@
  	int pp_ntsc;
  	int pd_adj_pal;
  	int pd_adj_ntsc;
@@ -131,10 +116,10 @@ diff -u -r1.49 adv717x.c
  
  	unsigned char config[32];
  	int configlen;
-@@ -398,6 +399,63 @@
+@@ -430,6 +431,63 @@
  		/* ADV7170/1 RGB sync: MR42 (register 4, bit 2) */
  		SET_REG(tmpconfig[ADV7170_REG_MR4], 2,
- 				ModeInfo[data->out_mode].sync_all);
+ 				mode_info[data->out_mode].conf.sync_all);
 +
 +		switch (data->wsscode) {
 +		case 0x08:
@@ -195,7 +180,7 @@ diff -u -r1.49 adv717x.c
  		break;
  	}
  	/* ADV7170/1/5A/6A non-interlace: MR10 (register 1, bit 0) */
-@@ -559,6 +617,7 @@
+@@ -591,6 +649,7 @@
  	data->out_mode = output_mode_nr[em->card_nr];
  	if (data->out_mode < 0 || data->out_mode >= MODE_MAX)
  		data->out_mode = 0;
@@ -203,7 +188,7 @@ diff -u -r1.49 adv717x.c
  
  	adv717x_setmode(ENCODER_MODE_PAL60, client);
  
-@@ -664,6 +723,42 @@
+@@ -696,6 +755,42 @@
  		data->enableoutput = (long int) arg;
  		adv717x_update(client);
  		break;
@@ -243,17 +228,12 @@ diff -u -r1.49 adv717x.c
 +		data->wsscode = 0; 
 +		adv717x_update(client);
 +		break;
- 	default:
- 		return -EINVAL;
- 		break;
-Index: modules/em8300_ioctl.c
-===================================================================
-RCS file: /cvsroot/dxr3/em8300/modules/em8300_ioctl.c,v
-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 @@
+ 	case ENCODER_CMD_GETCONFIG:
+ 	{
+ 		struct em8300_s *em = i2c_get_adapdata(client->adapter);
+--- modules/em8300_ioctl.c~	2007-03-03 12:13:25.000000000 +0200
++++ modules/em8300_ioctl.c	2007-04-04 03:07:33.000000000 +0300
+@@ -174,6 +174,20 @@
  		}
  		break;
  
@@ -271,10 +251,10 @@ diff -u -r1.49 em8300_ioctl.c
 +
 +		break;
 +
- 	case _IOC_NR(EM8300_IOCTL_GET_AUDIOMODE):
+ 	case _IOC_NR(EM8300_IOCTL_SET_PLAYMODE):
  		em8300_require_ucode(em);
  
-@@ -590,6 +604,52 @@
+@@ -611,6 +625,52 @@
  	return 0;
  }
  
@@ -327,13 +307,8 @@ diff -u -r1.49 em8300_ioctl.c
  int em8300_ioctl_setplaymode(struct em8300_s *em, int mode)
  {
  	switch (mode) {
-Index: modules/encoder.h
-===================================================================
-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	5 Nov 2005 08:32:25 -0000
+--- modules/encoder.h~	2007-03-09 01:48:00.000000000 +0200
++++ modules/encoder.h	2007-04-04 03:07:41.000000000 +0300
 @@ -13,6 +13,15 @@
  
  #define ENCODER_CMD_SETMODE      1
@@ -347,16 +322,11 @@ diff -u -r1.8 encoder.h
 +#define ENCODER_CMD_WSS_14_9               9
 +#define ENCODER_CMD_WSS_16_9               10
 +#define ENCODER_CMD_WSS_OFF                11
+ #define ENCODER_CMD_GETCONFIG    0xDEADBEEF
  
  #endif
- 
-Index: em8300setup/em8300setup.1
-===================================================================
-RCS file: /cvsroot/dxr3/em8300/em8300setup/em8300setup.1,v
-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
+--- em8300setup/em8300setup.1~	2005-10-20 01:15:16.000000000 +0300
++++ em8300setup/em8300setup.1	2007-04-04 03:07:30.000000000 +0300
 @@ -26,6 +26,33 @@
  \fB-o\fR, \fB-w\fR
  Set aspect ratio to respectively normal (4:3) or wide-screen (16:9).