summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/cx88/cx88-dvb.c12
-rw-r--r--v4l/ChangeLog9
2 files changed, 20 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index c0f0c3800..cc7aebd8c 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.71 2005/10/27 04:33:27 mkrufky Exp $
+ * $Id: cx88-dvb.c,v 1.72 2005/11/02 05:11:17 mkrufky Exp $
*
* device driver for Conexant 2388x based TV cards
* MPEG Transport Stream (DVB) routines
@@ -302,10 +302,20 @@ static int nxt200x_set_ts_param(struct dvb_frontend* fe,
return 0;
}
+static int nxt200x_set_pll_input(u8* buf, int input)
+{
+ if (input)
+ buf[3] |= 0x08;
+ else
+ buf[3] &= ~0x08;
+ return 0;
+}
+
static struct nxt200x_config ati_hdtvwonder = {
.demod_address = 0x0a,
.pll_address = 0x61,
.pll_desc = &dvb_pll_tuv1236d,
+ .set_pll_input = nxt200x_set_pll_input,
.set_ts_params = nxt200x_set_ts_param,
};
#endif
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index ffd82414a..ac851b295 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-02 05:10 mkrufky
+
+ * ../linux/drivers/media/video/cx88/cx88-dvb.c:
+ (nxt200x_set_pll_input):
+ - Added function for nxt200x to change pll input
+
+ Signed-off-by: Kirk Lapray <kirk.lapray@gmail.com>
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-11-02 00:39 mkrufky
* ../v4l/scripts/merge-trees.sh: