Fix cvs compile for 2.6.13

4 files changed, 143 insertions, 3 deletions

diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index 91a9afefa..7d7c82622 100644
--- a/linux/drivers/media/video/cx88/cx88-dvb.c
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-dvb.c,v 1.56 2005/07/27 19:25:32 mkrufky Exp $
+ * $Id: cx88-dvb.c,v 1.57 2005/07/30 16:21:58 mkrufky Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * MPEG Transport Stream (DVB) routines
@@ -216,8 +216,9 @@ static struct or51132_config pchdtv_hd3000 = {
 #endif
 
 #ifdef HAVE_LGDT330X
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 static int lgdt330x_pll_set(struct dvb_frontend* fe,
-							struct dvb_frontend_parameters* params)
+			    struct dvb_frontend_parameters* params)
 {
 	/* FIXME make this routine use the tuner-simple code.
 	 * It could probably be shared with a number of ATSC
@@ -245,6 +246,18 @@ static int lgdt330x_pll_set(struct dvb_frontend* fe,
 	}
 	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)
 {
@@ -271,6 +284,7 @@ static int lgdt330x_set_ts_param(struct dvb_frontend* fe, int is_punctured)
 
 static struct lgdt330x_config fusionhdtv_3_gold = {
 	.demod_address    = 0x0e,
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 	.chip             = LGDT3302,
 	.serial_mpeg      = 1,
 	.pll_set          = lgdt330x_pll_set,
@@ -282,6 +296,7 @@ static struct lgdt330x_config fusionhdtv_5_gold = {
 	.demod_address    = 0x0e,
 	.chip             = LGDT3303,
 	.serial_mpeg      = 1,
+#endif
 	.pll_set          = lgdt330x_pll_set,
 	.set_ts_params    = lgdt330x_set_ts_param,
 };
@@ -370,6 +385,7 @@ static int dvb_register(struct cx8802_dev *dev)
 						    &dev->core->i2c_adap);
 		}
 		break;
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 	case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD:
 		dev->ts_gen_cntrl = 0x08;
 		{
@@ -387,6 +403,7 @@ static int dvb_register(struct cx8802_dev *dev)
 		}
 		break;
 #endif
+#endif
 	default:
 		printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
 		       dev->core->name);
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 45b1ccfd8..348832b5f 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,5 +1,10 @@
-2005-07-29 12:45  mchehab
+2005-07-30 16:17  mkrufky
+	* cx88-dvb.c, scripts/merge-trees.sh, scripts/unmerge-trees.sh:
+	- Fix cvs compile for 2.6.13
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
 
+2005-07-29 12:45  mchehab
 	* bttv-cards.c:
 	- Acorp Y878F PCI identifier corrected. Board has radio.
 
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index 9b4a5fe12..51baa5401 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -69,6 +69,65 @@ 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
+ #endif
+ 
+ #ifdef HAVE_LGDT330X
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
+ 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 
+ 
+ static struct lgdt330x_config fusionhdtv_3_gold = {
+ 	.demod_address    = 0x0e,
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
+ 	.chip             = LGDT3302,
+ 	.serial_mpeg      = 1,
+ 	.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
+ 						    &dev->core->i2c_adap);
+ 		}
+ 		break;
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
+ 	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 856331fba..a37344397 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -69,6 +69,65 @@ 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
+ #endif
+ 
+ #ifdef HAVE_LGDT330X
++#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 
+ 
+ static struct lgdt330x_config fusionhdtv_3_gold = {
+ 	.demod_address    = 0x0e,
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
+ 	.chip             = LGDT3302,
+ 	.serial_mpeg      = 1,
+ 	.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
+ 						    &dev->core->i2c_adap);
+ 		}
+ 		break;
++#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