tree merging scripts updated for lgdt330x changes

2 files changed, 16 insertions, 80 deletions

diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index 2d16a39ab..88e5cbbf3 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -70,65 +70,33 @@ diff -upr video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c
  #include "cx88.h"
  #include "dvb-pll.h"
  
-@@ -216,7 +216,6 @@ static struct or51132_config pchdtv_hd30
+@@ -216,7 +212,7 @@ static struct or51132_config pchdtv_hd30
  #endif
  
  #ifdef HAVE_LGDT330X
 -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
++#if 1
  static int lgdt330x_pll_set(struct dvb_frontend* fe,
  			    struct dvb_frontend_parameters* params)
  {
-@@ -246,18 +245,6 @@ static int lgdt330x_pll_set(struct dvb_f
- 	}
- 	return 0;
- }
--#else
--static int lgdt330x_pll_set(struct dvb_frontend* fe,
--			    struct dvb_frontend_parameters* params, u8* pllbuf)
--{
--	struct cx8802_dev *dev= fe->dvb->priv;
--
--	pllbuf[0] = dev->core->pll_addr;
--	dvb_pll_configure(dev->core->pll_desc, &pllbuf[1],
--			  params->frequency, 0);
--	return 0;
--}
--#endif
- 
- static int lgdt330x_pll_rf_set(struct dvb_frontend* fe, int index)
- {
-@@ -284,7 +271,6 @@ static int lgdt330x_set_ts_param(struct 
+@@ -289,7 +285,7 @@ static int lgdt330x_set_ts_param(struct 
  
  static struct lgdt330x_config fusionhdtv_3_gold = {
  	.demod_address    = 0x0e,
 -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
- 	.chip             = LGDT3302,
- 	.serial_mpeg      = 1,
++#if 1
+ 	.demod_chip       = LGDT3302,
+ 	.serial_mpeg      = 0x04, /* TPSERIAL for 3302 in TOP_CONTROL */
  	.pll_set          = lgdt330x_pll_set,
-@@ -296,7 +282,6 @@ static struct lgdt330x_config fusionhdtv
- 	.demod_address    = 0x0e,
- 	.chip             = LGDT3303,
- 	.serial_mpeg      = 1,
--#endif
- 	.pll_set          = lgdt330x_pll_set,
- 	.set_ts_params    = lgdt330x_set_ts_param,
- };
-@@ -385,7 +370,6 @@ static int dvb_register(struct cx8802_de
+@@ -389,7 +385,7 @@ static int dvb_register(struct cx8802_de
  						    &dev->core->i2c_adap);
  		}
  		break;
 -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
++#if 1
  	case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD:
  		dev->ts_gen_cntrl = 0x08;
  		{
-@@ -403,7 +387,6 @@ static int dvb_register(struct cx8802_de
- 		}
- 		break;
- #endif
--#endif
- 	default:
- 		printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
- 		       dev->core->name);
 diff -upr video4linux.orig/saa7134-dvb.c video4linux/saa7134-dvb.c
 --- video4linux.orig/saa7134-dvb.c	2005-07-29 21:40:53.000000000 +0000
 +++ video4linux/saa7134-dvb.c	2005-07-29 21:41:59.000000000 +0000
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index a3224d794..ace39a171 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -70,65 +70,33 @@ diff -upr video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c
  #include "cx88.h"
  #include "dvb-pll.h"
  
-@@ -212,6 +212,7 @@ static struct or51132_config pchdtv_hd30
+@@ -212,7 +216,7 @@ static struct or51132_config pchdtv_hd30
  #endif
  
  #ifdef HAVE_LGDT330X
+-#if 1
 +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
  static int lgdt330x_pll_set(struct dvb_frontend* fe,
  			    struct dvb_frontend_parameters* params)
  {
-@@ -241,6 +242,18 @@ static int lgdt330x_pll_set(struct dvb_f
- 	}
- 	return 0;
- }
-+#else
-+static int lgdt330x_pll_set(struct dvb_frontend* fe,
-+			    struct dvb_frontend_parameters* params, u8* pllbuf)
-+{
-+	struct cx8802_dev *dev= fe->dvb->priv;
-+
-+	pllbuf[0] = dev->core->pll_addr;
-+	dvb_pll_configure(dev->core->pll_desc, &pllbuf[1],
-+			  params->frequency, 0);
-+	return 0;
-+}
-+#endif
- 
- static int lgdt330x_pll_rf_set(struct dvb_frontend* fe, int index)
- {
-@@ -267,6 +280,7 @@ static int lgdt330x_set_ts_param(struct 
+@@ -285,7 +289,7 @@ static int lgdt330x_set_ts_param(struct 
  
  static struct lgdt330x_config fusionhdtv_3_gold = {
  	.demod_address    = 0x0e,
+-#if 1
 +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
- 	.chip             = LGDT3302,
- 	.serial_mpeg      = 1,
+ 	.demod_chip       = LGDT3302,
+ 	.serial_mpeg      = 0x04, /* TPSERIAL for 3302 in TOP_CONTROL */
  	.pll_set          = lgdt330x_pll_set,
-@@ -278,6 +292,7 @@ static struct lgdt330x_config fusionhdtv
- 	.demod_address    = 0x0e,
- 	.chip             = LGDT3303,
- 	.serial_mpeg      = 1,
-+#endif
- 	.pll_set          = lgdt330x_pll_set,
- 	.set_ts_params    = lgdt330x_set_ts_param,
- };
-@@ -366,6 +381,7 @@ static int dvb_register(struct cx8802_de
+@@ -385,7 +389,7 @@ static int dvb_register(struct cx8802_de
  						    &dev->core->i2c_adap);
  		}
  		break;
+-#if 1
 +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
  	case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD:
  		dev->ts_gen_cntrl = 0x08;
  		{
-@@ -383,6 +399,7 @@ static int dvb_register(struct cx8802_de
- 		}
- 		break;
- #endif
-+#endif
- 	default:
- 		printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
- 		       dev->core->name);
 diff -upr video4linux/saa7134-dvb.c video4linux.orig/saa7134-dvb.c
 --- video4linux/saa7134-dvb.c	2005-07-29 21:44:41.000000000 +0000
 +++ video4linux.orig/saa7134-dvb.c	2005-07-29 21:44:31.000000000 +0000