diff options
author | Michael Krufky <devnull@localhost> | 2005-07-14 01:34:46 +0000 |
---|---|---|
committer | Michael Krufky <devnull@localhost> | 2005-07-14 01:34:46 +0000 |
commit | 76a624b145afe41884999f9b89fde40585aa3929 (patch) | |
tree | e18be4b43f44d93101a1645076e5268f854aa79e /v4l | |
parent | 9c97538e1711c0abf853ba63b7e415d614fe30a8 (diff) | |
download | mediapointer-dvb-s2-76a624b145afe41884999f9b89fde40585aa3929.tar.gz mediapointer-dvb-s2-76a624b145afe41884999f9b89fde40585aa3929.tar.bz2 |
* lgdt3302.c:
- fix QAM lock bug. Previously, it was necessary to first
scan in VSB before attempting to get a QAM lock.
Signed-off-by: Mac Michaels <wmichaels1@earthlink.net>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l')
-rw-r--r-- | v4l/ChangeLog | 11 | ||||
-rw-r--r-- | v4l/lgdt3302.c | 18 |
2 files changed, 13 insertions, 16 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 93f271f77..a16f203b8 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,5 +1,12 @@ -2005-07-13 17:11 Mauro Carvalho Chehab <mchehab@brturbo.com.br> +2005-07-14 01:20 mkrufky + * lgdt3302.c: + - fix QAM lock bug. Previously, it was necessary to first + scan in VSB before attempting to get a QAM lock. + Signed-off-by: Mac Michaels <wmichaels1@earthlink.net> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + +2005-07-13 17:11 mchehab * bttvp.h,cx88.h,dpl3518.c,ir-common.c, ir-common.h, saa7134.h, tveeprom.c, v4l1-compat.c, v4l2-common.c: - linux/version.h removed. @@ -8,7 +15,7 @@ * compat.h: - Included linux/version.h. -Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> 2005-07-13 13:22 mchehab * tea5761.c: diff --git a/v4l/lgdt3302.c b/v4l/lgdt3302.c index ac33f1e4d..c04ea4c12 100644 --- a/v4l/lgdt3302.c +++ b/v4l/lgdt3302.c @@ -1,5 +1,5 @@ /* - * $Id: lgdt3302.c,v 1.17 2005/07/12 04:09:24 mkrufky Exp $ + * $Id: lgdt3302.c,v 1.18 2005/07/14 01:34:46 mkrufky Exp $ * * Support for LGDT3302 (DViCO FustionHDTV 3 Gold) - VSB/QAM * @@ -219,13 +219,11 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe, static u8 demux_ctrl_cfg[] = { DEMUX_CONTROL, 0xfb }; static u8 agc_rf_cfg[] = { AGC_RF_BANDWIDTH0, 0x40, 0x93, 0x00 }; static u8 agc_ctrl_cfg[] = { AGC_FUNC_CTRL2, 0xc6, 0x40 }; - static u8 agc_delay_cfg[] = { AGC_DELAY0, 0x00, 0x00, 0x00 }; + static u8 agc_delay_cfg[] = { AGC_DELAY0, 0x07, 0x00, 0xfe }; static u8 agc_loop_cfg[] = { AGC_LOOP_BANDWIDTH0, 0x08, 0x9a }; /* Change only if we are actually changing the modulation */ if (state->current_modulation != param->u.vsb.modulation) { - int value; - switch(param->u.vsb.modulation) { case VSB_8: dprintk("%s: VSB_8 MODE\n", __FUNCTION__); @@ -278,16 +276,8 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe, recovery center frequency register */ i2c_writebytes(state, state->config->demod_address, vsb_freq_cfg, sizeof(vsb_freq_cfg)); - /* Set the value of 'INLVTHD' register 0x2a/0x2c - to value from 'IFACC' register 0x39/0x3b -1 */ - i2c_selectreadbytes(state, AGC_RFIF_ACC0, - &agc_delay_cfg[1], 3); - value = ((agc_delay_cfg[1] & 0x0f) << 8) | agc_delay_cfg[3]; - value = value -1; - dprintk("%s IFACC -1 = 0x%03x\n", __FUNCTION__, value); - agc_delay_cfg[1] = (value >> 8) & 0x0f; - agc_delay_cfg[2] = 0x00; - agc_delay_cfg[3] = value & 0xff; + + /* Set the value of 'INLVTHD' register 0x2a/0x2c to 0x7fe */ i2c_writebytes(state, state->config->demod_address, agc_delay_cfg, sizeof(agc_delay_cfg)); |