* cx88-dvb.c, saa7134-dvb.c:

        * scripts/merge-trees.sh, scripts/unmerge-trees.sh:
        - fix compilation warning for missing lgdt3302 when
          compiling against kernel 2.6.12 without DVB tree.
        - replaced #IF CONFIG_DVB_* with #IFDEF CONFIG_DVB_*
        - include linux/config.h
        - Let kconfig / Makefile decide to include frontend-specific code.
          (Properly functioning now)

        Signed-off-by: Michael Krufky <mkrufky@m1k.net>

5 files changed, 71 insertions, 68 deletions

diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index 3fe9b0a98..b4839b865 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.49 2005/07/20 05:38:09 mkrufky Exp $
+ * $Id: cx88-dvb.c,v 1.50 2005/07/23 10:08:00 mkrufky Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * MPEG Transport Stream (DVB) routines
@@ -29,31 +29,27 @@
 #include <linux/kthread.h>
 #include <linux/file.h>
 #include <linux/suspend.h>
+#include <linux/config.h>
 #include "compat.h"
 
-#define CONFIG_DVB_MT352 1
-#define CONFIG_DVB_CX22702 1
-#define CONFIG_DVB_OR51132 1
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-#define CONFIG_DVB_LGDT3302 0
-#else
-#define CONFIG_DVB_LGDT3302 1
+#undef CONFIG_DVB_LGDT3302
 #endif
 
 #include "cx88.h"
 #include "dvb-pll.h"
 
-#if CONFIG_DVB_MT352
+#ifdef CONFIG_DVB_MT352
 # include "mt352.h"
 # include "mt352_priv.h"
 #endif
-#if CONFIG_DVB_CX22702
+#ifdef CONFIG_DVB_CX22702
 # include "cx22702.h"
 #endif
-#if CONFIG_DVB_OR51132
+#ifdef CONFIG_DVB_OR51132
 # include "or51132.h"
 #endif
-#if CONFIG_DVB_LGDT3302
+#ifdef CONFIG_DVB_LGDT3302
 # include "lgdt3302.h"
 #endif
 
@@ -112,7 +108,7 @@ static struct videobuf_queue_ops dvb_qops = {
 
 /* ------------------------------------------------------------------ */
 
-#if CONFIG_DVB_MT352
+#ifdef CONFIG_DVB_MT352
 static int dvico_fusionhdtv_demod_init(struct dvb_frontend* fe)
 {
 	static u8 clock_config []  = { CLOCK_CTL,  0x38, 0x39 };
@@ -182,7 +178,7 @@ static struct mt352_config dntv_live_dvbt_config = {
 };
 #endif
 
-#if CONFIG_DVB_CX22702
+#ifdef CONFIG_DVB_CX22702
 static struct cx22702_config connexant_refboard_config = {
 	.demod_address = 0x43,
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
@@ -202,7 +198,7 @@ static struct cx22702_config hauppauge_novat_config = {
 };
 #endif
 
-#if CONFIG_DVB_OR51132
+#ifdef CONFIG_DVB_OR51132
 static int or51132_set_ts_param(struct dvb_frontend* fe,
 				int is_punctured)
 {
@@ -219,7 +215,7 @@ static struct or51132_config pchdtv_hd3000 = {
 };
 #endif
 
-#if CONFIG_DVB_LGDT3302
+#ifdef CONFIG_DVB_LGDT3302
 static int lgdt3302_pll_set(struct dvb_frontend* fe,
 			    struct dvb_frontend_parameters* params,
 			    u8* pllbuf)
@@ -270,7 +266,7 @@ static int dvb_register(struct cx8802_dev *dev)
 
 	/* init frontend */
 	switch (dev->core->board) {
-#if CONFIG_DVB_CX22702
+#ifdef CONFIG_DVB_CX22702
 	case CX88_BOARD_HAUPPAUGE_DVB_T1:
 		dev->dvb.frontend = cx22702_attach(&hauppauge_novat_config,
 						   &dev->core->i2c_adap);
@@ -281,7 +277,7 @@ static int dvb_register(struct cx8802_dev *dev)
 						   &dev->core->i2c_adap);
 		break;
 #endif
-#if CONFIG_DVB_MT352
+#ifdef CONFIG_DVB_MT352
 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
 		dev->core->pll_addr = 0x61;
 		dev->core->pll_desc = &dvb_pll_lg_z201;
@@ -303,13 +299,13 @@ static int dvb_register(struct cx8802_dev *dev)
 						 &dev->core->i2c_adap);
 		break;
 #endif
-#if CONFIG_DVB_OR51132
+#ifdef CONFIG_DVB_OR51132
 	case CX88_BOARD_PCHDTV_HD3000:
 		dev->dvb.frontend = or51132_attach(&pchdtv_hd3000,
 						 &dev->core->i2c_adap);
 		break;
 #endif
-#if CONFIG_DVB_LGDT3302
+#ifdef CONFIG_DVB_LGDT3302
 	case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q:
 		dev->ts_gen_cntrl = 0x08;
 		{
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c
index 822bd7ce9..c3b498172 100644
--- a/linux/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-dvb.c,v 1.21 2005/07/15 23:59:43 mchehab Exp $
+ * $Id: saa7134-dvb.c,v 1.22 2005/07/23 10:08:00 mkrufky Exp $
  *
  * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
  *
@@ -29,22 +29,21 @@
 #include <linux/delay.h>
 #include <linux/kthread.h>
 #include <linux/suspend.h>
+#include <linux/config.h>
 #include "compat.h"
 
-#define CONFIG_DVB_MT352 1
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
-#define CONFIG_DVB_TDA1004X 1
-#else
-#define CONFIG_DVB_TDA1004X 0
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
+#undef CONFIG_DVB_TDA1004X
 #endif
+
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
-#if CONFIG_DVB_MT352
+#ifdef CONFIG_DVB_MT352
 # include "mt352.h"
 # include "mt352_priv.h" /* FIXME */
 #endif
-#if CONFIG_DVB_TDA1004X
+#ifdef CONFIG_DVB_TDA1004X
 # include "tda1004x.h"
 #endif
 
@@ -58,7 +57,7 @@ MODULE_PARM_DESC(antenna_pwr,"enable antenna power (Pinnacle 300i)");
 
 /* ------------------------------------------------------------------ */
 
-#if CONFIG_DVB_MT352
+#ifdef CONFIG_DVB_MT352
 static int pinnacle_antenna_pwr(struct saa7134_dev *dev, int on)
 {
 	u32 ok;
@@ -157,7 +156,7 @@ static struct mt352_config pinnacle_300i = {
 
 /* ------------------------------------------------------------------ */
 
-#if CONFIG_DVB_TDA1004X
+#ifdef CONFIG_DVB_TDA1004X
 static int philips_tu1216_pll_init(struct dvb_frontend *fe)
 {
 	struct saa7134_dev *dev = fe->dvb->priv;
@@ -389,7 +388,7 @@ static int philips_fmd1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_
 	return 0;
 }
 
-#if CONFIG_DVB_TDA1004X
+#ifdef CONFIG_DVB_TDA1004X
 static struct tda1004x_config medion_cardbus = {
 	.demod_address = 0x08,
 	.invert        = 1,
@@ -552,14 +551,14 @@ static int dvb_init(struct saa7134_dev *dev)
 			    dev);
 
 	switch (dev->board) {
-#if CONFIG_DVB_MT352
+#ifdef CONFIG_DVB_MT352
 	case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL:
 		printk("%s: pinnacle 300i dvb setup\n",dev->name);
 		dev->dvb.frontend = mt352_attach(&pinnacle_300i,
 						 &dev->i2c_adap);
 		break;
 #endif
-#if CONFIG_DVB_TDA1004X
+#ifdef CONFIG_DVB_TDA1004X
 	case SAA7134_BOARD_MD7134:
 		dev->dvb.frontend = tda10046_attach(&medion_cardbus,
 						    &dev->i2c_adap);
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index fa5b99bae..521e43bf3 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,15 @@
+2005-07-23 09:49  mkrufky
+	* cx88-dvb.c, saa7134-dvb.c:
+	* scripts/merge-trees.sh, scripts/unmerge-trees.sh:
+	- fix compilation warning for missing lgdt3302 when 
+	  compiling against kernel 2.6.12 without DVB tree.
+	- replaced #IF CONFIG_DVB_* with #IFDEF CONFIG_DVB_*
+	- include linux/config.h
+	- Let kconfig / Makefile decide to include frontend-specific code.
+	  (Properly functioning now)
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
 2005-07-22 16:27  mkrufky
 	* tveeprom.c:
 	- Recognize the MFPE05-2 Tuner.
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index 90021bed0..fbc9fa564 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -47,32 +47,30 @@ patch -p1 <<'DIFF'
  	-install -m 644 -c $(inst_video) $(KDIR26)/video
  
 diff -upr video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c
---- video4linux.orig/cx88-dvb.c	2005-07-21 23:35:26.000000000 +0000
-+++ video4linux/cx88-dvb.c	2005-07-21 23:35:52.000000000 +0000
-@@ -34,11 +34,7 @@
- #define CONFIG_DVB_MT352 1
- #define CONFIG_DVB_CX22702 1
- #define CONFIG_DVB_OR51132 1
+--- video4linux.orig/cx88-dvb.c	2005-07-23 05:35:09.000000000 +0000
++++ video4linux/cx88-dvb.c	2005-07-23 05:36:30.000000000 +0000
+@@ -32,10 +32,6 @@
+ #include <linux/config.h>
+ #include "compat.h"
+ 
 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
--#define CONFIG_DVB_LGDT3302 0
--#else
- #define CONFIG_DVB_LGDT3302 1
+-#undef CONFIG_DVB_LGDT3302
 -#endif
- 
+-
  #include "cx88.h"
  #include "dvb-pll.h"
+ 
 diff -upr video4linux.orig/saa7134-dvb.c video4linux/saa7134-dvb.c
---- video4linux.orig/saa7134-dvb.c	2005-07-21 23:35:26.000000000 +0000
-+++ video4linux/saa7134-dvb.c	2005-07-21 23:36:19.000000000 +0000
-@@ -32,11 +32,7 @@
+--- video4linux.orig/saa7134-dvb.c	2005-07-23 05:35:09.000000000 +0000
++++ video4linux/saa7134-dvb.c	2005-07-23 05:36:50.000000000 +0000
+@@ -32,10 +32,6 @@
+ #include <linux/config.h>
  #include "compat.h"
  
- #define CONFIG_DVB_MT352 1
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
- #define CONFIG_DVB_TDA1004X 1
--#else
--#define CONFIG_DVB_TDA1004X 0
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
+-#undef CONFIG_DVB_TDA1004X
 -#endif
+-
  #include "saa7134-reg.h"
  #include "saa7134.h"
  
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index 6de4527cf..d3627aa5a 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -49,32 +49,30 @@ video4linux.orig/Makefile
  	-install -m 644 -c $(inst_video) $(KDIR26)/video
  
 diff -upr video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c
---- video4linux/cx88-dvb.c	2005-07-21 23:41:13.000000000 +0000
-+++ video4linux.orig/cx88-dvb.c	2005-07-21 23:39:50.000000000 +0000
-@@ -34,7 +34,11 @@
- #define CONFIG_DVB_MT352 1
- #define CONFIG_DVB_CX22702 1
- #define CONFIG_DVB_OR51132 1
+--- video4linux/cx88-dvb.c	2005-07-23 05:36:30.000000000 +0000
++++ video4linux.orig/cx88-dvb.c	2005-07-23 05:35:09.000000000 +0000
+@@ -32,6 +32,10 @@
+ #include <linux/config.h>
+ #include "compat.h"
+ 
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+#define CONFIG_DVB_LGDT3302 0
-+#else
- #define CONFIG_DVB_LGDT3302 1
++#undef CONFIG_DVB_LGDT3302
 +#endif
- 
++
  #include "cx88.h"
  #include "dvb-pll.h"
+ 
 diff -upr video4linux/saa7134-dvb.c video4linux.orig/saa7134-dvb.c
---- video4linux/saa7134-dvb.c	2005-07-21 23:41:13.000000000 +0000
-+++ video4linux.orig/saa7134-dvb.c	2005-07-21 23:39:50.000000000 +0000
-@@ -32,7 +32,11 @@
+--- video4linux/saa7134-dvb.c	2005-07-23 05:36:50.000000000 +0000
++++ video4linux.orig/saa7134-dvb.c	2005-07-23 05:35:09.000000000 +0000
+@@ -32,6 +32,10 @@
+ #include <linux/config.h>
  #include "compat.h"
  
- #define CONFIG_DVB_MT352 1
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
- #define CONFIG_DVB_TDA1004X 1
-+#else
-+#define CONFIG_DVB_TDA1004X 0
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
++#undef CONFIG_DVB_TDA1004X
 +#endif
++
  #include "saa7134-reg.h"
  #include "saa7134.h"