summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/cx88/cx88-dvb.c34
-rw-r--r--linux/drivers/media/video/cx88/cx88-i2c.c4
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-dvb.c6
-rw-r--r--v4l/ChangeLog7
-rw-r--r--v4l/Makefile10
-rw-r--r--v4l/scripts/merge-trees.sh12
-rw-r--r--v4l/scripts/unmerge-trees.sh12
7 files changed, 44 insertions, 41 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index a448eb985..4ce5ebc1a 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.52 2005/07/24 22:12:47 mkrufky Exp $
+ * $Id: cx88-dvb.c,v 1.53 2005/07/25 05:10:13 mkrufky Exp $
*
* device driver for Conexant 2388x based TV cards
* MPEG Transport Stream (DVB) routines
@@ -32,10 +32,6 @@
#include <linux/config.h>
#include "compat.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-#undef HAVE_LGDT3302
-#endif
-
#include "cx88.h"
#include "dvb-pll.h"
@@ -49,8 +45,8 @@
#ifdef HAVE_OR51132
# include "or51132.h"
#endif
-#ifdef HAVE_LGDT3302
-# include "lgdt3302.h"
+#ifdef HAVE_LGDT330X
+# include "lgdt330x.h"
#endif
MODULE_DESCRIPTION("driver for cx2388x based DVB cards");
@@ -215,8 +211,8 @@ static struct or51132_config pchdtv_hd3000 = {
};
#endif
-#ifdef HAVE_LGDT3302
-static int lgdt3302_pll_set(struct dvb_frontend* fe,
+#ifdef HAVE_LGDT330X
+static int lgdt330x_pll_set(struct dvb_frontend* fe,
struct dvb_frontend_parameters* params,
u8* pllbuf)
{
@@ -228,7 +224,7 @@ static int lgdt3302_pll_set(struct dvb_frontend* fe,
return 0;
}
-static int lgdt3302_pll_rf_set(struct dvb_frontend* fe, int index)
+static int lgdt330x_pll_rf_set(struct dvb_frontend* fe, int index)
{
struct cx8802_dev *dev= fe->dvb->priv;
struct cx88_core *core = dev->core;
@@ -241,7 +237,7 @@ static int lgdt3302_pll_rf_set(struct dvb_frontend* fe, int index)
return 0;
}
-static int lgdt3302_set_ts_param(struct dvb_frontend* fe, int is_punctured)
+static int lgdt330x_set_ts_param(struct dvb_frontend* fe, int is_punctured)
{
struct cx8802_dev *dev= fe->dvb->priv;
if (is_punctured)
@@ -251,10 +247,10 @@ static int lgdt3302_set_ts_param(struct dvb_frontend* fe, int is_punctured)
return 0;
}
-static struct lgdt3302_config fusionhdtv_3_gold = {
+static struct lgdt330x_config fusionhdtv_3_gold = {
.demod_address = 0x0e,
- .pll_set = lgdt3302_pll_set,
- .set_ts_params = lgdt3302_set_ts_param,
+ .pll_set = lgdt330x_pll_set,
+ .set_ts_params = lgdt330x_set_ts_param,
};
#endif
@@ -305,7 +301,7 @@ static int dvb_register(struct cx8802_dev *dev)
&dev->core->i2c_adap);
break;
#endif
-#ifdef HAVE_LGDT3302
+#ifdef HAVE_LGDT330X
case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q:
dev->ts_gen_cntrl = 0x08;
{
@@ -318,10 +314,10 @@ static int dvb_register(struct cx8802_dev *dev)
mdelay(200);
/* Select RF connector callback */
- fusionhdtv_3_gold.pll_rf_set = lgdt3302_pll_rf_set;
+ fusionhdtv_3_gold.pll_rf_set = lgdt330x_pll_rf_set;
dev->core->pll_addr = 0x61;
dev->core->pll_desc = &dvb_pll_microtune_4042;
- dev->dvb.frontend = lgdt3302_attach(&fusionhdtv_3_gold,
+ dev->dvb.frontend = lgdt330x_attach(&fusionhdtv_3_gold,
&dev->core->i2c_adap);
}
break;
@@ -337,7 +333,7 @@ static int dvb_register(struct cx8802_dev *dev)
mdelay(200);
dev->core->pll_addr = 0x61;
dev->core->pll_desc = &dvb_pll_thomson_dtt7611;
- dev->dvb.frontend = lgdt3302_attach(&fusionhdtv_3_gold,
+ dev->dvb.frontend = lgdt330x_attach(&fusionhdtv_3_gold,
&dev->core->i2c_adap);
}
break;
@@ -355,7 +351,7 @@ static int dvb_register(struct cx8802_dev *dev)
mdelay(200);
dev->core->pll_addr = 0x61;
dev->core->pll_desc = &dvb_pll_tua6034;
- dev->dvb.frontend = lgdt3302_attach(&fusionhdtv_3_gold,
+ dev->dvb.frontend = lgdt330x_attach(&fusionhdtv_3_gold,
&dev->core->i2c_adap);
}
break;
diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c
index 410ae0cc4..68abab976 100644
--- a/linux/drivers/media/video/cx88/cx88-i2c.c
+++ b/linux/drivers/media/video/cx88/cx88-i2c.c
@@ -1,5 +1,5 @@
/*
- $Id: cx88-i2c.c,v 1.29 2005/07/15 21:44:14 mchehab Exp $
+ $Id: cx88-i2c.c,v 1.30 2005/07/25 05:10:13 mkrufky Exp $
cx88-i2c.c -- all the i2c code is here
@@ -165,7 +165,7 @@ static struct i2c_client cx8800_i2c_client_template = {
};
static char *i2c_devs[128] = {
- [ 0x1c >> 1 ] = "lgdt3302",
+ [ 0x1c >> 1 ] = "lgdt330x",
[ 0x86 >> 1 ] = "tda9887/cx22702",
[ 0xa0 >> 1 ] = "eeprom",
[ 0xc0 >> 1 ] = "tuner (analog)",
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c
index 8566b4084..91c043fe7 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.23 2005/07/24 22:12:47 mkrufky Exp $
+ * $Id: saa7134-dvb.c,v 1.24 2005/07/25 05:10:13 mkrufky Exp $
*
* (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
*
@@ -32,10 +32,6 @@
#include <linux/config.h>
#include "compat.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-#undef HAVE_TDA1004X
-#endif
-
#include "saa7134-reg.h"
#include "saa7134.h"
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 77bd94f6b..f4a076a1a 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-25 05:06 mkrufky
+ * cx88-dvb.c, cx88-i2c.c, Makefile:
+ * scripts/merge-trees.sh, scripts/unmerge-trees.sh:
+ - Rename lgdt3302 to lgdt330x.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-07-24 22:08 mkrufky
* cx88-dvb.c, saa7134-dvb.c, Makefile:
- The #define CONFIG_DVB_* are actually CFLAGS set by Makefile.
diff --git a/v4l/Makefile b/v4l/Makefile
index 69029d0f7..b7c9b6f58 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -39,8 +39,8 @@ obj-$(CONFIG_VIDEO_IR) += ir-common.o
obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o
obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o
-obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o
-obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o
+obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt330x.o mt352.o
+obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o
# 2.6-only stuff
ifeq ($(VERSION).$(PATCHLEVEL),2.6)
@@ -60,7 +60,7 @@ ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
EXTRA_CFLAGS += -DCONFIG_VIDEO_CX88_DVB_MODULE=1
EXTRA_CFLAGS += -DHAVE_CX22702=1
EXTRA_CFLAGS += -DHAVE_OR51132=1
- EXTRA_CFLAGS += -DHAVE_LGDT3302=1
+ EXTRA_CFLAGS += -DHAVE_LGDT330X=1
EXTRA_CFLAGS += -DHAVE_MT352=1
endif
ifeq ($(CONFIG_VIDEO_SAA7134_DVB),m)
@@ -123,6 +123,7 @@ ifeq ($(inst-m),)
endif
inst_common := ir-common.ko
+inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt330x.ko or51132.ko tda1004x.ko
inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko
inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko
inst_video += video-buf.ko video-buf-dvb.ko
@@ -149,6 +150,9 @@ install:: rminstall
-install -d $(KDIR26)/common
-install -m 644 -c $(inst_common) $(KDIR26)/common
+ -install -d $(KDIR26)/dvb/frontends
+ -install -m 644 -c $(inst_frontends) $(KDIR26)/dvb/frontends
+
-install -d $(KDIR26)/video
-install -m 644 -c $(inst_video) $(KDIR26)/video
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index de987444d..9a16be40b 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -7,9 +7,9 @@ ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/mt352.h mt352.h
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/mt352_priv.h mt352_priv.h
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx22702.c cx22702.c
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx22702.h cx22702.h
-ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302.c lgdt3302.c
-ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302.h lgdt3302.h
-ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302_priv.h lgdt3302_priv.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x.c lgdt330x.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x.h lgdt330x.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x_priv.h lgdt330x_priv.h
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.c or51132.c
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.h or51132.h
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/tda1004x.c tda1004x.c
@@ -23,7 +23,7 @@ patch -p1 <<'DIFF'
-obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o
-obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o
-+obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt3302.o mt352.o
++obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt330x.o mt352.o
+obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o
# 2.6-only stuff
@@ -32,7 +32,7 @@ patch -p1 <<'DIFF'
endif
inst_common := ir-common.ko
-+inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt3302.ko or51132.ko tda1004x.ko
++inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt330x.ko or51132.ko tda1004x.ko
inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko
inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko
inst_video += video-buf.ko video-buf-dvb.ko
@@ -54,7 +54,7 @@ diff -upr video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c
#include "compat.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
--#undef HAVE_LGDT3302
+-#undef HAVE_LGDT330X
-#endif
-
#include "cx88.h"
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index 49f22b3a0..2ea436e6a 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -7,9 +7,9 @@ rm mt352.h
rm mt352_priv.h
rm cx22702.c
rm cx22702.h
-rm lgdt3302.c
-rm lgdt3302.h
-rm lgdt3302_priv.h
+rm lgdt330x.c
+rm lgdt330x.h
+rm lgdt330x_priv.h
rm or51132.c
rm or51132.h
rm tda1004x.c
@@ -23,7 +23,7 @@ video4linux.orig/Makefile
obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o
obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o
--obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt3302.o mt352.o
+-obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt330x.o mt352.o
-obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o
+obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o
+obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o
@@ -34,7 +34,7 @@ video4linux.orig/Makefile
endif
inst_common := ir-common.ko
--inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt3302.ko or51132.ko tda1004x.ko
+-inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt330x.ko or51132.ko tda1004x.ko
inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko
inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko
inst_video += video-buf.ko video-buf-dvb.ko
@@ -56,7 +56,7 @@ diff -upr video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c
#include "compat.h"
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+#undef HAVE_LGDT3302
++#undef HAVE_LGDT330X
+#endif
+
#include "cx88.h"