Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 261519
b: refs/heads/master
c: f1b8297
h: refs/heads/master
i:
  261517: 38573e0
  261515: 7c37db8
  261511: 691cc0b
  261503: 884d53e
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Jul 27, 2011
1 parent e436c4c commit 07ffb8a
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 85 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cf694b141ea2973179756fd572dd5cdd064e1abf
refs/heads/master: f1b829704c0b48daff99056932855e71c2814855
165 changes: 81 additions & 84 deletions trunk/drivers/media/dvb/frontends/drxk_hard.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1806,57 +1806,59 @@ static int SetOperationMode(struct drxk_state *state,
if (status < 0)
goto error;

if (state->m_OperationMode != oMode) {
switch (state->m_OperationMode) {
/* OM_NONE was added for start up */
case OM_NONE:
break;
case OM_DVBT:
status = MPEGTSStop(state);
if (status < 0)
goto error;
status = PowerDownDVBT(state, true);
if (status < 0)
goto error;
state->m_OperationMode = OM_NONE;
break;
case OM_QAM_ITU_A: /* fallthrough */
case OM_QAM_ITU_C:
status = MPEGTSStop(state);
if (status < 0)
goto error;
status = PowerDownQAM(state);
if (status < 0)
goto error;
state->m_OperationMode = OM_NONE;
break;
case OM_QAM_ITU_B:
default:
status = -EINVAL;
/* Device is already at the required mode */
if (state->m_OperationMode == oMode)
return 0;

switch (state->m_OperationMode) {
/* OM_NONE was added for start up */
case OM_NONE:
break;
case OM_DVBT:
status = MPEGTSStop(state);
if (status < 0)
goto error;
}
status = PowerDownDVBT(state, true);
if (status < 0)
goto error;
state->m_OperationMode = OM_NONE;
break;
case OM_QAM_ITU_A: /* fallthrough */
case OM_QAM_ITU_C:
status = MPEGTSStop(state);
if (status < 0)
goto error;
status = PowerDownQAM(state);
if (status < 0)
goto error;
state->m_OperationMode = OM_NONE;
break;
case OM_QAM_ITU_B:
default:
status = -EINVAL;
goto error;
}

/*
Power up new standard
*/
switch (oMode) {
case OM_DVBT:
state->m_OperationMode = oMode;
status = SetDVBTStandard(state, oMode);
if (status < 0)
goto error;
break;
case OM_QAM_ITU_A: /* fallthrough */
case OM_QAM_ITU_C:
state->m_OperationMode = oMode;
status = SetQAMStandard(state, oMode);
if (status < 0)
goto error;
break;
case OM_QAM_ITU_B:
default:
status = -EINVAL;
}
/*
Power up new standard
*/
switch (oMode) {
case OM_DVBT:
state->m_OperationMode = oMode;
status = SetDVBTStandard(state, oMode);
if (status < 0)
goto error;
break;
case OM_QAM_ITU_A: /* fallthrough */
case OM_QAM_ITU_C:
state->m_OperationMode = oMode;
status = SetQAMStandard(state, oMode);
if (status < 0)
goto error;
break;
case OM_QAM_ITU_B:
default:
status = -EINVAL;
}
error:
if (status < 0)
Expand Down Expand Up @@ -3086,35 +3088,28 @@ static int InitAGC(struct drxk_state *state, bool isDTV)
clpCyclen = 500;
clpSumMax = 1023;

if (IsQAM(state)) {
/* Standard specific settings */
clpSumMin = 8;
clpDirTo = (u16) -9;
clpCtrlMode = 0;
snsSumMin = 8;
snsDirTo = (u16) -9;
kiInnergainMin = (u16) -1030;
} else {
status = -EINVAL;
goto error;
}
if (IsQAM(state)) {
ifIaccuHiTgtMax = 0x2380;
ifIaccuHiTgt = 0x2380;
ingainTgtMin = 0x0511;
ingainTgt = 0x0511;
ingainTgtMax = 5119;
fastClpCtrlDelay =
state->m_qamIfAgcCfg.FastClipCtrlDelay;
} else {
ifIaccuHiTgtMax = 0x1200;
ifIaccuHiTgt = 0x1200;
ingainTgtMin = 13424;
ingainTgt = 13424;
ingainTgtMax = 30000;
fastClpCtrlDelay =
state->m_dvbtIfAgcCfg.FastClipCtrlDelay;
/* AGCInit() not available for DVBT; init done in microcode */
if (!IsQAM(state)) {
printk(KERN_ERR "drxk: %s: mode %d is not DVB-C\n", __func__, state->m_OperationMode);
return -EINVAL;
}

/* FIXME: Analog TV AGC require different settings */

/* Standard specific settings */
clpSumMin = 8;
clpDirTo = (u16) -9;
clpCtrlMode = 0;
snsSumMin = 8;
snsDirTo = (u16) -9;
kiInnergainMin = (u16) -1030;
ifIaccuHiTgtMax = 0x2380;
ifIaccuHiTgt = 0x2380;
ingainTgtMin = 0x0511;
ingainTgt = 0x0511;
ingainTgtMax = 5119;
fastClpCtrlDelay = state->m_qamIfAgcCfg.FastClipCtrlDelay;

status = write16(state, SCU_RAM_AGC_FAST_CLP_CTRL_DELAY__A, fastClpCtrlDelay);
if (status < 0)
goto error;
Expand Down Expand Up @@ -3238,13 +3233,13 @@ static int InitAGC(struct drxk_state *state, bool isDTV)
status = read16(state, SCU_RAM_AGC_KI__A, &data);
if (status < 0)
goto error;
if (IsQAM(state)) {
data = 0x0657;
data &= ~SCU_RAM_AGC_KI_RF__M;
data |= (DRXK_KI_RAGC_QAM << SCU_RAM_AGC_KI_RF__B);
data &= ~SCU_RAM_AGC_KI_IF__M;
data |= (DRXK_KI_IAGC_QAM << SCU_RAM_AGC_KI_IF__B);
}

data = 0x0657;
data &= ~SCU_RAM_AGC_KI_RF__M;
data |= (DRXK_KI_RAGC_QAM << SCU_RAM_AGC_KI_RF__B);
data &= ~SCU_RAM_AGC_KI_IF__M;
data |= (DRXK_KI_IAGC_QAM << SCU_RAM_AGC_KI_IF__B);

status = write16(state, SCU_RAM_AGC_KI__A, data);
error:
if (status < 0)
Expand Down Expand Up @@ -5627,6 +5622,8 @@ static int SetQAMStandard(struct drxk_state *state,
#undef DRXK_QAMA_TAPS_SELECT
#endif

dprintk(1, "\n");

/* added antenna switch */
SwitchAntennaToQAM(state);

Expand Down

0 comments on commit 07ffb8a

Please sign in to comment.