Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 285636
b: refs/heads/master
c: 31e67fa
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Jan 5, 2012
1 parent 270e951 commit 0fffd3f
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 95 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: 66aea30d32b8938f0b6ef06b0a2811272bd9968d
refs/heads/master: 31e67faeaf058e0575cfb304a39dbcccf3d8569b
137 changes: 43 additions & 94 deletions trunk/drivers/media/common/tuners/mt2063.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@
static unsigned int verbose;
module_param(verbose, int, 0644);

/* Internal structures and types */

/* FIXME: Those two error codes need conversion*/
/* Error: Upconverter PLL is not locked */
#define MT2063_UPC_UNLOCK (0x80000002)
/* Error: Downconverter PLL is not locked */
#define MT2063_DNC_UNLOCK (0x80000004)
/* positive error codes used internally */

/* Info: Unavoidable LO-related spur may be present in the output */
#define MT2063_SPUR_PRESENT_ERR (0x00800000)
Expand All @@ -29,10 +23,6 @@ module_param(verbose, int, 0644);
/* Info: Downconverter frequency is out of range (may be reason for MT_DPC_UNLOCK) */
#define MT2063_DNC_RANGE (0x08000000)

/*
* Data Types
*/

/*
* Constant defining the version of the following structure
* and therefore the API for this code.
Expand Down Expand Up @@ -362,29 +352,6 @@ unsigned int mt2063_setTune(struct dvb_frontend *fe, u32 f_in,
return err;
}

unsigned int mt2063_lockStatus(struct dvb_frontend *fe)
{
struct dvb_frontend_ops *frontend_ops = &fe->ops;
struct dvb_tuner_ops *tuner_ops = &frontend_ops->tuner_ops;
struct tuner_state t_state;
int err = 0;

if (&fe->ops)
frontend_ops = &fe->ops;
if (&frontend_ops->tuner_ops)
tuner_ops = &frontend_ops->tuner_ops;
if (tuner_ops->get_state) {
if ((err =
tuner_ops->get_state(fe, DVBFE_TUNER_REFCLOCK,
&t_state)) < 0) {
printk("%s: Invalid parameter\n", __func__);
return err;
}
}
return err;
}


unsigned int tuner_MT2063_SoftwareShutdown(struct dvb_frontend *fe)
{
struct mt2063_state *state = fe->tuner_priv;
Expand Down Expand Up @@ -1193,68 +1160,46 @@ static u32 MT2063_CalcLO2Mult(u32 * Div, u32 * FracN, u32 f_LO,
static u32 MT2063_fLO_FractionalTerm(u32 f_ref, u32 num,
u32 denom);

/****************************************************************************
**
** Name: MT2063_GetLocked
**
** Description: Checks to see if LO1 and LO2 are locked.
**
** Parameters: h - Open handle to the tuner (from MT2063_Open).
**
** Returns: status:
** MT_OK - No errors
** MT_UPC_UNLOCK - Upconverter PLL unlocked
** MT_DNC_UNLOCK - Downconverter PLL unlocked
** MT_COMM_ERR - Serial bus communications error
** MT_INV_HANDLE - Invalid tuner handle
**
** Dependencies: MT_ReadSub - Read byte(s) of data from the serial bus
** MT_Sleep - Delay execution for x milliseconds
**
** Revision History:
**
** SCR Date Author Description
** -------------------------------------------------------------------------
** 138 06-19-2007 DAD Ver 1.00: Initial, derived from mt2067_b.
**
****************************************************************************/
static u32 MT2063_GetLocked(struct mt2063_state *state)
/**
* mt2063_lockStatus - Checks to see if LO1 and LO2 are locked
*
* @state: struct mt2063_state pointer
*
* This function returns 0, if no lock, 1 if locked and a value < 1 if error
*/
unsigned int mt2063_lockStatus(struct mt2063_state *state)
{
const u32 nMaxWait = 100; /* wait a maximum of 100 msec */
const u32 nPollRate = 2; /* poll status bits every 2 ms */
const u32 nMaxLoops = nMaxWait / nPollRate;
const u8 LO1LK = 0x80;
u8 LO2LK = 0x08;
u32 status = 0; /* Status to be returned */
u32 status;
u32 nDelays = 0;

/* LO2 Lock bit was in a different place for B0 version */
if (state->tuner_id == MT2063_B0)
LO2LK = 0x40;

do {
status |=
mt2063_read(state,
MT2063_REG_LO_STATUS,
&state->reg[MT2063_REG_LO_STATUS], 1);
status = mt2063_read(state, MT2063_REG_LO_STATUS,
&state->reg[MT2063_REG_LO_STATUS], 1);

if (status < 0)
return (status);
return status;

if ((state->reg[MT2063_REG_LO_STATUS] & (LO1LK | LO2LK)) ==
(LO1LK | LO2LK)) {
return (status);
return TUNER_STATUS_LOCKED | TUNER_STATUS_STEREO;
}
msleep(nPollRate); /* Wait between retries */
}
while (++nDelays < nMaxLoops);

if ((state->reg[MT2063_REG_LO_STATUS] & LO1LK) == 0x00)
status |= MT2063_UPC_UNLOCK;
if ((state->reg[MT2063_REG_LO_STATUS] & LO2LK) == 0x00)
status |= MT2063_DNC_UNLOCK;

return (status);
/*
* Got no lock or partial lock
*/
return 0;
}

/****************************************************************************
Expand Down Expand Up @@ -2424,15 +2369,14 @@ static u32 MT2063_ClearPowerMaskBits(struct mt2063_state *state, enum MT2063_Mas
****************************************************************************/
static u32 MT2063_SoftwareShutdown(struct mt2063_state *state, u8 Shutdown)
{
u32 status = 0; /* Status to be returned */
u32 status; /* Status to be returned */

if (Shutdown == 1)
state->reg[MT2063_REG_PWR_1] |= 0x04; /* Turn the bit on */
else
state->reg[MT2063_REG_PWR_1] &= ~0x04; /* Turn off the bit */

status |=
mt2063_write(state,
status = mt2063_write(state,
MT2063_REG_PWR_1,
&state->reg[MT2063_REG_PWR_1], 1);

Expand All @@ -2453,7 +2397,7 @@ static u32 MT2063_SoftwareShutdown(struct mt2063_state *state, u8 Shutdown)
1);
}

return (status);
return status;
}

/****************************************************************************
Expand Down Expand Up @@ -2486,17 +2430,18 @@ static u32 MT2063_SoftwareShutdown(struct mt2063_state *state, u8 Shutdown)
****************************************************************************/
static u32 MT2063_SetReg(struct mt2063_state *state, u8 reg, u8 val)
{
u32 status = 0; /* Status to be returned */
u32 status;

if (reg >= MT2063_REG_END_REGS)
status |= -ERANGE;
return -ERANGE;

status = mt2063_write(state, reg, &val,
1);
if (status >= 0)
state->reg[reg] = val;
status = mt2063_write(state, reg, &val, 1);
if (status < 0)
return status;

return (status);
state->reg[reg] = val;

return 0;
}

static u32 MT2063_Round_fLO(u32 f_LO, u32 f_LO_Step, u32 f_ref)
Expand Down Expand Up @@ -2670,7 +2615,7 @@ static u32 FindClearTuneFilter(struct mt2063_state *state, u32 f_in)
break;
}
}
return (RFBand);
return RFBand;
}

/****************************************************************************
Expand Down Expand Up @@ -2899,18 +2844,22 @@ static u32 MT2063_Tune(struct mt2063_state *state, u32 f_in)
** Check for LO's locking
*/

if (status >= 0) {
status |= MT2063_GetLocked(state);
}
if (status < 0)
return status;

status = mt2063_lockStatus(state);
if (status < 0)
return status;
if (!status)
return -EINVAL; /* Couldn't lock */

/*
** If we locked OK, assign calculated data to mt2063_state structure
* If we locked OK, assign calculated data to mt2063_state structure
*/
if (status >= 0) {
state->f_IF1_actual = state->AS_Data.f_LO1 - f_in;
}
state->f_IF1_actual = state->AS_Data.f_LO1 - f_in;
}

return (status);
return status;
}

static u32 MT_Tune_atv(void *h, u32 f_in, u32 bw_in,
Expand Down Expand Up @@ -3321,7 +3270,7 @@ static int mt2063_get_state(struct dvb_frontend *fe,
//get bandwidth
break;
case DVBFE_TUNER_REFCLOCK:
tunstate->refclock = (u32) MT2063_GetLocked(state);
tunstate->refclock = mt2063_lockStatus(state);
break;
default:
break;
Expand Down

0 comments on commit 0fffd3f

Please sign in to comment.