[PATCH] DVB: rename lgdt3302 frontend module to lgdt330x
This patch depends on the following patches to be applied first in order
to apply cleanly:
01-lgdt3302-isolate-tuner.patch
02-lgdt3302-rf-input.patch
03-lgdt3302-suppress-compile-warning.patch
04-cx88-dvb-cleanup.patch
[-mm PATCH] v4l: hybrid dvb: fix warnings with -Wundef
[-mm PATCH] v4l: hybrid dvb: move #defines to Makefile
[-mm PATCH] v4l: hybrid dvb: rename CFLAGS from CONFIG_DVB_ back to
original HAVE_
I am listing these because I haven't seen any of these in -mm-commits
mailing list yet. (No commits at all for a week or so)
I am changing the name of this module now so that hopefully the name
will be changed before the release of 2.6.13 ... It wouldn't make sense
to release 2.6.13 with the name lgdt3302 in it, which will only be
renamed to lgdt330x in later versions.
Andrew-
If you, for any reason, don't want to send my #ifdef changes to 2.6.13
right away, just let me know and I'll regenerate these patches such that
the #ifdef patches aren't a prerequisite... Although it would just be a
lot easier to merge all of the patches above...
Rename lgdt3302 to lgdt330x, to make way for the addition of lgdt3303
support in future revisions.
Signed-off-by: Michael Krufky <[EMAIL PROTECTED]>
linux/drivers/media/dvb/frontends/Kconfig |4
linux/drivers/media/dvb/frontends/Makefile|2
linux/drivers/media/dvb/frontends/lgdt3302.c | 607 --
linux/drivers/media/dvb/frontends/lgdt3302.h | 49 -
linux/drivers/media/dvb/frontends/lgdt3302_priv.h | 72 -
linux/drivers/media/dvb/frontends/lgdt330x.c | 606 +
linux/drivers/media/dvb/frontends/lgdt330x.h | 49 +
linux/drivers/media/dvb/frontends/lgdt330x_priv.h | 70 +
linux/drivers/media/video/Kconfig |2
linux/drivers/media/video/cx88/Makefile |4
linux/drivers/media/video/cx88/cx88-dvb.c | 29
linux/drivers/media/video/cx88/cx88-i2c.c |4
12 files changed, 747 insertions(+), 751 deletions(-)
diff -u linux-2.6.13/drivers/media/video/cx88/cx88-dvb.c
linux/drivers/media/video/cx88/cx88-dvb.c
--- linux-2.6.13/drivers/media/video/cx88/cx88-dvb.c2005-07-25
02:37:22.0 +
+++ linux/drivers/media/video/cx88/cx88-dvb.c 2005-07-25 02:41:15.0
+
@@ -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.54 2005/07/25 05:13:50 mkrufky Exp $
*
* device driver for Conexant 2388x based TV cards
* MPEG Transport Stream (DVB) routines
@@ -31,7 +31,6 @@
#include
#include
-
#include "cx88.h"
#include "dvb-pll.h"
@@ -45,8 +44,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");
@@ -207,8 +206,8 @@
};
#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)
{
@@ -220,7 +219,7 @@
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;
@@ -233,7 +232,7 @@
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)
@@ -243,10 +242,10 @@
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
@@ -297,7 +296,7 @@
>core->i2c_adap);
break;
#endif
-#ifdef HAVE_LGDT3302
+#ifdef HAVE_LGDT330X
case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q:
dev->ts_gen_cntrl = 0x08;
{
@@ -310,10 +309,10 @@
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 = _pll_microtune_4042;
- dev->dvb.frontend = lgdt3302_attach(_3_gold,
+ dev->dvb.frontend = lgdt330x_attach(_3_gold,
>core->i2c_adap);
}
break;
@@ -329,7 +328,7 @@
[PATCH] DVB: rename lgdt3302 frontend module to lgdt330x
This patch depends on the following patches to be applied first in order
to apply cleanly:
01-lgdt3302-isolate-tuner.patch
02-lgdt3302-rf-input.patch
03-lgdt3302-suppress-compile-warning.patch
04-cx88-dvb-cleanup.patch
[-mm PATCH] v4l: hybrid dvb: fix warnings with -Wundef
[-mm PATCH] v4l: hybrid dvb: move #defines to Makefile
[-mm PATCH] v4l: hybrid dvb: rename CFLAGS from CONFIG_DVB_ back to
original HAVE_
I am listing these because I haven't seen any of these in -mm-commits
mailing list yet. (No commits at all for a week or so)
I am changing the name of this module now so that hopefully the name
will be changed before the release of 2.6.13 ... It wouldn't make sense
to release 2.6.13 with the name lgdt3302 in it, which will only be
renamed to lgdt330x in later versions.
Andrew-
If you, for any reason, don't want to send my #ifdef changes to 2.6.13
right away, just let me know and I'll regenerate these patches such that
the #ifdef patches aren't a prerequisite... Although it would just be a
lot easier to merge all of the patches above...
Rename lgdt3302 to lgdt330x, to make way for the addition of lgdt3303
support in future revisions.
Signed-off-by: Michael Krufky [EMAIL PROTECTED]
linux/drivers/media/dvb/frontends/Kconfig |4
linux/drivers/media/dvb/frontends/Makefile|2
linux/drivers/media/dvb/frontends/lgdt3302.c | 607 --
linux/drivers/media/dvb/frontends/lgdt3302.h | 49 -
linux/drivers/media/dvb/frontends/lgdt3302_priv.h | 72 -
linux/drivers/media/dvb/frontends/lgdt330x.c | 606 +
linux/drivers/media/dvb/frontends/lgdt330x.h | 49 +
linux/drivers/media/dvb/frontends/lgdt330x_priv.h | 70 +
linux/drivers/media/video/Kconfig |2
linux/drivers/media/video/cx88/Makefile |4
linux/drivers/media/video/cx88/cx88-dvb.c | 29
linux/drivers/media/video/cx88/cx88-i2c.c |4
12 files changed, 747 insertions(+), 751 deletions(-)
diff -u linux-2.6.13/drivers/media/video/cx88/cx88-dvb.c
linux/drivers/media/video/cx88/cx88-dvb.c
--- linux-2.6.13/drivers/media/video/cx88/cx88-dvb.c2005-07-25
02:37:22.0 +
+++ linux/drivers/media/video/cx88/cx88-dvb.c 2005-07-25 02:41:15.0
+
@@ -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.54 2005/07/25 05:13:50 mkrufky Exp $
*
* device driver for Conexant 2388x based TV cards
* MPEG Transport Stream (DVB) routines
@@ -31,7 +31,6 @@
#include linux/suspend.h
#include linux/config.h
-
#include cx88.h
#include dvb-pll.h
@@ -45,8 +44,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);
@@ -207,8 +206,8 @@
};
#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)
{
@@ -220,7 +219,7 @@
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;
@@ -233,7 +232,7 @@
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)
@@ -243,10 +242,10 @@
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
@@ -297,7 +296,7 @@
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;
{
@@ -310,10 +309,10 @@
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;
@@ -329,7
