Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 285641
b: refs/heads/master
c: e3f94fb
h: refs/heads/master
i:
  285639: 0695ce3
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Jan 5, 2012
1 parent 4554b67 commit 7eb7c3f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 29 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: 8294e3ed418e0521e9c48c3b2653cdec163bbc17
refs/heads/master: e3f94fb8c53bb0537396b66da5f86f3865fdb616
44 changes: 16 additions & 28 deletions trunk/drivers/media/common/tuners/mt2063.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ static struct MT2063_ExclZone_t *RemoveNode(struct MT2063_AvoidSpursData_t
**
*****************************************************************************/
static void MT2063_AddExclZone(struct MT2063_AvoidSpursData_t *pAS_Info,
u32 f_min, u32 f_max)
u32 f_min, u32 f_max)
{
struct MT2063_ExclZone_t *pNode = pAS_Info->usedZones;
struct MT2063_ExclZone_t *pPrev = NULL;
Expand Down Expand Up @@ -734,7 +734,7 @@ static u32 MT2063_gcd(u32 u, u32 v)
**
****************************************************************************/
static u32 IsSpurInBand(struct MT2063_AvoidSpursData_t *pAS_Info,
u32 * fm, u32 * fp)
u32 *fm, u32 * fp)
{
/*
** Calculate LO frequency settings.
Expand Down Expand Up @@ -849,7 +849,7 @@ static u32 IsSpurInBand(struct MT2063_AvoidSpursData_t *pAS_Info,
** 096 04-06-2005 DAD Ver 1.11: Fix divide by 0 error if maxH==0.
**
*****************************************************************************/
static u32 MT2063_AvoidSpurs(void *h, struct MT2063_AvoidSpursData_t * pAS_Info)
static u32 MT2063_AvoidSpurs(struct MT2063_AvoidSpursData_t *pAS_Info)
{
u32 status = 0;
u32 fm, fp; /* restricted range on LO's */
Expand Down Expand Up @@ -1011,18 +1011,6 @@ static const u8 FIFOVDIS[] = { 0, 0, 0, 0, 0, 0 };
static const u8 ACFIFMAX[] = { 29, 29, 29, 29, 29, 29 };
static const u8 PD2TGT[] = { 40, 33, 38, 42, 30, 38 };

/*
** Local Function Prototypes - not available for external access.
*/

/* Forward declaration(s): */
static u32 MT2063_CalcLO1Mult(u32 * Div, u32 * FracN, u32 f_LO,
u32 f_LO_Step, u32 f_Ref);
static u32 MT2063_CalcLO2Mult(u32 * Div, u32 * FracN, u32 f_LO,
u32 f_LO_Step, u32 f_Ref);
static u32 MT2063_fLO_FractionalTerm(u32 f_ref, u32 num,
u32 denom);

/**
* mt2063_lockStatus - Checks to see if LO1 and LO2 are locked
*
Expand Down Expand Up @@ -1300,7 +1288,7 @@ static u32 mt2063_set_dnc_output_enable(struct mt2063_state *state,
**
******************************************************************************/
static u32 MT2063_SetReceiverMode(struct mt2063_state *state,
enum MT2063_RCVR_MODES Mode)
enum MT2063_RCVR_MODES Mode)
{
u32 status = 0; /* Status to be returned */
u8 val;
Expand Down Expand Up @@ -1464,7 +1452,8 @@ static u32 MT2063_SetReceiverMode(struct mt2063_state *state,
** 138 06-19-2007 DAD Ver 1.00: Initial, derived from mt2067_b.
**
****************************************************************************/
static u32 MT2063_ClearPowerMaskBits(struct mt2063_state *state, enum MT2063_Mask_Bits Bits)
static u32 MT2063_ClearPowerMaskBits(struct mt2063_state *state,
enum MT2063_Mask_Bits Bits)
{
u32 status = 0; /* Status to be returned */

Expand Down Expand Up @@ -1584,8 +1573,7 @@ static u32 MT2063_Round_fLO(u32 f_LO, u32 f_LO_Step, u32 f_ref)
** 138 06-19-2007 DAD Ver 1.00: Initial, derived from mt2067_b.
**
****************************************************************************/
static u32 MT2063_fLO_FractionalTerm(u32 f_ref,
u32 num, u32 denom)
static u32 MT2063_fLO_FractionalTerm(u32 f_ref, u32 num, u32 denom)
{
u32 t1 = (f_ref >> 14) * num;
u32 term1 = t1 / denom;
Expand Down Expand Up @@ -1623,9 +1611,9 @@ static u32 MT2063_fLO_FractionalTerm(u32 f_ref,
**
****************************************************************************/
static u32 MT2063_CalcLO1Mult(u32 * Div,
u32 * FracN,
u32 f_LO,
u32 f_LO_Step, u32 f_Ref)
u32 * FracN,
u32 f_LO,
u32 f_LO_Step, u32 f_Ref)
{
/* Calculate the whole number portion of the divider */
*Div = f_LO / f_Ref;
Expand Down Expand Up @@ -1666,9 +1654,9 @@ static u32 MT2063_CalcLO1Mult(u32 * Div,
**
****************************************************************************/
static u32 MT2063_CalcLO2Mult(u32 * Div,
u32 * FracN,
u32 f_LO,
u32 f_LO_Step, u32 f_Ref)
u32 * FracN,
u32 f_LO,
u32 f_LO_Step, u32 f_Ref)
{
/* Calculate the whole number portion of the divider */
*Div = f_LO / f_Ref;
Expand Down Expand Up @@ -1857,7 +1845,7 @@ static u32 MT2063_Tune(struct mt2063_state *state, u32 f_in)
** Check for any LO spurs in the output bandwidth and adjust
** the LO settings to avoid them if needed
*/
status |= MT2063_AvoidSpurs(state, &state->AS_Data);
status |= MT2063_AvoidSpurs(&state->AS_Data);
/*
** MT_AvoidSpurs spurs may have changed the LO1 & LO2 values.
** Recalculate the LO frequencies and the values to be placed
Expand Down Expand Up @@ -1967,7 +1955,7 @@ static u32 MT2063_Tune(struct mt2063_state *state, u32 f_in)
}

int mt2063_setTune(struct dvb_frontend *fe, u32 f_in, u32 bw_in,
enum MTTune_atv_standard tv_type)
enum MTTune_atv_standard tv_type)
{
struct mt2063_state *state = fe->tuner_priv;
u32 status = 0;
Expand Down Expand Up @@ -2349,7 +2337,7 @@ static int mt2063_get_status(struct dvb_frontend *fe, u32 * status)
{
int rc = 0;

//get tuner lock status
/* FIXME: add get tuner lock status */

return rc;
}
Expand Down

0 comments on commit 7eb7c3f

Please sign in to comment.