From 99a1c73d4b9c5a527ca535981a049b74fe4eee70 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Wed, 24 Oct 2007 09:55:54 -0300 Subject: [PATCH] --- yaml --- r: 76320 b: refs/heads/master c: 7d11c53c5d909d866dee0ce5db2d6ca1c422edca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/Makefile | 1 + trunk/drivers/media/dvb/frontends/tda18271.c | 33 +++++++++++++++----- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 37d291020f0b..d2b82ce08475 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a72dd305f99f6c6e4eff01478ae53fc80ce98fb1 +refs/heads/master: 7d11c53c5d909d866dee0ce5db2d6ca1c422edca diff --git a/trunk/drivers/media/dvb/frontends/Makefile b/trunk/drivers/media/dvb/frontends/Makefile index 457effcda5da..57e5fa80589b 100644 --- a/trunk/drivers/media/dvb/frontends/Makefile +++ b/trunk/drivers/media/dvb/frontends/Makefile @@ -3,6 +3,7 @@ # EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ +EXTRA_CFLAGS += -Idrivers/media/video/ obj-$(CONFIG_DVB_PLL) += dvb-pll.o obj-$(CONFIG_DVB_STV0299) += stv0299.o diff --git a/trunk/drivers/media/dvb/frontends/tda18271.c b/trunk/drivers/media/dvb/frontends/tda18271.c index 1b9c143888ea..aaaa2f885186 100644 --- a/trunk/drivers/media/dvb/frontends/tda18271.c +++ b/trunk/drivers/media/dvb/frontends/tda18271.c @@ -21,6 +21,7 @@ #include #include #include +#include "tuner-driver.h" #include "tda18271.h" @@ -324,6 +325,26 @@ struct tda18271_priv { u32 bandwidth; }; +static int tda18271_i2c_gate_ctrl(struct dvb_frontend *fe, int enable) +{ + struct tda18271_priv *priv = fe->tuner_priv; + struct analog_tuner_ops *ops = fe->ops.analog_demod_ops; + int ret = 0; + + switch (priv->mode) { + case TDA18271_ANALOG: + if (ops && ops->i2c_gate_ctrl) + ret = ops->i2c_gate_ctrl(fe, enable); + break; + case TDA18271_DIGITAL: + if (fe->ops.i2c_gate_ctrl) + ret = fe->ops.i2c_gate_ctrl(fe, enable); + break; + } + + return ret; +}; + /*---------------------------------------------------------------------*/ static void tda18271_dump_regs(struct dvb_frontend *fe) @@ -363,14 +384,12 @@ static void tda18271_read_regs(struct dvb_frontend *fe) .buf = regs, .len = 16 } }; - if (fe->ops.i2c_gate_ctrl) - fe->ops.i2c_gate_ctrl(fe, 1); + tda18271_i2c_gate_ctrl(fe, 1); /* read all registers */ ret = i2c_transfer(priv->i2c_adap, msg, 2); - if (fe->ops.i2c_gate_ctrl) - fe->ops.i2c_gate_ctrl(fe, 0); + tda18271_i2c_gate_ctrl(fe, 0); if (ret != 2) printk("ERROR: %s: i2c_transfer returned: %d\n", @@ -396,14 +415,12 @@ static void tda18271_write_regs(struct dvb_frontend *fe, int idx, int len) buf[i] = regs[idx-1+i]; } - if (fe->ops.i2c_gate_ctrl) - fe->ops.i2c_gate_ctrl(fe, 1); + tda18271_i2c_gate_ctrl(fe, 1); /* write registers */ ret = i2c_transfer(priv->i2c_adap, &msg, 1); - if (fe->ops.i2c_gate_ctrl) - fe->ops.i2c_gate_ctrl(fe, 0); + tda18271_i2c_gate_ctrl(fe, 0); if (ret != 1) printk(KERN_WARNING "ERROR: %s: i2c_transfer returned: %d\n",