From: Michael Krufky Date: Mon, 24 Dec 2007 07:35:21 +0000 (-0300) Subject: V4L/DVB (6906): tda18271: rename tda18271_calc_* functions to tda18271_lookup_* X-Git-Tag: v2.6.25-rc1~1235^2~127 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f0bd504fb91c8929bfbacbad759a8e3fe572589f;p=karo-tx-linux.git V4L/DVB (6906): tda18271: rename tda18271_calc_* functions to tda18271_lookup_* Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb/frontends/tda18271-fe.c b/drivers/media/dvb/frontends/tda18271-fe.c index 4a32c2e63719..4c105853d93c 100644 --- a/drivers/media/dvb/frontends/tda18271-fe.c +++ b/drivers/media/dvb/frontends/tda18271-fe.c @@ -386,7 +386,7 @@ static int tda18271_tune(struct dvb_frontend *fe, /* RF tracking filter calibration */ /* calculate BP_Filter */ - tda18271_calc_bp_filter(&freq, &val); + tda18271_lookup_bp_filter(&freq, &val); regs[R_EP1] &= ~0x07; /* clear bp filter bits */ regs[R_EP1] |= val; @@ -419,7 +419,7 @@ static int tda18271_tune(struct dvb_frontend *fe, break; } - tda18271_calc_cal_pll(&N, &pd, &d); + tda18271_lookup_cal_pll(&N, &pd, &d); regs[R_CPD] = pd; @@ -439,7 +439,7 @@ static int tda18271_tune(struct dvb_frontend *fe, break; } - tda18271_calc_main_pll(&N, &pd, &d); + tda18271_lookup_main_pll(&N, &pd, &d); regs[R_MPD] = (0x7f & pd); @@ -461,20 +461,20 @@ static int tda18271_tune(struct dvb_frontend *fe, msleep(5); /* RF tracking filter calibration initialization */ /* search for K,M,CO for RF Calibration */ - tda18271_calc_km(&freq, &val); + tda18271_lookup_km(&freq, &val); regs[R_EB13] &= 0x83; regs[R_EB13] |= val; tda18271_write_regs(fe, R_EB13, 1); /* search for RF_BAND */ - tda18271_calc_rf_band(&freq, &val); + tda18271_lookup_rf_band(&freq, &val); regs[R_EP2] &= ~0xe0; /* clear rf band bits */ regs[R_EP2] |= (val << 5); /* search for Gain_Taper */ - tda18271_calc_gain_taper(&freq, &val); + tda18271_lookup_gain_taper(&freq, &val); regs[R_EP2] &= ~0x1f; /* clear gain taper bits */ regs[R_EP2] |= val; @@ -502,7 +502,7 @@ static int tda18271_tune(struct dvb_frontend *fe, tda18271_write_regs(fe, R_EP1, 1); /* RF tracking filer correction for VHF_Low band */ - tda18271_calc_rf_cal(&freq, &val); + tda18271_lookup_rf_cal(&freq, &val); /* VHF_Low band only */ if (val != 0) { @@ -546,7 +546,7 @@ static int tda18271_tune(struct dvb_frontend *fe, regs[R_EP4] &= ~0x80; /* turn this bit on only for fm */ /* image rejection validity EP5[2:0] */ - tda18271_calc_ir_measure(&freq, &val); + tda18271_lookup_ir_measure(&freq, &val); regs[R_EP5] &= ~0x07; regs[R_EP5] |= val; @@ -554,7 +554,7 @@ static int tda18271_tune(struct dvb_frontend *fe, /* calculate MAIN PLL */ N = freq + ifc; - tda18271_calc_main_pll(&N, &pd, &d); + tda18271_lookup_main_pll(&N, &pd, &d); regs[R_MPD] = (0x7f & pd); switch (priv->mode) { diff --git a/drivers/media/dvb/frontends/tda18271-priv.h b/drivers/media/dvb/frontends/tda18271-priv.h index d56c2fe3efa2..e1fa9a467939 100644 --- a/drivers/media/dvb/frontends/tda18271-priv.h +++ b/drivers/media/dvb/frontends/tda18271-priv.h @@ -82,15 +82,15 @@ extern int tda18271_debug; /*---------------------------------------------------------------------*/ -extern void tda18271_calc_cal_pll(u32 *freq, u8 *post_div, u8 *div); -extern void tda18271_calc_main_pll(u32 *freq, u8 *post_div, u8 *div); - -extern void tda18271_calc_bp_filter(u32 *freq, u8 *val); -extern void tda18271_calc_km(u32 *freq, u8 *val); -extern void tda18271_calc_rf_band(u32 *freq, u8 *val); -extern void tda18271_calc_gain_taper(u32 *freq, u8 *val); -extern void tda18271_calc_rf_cal(u32 *freq, u8 *val); -extern void tda18271_calc_ir_measure(u32 *freq, u8 *val); +extern void tda18271_lookup_cal_pll(u32 *freq, u8 *post_div, u8 *div); +extern void tda18271_lookup_main_pll(u32 *freq, u8 *post_div, u8 *div); + +extern void tda18271_lookup_bp_filter(u32 *freq, u8 *val); +extern void tda18271_lookup_km(u32 *freq, u8 *val); +extern void tda18271_lookup_rf_band(u32 *freq, u8 *val); +extern void tda18271_lookup_gain_taper(u32 *freq, u8 *val); +extern void tda18271_lookup_rf_cal(u32 *freq, u8 *val); +extern void tda18271_lookup_ir_measure(u32 *freq, u8 *val); #endif /* __TDA18271_PRIV_H__ */ diff --git a/drivers/media/dvb/frontends/tda18271-tables.c b/drivers/media/dvb/frontends/tda18271-tables.c index 65387bb059eb..cce0e0d82233 100644 --- a/drivers/media/dvb/frontends/tda18271-tables.c +++ b/drivers/media/dvb/frontends/tda18271-tables.c @@ -294,49 +294,49 @@ static void tda18271_lookup_pll_map(struct tda18271_pll_map *map, /*---------------------------------------------------------------------*/ -void tda18271_calc_cal_pll(u32 *freq, u8 *post_div, u8 *div) +void tda18271_lookup_cal_pll(u32 *freq, u8 *post_div, u8 *div) { tda18271_lookup_pll_map(tda18271_cal_pll, freq, post_div, div); dbg_map("post div = 0x%02x, div = 0x%02x\n", *post_div, *div); } -void tda18271_calc_main_pll(u32 *freq, u8 *post_div, u8 *div) +void tda18271_lookup_main_pll(u32 *freq, u8 *post_div, u8 *div) { tda18271_lookup_pll_map(tda18271_main_pll, freq, post_div, div); dbg_map("post div = 0x%02x, div = 0x%02x\n", *post_div, *div); } -void tda18271_calc_bp_filter(u32 *freq, u8 *val) +void tda18271_lookup_bp_filter(u32 *freq, u8 *val) { tda18271_lookup_map(tda18271_bp_filter, freq, val); dbg_map("0x%02x\n", *val); } -void tda18271_calc_km(u32 *freq, u8 *val) +void tda18271_lookup_km(u32 *freq, u8 *val) { tda18271_lookup_map(tda18271_km, freq, val); dbg_map("0x%02x\n", *val); } -void tda18271_calc_rf_band(u32 *freq, u8 *val) +void tda18271_lookup_rf_band(u32 *freq, u8 *val) { tda18271_lookup_map(tda18271_rf_band, freq, val); dbg_map("0x%02x\n", *val); } -void tda18271_calc_gain_taper(u32 *freq, u8 *val) +void tda18271_lookup_gain_taper(u32 *freq, u8 *val) { tda18271_lookup_map(tda18271_gain_taper, freq, val); dbg_map("0x%02x\n", *val); } -void tda18271_calc_rf_cal(u32 *freq, u8 *val) +void tda18271_lookup_rf_cal(u32 *freq, u8 *val) { tda18271_lookup_map(tda18271_rf_cal, freq, val); dbg_map("0x%02x\n", *val); } -void tda18271_calc_ir_measure(u32 *freq, u8 *val) +void tda18271_lookup_ir_measure(u32 *freq, u8 *val) { tda18271_lookup_map(tda18271_ir_measure, freq, val); dbg_map("0x%02x\n", *val);