Skip to content

L
linux
Commit 27d40321 authored by Manu Abraham's avatar Manu Abraham Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (11682): STV0900/STV0903: Add support for Silicon cut >= 3 

1. Support Silicon Cut >= 3.0
2. Remove support for obsolete cuts: 1.0. 1.1. 1.2
3. Try to catch more error cases

Driver doesn't now attach to obsolete silcon cuts, It just simply quits.
Results in code simplification, with removal of the obsolete cuts.
Signed-off-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b5b2b7ed
Hide whitespace changes
Inline Side-by-side
Showing with 766 additions and 508 deletions
drivers/media/dvb/frontends/stv090x.c
View file @ 27d40321
...@@ -503,25 +503,6 @@ static struct stv090x_reg stv0903_cut20_val[] = { ...@@ -503,25 +503,6 @@ static struct stv090x_reg stv0903_cut20_val[] = {
{ STV090x_GAINLLR_NF17, 0x21 } { STV090x_GAINLLR_NF17, 0x21 }
}; };
/* Cut 1.x Long Frame Tracking CR loop */
static struct stv090x_long_frame_crloop stv090x_s2_crl[] = {
/* MODCOD 2MPon 2MPoff 5MPon 5MPoff 10MPon 10MPoff 20MPon 20MPoff 30MPon 30MPoff */
{ STV090x_QPSK_12, 0x1c, 0x0d, 0x1b, 0x2c, 0x3a, 0x1c, 0x2a, 0x3b, 0x2a, 0x1b },
{ STV090x_QPSK_35, 0x2c, 0x0d, 0x2b, 0x2c, 0x3a, 0x0c, 0x3a, 0x2b, 0x2a, 0x0b },
{ STV090x_QPSK_23, 0x2c, 0x0d, 0x2b, 0x2c, 0x0b, 0x0c, 0x3a, 0x1b, 0x2a, 0x3a },
{ STV090x_QPSK_34, 0x3c, 0x0d, 0x3b, 0x1c, 0x0b, 0x3b, 0x3a, 0x0b, 0x2a, 0x3a },
{ STV090x_QPSK_45, 0x3c, 0x0d, 0x3b, 0x1c, 0x0b, 0x3b, 0x3a, 0x0b, 0x2a, 0x3a },
{ STV090x_QPSK_56, 0x0d, 0x0d, 0x3b, 0x1c, 0x0b, 0x3b, 0x3a, 0x0b, 0x2a, 0x3a },
{ STV090x_QPSK_89, 0x0d, 0x0d, 0x3b, 0x1c, 0x1b, 0x3b, 0x3a, 0x0b, 0x2a, 0x3a },
{ STV090x_QPSK_910, 0x1d, 0x0d, 0x3b, 0x1c, 0x1b, 0x3b, 0x3a, 0x0b, 0x2a, 0x3a },
{ STV090x_8PSK_35, 0x29, 0x3b, 0x09, 0x2b, 0x38, 0x0b, 0x18, 0x1a, 0x08, 0x0a },
{ STV090x_8PSK_23, 0x0a, 0x3b, 0x29, 0x2b, 0x19, 0x0b, 0x38, 0x1a, 0x18, 0x0a },
{ STV090x_8PSK_34, 0x3a, 0x3b, 0x2a, 0x2b, 0x39, 0x0b, 0x19, 0x1a, 0x38, 0x0a },
{ STV090x_8PSK_56, 0x1b, 0x3b, 0x0b, 0x2b, 0x1a, 0x0b, 0x39, 0x1a, 0x19, 0x0a },
{ STV090x_8PSK_89, 0x3b, 0x3b, 0x0b, 0x2b, 0x2a, 0x0b, 0x39, 0x1a, 0x29, 0x39 },
{ STV090x_8PSK_910, 0x3b, 0x3b, 0x0b, 0x2b, 0x2a, 0x0b, 0x39, 0x1a, 0x29, 0x39 }
};
/* Cut 2.0 Long Frame Tracking CR loop */ /* Cut 2.0 Long Frame Tracking CR loop */
static struct stv090x_long_frame_crloop stv090x_s2_crl_cut20[] = { static struct stv090x_long_frame_crloop stv090x_s2_crl_cut20[] = {
/* MODCOD 2MPon 2MPoff 5MPon 5MPoff 10MPon 10MPoff 20MPon 20MPoff 30MPon 30MPoff */ /* MODCOD 2MPon 2MPoff 5MPon 5MPoff 10MPon 10MPoff 20MPon 20MPoff 30MPon 30MPoff */
...@@ -541,6 +522,24 @@ static struct stv090x_long_frame_crloop stv090x_s2_crl_cut20[] = { ...@@ -541,6 +522,24 @@ static struct stv090x_long_frame_crloop stv090x_s2_crl_cut20[] = {
{ STV090x_8PSK_910, 0x3e, 0x3e, 0x1e, 0x2e, 0x3d, 0x1e, 0x1d, 0x2d, 0x0d, 0x1d } { STV090x_8PSK_910, 0x3e, 0x3e, 0x1e, 0x2e, 0x3d, 0x1e, 0x1d, 0x2d, 0x0d, 0x1d }
}; };
/* Cut 3.0 Long Frame Tracking CR loop */
static struct stv090x_long_frame_crloop stv090x_s2_crl_cut30[] = {
/* MODCOD 2MPon 2MPoff 5MPon 5MPoff 10MPon 10MPoff 20MPon 20MPoff 30MPon 30MPoff */
{ STV090x_QPSK_12, 0x3c, 0x2c, 0x0c, 0x2c, 0x1b, 0x2c, 0x1b, 0x1c, 0x0b, 0x3b },
{ STV090x_QPSK_35, 0x0d, 0x0d, 0x0c, 0x0d, 0x1b, 0x3c, 0x1b, 0x1c, 0x0b, 0x3b },
{ STV090x_QPSK_23, 0x1d, 0x0d, 0x0c, 0x1d, 0x2b, 0x3c, 0x1b, 0x1c, 0x0b, 0x3b },
{ STV090x_QPSK_34, 0x1d, 0x1d, 0x0c, 0x1d, 0x2b, 0x3c, 0x1b, 0x1c, 0x0b, 0x3b },
{ STV090x_QPSK_45, 0x2d, 0x1d, 0x1c, 0x1d, 0x2b, 0x3c, 0x2b, 0x0c, 0x1b, 0x3b },
{ STV090x_QPSK_56, 0x2d, 0x1d, 0x1c, 0x1d, 0x2b, 0x3c, 0x2b, 0x0c, 0x1b, 0x3b },
{ STV090x_QPSK_89, 0x3d, 0x2d, 0x1c, 0x1d, 0x3b, 0x3c, 0x2b, 0x0c, 0x1b, 0x3b },
{ STV090x_QPSK_910, 0x3d, 0x2d, 0x1c, 0x1d, 0x3b, 0x3c, 0x2b, 0x0c, 0x1b, 0x3b },
{ STV090x_8PSK_35, 0x39, 0x29, 0x39, 0x19, 0x19, 0x19, 0x19, 0x19, 0x09, 0x19 },
{ STV090x_8PSK_23, 0x2a, 0x39, 0x1a, 0x0a, 0x39, 0x0a, 0x29, 0x39, 0x29, 0x0a },
{ STV090x_8PSK_34, 0x2b, 0x3a, 0x1b, 0x1b, 0x3a, 0x1b, 0x1a, 0x0b, 0x1a, 0x3a },
{ STV090x_8PSK_56, 0x0c, 0x1b, 0x3b, 0x3b, 0x1b, 0x3b, 0x3a, 0x3b, 0x3a, 0x1b },
{ STV090x_8PSK_89, 0x0d, 0x3c, 0x2c, 0x2c, 0x2b, 0x0c, 0x0b, 0x3b, 0x0b, 0x1b },
{ STV090x_8PSK_910, 0x0d, 0x0d, 0x2c, 0x3c, 0x3b, 0x1c, 0x0b, 0x3b, 0x0b, 0x1b }
};
/* Cut 2.0 Long Frame Tracking CR Loop */ /* Cut 2.0 Long Frame Tracking CR Loop */
static struct stv090x_long_frame_crloop stv090x_s2_apsk_crl_cut20[] = { static struct stv090x_long_frame_crloop stv090x_s2_apsk_crl_cut20[] = {
...@@ -558,6 +557,21 @@ static struct stv090x_long_frame_crloop stv090x_s2_apsk_crl_cut20[] = { ...@@ -558,6 +557,21 @@ static struct stv090x_long_frame_crloop stv090x_s2_apsk_crl_cut20[] = {
{ STV090x_32APSK_910, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c } { STV090x_32APSK_910, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c }
}; };
/* Cut 3.0 Long Frame Tracking CR Loop */
static struct stv090x_long_frame_crloop stv090x_s2_apsk_crl_cut30[] = {
/* MODCOD 2MPon 2MPoff 5MPon 5MPoff 10MPon 10MPoff 20MPon 20MPoff 30MPon 30MPoff */
{ STV090x_16APSK_23, 0x0a, 0x0a, 0x0a, 0x0a, 0x1a, 0x0a, 0x3a, 0x0a, 0x2a, 0x0a },
{ STV090x_16APSK_34, 0x0a, 0x0a, 0x0a, 0x0a, 0x0b, 0x0a, 0x3b, 0x0a, 0x1b, 0x0a },
{ STV090x_16APSK_45, 0x0a, 0x0a, 0x0a, 0x0a, 0x1b, 0x0a, 0x3b, 0x0a, 0x2b, 0x0a },
{ STV090x_16APSK_56, 0x0a, 0x0a, 0x0a, 0x0a, 0x1b, 0x0a, 0x3b, 0x0a, 0x2b, 0x0a },
{ STV090x_16APSK_89, 0x0a, 0x0a, 0x0a, 0x0a, 0x2b, 0x0a, 0x0c, 0x0a, 0x3b, 0x0a },
{ STV090x_16APSK_910, 0x0a, 0x0a, 0x0a, 0x0a, 0x2b, 0x0a, 0x0c, 0x0a, 0x3b, 0x0a },
{ STV090x_32APSK_34, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a },
{ STV090x_32APSK_45, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a },
{ STV090x_32APSK_56, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a },
{ STV090x_32APSK_89, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a },
{ STV090x_32APSK_910, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a }
};
static struct stv090x_long_frame_crloop stv090x_s2_lowqpsk_crl_cut20[] = { static struct stv090x_long_frame_crloop stv090x_s2_lowqpsk_crl_cut20[] = {
/* MODCOD 2MPon 2MPoff 5MPon 5MPoff 10MPon 10MPoff 20MPon 20MPoff 30MPon 30MPoff */ /* MODCOD 2MPon 2MPoff 5MPon 5MPoff 10MPon 10MPoff 20MPon 20MPoff 30MPon 30MPoff */
...@@ -566,16 +580,30 @@ static struct stv090x_long_frame_crloop stv090x_s2_lowqpsk_crl_cut20[] = { ...@@ -566,16 +580,30 @@ static struct stv090x_long_frame_crloop stv090x_s2_lowqpsk_crl_cut20[] = {
{ STV090x_QPSK_25, 0x1f, 0x3f, 0x1e, 0x3f, 0x3d, 0x1f, 0x3d, 0x3e, 0x3d, 0x2e } { STV090x_QPSK_25, 0x1f, 0x3f, 0x1e, 0x3f, 0x3d, 0x1f, 0x3d, 0x3e, 0x3d, 0x2e }
}; };
static struct stv090x_long_frame_crloop stv090x_s2_lowqpsk_crl_cut30[] = {
/* MODCOD 2MPon 2MPoff 5MPon 5MPoff 10MPon 10MPoff 20MPon 20MPoff 30MPon 30MPoff */
{ STV090x_QPSK_14, 0x0c, 0x3c, 0x0b, 0x3c, 0x2a, 0x2c, 0x2a, 0x1c, 0x3a, 0x3b },
{ STV090x_QPSK_13, 0x0c, 0x3c, 0x0b, 0x3c, 0x2a, 0x2c, 0x3a, 0x0c, 0x3a, 0x2b },
{ STV090x_QPSK_25, 0x1c, 0x3c, 0x1b, 0x3c, 0x3a, 0x1c, 0x3a, 0x3b, 0x3a, 0x2b }
};
/* Cut 1.2 & 2.0 Short Frame Tracking CR Loop */ /* Cut 2.0 Short Frame Tracking CR Loop */
static struct stv090x_short_frame_crloop stv090x_s2_short_crl[] = { static struct stv090x_short_frame_crloop stv090x_s2_short_crl_cut20[] = {
/* MODCOD 2M_cut1.2 2M_cut2.0 5M_cut1.2 5M_cut2.0 10M_cut1.2 10M_cut2.0 20M_cut1.2 20M_cut2.0 30M_cut1.2 30M_cut2.0 */ /* MODCOD 2M 5M 10M 20M 30M */
{ STV090x_QPSK, 0x3c, 0x2f, 0x2b, 0x2e, 0x0b, 0x0e, 0x3a, 0x0e, 0x2a, 0x3d }, { STV090x_QPSK, 0x2f, 0x2e, 0x0e, 0x0e, 0x3d },
{ STV090x_8PSK, 0x0b, 0x3e, 0x2a, 0x0e, 0x0a, 0x2d, 0x19, 0x0d, 0x09, 0x3c }, { STV090x_8PSK, 0x3e, 0x0e, 0x2d, 0x0d, 0x3c },
{ STV090x_16APSK, 0x1b, 0x1e, 0x1b, 0x1e, 0x1b, 0x1e, 0x3a, 0x3d, 0x2a, 0x2d }, { STV090x_16APSK, 0x1e, 0x1e, 0x1e, 0x3d, 0x2d },
{ STV090x_32APSK, 0x1b, 0x1e, 0x1b, 0x1e, 0x1b, 0x1e, 0x3a, 0x3d, 0x2a, 0x2d } { STV090x_32APSK, 0x1e, 0x1e, 0x1e, 0x3d, 0x2d }
}; };
/* Cut 3.0 Short Frame Tracking CR Loop */
static struct stv090x_short_frame_crloop stv090x_s2_short_crl_cut30[] = {
/* MODCOD 2M 5M 10M 20M 30M */
{ STV090x_QPSK, 0x2C, 0x2B, 0x0B, 0x0B, 0x3A },
{ STV090x_8PSK, 0x3B, 0x0B, 0x2A, 0x0A, 0x39 },
{ STV090x_16APSK, 0x1B, 0x1B, 0x1B, 0x3A, 0x2A },
{ STV090x_32APSK, 0x1B, 0x1B, 0x1B, 0x3A, 0x2A }
};
static inline s32 comp2(s32 __x, s32 __width) static inline s32 comp2(s32 __x, s32 __width)
{ {
...@@ -987,74 +1015,83 @@ static int stv090x_stop_modcod(struct stv090x_state *state) ...@@ -987,74 +1015,83 @@ static int stv090x_stop_modcod(struct stv090x_state *state)
static int stv090x_activate_modcod(struct stv090x_state *state) static int stv090x_activate_modcod(struct stv090x_state *state)
{ {
u32 matype, modcod, f_mod, index; if (STV090x_WRITE_DEMOD(state, MODCODLST0, 0xff) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST1, 0xfc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST2, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST3, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST4, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST5, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST6, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST7, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST8, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST9, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTA, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTB, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTC, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTD, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTE, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTF, 0xcf) < 0)
goto err;
if (state->dev_ver <= 0x11) { return 0;
msleep(5); err:
modcod = STV090x_READ_DEMOD(state, PLHMODCOD); dprintk(FE_ERROR, 1, "I/O error");
matype = modcod & 0x03; return -1;
modcod = (modcod & 0x7f) >> 2; }
index = STV090x_ADDR_OFFST(state, MODCODLSTF) - (modcod / 2);
static int stv090x_activate_modcod_single(struct stv090x_state *state)
{
if (STV090x_WRITE_DEMOD(state, MODCODLST0, 0xff) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST1, 0xf0) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST2, 0x00) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST3, 0x00) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST4, 0x00) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST5, 0x00) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST6, 0x00) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST7, 0x00) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST8, 0x00) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST9, 0x00) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTA, 0x00) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTB, 0x00) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTC, 0x00) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTD, 0x00) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTE, 0x00) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTF, 0x0f) < 0)
goto err;
switch (matype) {
default:
case 0:
f_mod = 14;
break;
case 1:
f_mod = 13;
break;
case 2:
f_mod = 11;
break;
case 3:
f_mod = 7;
break;
}
if (matype <= 1) {
if (modcod % 2) {
if (stv090x_write_reg(state, index, 0xf0 | f_mod) < 0)
goto err;
} else {
if (stv090x_write_reg(state, index, (f_mod << 4) | 0x0f) < 0)
goto err;
}
}
} else if (state->dev_ver >= 0x12) {
if (STV090x_WRITE_DEMOD(state, MODCODLST0, 0xff) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST1, 0xfc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST2, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST3, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST4, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST5, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST6, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST7, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST8, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST9, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTA, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTB, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTC, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTD, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTE, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTF, 0xcf) < 0)
goto err;
}
return 0; return 0;
err: err:
dprintk(FE_ERROR, 1, "I/O error"); dprintk(FE_ERROR, 1, "I/O error");
return -1; return -1;
...@@ -1094,6 +1131,40 @@ static int stv090x_vitclk_ctl(struct stv090x_state *state, int enable) ...@@ -1094,6 +1131,40 @@ static int stv090x_vitclk_ctl(struct stv090x_state *state, int enable)
return -1; return -1;
} }
static int stv090x_dvbs_track_crl(struct stv090x_state *state)
{
if (state->dev_ver >= 0x30) {
/* Set ACLC BCLC optimised value vs SR */
if (state->srate >= 15000000) {
if (STV090x_WRITE_DEMOD(state, ACLC, 0x2b) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, BCLC, 0x1a) < 0)
goto err;
} else if ((state->srate >= 7000000) && (15000000 > state->srate)) {
if (STV090x_WRITE_DEMOD(state, ACLC, 0x0c) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, BCLC, 0x1b) < 0)
goto err;
} else if (state->srate < 7000000) {
if (STV090x_WRITE_DEMOD(state, ACLC, 0x2c) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, BCLC, 0x1c) < 0)
goto err;
}
} else {
/* Cut 2.0 */
if (STV090x_WRITE_DEMOD(state, ACLC, 0x1a) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, BCLC, 0x09) < 0)
goto err;
}
return 0;
err:
dprintk(FE_ERROR, 1, "I/O error");
return -1;
}
static int stv090x_delivery_search(struct stv090x_state *state) static int stv090x_delivery_search(struct stv090x_state *state)
{ {
u32 reg; u32 reg;
...@@ -1107,19 +1178,22 @@ static int stv090x_delivery_search(struct stv090x_state *state) ...@@ -1107,19 +1178,22 @@ static int stv090x_delivery_search(struct stv090x_state *state)
if (STV090x_WRITE_DEMOD(state, DMDCFGMD, reg) < 0) if (STV090x_WRITE_DEMOD(state, DMDCFGMD, reg) < 0)
goto err; goto err;
/* Activate Viterbi decoder in legacy search, do not use FRESVIT1, might impact VITERBI2 */ /* Activate Viterbi decoder in legacy search,
* do not use FRESVIT1, might impact VITERBI2
*/
if (stv090x_vitclk_ctl(state, 0) < 0) if (stv090x_vitclk_ctl(state, 0) < 0)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, ACLC, 0x1a) < 0) if (stv090x_dvbs_track_crl(state) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, BCLC, 0x09) < 0)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, CAR2CFG, 0x22) < 0) /* disable DVB-S2 */ if (STV090x_WRITE_DEMOD(state, CAR2CFG, 0x22) < 0) /* disable DVB-S2 */
goto err; goto err;
stv090x_set_vit_thacq(state); if (stv090x_set_vit_thacq(state) < 0)
stv090x_set_viterbi(state); goto err;
if (stv090x_set_viterbi(state) < 0)
goto err;
break; break;
case STV090x_SEARCH_DVBS2: case STV090x_SEARCH_DVBS2:
...@@ -1140,24 +1214,36 @@ static int stv090x_delivery_search(struct stv090x_state *state) ...@@ -1140,24 +1214,36 @@ static int stv090x_delivery_search(struct stv090x_state *state)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, BCLC, 0x09) < 0) if (STV090x_WRITE_DEMOD(state, BCLC, 0x09) < 0)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, CAR2CFG, 0x26) < 0)
goto err; if (state->dev_ver <= 0x20) {
/* enable S2 carrier loop */
if (STV090x_WRITE_DEMOD(state, CAR2CFG, 0x26) < 0)
goto err;
} else {
/* > Cut 3: Stop carrier 3 */
if (STV090x_WRITE_DEMOD(state, CAR2CFG, 0x66) < 0)
goto err;
}
if (state->demod_mode != STV090x_SINGLE) { if (state->demod_mode != STV090x_SINGLE) {
if (state->dev_ver <= 0x11) /* 900 in dual TS mode */ /* Cut 2: enable link during search */
stv090x_stop_modcod(state); if (stv090x_activate_modcod(state) < 0)
else goto err;
stv090x_activate_modcod(state); } else {
/* Single demodulator
* Authorize SHORT and LONG frames,
* QPSK, 8PSK, 16APSK and 32APSK
*/
if (stv090x_activate_modcod_single(state) < 0)
goto err;
} }
break; break;
case STV090x_SEARCH_AUTO: case STV090x_SEARCH_AUTO:
default: default:
/* enable DVB-S2 and DVB-S2 in Auto MODE */
reg = STV090x_READ_DEMOD(state, DMDCFGMD); reg = STV090x_READ_DEMOD(state, DMDCFGMD);
STV090x_SETFIELD_Px(reg, DVBS1_ENABLE_FIELD, 0);
STV090x_SETFIELD_Px(reg, DVBS2_ENABLE_FIELD, 0);
if (STV090x_WRITE_DEMOD(state, DMDCFGMD, reg) < 0)
goto err;
STV090x_SETFIELD_Px(reg, DVBS1_ENABLE_FIELD, 1); STV090x_SETFIELD_Px(reg, DVBS1_ENABLE_FIELD, 1);
STV090x_SETFIELD_Px(reg, DVBS2_ENABLE_FIELD, 1); STV090x_SETFIELD_Px(reg, DVBS2_ENABLE_FIELD, 1);
if (STV090x_WRITE_DEMOD(state, DMDCFGMD, reg) < 0) if (STV090x_WRITE_DEMOD(state, DMDCFGMD, reg) < 0)
...@@ -1166,21 +1252,46 @@ static int stv090x_delivery_search(struct stv090x_state *state) ...@@ -1166,21 +1252,46 @@ static int stv090x_delivery_search(struct stv090x_state *state)
if (stv090x_vitclk_ctl(state, 0) < 0) if (stv090x_vitclk_ctl(state, 0) < 0)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, ACLC, 0x1a) < 0) if (stv090x_dvbs_track_crl(state) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, BCLC, 0x09) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, CAR2CFG, 0x26) < 0)
goto err; goto err;
if (state->dev_ver <= 0x20) {
/* enable S2 carrier loop */
if (STV090x_WRITE_DEMOD(state, CAR2CFG, 0x26) < 0)
goto err;
} else {
/* > Cut 3: Stop carrier 3 */
if (STV090x_WRITE_DEMOD(state, CAR2CFG, 0x66) < 0)
goto err;
}
if (state->demod_mode != STV090x_SINGLE) { if (state->demod_mode != STV090x_SINGLE) {
if (state->dev_ver <= 0x11) /* 900 in dual TS mode */ /* Cut 2: enable link during search */
stv090x_stop_modcod(state); if (stv090x_activate_modcod(state) < 0)
else goto err;
stv090x_activate_modcod(state); } else {
/* Single demodulator
* Authorize SHORT and LONG frames,
* QPSK, 8PSK, 16APSK and 32APSK
*/
if (stv090x_activate_modcod_single(state) < 0)
goto err;
} }
stv090x_set_vit_thacq(state);
stv090x_set_viterbi(state); if (state->srate >= 2000000) {
/* Srate >= 2MSPS, Viterbi threshold to acquire */
if (stv090x_set_vit_thacq(state) < 0)
goto err;
} else {
/* Srate < 2MSPS, Reset Viterbi thresholdto track
* and then re-acquire
*/
if (stv090x_set_vit_thtracq(state) < 0)
goto err;
}
if (stv090x_set_viterbi(state) < 0)
goto err;
break; break;
} }
return 0; return 0;
...@@ -1191,45 +1302,87 @@ static int stv090x_delivery_search(struct stv090x_state *state) ...@@ -1191,45 +1302,87 @@ static int stv090x_delivery_search(struct stv090x_state *state)
static int stv090x_start_search(struct stv090x_state *state) static int stv090x_start_search(struct stv090x_state *state)
{ {
u32 reg; u32 reg, freq_abs;
s16 freq;
/* Reset demodulator */
reg = STV090x_READ_DEMOD(state, DMDISTATE); reg = STV090x_READ_DEMOD(state, DMDISTATE);
STV090x_SETFIELD_Px(reg, I2C_DEMOD_MODE_FIELD, 0x1f); STV090x_SETFIELD_Px(reg, I2C_DEMOD_MODE_FIELD, 0x1f);
if (STV090x_WRITE_DEMOD(state, DMDISTATE, reg) < 0) if (STV090x_WRITE_DEMOD(state, DMDISTATE, reg) < 0)
goto err; goto err;
if (state->dev_ver == 0x10) { if (state->dev_ver <= 0x20) {
if (STV090x_WRITE_DEMOD(state, CORRELEXP, 0xaa) < 0) if (state->srate <= 5000000) {
goto err; if (STV090x_WRITE_DEMOD(state, CARCFG, 0x44) < 0)
} goto err;
if (state->dev_ver < 0x20) { if (STV090x_WRITE_DEMOD(state, CFRUP1, 0x0f) < 0)
if (STV090x_WRITE_DEMOD(state, CARHDR, 0x55) < 0) goto err;
goto err; if (STV090x_WRITE_DEMOD(state, CFRUP1, 0xff) < 0)
} goto err;
if (state->srate <= 5000000) { if (STV090x_WRITE_DEMOD(state, CFRLOW1, 0xf0) < 0)
if (STV090x_WRITE_DEMOD(state, CARCFG, 0x44) < 0) goto err;
goto err; if (STV090x_WRITE_DEMOD(state, CFRLOW0, 0x00) < 0)
if (STV090x_WRITE_DEMOD(state, CFRUP1, 0x0f) < 0) goto err;
goto err;
if (STV090x_WRITE_DEMOD(state, CFRUP1, 0xff) < 0) /*enlarge the timing bandwith for Low SR*/
goto err; if (STV090x_WRITE_DEMOD(state, RTCS2, 0x68) < 0)
if (STV090x_WRITE_DEMOD(state, CFRLOW1, 0xf0) < 0) goto err;
} else {
/* If the symbol rate is >5 Msps
Set The carrier search up and low to auto mode */
if (STV090x_WRITE_DEMOD(state, CARCFG, 0xc4) < 0)
goto err;
/*reduce the timing bandwith for high SR*/
if (STV090x_WRITE_DEMOD(state, RTCS2, 0x44) < 0)
goto err;
}
} else {
/* >= Cut 3 */
if (state->srate <= 5000000) {
/* enlarge the timing bandwith for Low SR */
STV090x_WRITE_DEMOD(state, RTCS2, 0x68);
} else {
/* reduce timing bandwith for high SR */
STV090x_WRITE_DEMOD(state, RTCS2, 0x44);
}
/* Set CFR min and max to manual mode */
STV090x_WRITE_DEMOD(state, CARCFG, 0x46);
if (state->algo == STV090x_WARM_SEARCH) {
/* WARM Start
* CFR min = -1MHz,
* CFR max = +1MHz
*/
freq_abs = 1000 << 16;
freq_abs /= (state->mclk / 1000);
freq = (s16) freq_abs;
} else {
/* COLD Start
* CFR min =- (SearchRange / 2 + 600KHz)
* CFR max = +(SearchRange / 2 + 600KHz)
* (600KHz for the tuner step size)
*/
freq_abs = (state->search_range / 2000) + 600;
freq_abs = freq_abs << 16;
freq_abs /= (state->mclk / 1000);
freq = (s16) freq_abs;
}
if (STV090x_WRITE_DEMOD(state, CFRUP1, MSB(freq)) < 0)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, CFRLOW0, 0x00) < 0) if (STV090x_WRITE_DEMOD(state, CFRUP1, LSB(freq)) < 0)
goto err; goto err;
/*enlarge the timing bandwith for Low SR*/ freq *= -1;
if (STV090x_WRITE_DEMOD(state, RTCS2, 0x68) < 0)
goto err; if (STV090x_WRITE_DEMOD(state, CFRLOW1, MSB(freq)) < 0)
} else {
/* If the symbol rate is >5 Msps
Set The carrier search up and low to auto mode */
if (STV090x_WRITE_DEMOD(state, CARCFG, 0xc4) < 0)
goto err; goto err;
/*reduce the timing bandwith for high SR*/ if (STV090x_WRITE_DEMOD(state, CFRLOW0, LSB(freq)) < 0)
if (STV090x_WRITE_DEMOD(state, RTCS2, 0x44) < 0)
goto err; goto err;
} }
if (STV090x_WRITE_DEMOD(state, CFRINIT1, 0) < 0) if (STV090x_WRITE_DEMOD(state, CFRINIT1, 0) < 0)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, CFRINIT0, 0) < 0) if (STV090x_WRITE_DEMOD(state, CFRINIT0, 0) < 0)
...@@ -1269,7 +1422,22 @@ static int stv090x_start_search(struct stv090x_state *state) ...@@ -1269,7 +1422,22 @@ static int stv090x_start_search(struct stv090x_state *state)
if (STV090x_WRITE_DEMOD(state, DMDCFG2, reg) < 0) if (STV090x_WRITE_DEMOD(state, DMDCFG2, reg) < 0)
goto err; goto err;
if (state->dev_ver >= 0x20) { /*Frequency offset detector setting*/ if (state->dev_ver >= 0x20) {
/*Frequency offset detector setting*/
if (state->srate < 2000000) {
if (state->dev_ver <= 0x20) {
/* Cut 2 */
if (STV090x_WRITE_DEMOD(state, CARFREQ, 0x39) < 0)
goto err;
} else {
/* Cut 2 */
if (STV090x_WRITE_DEMOD(state, CARFREQ, 0x89) < 0)
goto err;
}
if (STV090x_WRITE_DEMOD(state, CARHDR, 0x40) < 0)
goto err;
}
if (state->srate < 10000000) { if (state->srate < 10000000) {
if (STV090x_WRITE_DEMOD(state, CARFREQ, 0x4c) < 0) if (STV090x_WRITE_DEMOD(state, CARFREQ, 0x4c) < 0)
goto err; goto err;
...@@ -1288,14 +1456,18 @@ static int stv090x_start_search(struct stv090x_state *state) ...@@ -1288,14 +1456,18 @@ static int stv090x_start_search(struct stv090x_state *state)
} }
switch (state->algo) { switch (state->algo) {
case STV090x_WARM_SEARCH:/*The symbol rate and the exact carrier Frequency are known */ case STV090x_WARM_SEARCH:
/* The symbol rate and the exact
* carrier Frequency are known
*/
if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1f) < 0) if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1f) < 0)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x18) < 0) if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x18) < 0)
goto err; goto err;
break; break;
case STV090x_COLD_SEARCH:/*The symbol rate is known*/ case STV090x_COLD_SEARCH:
/* The symbol rate is known */
if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1f) < 0) if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1f) < 0)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x15) < 0) if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x15) < 0)
...@@ -1334,7 +1506,8 @@ static int stv090x_get_agc2_min_level(struct stv090x_state *state) ...@@ -1334,7 +1506,8 @@ static int stv090x_get_agc2_min_level(struct stv090x_state *state)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, DMDTOM, 0x00) < 0) /* stop acq @ coarse carrier state */ if (STV090x_WRITE_DEMOD(state, DMDTOM, 0x00) < 0) /* stop acq @ coarse carrier state */
goto err; goto err;
stv090x_set_srate(state, 1000000); if (stv090x_set_srate(state, 1000000) < 0)
goto err;
steps = -1 + state->search_range / 1000000; steps = -1 + state->search_range / 1000000;
steps /= 2; steps /= 2;
...@@ -1441,15 +1614,16 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state) ...@@ -1441,15 +1614,16 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state)
if (STV090x_WRITE_DEMOD(state, AGC2REF, 0x60) < 0) if (STV090x_WRITE_DEMOD(state, AGC2REF, 0x60) < 0)
goto err; goto err;
if (state->dev_ver >= 0x20) { if (state->dev_ver >= 0x30) {
if (STV090x_WRITE_DEMOD(state, CARFREQ, 0x6a) < 0) if (STV090x_WRITE_DEMOD(state, CARFREQ, 0x99) < 0)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, SFRSTEP, 0x95) < 0) if (STV090x_WRITE_DEMOD(state, SFRSTEP, 0x95) < 0)
goto err; goto err;
} else {
if (STV090x_WRITE_DEMOD(state, CARFREQ, 0xed) < 0) } else if (state->dev_ver >= 0x20) {
if (STV090x_WRITE_DEMOD(state, CARFREQ, 0x6a) < 0)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, SFRSTEP, 0x73) < 0) if (STV090x_WRITE_DEMOD(state, SFRSTEP, 0x95) < 0)
goto err; goto err;
} }
...@@ -1503,27 +1677,39 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state) ...@@ -1503,27 +1677,39 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state)
freq -= cur_step * car_step; freq -= cur_step * car_step;
/* Setup tuner */ /* Setup tuner */
stv090x_i2c_gate_ctrl(fe, 1); if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
goto err;
if (state->config->tuner_set_frequency) if (state->config->tuner_set_frequency) {
state->config->tuner_set_frequency(fe, state->frequency); if (state->config->tuner_set_frequency(fe, state->frequency) < 0)
goto err;
}
if (state->config->tuner_set_bandwidth) if (state->config->tuner_set_bandwidth) {
state->config->tuner_set_bandwidth(fe, state->tuner_bw); if (state->config->tuner_set_bandwidth(fe, state->tuner_bw) < 0)
goto err;
}
if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
goto err;
stv090x_i2c_gate_ctrl(fe, 0);
msleep(50); msleep(50);
stv090x_i2c_gate_ctrl(fe, 1);
if (state->config->tuner_get_status) if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
state->config->tuner_get_status(fe, &reg); goto err;
if (state->config->tuner_get_status) {
if (state->config->tuner_get_status(fe, &reg) < 0)
goto err;
}
if (reg) if (reg)
dprintk(FE_DEBUG, 1, "Tuner phase locked"); dprintk(FE_DEBUG, 1, "Tuner phase locked");
else else
dprintk(FE_DEBUG, 1, "Tuner unlocked"); dprintk(FE_DEBUG, 1, "Tuner unlocked");
stv090x_i2c_gate_ctrl(fe, 0); if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
goto err;
} }
} }
...@@ -1565,11 +1751,11 @@ static u32 stv090x_srate_srch_fine(struct stv090x_state *state) ...@@ -1565,11 +1751,11 @@ static u32 stv090x_srate_srch_fine(struct stv090x_state *state)
if (STV090x_WRITE_DEMOD(state, DMDCFGMD, reg) < 0) if (STV090x_WRITE_DEMOD(state, DMDCFGMD, reg) < 0)
goto err; goto err;
if (state->dev_ver >= 0x20) { if (state->dev_ver >= 0x30) {
if (STV090x_WRITE_DEMOD(state, CARFREQ, 0x49) < 0) if (STV090x_WRITE_DEMOD(state, CARFREQ, 0x79) < 0)
goto err; goto err;
} else { } else if (state->dev_ver >= 0x20) {
if (STV090x_WRITE_DEMOD(state, CARFREQ, 0xed) < 0) if (STV090x_WRITE_DEMOD(state, CARFREQ, 0x49) < 0)
goto err; goto err;
} }
...@@ -1674,32 +1860,27 @@ static int stv090x_blind_search(struct stv090x_state *state) ...@@ -1674,32 +1860,27 @@ static int stv090x_blind_search(struct stv090x_state *state)
u8 k_ref, k_max, k_min; u8 k_ref, k_max, k_min;
int coarse_fail, lock; int coarse_fail, lock;
if (state->dev_ver < 0x20) { k_max = 120;
k_max = 233; k_min = 30;
k_min = 143;
} else {
k_max = 120;
k_min = 30;
}
agc2 = stv090x_get_agc2_min_level(state); agc2 = stv090x_get_agc2_min_level(state);
if (agc2 > STV090x_SEARCH_AGC2_TH) { if (agc2 > STV090x_SEARCH_AGC2_TH(state->dev_ver)) {
lock = 0; lock = 0;
} else { } else {
if (state->dev_ver == 0x10) {
if (STV090x_WRITE_DEMOD(state, CORRELEXP, 0xaa) < 0) if (state->dev_ver <= 0x20) {
if (STV090x_WRITE_DEMOD(state, CARCFG, 0xc4) < 0)
goto err; goto err;
} } else {
if (state->dev_ver < 0x20) { /* > Cut 3 */
if (STV090x_WRITE_DEMOD(state, CARHDR, 0x55) < 0) if (STV090x_WRITE_DEMOD(state, CARCFG, 0x06) < 0)
goto err; goto err;
} }
if (STV090x_WRITE_DEMOD(state, CARCFG, 0xc4) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, RTCS2, 0x44) < 0) if (STV090x_WRITE_DEMOD(state, RTCS2, 0x44) < 0)
goto err; goto err;
if (state->dev_ver >= 0x20) { if (state->dev_ver >= 0x20) {
if (STV090x_WRITE_DEMOD(state, EQUALCFG, 0x41) < 0) if (STV090x_WRITE_DEMOD(state, EQUALCFG, 0x41) < 0)
goto err; goto err;
...@@ -1756,7 +1937,7 @@ static int stv090x_blind_search(struct stv090x_state *state) ...@@ -1756,7 +1937,7 @@ static int stv090x_blind_search(struct stv090x_state *state)
static int stv090x_chk_tmg(struct stv090x_state *state) static int stv090x_chk_tmg(struct stv090x_state *state)
{ {
u32 reg; u32 reg;
s32 tmg_cpt, i; s32 tmg_cpt = 0, i;
u8 freq, tmg_thh, tmg_thl; u8 freq, tmg_thh, tmg_thl;
int tmg_lock; int tmg_lock;
...@@ -1877,29 +2058,39 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd) ...@@ -1877,29 +2058,39 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd)
freq -= cur_step * car_step; freq -= cur_step * car_step;
/* Setup tuner */ /* Setup tuner */
stv090x_i2c_gate_ctrl(fe, 1); if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
goto err;
if (state->config->tuner_set_frequency) if (state->config->tuner_set_frequency) {
state->config->tuner_set_frequency(fe, state->frequency); if (state->config->tuner_set_frequency(fe, state->frequency) < 0)
goto err;
}
if (state->config->tuner_set_bandwidth) if (state->config->tuner_set_bandwidth) {
state->config->tuner_set_bandwidth(fe, state->tuner_bw); if (state->config->tuner_set_bandwidth(fe, state->tuner_bw) < 0)
goto err;
}
stv090x_i2c_gate_ctrl(fe, 0); if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
goto err;
msleep(50); msleep(50);
stv090x_i2c_gate_ctrl(fe, 1); if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
goto err;
if (state->config->tuner_get_status) if (state->config->tuner_get_status) {
state->config->tuner_get_status(fe, &reg); if (state->config->tuner_get_status(fe, &reg) < 0)
goto err;
}
if (reg) if (reg)
dprintk(FE_DEBUG, 1, "Tuner phase locked"); dprintk(FE_DEBUG, 1, "Tuner phase locked");
else else
dprintk(FE_DEBUG, 1, "Tuner unlocked"); dprintk(FE_DEBUG, 1, "Tuner unlocked");
stv090x_i2c_gate_ctrl(fe, 0); if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
goto err;
STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1c); STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1c);
if (state->delsys == STV090x_DVBS2) { if (state->delsys == STV090x_DVBS2) {
...@@ -2031,7 +2222,7 @@ static int stv090x_chk_signal(struct stv090x_state *state) ...@@ -2031,7 +2222,7 @@ static int stv090x_chk_signal(struct stv090x_state *state)
static int stv090x_search_car_loop(struct stv090x_state *state, s32 inc, s32 timeout, int zigzag, s32 steps_max) static int stv090x_search_car_loop(struct stv090x_state *state, s32 inc, s32 timeout, int zigzag, s32 steps_max)
{ {
int no_signal, lock = 0; int no_signal, lock = 0;
s32 cpt_step, offst_freq, car_max; s32 cpt_step = 0, offst_freq, car_max;
u32 reg; u32 reg;
car_max = state->search_range / 1000; car_max = state->search_range / 1000;
...@@ -2046,7 +2237,6 @@ static int stv090x_search_car_loop(struct stv090x_state *state, s32 inc, s32 tim ...@@ -2046,7 +2237,6 @@ static int stv090x_search_car_loop(struct stv090x_state *state, s32 inc, s32 tim
else else
offst_freq = -car_max + inc; offst_freq = -car_max + inc;
cpt_step = 0;
do { do {
if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1c) < 0) if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1c) < 0)
goto err; goto err;
...@@ -2062,16 +2252,6 @@ static int stv090x_search_car_loop(struct stv090x_state *state, s32 inc, s32 tim ...@@ -2062,16 +2252,6 @@ static int stv090x_search_car_loop(struct stv090x_state *state, s32 inc, s32 tim
if (STV090x_WRITE_DEMOD(state, PDELCTRL1, reg) < 0) if (STV090x_WRITE_DEMOD(state, PDELCTRL1, reg) < 0)
goto err; goto err;
if (state->dev_ver == 0x12) {
reg = STV090x_READ_DEMOD(state, TSCFGH);
STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 0x1);
if (STV090x_WRITE_DEMOD(state, TSCFGH, reg) < 0)
goto err;
STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 0x0);
if (STV090x_WRITE_DEMOD(state, TSCFGH, reg) < 0)
goto err;
}
if (zigzag) { if (zigzag) {
if (offst_freq >= 0) if (offst_freq >= 0)
offst_freq = -offst_freq - 2 * inc; offst_freq = -offst_freq - 2 * inc;
...@@ -2111,7 +2291,8 @@ static int stv090x_sw_algo(struct stv090x_state *state) ...@@ -2111,7 +2291,8 @@ static int stv090x_sw_algo(struct stv090x_state *state)
s32 dvbs2_fly_wheel; s32 dvbs2_fly_wheel;
s32 inc, timeout_step, trials, steps_max; s32 inc, timeout_step, trials, steps_max;
stv090x_get_loop_params(state, &inc, &timeout_step, &steps_max); /* get params */ /* get params */
stv090x_get_loop_params(state, &inc, &timeout_step, &steps_max);
switch (state->search_mode) { switch (state->search_mode) {
case STV090x_SEARCH_DVBS1: case STV090x_SEARCH_DVBS1:
...@@ -2120,10 +2301,8 @@ static int stv090x_sw_algo(struct stv090x_state *state) ...@@ -2120,10 +2301,8 @@ static int stv090x_sw_algo(struct stv090x_state *state)
if (state->dev_ver >= 0x20) { if (state->dev_ver >= 0x20) {
if (STV090x_WRITE_DEMOD(state, CARFREQ, 0x3B) < 0) if (STV090x_WRITE_DEMOD(state, CARFREQ, 0x3B) < 0)
goto err; goto err;
} else {
if (STV090x_WRITE_DEMOD(state, CARFREQ, 0xef) < 0)
goto err;
} }
if (STV090x_WRITE_DEMOD(state, DMDCFGMD, 0x49) < 0) if (STV090x_WRITE_DEMOD(state, DMDCFGMD, 0x49) < 0)
goto err; goto err;
zigzag = 0; zigzag = 0;
...@@ -2133,10 +2312,8 @@ static int stv090x_sw_algo(struct stv090x_state *state) ...@@ -2133,10 +2312,8 @@ static int stv090x_sw_algo(struct stv090x_state *state)
if (state->dev_ver >= 0x20) { if (state->dev_ver >= 0x20) {
if (STV090x_WRITE_DEMOD(state, CORRELABS, 0x79) < 0) if (STV090x_WRITE_DEMOD(state, CORRELABS, 0x79) < 0)
goto err; goto err;
} else {
if (STV090x_WRITE_DEMOD(state, CORRELABS, 0x68) < 0)
goto err;
} }
if (STV090x_WRITE_DEMOD(state, DMDCFGMD, 0x89) < 0) if (STV090x_WRITE_DEMOD(state, DMDCFGMD, 0x89) < 0)
goto err; goto err;
zigzag = 1; zigzag = 1;
...@@ -2150,12 +2327,8 @@ static int stv090x_sw_algo(struct stv090x_state *state) ...@@ -2150,12 +2327,8 @@ static int stv090x_sw_algo(struct stv090x_state *state)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, CORRELABS, 0x79) < 0) if (STV090x_WRITE_DEMOD(state, CORRELABS, 0x79) < 0)
goto err; goto err;
} else {
if (STV090x_WRITE_DEMOD(state, CARFREQ, 0xef) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, CORRELABS, 0x68) < 0)
goto err;
} }
if (STV090x_WRITE_DEMOD(state, DMDCFGMD, 0xc9) < 0) if (STV090x_WRITE_DEMOD(state, DMDCFGMD, 0xc9) < 0)
goto err; goto err;
zigzag = 0; zigzag = 0;
...@@ -2176,11 +2349,6 @@ static int stv090x_sw_algo(struct stv090x_state *state) ...@@ -2176,11 +2349,6 @@ static int stv090x_sw_algo(struct stv090x_state *state)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, CORRELABS, 0x9e) < 0) if (STV090x_WRITE_DEMOD(state, CORRELABS, 0x9e) < 0)
goto err; goto err;
} else {
if (STV090x_WRITE_DEMOD(state, CARFREQ, 0xed) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, CORRELABS, 0x88) < 0)
goto err;
} }
reg = STV090x_READ_DEMOD(state, DMDSTATE); reg = STV090x_READ_DEMOD(state, DMDSTATE);
...@@ -2201,10 +2369,8 @@ static int stv090x_sw_algo(struct stv090x_state *state) ...@@ -2201,10 +2369,8 @@ static int stv090x_sw_algo(struct stv090x_state *state)
if (state->dev_ver >= 0x20) { if (state->dev_ver >= 0x20) {
if (STV090x_WRITE_DEMOD(state, CORRELABS, 0x79) < 0) if (STV090x_WRITE_DEMOD(state, CORRELABS, 0x79) < 0)
goto err; goto err;
} else {
if (STV090x_WRITE_DEMOD(state, CORRELABS, 0x68) < 0)
goto err;
} }
if (STV090x_WRITE_DEMOD(state, DMDCFGMD, 0x89) < 0) if (STV090x_WRITE_DEMOD(state, DMDCFGMD, 0x89) < 0)
goto err; goto err;
} }
...@@ -2325,16 +2491,23 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st ...@@ -2325,16 +2491,23 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st
} }
state->delsys = stv090x_get_std(state); state->delsys = stv090x_get_std(state);
stv090x_i2c_gate_ctrl(fe, 1); if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
goto err;
if (state->config->tuner_get_frequency) if (state->config->tuner_get_frequency) {
state->config->tuner_get_frequency(fe, &state->frequency); if (state->config->tuner_get_frequency(fe, &state->frequency) < 0)
goto err;
}
stv090x_i2c_gate_ctrl(fe, 0); if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
goto err;
offst_freq = stv090x_get_car_freq(state, state->mclk) / 1000; offst_freq = stv090x_get_car_freq(state, state->mclk) / 1000;
state->frequency += offst_freq; state->frequency += offst_freq;
stv090x_get_viterbi(state);
if (stv090x_get_viterbi(state) < 0)
goto err;
reg = STV090x_READ_DEMOD(state, DMDMODCOD); reg = STV090x_READ_DEMOD(state, DMDMODCOD);
state->modcod = STV090x_GETFIELD_Px(reg, DEMOD_MODCOD_FIELD); state->modcod = STV090x_GETFIELD_Px(reg, DEMOD_MODCOD_FIELD);
state->pilots = STV090x_GETFIELD_Px(reg, DEMOD_TYPE_FIELD) & 0x01; state->pilots = STV090x_GETFIELD_Px(reg, DEMOD_TYPE_FIELD) & 0x01;
...@@ -2346,12 +2519,16 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st ...@@ -2346,12 +2519,16 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st
if ((state->algo == STV090x_BLIND_SEARCH) || (state->srate < 10000000)) { if ((state->algo == STV090x_BLIND_SEARCH) || (state->srate < 10000000)) {
stv090x_i2c_gate_ctrl(fe, 1); if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
goto err;
if (state->config->tuner_get_frequency) if (state->config->tuner_get_frequency) {
state->config->tuner_get_frequency(fe, &state->frequency); if (state->config->tuner_get_frequency(fe, &state->frequency) < 0)
goto err;
}
stv090x_i2c_gate_ctrl(fe, 0); if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
goto err;
if (abs(offst_freq) <= ((state->search_range / 2000) + 500)) if (abs(offst_freq) <= ((state->search_range / 2000) + 500))
return STV090x_RANGEOK; return STV090x_RANGEOK;
...@@ -2367,6 +2544,9 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st ...@@ -2367,6 +2544,9 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st
} }
return STV090x_OUTOFRANGE; return STV090x_OUTOFRANGE;
err:
dprintk(FE_ERROR, 1, "I/O error");
return -1;
} }
static u32 stv090x_get_tmgoffst(struct stv090x_state *state, u32 srate) static u32 stv090x_get_tmgoffst(struct stv090x_state *state, u32 srate)
...@@ -2391,19 +2571,22 @@ static u8 stv090x_optimize_carloop(struct stv090x_state *state, enum stv090x_mod ...@@ -2391,19 +2571,22 @@ static u8 stv090x_optimize_carloop(struct stv090x_state *state, enum stv090x_mod
{ {
u8 aclc = 0x29; u8 aclc = 0x29;
s32 i; s32 i;
struct stv090x_long_frame_crloop *car_loop; struct stv090x_long_frame_crloop *car_loop, *car_loop_qpsk_low, *car_loop_apsk_low;
if (state->dev_ver <= 0x12)
car_loop = stv090x_s2_crl;
else if (state->dev_ver == 0x20)
car_loop = stv090x_s2_crl_cut20;
else
car_loop = stv090x_s2_crl;
if (state->dev_ver == 0x20) {
car_loop = stv090x_s2_crl_cut20;
car_loop_qpsk_low = stv090x_s2_lowqpsk_crl_cut20;
car_loop_apsk_low = stv090x_s2_apsk_crl_cut20;
} else {
/* >= Cut 3 */
car_loop = stv090x_s2_crl_cut30;
car_loop_qpsk_low = stv090x_s2_lowqpsk_crl_cut30;
car_loop_apsk_low = stv090x_s2_apsk_crl_cut30;
}
if (modcod < STV090x_QPSK_12) { if (modcod < STV090x_QPSK_12) {
i = 0; i = 0;
while ((i < 3) && (modcod != stv090x_s2_lowqpsk_crl_cut20[i].modcod)) while ((i < 3) && (modcod != car_loop_qpsk_low[i].modcod))
i++; i++;
if (i >= 3) if (i >= 3)
...@@ -2416,7 +2599,7 @@ static u8 stv090x_optimize_carloop(struct stv090x_state *state, enum stv090x_mod ...@@ -2416,7 +2599,7 @@ static u8 stv090x_optimize_carloop(struct stv090x_state *state, enum stv090x_mod
if (i >= 14) { if (i >= 14) {
i = 0; i = 0;
while ((i < 11) && (modcod != stv090x_s2_lowqpsk_crl_cut20[i].modcod)) while ((i < 11) && (modcod != car_loop_apsk_low[i].modcod))
i++; i++;
if (i >= 11) if (i >= 11)
...@@ -2427,26 +2610,26 @@ static u8 stv090x_optimize_carloop(struct stv090x_state *state, enum stv090x_mod ...@@ -2427,26 +2610,26 @@ static u8 stv090x_optimize_carloop(struct stv090x_state *state, enum stv090x_mod
if (modcod <= STV090x_QPSK_25) { if (modcod <= STV090x_QPSK_25) {
if (pilots) { if (pilots) {
if (state->srate <= 3000000) if (state->srate <= 3000000)
aclc = stv090x_s2_lowqpsk_crl_cut20[i].crl_pilots_on_2; aclc = car_loop_qpsk_low[i].crl_pilots_on_2;
else if (state->srate <= 7000000) else if (state->srate <= 7000000)
aclc = stv090x_s2_lowqpsk_crl_cut20[i].crl_pilots_on_5; aclc = car_loop_qpsk_low[i].crl_pilots_on_5;
else if (state->srate <= 15000000) else if (state->srate <= 15000000)
aclc = stv090x_s2_lowqpsk_crl_cut20[i].crl_pilots_on_10; aclc = car_loop_qpsk_low[i].crl_pilots_on_10;
else if (state->srate <= 25000000) else if (state->srate <= 25000000)
aclc = stv090x_s2_lowqpsk_crl_cut20[i].crl_pilots_on_20; aclc = car_loop_qpsk_low[i].crl_pilots_on_20;
else else
aclc = stv090x_s2_lowqpsk_crl_cut20[i].crl_pilots_on_30; aclc = car_loop_qpsk_low[i].crl_pilots_on_30;
} else { } else {
if (state->srate <= 3000000) if (state->srate <= 3000000)
aclc = stv090x_s2_lowqpsk_crl_cut20[i].crl_pilots_off_2; aclc = car_loop_qpsk_low[i].crl_pilots_off_2;
else if (state->srate <= 7000000) else if (state->srate <= 7000000)
aclc = stv090x_s2_lowqpsk_crl_cut20[i].crl_pilots_off_5; aclc = car_loop_qpsk_low[i].crl_pilots_off_5;
else if (state->srate <= 15000000) else if (state->srate <= 15000000)
aclc = stv090x_s2_lowqpsk_crl_cut20[i].crl_pilots_off_10; aclc = car_loop_qpsk_low[i].crl_pilots_off_10;
else if (state->srate <= 25000000) else if (state->srate <= 25000000)
aclc = stv090x_s2_lowqpsk_crl_cut20[i].crl_pilots_off_20; aclc = car_loop_qpsk_low[i].crl_pilots_off_20;
else else
aclc = stv090x_s2_lowqpsk_crl_cut20[i].crl_pilots_off_30; aclc = car_loop_qpsk_low[i].crl_pilots_off_30;
} }
} else if (modcod <= STV090x_8PSK_910) { } else if (modcod <= STV090x_8PSK_910) {
...@@ -2475,15 +2658,15 @@ static u8 stv090x_optimize_carloop(struct stv090x_state *state, enum stv090x_mod ...@@ -2475,15 +2658,15 @@ static u8 stv090x_optimize_carloop(struct stv090x_state *state, enum stv090x_mod
} }
} else { /* 16APSK and 32APSK */ } else { /* 16APSK and 32APSK */
if (state->srate <= 3000000) if (state->srate <= 3000000)
aclc = stv090x_s2_apsk_crl_cut20[i].crl_pilots_on_2; aclc = car_loop_apsk_low[i].crl_pilots_on_2;
else if (state->srate <= 7000000) else if (state->srate <= 7000000)
aclc = stv090x_s2_apsk_crl_cut20[i].crl_pilots_on_5; aclc = car_loop_apsk_low[i].crl_pilots_on_5;
else if (state->srate <= 15000000) else if (state->srate <= 15000000)
aclc = stv090x_s2_apsk_crl_cut20[i].crl_pilots_on_10; aclc = car_loop_apsk_low[i].crl_pilots_on_10;
else if (state->srate <= 25000000) else if (state->srate <= 25000000)
aclc = stv090x_s2_apsk_crl_cut20[i].crl_pilots_on_20; aclc = car_loop_apsk_low[i].crl_pilots_on_20;
else else
aclc = stv090x_s2_apsk_crl_cut20[i].crl_pilots_on_30; aclc = car_loop_apsk_low[i].crl_pilots_on_30;
} }
return aclc; return aclc;
...@@ -2491,6 +2674,7 @@ static u8 stv090x_optimize_carloop(struct stv090x_state *state, enum stv090x_mod ...@@ -2491,6 +2674,7 @@ static u8 stv090x_optimize_carloop(struct stv090x_state *state, enum stv090x_mod
static u8 stv090x_optimize_carloop_short(struct stv090x_state *state) static u8 stv090x_optimize_carloop_short(struct stv090x_state *state)
{ {
struct stv090x_short_frame_crloop *short_crl;
s32 index = 0; s32 index = 0;
u8 aclc = 0x0b; u8 aclc = 0x0b;
...@@ -2510,34 +2694,21 @@ static u8 stv090x_optimize_carloop_short(struct stv090x_state *state) ...@@ -2510,34 +2694,21 @@ static u8 stv090x_optimize_carloop_short(struct stv090x_state *state)
break; break;
} }
switch (state->dev_ver) { if (state->dev_ver >= 0x30)
case 0x20: short_crl = stv090x_s2_short_crl_cut20;
if (state->srate <= 3000000) else if (state->dev_ver >= 0x20)
aclc = stv090x_s2_short_crl[index].crl_cut20_2; short_crl = stv090x_s2_short_crl_cut30;
else if (state->srate <= 7000000)
aclc = stv090x_s2_short_crl[index].crl_cut20_5; if (state->srate <= 3000000)
else if (state->srate <= 15000000) aclc = short_crl[index].crl_2;
aclc = stv090x_s2_short_crl[index].crl_cut20_10; else if (state->srate <= 7000000)
else if (state->srate <= 25000000) aclc = short_crl[index].crl_5;
aclc = stv090x_s2_short_crl[index].crl_cut20_20; else if (state->srate <= 15000000)
else aclc = short_crl[index].crl_10;
aclc = stv090x_s2_short_crl[index].crl_cut20_30; else if (state->srate <= 25000000)
break; aclc = short_crl[index].crl_20;
else
case 0x12: aclc = short_crl[index].crl_30;
default:
if (state->srate <= 3000000)
aclc = stv090x_s2_short_crl[index].crl_cut12_2;
else if (state->srate <= 7000000)
aclc = stv090x_s2_short_crl[index].crl_cut12_5;
else if (state->srate <= 15000000)
aclc = stv090x_s2_short_crl[index].crl_cut12_10;
else if (state->srate <= 25000000)
aclc = stv090x_s2_short_crl[index].crl_cut12_20;
else
aclc = stv090x_s2_short_crl[index].crl_cut12_30;
break;
}
return aclc; return aclc;
} }
...@@ -2567,9 +2738,27 @@ static int stv090x_optimize_track(struct stv090x_state *state) ...@@ -2567,9 +2738,27 @@ static int stv090x_optimize_track(struct stv090x_state *state)
} }
reg = STV090x_READ_DEMOD(state, DEMOD); reg = STV090x_READ_DEMOD(state, DEMOD);
STV090x_SETFIELD_Px(reg, ROLLOFF_CONTROL_FIELD, state->rolloff); STV090x_SETFIELD_Px(reg, ROLLOFF_CONTROL_FIELD, state->rolloff);
STV090x_SETFIELD_Px(reg, MANUAL_ROLLOFF_FIELD, 0x01); STV090x_SETFIELD_Px(reg, MANUAL_SXROLLOFF_FIELD, 0x01);
if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0) if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0)
goto err; goto err;
if (state->dev_ver >= 0x30) {
if (stv090x_get_viterbi(state) < 0)
goto err;
if (state->fec == STV090x_PR12) {
if (STV090x_WRITE_DEMOD(state, GAUSSR0, 0x98) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, CCIR0, 0x18) < 0)
goto err;
} else {
if (STV090x_WRITE_DEMOD(state, GAUSSR0, 0x18) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, CCIR0, 0x18) < 0)
goto err;
}
}
if (STV090x_WRITE_DEMOD(state, ERRCTRL1, 0x75) < 0) if (STV090x_WRITE_DEMOD(state, ERRCTRL1, 0x75) < 0)
goto err; goto err;
break; break;
...@@ -2633,10 +2822,7 @@ static int stv090x_optimize_track(struct stv090x_state *state) ...@@ -2633,10 +2822,7 @@ static int stv090x_optimize_track(struct stv090x_state *state)
goto err; goto err;
} }
} }
if (state->dev_ver <= 0x11) {
if (state->demod_mode != STV090x_SINGLE)
stv090x_activate_modcod(state); /* link to LDPC after demod LOCK */
}
STV090x_WRITE_DEMOD(state, ERRCTRL1, 0x67); /* PER */ STV090x_WRITE_DEMOD(state, ERRCTRL1, 0x67); /* PER */
break; break;
...@@ -2662,11 +2848,11 @@ static int stv090x_optimize_track(struct stv090x_state *state) ...@@ -2662,11 +2848,11 @@ static int stv090x_optimize_track(struct stv090x_state *state)
STV090x_SETFIELD_Px(reg, CFR_AUTOSCAN_FIELD, 0x00); STV090x_SETFIELD_Px(reg, CFR_AUTOSCAN_FIELD, 0x00);
if (STV090x_WRITE_DEMOD(state, DMDCFGMD, reg) < 0) if (STV090x_WRITE_DEMOD(state, DMDCFGMD, reg) < 0)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, TMGCFG2, 0x01) < 0) if (STV090x_WRITE_DEMOD(state, TMGCFG2, 0xc1) < 0)
goto err;
if (stv090x_set_srate(state, srate) < 0)
goto err; goto err;
stv090x_set_srate(state, srate);
stv090x_set_max_srate(state, state->mclk, srate);
stv090x_set_min_srate(state, state->mclk, srate);
blind_tune = 1; blind_tune = 1;
} }
...@@ -2682,20 +2868,18 @@ static int stv090x_optimize_track(struct stv090x_state *state) ...@@ -2682,20 +2868,18 @@ static int stv090x_optimize_track(struct stv090x_state *state)
} }
} }
if (state->dev_ver < 0x20) {
if (STV090x_WRITE_DEMOD(state, CARHDR, 0x08) < 0)
goto err;
}
if (state->dev_ver == 0x10) {
if (STV090x_WRITE_DEMOD(state, CORRELEXP, 0x0a) < 0)
goto err;
}
if (STV090x_WRITE_DEMOD(state, AGC2REF, 0x38) < 0) if (STV090x_WRITE_DEMOD(state, AGC2REF, 0x38) < 0)
goto err; goto err;
if ((state->dev_ver >= 0x20) || (blind_tune == 1) || (state->srate < 10000000)) { /* AUTO tracking MODE */
if (STV090x_WRITE_DEMOD(state, SFRUP1, 0x80) < 0)
goto err;
/* AUTO tracking MODE */
if (STV090x_WRITE_DEMOD(state, SFRLOW1, 0x80) < 0)
goto err;
if ((state->dev_ver >= 0x20) || (blind_tune == 1) || (state->srate < 10000000)) {
/* update initial carrier freq with the found freq offset */
if (STV090x_WRITE_DEMOD(state, CFRINIT1, f_1) < 0) if (STV090x_WRITE_DEMOD(state, CFRINIT1, f_1) < 0)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, CFRINIT0, f_0) < 0) if (STV090x_WRITE_DEMOD(state, CFRINIT0, f_0) < 0)
...@@ -2706,12 +2890,16 @@ static int stv090x_optimize_track(struct stv090x_state *state) ...@@ -2706,12 +2890,16 @@ static int stv090x_optimize_track(struct stv090x_state *state)
if (state->algo != STV090x_WARM_SEARCH) { if (state->algo != STV090x_WARM_SEARCH) {
stv090x_i2c_gate_ctrl(fe, 1); if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
goto err;
if (state->config->tuner_set_bandwidth) if (state->config->tuner_set_bandwidth) {
state->config->tuner_set_bandwidth(fe, state->tuner_bw); if (state->config->tuner_set_bandwidth(fe, state->tuner_bw) < 0)
goto err;
}
stv090x_i2c_gate_ctrl(fe, 0); if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
goto err;
} }
} }
...@@ -2754,6 +2942,7 @@ static int stv090x_optimize_track(struct stv090x_state *state) ...@@ -2754,6 +2942,7 @@ static int stv090x_optimize_track(struct stv090x_state *state)
if (STV090x_WRITE_DEMOD(state, CARFREQ, 0x49) < 0) if (STV090x_WRITE_DEMOD(state, CARFREQ, 0x49) < 0)
goto err; goto err;
} }
if ((state->delsys == STV090x_DVBS1) || (state->delsys == STV090x_DSS)) if ((state->delsys == STV090x_DVBS1) || (state->delsys == STV090x_DSS))
stv090x_set_vit_thtracq(state); stv090x_set_vit_thtracq(state);
...@@ -2823,22 +3012,18 @@ static int stv090x_get_lock(struct stv090x_state *state, s32 timeout_dmd, s32 ti ...@@ -2823,22 +3012,18 @@ static int stv090x_get_lock(struct stv090x_state *state, s32 timeout_dmd, s32 ti
static int stv090x_set_s2rolloff(struct stv090x_state *state) static int stv090x_set_s2rolloff(struct stv090x_state *state)
{ {
s32 rolloff;
u32 reg; u32 reg;
if (state->dev_ver == 0x10) { if (state->dev_ver <= 0x20) {
/* rolloff to auto mode if DVBS2 */
reg = STV090x_READ_DEMOD(state, DEMOD); reg = STV090x_READ_DEMOD(state, DEMOD);
STV090x_SETFIELD_Px(reg, MANUAL_ROLLOFF_FIELD, 0x01); STV090x_SETFIELD_Px(reg, MANUAL_SXROLLOFF_FIELD, 0x00);
if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0)
goto err;
rolloff = STV090x_READ_DEMOD(state, MATSTR1) & 0x03;
reg = STV090x_READ_DEMOD(state, DEMOD);
STV090x_SETFIELD_Px(reg, ROLLOFF_CONTROL_FIELD, reg);
if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0) if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0)
goto err; goto err;
} else { } else {
/* DVB-S2 rolloff to auto mode if DVBS2 */
reg = STV090x_READ_DEMOD(state, DEMOD); reg = STV090x_READ_DEMOD(state, DEMOD);
STV090x_SETFIELD_Px(reg, MANUAL_ROLLOFF_FIELD, 0x00); STV090x_SETFIELD_Px(reg, MANUAL_S2ROLLOFF_FIELD, 0x00);
if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0) if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0)
goto err; goto err;
} }
...@@ -2848,84 +3033,13 @@ static int stv090x_set_s2rolloff(struct stv090x_state *state) ...@@ -2848,84 +3033,13 @@ static int stv090x_set_s2rolloff(struct stv090x_state *state)
return -1; return -1;
} }
static enum stv090x_signal_state stv090x_acq_fixs1(struct stv090x_state *state)
{
s32 srate, f_1, f_2;
enum stv090x_signal_state signal_state = STV090x_NODATA;
u32 reg;
int lock;
reg = STV090x_READ_DEMOD(state, DMDSTATE);
if (STV090x_GETFIELD_Px(reg, HEADER_MODE_FIELD) == 3) { /* DVB-S mode */
srate = stv090x_get_srate(state, state->mclk);
srate += stv090x_get_tmgoffst(state, state->srate);
if (state->algo == STV090x_BLIND_SEARCH)
stv090x_set_srate(state, state->srate);
stv090x_get_lock_tmg(state);
f_1 = STV090x_READ_DEMOD(state, CFR2);
f_2 = STV090x_READ_DEMOD(state, CFR1);
reg = STV090x_READ_DEMOD(state, DMDCFGMD);
STV090x_SETFIELD_Px(reg, CFR_AUTOSCAN_FIELD, 0);
if (STV090x_WRITE_DEMOD(state, DMDCFGMD, reg) < 0)
goto err;
reg = STV090x_READ_DEMOD(state, DEMOD);
STV090x_SETFIELD_Px(reg, SPECINV_CONTROL_FIELD, STV090x_IQ_SWAP);
if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1c) < 0) /* stop demod */
goto err;
if (STV090x_WRITE_DEMOD(state, CFRINIT1, f_1) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, CFRINIT0, f_2) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x18) < 0) /* warm start trigger */
goto err;
if (stv090x_get_lock(state, state->DemodTimeout, state->FecTimeout)) {
lock = 1;
stv090x_get_sig_params(state);
stv090x_optimize_track(state);
} else {
reg = STV090x_READ_DEMOD(state, DEMOD);
STV090x_SETFIELD_Px(reg, SPECINV_CONTROL_FIELD, STV090x_IQ_NORMAL);
if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1c) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, CFRINIT1, f_1) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, CFRINIT0, f_2) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x18) < 0) /* warm start trigger */
goto err;
if (stv090x_get_lock(state, state->DemodTimeout, state->FecTimeout)) {
lock = 1;
signal_state = stv090x_get_sig_params(state);
stv090x_optimize_track(state);
}
}
} else {
lock = 0;
}
return signal_state;
err:
dprintk(FE_ERROR, 1, "I/O error");
return -1;
}
static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state) static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
{ {
struct dvb_frontend *fe = &state->frontend; struct dvb_frontend *fe = &state->frontend;
enum stv090x_signal_state signal_state = STV090x_NOCARRIER; enum stv090x_signal_state signal_state = STV090x_NOCARRIER;
u32 reg; u32 reg;
s32 timeout_dmd = 500, timeout_fec = 50; s32 timeout_dmd = 500, timeout_fec = 50, agc1_power, power_iq = 0, i;
int lock = 0, low_sr = 0, no_signal = 0; int lock = 0, low_sr = 0, no_signal = 0;
reg = STV090x_READ_DEMOD(state, TSCFGH); reg = STV090x_READ_DEMOD(state, TSCFGH);
...@@ -2939,18 +3053,18 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state) ...@@ -2939,18 +3053,18 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
if (state->dev_ver >= 0x20) { if (state->dev_ver >= 0x20) {
if (STV090x_WRITE_DEMOD(state, CORRELABS, 0x9e) < 0) /* cut 2.0 */ if (STV090x_WRITE_DEMOD(state, CORRELABS, 0x9e) < 0) /* cut 2.0 */
goto err; goto err;
} else {
if (STV090x_WRITE_DEMOD(state, CORRELABS, 0x88) < 0) /* cut 1.x */
goto err;
} }
stv090x_get_lock_tmg(state); stv090x_get_lock_tmg(state);
if (state->algo == STV090x_BLIND_SEARCH) { if (state->algo == STV090x_BLIND_SEARCH) {
state->tuner_bw = 2 * 36000000; /* wide bw for unknown srate */ state->tuner_bw = 2 * 36000000; /* wide bw for unknown srate */
if (STV090x_WRITE_DEMOD(state, TMGCFG2, 0x00) < 0) /* wider srate scan */ if (STV090x_WRITE_DEMOD(state, TMGCFG2, 0xc0) < 0) /* wider srate scan */
goto err;
if (STV090x_WRITE_DEMOD(state, CORRELMANT, 0x70) < 0)
goto err;
if (stv090x_set_srate(state, 1000000) < 0) /* inital srate = 1Msps */
goto err; goto err;
stv090x_set_srate(state, 1000000); /* inital srate = 1Msps */
} else { } else {
/* known srate */ /* known srate */
if (STV090x_WRITE_DEMOD(state, DMDTOM, 0x20) < 0) if (STV090x_WRITE_DEMOD(state, DMDTOM, 0x20) < 0)
...@@ -2958,14 +3072,19 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state) ...@@ -2958,14 +3072,19 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
if (STV090x_WRITE_DEMOD(state, TMGCFG, 0xd2) < 0) if (STV090x_WRITE_DEMOD(state, TMGCFG, 0xd2) < 0)
goto err; goto err;
if (state->srate >= 10000000) { if (state->srate < 2000000) {
if (STV090x_WRITE_DEMOD(state, AGC2REF, 0x38) < 0) /* High SR */ /* SR < 2MSPS */
if (STV090x_WRITE_DEMOD(state, CORRELMANT, 0x63) < 0)
goto err; goto err;
} else { } else {
if (STV090x_WRITE_DEMOD(state, AGC2REF, 0x60) < 0) /* Low SR */ /* SR >= 2Msps */
if (STV090x_WRITE_DEMOD(state, CORRELMANT, 0x70) < 0)
goto err; goto err;
} }
if (STV090x_WRITE_DEMOD(state, AGC2REF, 0x38) < 0)
goto err;
if (state->dev_ver >= 0x20) { if (state->dev_ver >= 0x20) {
if (STV090x_WRITE_DEMOD(state, KREFTMG, 0x5a) < 0) if (STV090x_WRITE_DEMOD(state, KREFTMG, 0x5a) < 0)
goto err; goto err;
...@@ -2973,16 +3092,21 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state) ...@@ -2973,16 +3092,21 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
state->tuner_bw = (15 * (stv090x_car_width(state->srate, state->rolloff) + 10000000)) / 10; state->tuner_bw = (15 * (stv090x_car_width(state->srate, state->rolloff) + 10000000)) / 10;
else if (state->algo == STV090x_WARM_SEARCH) else if (state->algo == STV090x_WARM_SEARCH)
state->tuner_bw = stv090x_car_width(state->srate, state->rolloff) + 10000000; state->tuner_bw = stv090x_car_width(state->srate, state->rolloff) + 10000000;
} else {
if (STV090x_WRITE_DEMOD(state, KREFTMG, 0xc1) < 0)
goto err;
state->tuner_bw = (15 * (stv090x_car_width(state->srate, state->rolloff) + 10000000)) / 10;
} }
if (STV090x_WRITE_DEMOD(state, TMGCFG2, 0x01) < 0) /* narrow srate scan */
/* if cold start or warm (Symbolrate is known)
* use a Narrow symbol rate scan range
*/
if (STV090x_WRITE_DEMOD(state, TMGCFG2, 0xc1) < 0) /* narrow srate scan */
goto err;
if (stv090x_set_srate(state, state->srate) < 0)
goto err;
if (stv090x_set_max_srate(state, state->mclk, state->srate) < 0)
goto err;
if (stv090x_set_min_srate(state, state->mclk, state->srate) < 0)
goto err; goto err;
stv090x_set_srate(state, state->srate);
stv090x_set_max_srate(state, state->mclk, state->srate);
stv090x_set_min_srate(state, state->mclk, state->srate);
if (state->srate >= 10000000) if (state->srate >= 10000000)
low_sr = 0; low_sr = 0;
...@@ -2991,60 +3115,97 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state) ...@@ -2991,60 +3115,97 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
} }
/* Setup tuner */ /* Setup tuner */
stv090x_i2c_gate_ctrl(fe, 1); if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
goto err;
if (state->config->tuner_set_bbgain) if (state->config->tuner_set_bbgain) {
state->config->tuner_set_bbgain(fe, 10); /* 10dB */ if (state->config->tuner_set_bbgain(fe, 10) < 0) /* 10dB */
goto err;
}
if (state->config->tuner_set_frequency) if (state->config->tuner_set_frequency) {
state->config->tuner_set_frequency(fe, state->frequency); if (state->config->tuner_set_frequency(fe, state->frequency) < 0)
goto err;
}
if (state->config->tuner_set_bandwidth) if (state->config->tuner_set_bandwidth) {
state->config->tuner_set_bandwidth(fe, state->tuner_bw); if (state->config->tuner_set_bandwidth(fe, state->tuner_bw) < 0)
goto err;
}
stv090x_i2c_gate_ctrl(fe, 0); if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
goto err;
msleep(50); msleep(50);
stv090x_i2c_gate_ctrl(fe, 1); if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
goto err;
if (state->config->tuner_get_status) if (state->config->tuner_get_status) {
state->config->tuner_get_status(fe, &reg); if (state->config->tuner_get_status(fe, &reg) < 0)
goto err;
}
if (reg) if (reg)
dprintk(FE_DEBUG, 1, "Tuner phase locked"); dprintk(FE_DEBUG, 1, "Tuner phase locked");
else else
dprintk(FE_DEBUG, 1, "Tuner unlocked"); dprintk(FE_DEBUG, 1, "Tuner unlocked");
stv090x_i2c_gate_ctrl(fe, 0); if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
reg = STV090x_READ_DEMOD(state, DEMOD);
STV090x_SETFIELD_Px(reg, SPECINV_CONTROL_FIELD, state->inversion);
STV090x_SETFIELD_Px(reg, MANUAL_ROLLOFF_FIELD, 1);
if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0)
goto err; goto err;
stv090x_delivery_search(state);
if (state->algo != STV090x_BLIND_SEARCH)
stv090x_start_search(state);
if (state->dev_ver == 0x12) { msleep(10);
reg = STV090x_READ_DEMOD(state, TSCFGH); agc1_power = MAKEWORD16(STV090x_READ_DEMOD(state, AGCIQIN1),
STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 0); /* release merger reset */ STV090x_READ_DEMOD(state, AGCIQIN0));
if (STV090x_WRITE_DEMOD(state, TSCFGH, reg) < 0)
goto err; if (agc1_power == 0) {
msleep(3); /* If AGC1 integrator value is 0
STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 1); /* merger reset */ * then read POWERI, POWERQ
if (STV090x_WRITE_DEMOD(state, TSCFGH, reg) < 0) */
for (i = 0; i < 5; i++) {
power_iq += (STV090x_READ_DEMOD(state, POWERI) +
STV090x_READ_DEMOD(state, POWERQ)) >> 1;
}
power_iq /= 5;
}
if ((agc1_power == 0) && (power_iq < STV090x_IQPOWER_THRESHOLD)) {
dprintk(FE_ERROR, 1, "No Signal: POWER_IQ=0x%02x", power_iq);
lock = 0;
} else {
reg = STV090x_READ_DEMOD(state, DEMOD);
STV090x_SETFIELD_Px(reg, SPECINV_CONTROL_FIELD, state->inversion);
if (state->dev_ver <= 0x20) {
/* rolloff to auto mode if DVBS2 */
STV090x_SETFIELD_Px(reg, MANUAL_SXROLLOFF_FIELD, 1);
} else {
/* DVB-S2 rolloff to auto mode if DVBS2 */
STV090x_SETFIELD_Px(reg, MANUAL_S2ROLLOFF_FIELD, 1);
}
if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0)
goto err; goto err;
STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 0); /* release merger reset */
if (STV090x_WRITE_DEMOD(state, TSCFGH, reg) < 0) if (stv090x_delivery_search(state) < 0)
goto err; goto err;
if (state->algo != STV090x_BLIND_SEARCH) {
if (stv090x_start_search(state) < 0)
goto err;
}
} }
/* need to check for AGC1 state */
if (state->algo == STV090x_BLIND_SEARCH) if (state->algo == STV090x_BLIND_SEARCH)
lock = stv090x_blind_search(state); lock = stv090x_blind_search(state);
else if (state->algo == STV090x_COLD_SEARCH) else if (state->algo == STV090x_COLD_SEARCH)
lock = stv090x_get_coldlock(state, timeout_dmd); lock = stv090x_get_coldlock(state, timeout_dmd);
else if (state->algo == STV090x_WARM_SEARCH) else if (state->algo == STV090x_WARM_SEARCH)
lock = stv090x_get_dmdlock(state, timeout_dmd); lock = stv090x_get_dmdlock(state, timeout_dmd);
...@@ -3060,32 +3221,18 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state) ...@@ -3060,32 +3221,18 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
if ((lock) && (signal_state == STV090x_RANGEOK)) { /* signal within Range */ if ((lock) && (signal_state == STV090x_RANGEOK)) { /* signal within Range */
stv090x_optimize_track(state); stv090x_optimize_track(state);
if (state->dev_ver <= 0x11) { /*workaround for dual DVBS1 cut 1.1 and 1.0 only*/
if (stv090x_get_std(state) == STV090x_DVBS1) { if (state->dev_ver >= 0x20) {
msleep(20); /* >= Cut 2.0 :release TS reset after
reg = STV090x_READ_DEMOD(state, TSCFGH); * demod lock and optimized Tracking
STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 0); /* release merger reset */ */
if (STV090x_WRITE_DEMOD(state, TSCFGH, reg) < 0)
goto err;
} else {
reg = STV090x_READ_DEMOD(state, TSCFGH);
STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 0); /* release merger reset */
if (STV090x_WRITE_DEMOD(state, TSCFGH, reg) < 0)
goto err;
msleep(3);
STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 1); /* merger reset */
if (STV090x_WRITE_DEMOD(state, TSCFGH, reg) < 0)
goto err;
STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 0); /* release merger reset */
if (STV090x_WRITE_DEMOD(state, TSCFGH, reg) < 0)
goto err;
}
} else if (state->dev_ver == 0x20) { /*cut 2.0 :release TS reset after demod lock and TrackingOptimization*/
reg = STV090x_READ_DEMOD(state, TSCFGH); reg = STV090x_READ_DEMOD(state, TSCFGH);
STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 0); /* release merger reset */ STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 0); /* release merger reset */
if (STV090x_WRITE_DEMOD(state, TSCFGH, reg) < 0) if (STV090x_WRITE_DEMOD(state, TSCFGH, reg) < 0)
goto err; goto err;
msleep(3); msleep(3);
STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 1); /* merger reset */ STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 1); /* merger reset */
if (STV090x_WRITE_DEMOD(state, TSCFGH, reg) < 0) if (STV090x_WRITE_DEMOD(state, TSCFGH, reg) < 0)
goto err; goto err;
...@@ -3099,18 +3246,27 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state) ...@@ -3099,18 +3246,27 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
lock = 1; lock = 1;
if (state->delsys == STV090x_DVBS2) { if (state->delsys == STV090x_DVBS2) {
stv090x_set_s2rolloff(state); stv090x_set_s2rolloff(state);
if (STV090x_WRITE_DEMOD(state, PDELCTRL2, 0x40) < 0)
reg = STV090x_READ_DEMOD(state, PDELCTRL2);
STV090x_SETFIELD_Px(reg, RESET_UPKO_COUNT, 1);
if (STV090x_WRITE_DEMOD(state, PDELCTRL2, reg) < 0)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, PDELCTRL2, 0x00) < 0) /* RESET counter */ /* Reset DVBS2 packet delinator error counter */
reg = STV090x_READ_DEMOD(state, PDELCTRL2);
STV090x_SETFIELD_Px(reg, RESET_UPKO_COUNT, 0);
if (STV090x_WRITE_DEMOD(state, PDELCTRL2, reg) < 0)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, ERRCTRL1, 0x67) < 0) /* PER */ if (STV090x_WRITE_DEMOD(state, ERRCTRL1, 0x67) < 0) /* PER */
goto err; goto err;
} else { } else {
if (STV090x_WRITE_DEMOD(state, ERRCTRL1, 0x75) < 0) if (STV090x_WRITE_DEMOD(state, ERRCTRL1, 0x75) < 0)
goto err; goto err;
} }
/* Reset the Total packet counter */
if (STV090x_WRITE_DEMOD(state, FBERCPT4, 0x00) < 0) if (STV090x_WRITE_DEMOD(state, FBERCPT4, 0x00) < 0)
goto err; goto err;
/* Reset the packet Error counter2 */
if (STV090x_WRITE_DEMOD(state, ERRCTRL2, 0xc1) < 0) if (STV090x_WRITE_DEMOD(state, ERRCTRL2, 0xc1) < 0)
goto err; goto err;
} else { } else {
...@@ -3119,13 +3275,6 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state) ...@@ -3119,13 +3275,6 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
no_signal = stv090x_chk_signal(state); no_signal = stv090x_chk_signal(state);
} }
} }
if ((signal_state == STV090x_NODATA) && (!no_signal)) {
if (state->dev_ver <= 0x11) {
reg = STV090x_READ_DEMOD(state, DMDSTATE);
if (((STV090x_GETFIELD_Px(reg, HEADER_MODE_FIELD)) == STV090x_DVBS1) && (state->inversion == INVERSION_AUTO))
signal_state = stv090x_acq_fixs1(state);
}
}
return signal_state; return signal_state;
err: err:
...@@ -3578,17 +3727,18 @@ static void stv090x_release(struct dvb_frontend *fe) ...@@ -3578,17 +3727,18 @@ static void stv090x_release(struct dvb_frontend *fe)
static int stv090x_ldpc_mode(struct stv090x_state *state, enum stv090x_mode ldpc_mode) static int stv090x_ldpc_mode(struct stv090x_state *state, enum stv090x_mode ldpc_mode)
{ {
u32 reg; u32 reg = 0;
switch (ldpc_mode) { switch (ldpc_mode) {
case STV090x_DUAL: case STV090x_DUAL:
default: default:
reg = stv090x_read_reg(state, STV090x_GENCFG);
if ((state->demod_mode != STV090x_DUAL) || (STV090x_GETFIELD(reg, DDEMOD_FIELD) != 1)) { if ((state->demod_mode != STV090x_DUAL) || (STV090x_GETFIELD(reg, DDEMOD_FIELD) != 1)) {
/* follow LDPC default state */ /* set LDPC to dual mode */
if (stv090x_write_reg(state, STV090x_GENCFG, reg) < 0) if (stv090x_write_reg(state, STV090x_GENCFG, 0x1d) < 0)
goto err; goto err;
state->demod_mode = STV090x_DUAL; state->demod_mode = STV090x_DUAL;
reg = stv090x_read_reg(state, STV090x_TSTRES0); reg = stv090x_read_reg(state, STV090x_TSTRES0);
STV090x_SETFIELD(reg, FRESFEC_FIELD, 0x1); STV090x_SETFIELD(reg, FRESFEC_FIELD, 0x1);
if (stv090x_write_reg(state, STV090x_TSTRES0, reg) < 0) if (stv090x_write_reg(state, STV090x_TSTRES0, reg) < 0)
...@@ -3596,10 +3746,50 @@ static int stv090x_ldpc_mode(struct stv090x_state *state, enum stv090x_mode ldpc ...@@ -3596,10 +3746,50 @@ static int stv090x_ldpc_mode(struct stv090x_state *state, enum stv090x_mode ldpc
STV090x_SETFIELD(reg, FRESFEC_FIELD, 0x0); STV090x_SETFIELD(reg, FRESFEC_FIELD, 0x0);
if (stv090x_write_reg(state, STV090x_TSTRES0, reg) < 0) if (stv090x_write_reg(state, STV090x_TSTRES0, reg) < 0)
goto err; goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST0, 0xff) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST1, 0xff) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST2, 0xff) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST3, 0xff) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST4, 0xff) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST5, 0xff) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST6, 0xff) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST7, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST8, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLST9, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTA, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTB, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTC, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTD, 0xcc) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTE, 0xff) < 0)
goto err;
if (STV090x_WRITE_DEMOD(state, MODCODLSTF, 0xcf) < 0)
goto err;
} }
break; break;
case STV090x_SINGLE: case STV090x_SINGLE:
if (stv090x_stop_modcod(state) < 0)
goto err;
if (stv090x_activate_modcod_single(state) < 0)
goto err;
if (state->demod == STV090x_DEMODULATOR_1) { if (state->demod == STV090x_DEMODULATOR_1) {
if (stv090x_write_reg(state, STV090x_GENCFG, 0x06) < 0) /* path 2 */ if (stv090x_write_reg(state, STV090x_GENCFG, 0x06) < 0) /* path 2 */
goto err; goto err;
...@@ -3885,7 +4075,8 @@ static int stv090x_init(struct dvb_frontend *fe) ...@@ -3885,7 +4075,8 @@ static int stv090x_init(struct dvb_frontend *fe)
goto err; goto err;
} }
stv090x_ldpc_mode(state, state->demod_mode); if (stv090x_ldpc_mode(state, state->demod_mode) < 0)
goto err;
reg = STV090x_READ_DEMOD(state, TNRCFG2); reg = STV090x_READ_DEMOD(state, TNRCFG2);
STV090x_SETFIELD_Px(reg, TUN_IQSWAP_FIELD, state->inversion); STV090x_SETFIELD_Px(reg, TUN_IQSWAP_FIELD, state->inversion);
...@@ -3896,16 +4087,24 @@ static int stv090x_init(struct dvb_frontend *fe) ...@@ -3896,16 +4087,24 @@ static int stv090x_init(struct dvb_frontend *fe)
if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0) if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0)
goto err; goto err;
stv090x_i2c_gate_ctrl(fe, 1); if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
goto err;
if (config->tuner_set_mode) if (config->tuner_set_mode) {
config->tuner_set_mode(fe, TUNER_WAKE); if (config->tuner_set_mode(fe, TUNER_WAKE) < 0)
if (config->tuner_init) goto err;
config->tuner_init(fe); }
stv090x_i2c_gate_ctrl(fe, 0); if (config->tuner_init) {
if (config->tuner_init(fe) < 0)
goto err;
}
if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
goto err;
stv090x_set_tspath(state); if (stv090x_set_tspath(state) < 0)
goto err;
return 0; return 0;
err: err:
...@@ -3978,6 +4177,16 @@ static int stv090x_setup(struct dvb_frontend *fe) ...@@ -3978,6 +4177,16 @@ static int stv090x_setup(struct dvb_frontend *fe)
if (stv090x_write_reg(state, stv090x_cut20_val[i].addr, stv090x_cut20_val[i].data) < 0) if (stv090x_write_reg(state, stv090x_cut20_val[i].addr, stv090x_cut20_val[i].data) < 0)
goto err; goto err;
} }
} else if (state->dev_ver < 0x20) {
dprintk(FE_ERROR, 1, "ERROR: Unsupported Cut: 0x%02x!",
state->dev_ver);
goto err;
} else if (state->dev_ver > 0x30) {
/* we shouldn't bail out from here */
dprintk(FE_ERROR, 1, "INFO: Cut: 0x%02x probably incomplete support!",
state->dev_ver);
} }
if (stv090x_write_reg(state, STV090x_TSTRES0, 0x80) < 0) if (stv090x_write_reg(state, STV090x_TSTRES0, 0x80) < 0)
......
drivers/media/dvb/frontends/stv090x_priv.h
View file @ 27d40321
...@@ -77,7 +77,18 @@ ...@@ -77,7 +77,18 @@
#define MAKEWORD16(__a, __b) (((__a) << 8) | (__b)) #define MAKEWORD16(__a, __b) (((__a) << 8) | (__b))
#define STV090x_SEARCH_AGC2_TH 700 #define MSB(__x) ((__x >> 8) & 0xff)
#define LSB(__x) (__x & 0xff)
#define STV090x_IQPOWER_THRESHOLD 30
#define STV090x_SEARCH_AGC2_TH_CUT20 700
#define STV090x_SEARCH_AGC2_TH_CUT30 1200
#define STV090x_SEARCH_AGC2_TH(__ver) \
((__ver <= 0x20) ? \
STV090x_SEARCH_AGC2_TH_CUT20 : \
STV090x_SEARCH_AGC2_TH_CUT30)
enum stv090x_signal_state { enum stv090x_signal_state {
STV090x_NOCARRIER, STV090x_NOCARRIER,
...@@ -201,24 +212,8 @@ struct stv090x_long_frame_crloop { ...@@ -201,24 +212,8 @@ struct stv090x_long_frame_crloop {
struct stv090x_short_frame_crloop { struct stv090x_short_frame_crloop {
enum stv090x_modulation modulation; enum stv090x_modulation modulation;
u8 crl_cut12_2; /* Cut 1.2, SR <= 3M */ u8 crl_2; /* SR < 3M */
u8 crl_cut20_2; /* Cut 2.0, SR < 3M */ u8 crl_5; /* 3 < SR <= 7M */
u8 crl_cut12_5; /* Cut 1.2, 3 < SR <= 7M */
u8 crl_cut20_5; /* Cut 2.0, 3 < SR <= 7M */
u8 crl_cut12_10; /* Cut 1.2, 7 < SR <= 15M */
u8 crl_cut20_10; /* Cut 2.0, 7 < SR <= 15M */
u8 crl_cut12_20; /* Cut 1.2, 10 < SR <= 25M */
u8 crl_cut20_20; /* Cut 2.0, 10 < SR <= 25M */
u8 crl_cut12_30; /* Cut 1.2, 25 < SR <= 45M */
u8 crl_cut20_30; /* Cut 2.0, 10 < SR <= 45M */
};
struct stv090x_short_frame_vsmod_crloop {
enum stv090x_modulation modulation;
u8 crl_2; /* < 3M */
u8 crl_5; /* 3 < SR <= 7M */
u8 crl_10; /* 7 < SR <= 15M */ u8 crl_10; /* 7 < SR <= 15M */
u8 crl_20; /* 10 < SR <= 25M */ u8 crl_20; /* 10 < SR <= 25M */
u8 crl_30; /* 10 < SR <= 45M */ u8 crl_30; /* 10 < SR <= 45M */
......
drivers/media/dvb/frontends/stv090x_reg.h
View file @ 27d40321
...@@ -793,10 +793,16 @@ ...@@ -793,10 +793,16 @@
#define STV090x_Px_DEMOD(__x) (0xF410 - (__x - 1) * 0x200) #define STV090x_Px_DEMOD(__x) (0xF410 - (__x - 1) * 0x200)
#define STV090x_P1_DEMOD STV090x_Px_DEMOD(1) #define STV090x_P1_DEMOD STV090x_Px_DEMOD(1)
#define STV090x_P2_DEMOD STV090x_Px_DEMOD(2) #define STV090x_P2_DEMOD STV090x_Px_DEMOD(2)
#define STV090x_OFFST_Px_MANUAL_S2ROLLOFF_FIELD 7
#define STV090x_WIDTH_Px_MANUAL_S2ROLLOFF_FIELD 1
#define STV090x_OFFST_Px_DEMOD_STOP_FIELD 6
#define STV090x_WIDTH_Px_DEMOD_STOP_FIELD 1
#define STV090x_OFFST_Px_SPECINV_CONTROL_FIELD 4 #define STV090x_OFFST_Px_SPECINV_CONTROL_FIELD 4
#define STV090x_WIDTH_Px_SPECINV_CONTROL_FIELD 2 #define STV090x_WIDTH_Px_SPECINV_CONTROL_FIELD 2
#define STV090x_OFFST_Px_MANUAL_ROLLOFF_FIELD 2 #define STV090x_OFFST_Px_FORCE_ENASAMP_FIELD 3
#define STV090x_WIDTH_Px_MANUAL_ROLLOFF_FIELD 1 #define STV090x_WIDTH_Px_FORCE_ENASAMP_FIELD 1
#define STV090x_OFFST_Px_MANUAL_SXROLLOFF_FIELD 2
#define STV090x_WIDTH_Px_MANUAL_SXROLLOFF_FIELD 1
#define STV090x_OFFST_Px_ROLLOFF_CONTROL_FIELD 0 #define STV090x_OFFST_Px_ROLLOFF_CONTROL_FIELD 0
#define STV090x_WIDTH_Px_ROLLOFF_CONTROL_FIELD 2 #define STV090x_WIDTH_Px_ROLLOFF_CONTROL_FIELD 2
...@@ -1566,6 +1572,42 @@ ...@@ -1566,6 +1572,42 @@
#define STV090x_OFFST_Px_DIS_QP_1_4_FIELD 4 #define STV090x_OFFST_Px_DIS_QP_1_4_FIELD 4
#define STV090x_WIDTH_Px_DIS_QP_1_4_FIELD 4 #define STV090x_WIDTH_Px_DIS_QP_1_4_FIELD 4
#define STV090x_Px_GAUSSR0(__x) (0xf4c0 - (__x - 1) * 0x200)
#define STV090x_P1_GAUSSR0 STV090x_Px_GAUSSR0(1)
#define STV090x_P2_GAUSSR0 STV090x_Px_GAUSSR0(2)
#define STV090x_OFFST_Px_EN_CCIMODE_FIELD 7
#define STV090x_WIDTH_Px_EN_CCIMODE_FIELD 1
#define STV090x_OFFST_Px_R0_GAUSSIEN_FIELD 0
#define STV090x_WIDTH_Px_R0_GAUSSIEN_FIELD 7
#define STV090x_Px_CCIR0(__x) (0xf4c1 - (__x - 1) * 0x200)
#define STV090x_P1_CCIR0 STV090x_Px_CCIR0(1)
#define STV090x_P2_CCIR0 STV090x_Px_CCIR0(2)
#define STV090x_OFFST_Px_CCIDETECT_PLH_FIELD 7
#define STV090x_WIDTH_Px_CCIDETECT_PLH_FIELD 1
#define STV090x_OFFST_Px_R0_CCI_FIELD 0
#define STV090x_WIDTH_Px_R0_CCI_FIELD 7
#define STV090x_Px_CCIQUANT(__x) (0xf4c2 - (__x - 1) * 0x200)
#define STV090x_P1_CCIQUANT STV090x_Px_CCIQUANT(1)
#define STV090x_P2_CCIQUANT STV090x_Px_CCIQUANT(2)
#define STV090x_OFFST_Px_CCI_BETA_FIELD 5
#define STV090x_WIDTH_Px_CCI_BETA_FIELD 3
#define STV090x_OFFST_Px_CCI_QUANT_FIELD 0
#define STV090x_WIDTH_Px_CCI_QUANT_FIELD 5
#define STV090x_Px_CCITHRESH(__x) (0xf4c3 - (__x - 1) * 0x200)
#define STV090x_P1_CCITHRESH STV090x_Px_CCITHRESH(1)
#define STV090x_P2_CCITHRESH STV090x_Px_CCITHRESH(2)
#define STV090x_OFFST_Px_CCI_THRESHOLD_FIELD 0
#define STV090x_WIDTH_Px_CCI_THRESHOLD_FIELD 8
#define STV090x_Px_CCIACC(__x) (0xf4c4 - (__x - 1) * 0x200)
#define STV090x_P1_CCIACC STV090x_Px_CCIACC(1)
#define STV090x_P2_CCIACC STV090x_Px_CCIACC(1)
#define STV090x_OFFST_Px_CCI_VALUE_FIELD 0
#define STV090x_WIDTH_Px_CCI_VALUE_FIELD 8
#define STV090x_Px_DMDRESCFG(__x) (0xF4C6 - (__x - 1) * 0x200) #define STV090x_Px_DMDRESCFG(__x) (0xF4C6 - (__x - 1) * 0x200)
#define STV090x_P1_DMDRESCFG STV090x_Px_DMDRESCFG(1) #define STV090x_P1_DMDRESCFG STV090x_Px_DMDRESCFG(1)
#define STV090x_P2_DMDRESCFG STV090x_Px_DMDRESCFG(2) #define STV090x_P2_DMDRESCFG STV090x_Px_DMDRESCFG(2)
...@@ -1847,16 +1889,28 @@ ...@@ -1847,16 +1889,28 @@
#define STV090x_Px_PDELCTRL2(__x) (0xf551 - (__x - 1) * 0x200) #define STV090x_Px_PDELCTRL2(__x) (0xf551 - (__x - 1) * 0x200)
#define STV090x_P1_PDELCTRL2 STV090x_Px_PDELCTRL2(1) #define STV090x_P1_PDELCTRL2 STV090x_Px_PDELCTRL2(1)
#define STV090x_P2_PDELCTRL2 STV090x_Px_PDELCTRL2(2) #define STV090x_P2_PDELCTRL2 STV090x_Px_PDELCTRL2(2)
#define STV090x_OFFST_Px_FORCE_CONTINUOUS 7
#define STV090x_WIDTH_Px_FORCE_CONTINUOUS 1
#define STV090x_OFFST_Px_RESET_UPKO_COUNT 6
#define STV090x_WIDTH_Px_RESET_UPKO_COUNT 1
#define STV090x_OFFST_Px_USER_PKTDELIN_NB 5
#define STV090x_WIDTH_Px_USER_PKTDELIN_NB 1
#define STV090x_OFFST_Px_FORCE_LOCKED 4
#define STV090x_WIDTH_Px_FORCE_LOCKED 1
#define STV090x_OFFST_Px_DATA_UNBBSCRAM 3
#define STV090x_WIDTH_Px_DATA_UNBBSCRAM 1
#define STV090x_OFFST_Px_FORCE_LONGPACKET 2
#define STV090x_WIDTH_Px_FORCE_LONGPACKET 1
#define STV090x_OFFST_Px_FRAME_MODE_FIELD 1 #define STV090x_OFFST_Px_FRAME_MODE_FIELD 1
#define STV090x_WIDTH_Px_FRAME_MODE_FIELD 1 #define STV090x_WIDTH_Px_FRAME_MODE_FIELD 1
#define STV090x_Px_HYSTTHRESH(__x) (0xf554 - (__x - 1) * 0x200) #define STV090x_Px_HYSTTHRESH(__x) (0xf554 - (__x - 1) * 0x200)
#define STV090x_P1_HYSTTHRESH STV090x_Px_HYSTTHRESH(1) #define STV090x_P1_HYSTTHRESH STV090x_Px_HYSTTHRESH(1)
#define STV090x_P2_HYSTTHRESH STV090x_Px_HYSTTHRESH(2) #define STV090x_P2_HYSTTHRESH STV090x_Px_HYSTTHRESH(2)
#define STV090x_OFFST_Px_UNLCK_THRESH_FIELD 4 #define STV090x_OFFST_Px_UNLCK_THRESH_FIELD 4
#define STV090x_WIDTH_Px_UNLCK_THRESH_FIELD 4 #define STV090x_WIDTH_Px_UNLCK_THRESH_FIELD 4
#define STV090x_OFFST_Px_DELIN_LCK_THRESH_FIELD 0 #define STV090x_OFFST_Px_DELIN_LCK_THRESH_FIELD 0
#define STV090x_WIDTH_Px_DELIN_LCK_THRESH_FIELD 4 #define STV090x_WIDTH_Px_DELIN_LCK_THRESH_FIELD 4
#define STV090x_Px_ISIENTRY(__x) (0xf55e - (__x - 1) * 0x200) #define STV090x_Px_ISIENTRY(__x) (0xf55e - (__x - 1) * 0x200)
#define STV090x_P1_ISIENTRY STV090x_Px_ISIENTRY(1) #define STV090x_P1_ISIENTRY STV090x_Px_ISIENTRY(1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7