From 0dd5f9acbc4f69e168833c43267d3c3ca74d7a25 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 16 Dec 2007 17:14:31 -0500
Subject: tda9887: remove references to struct tuner from printk macros

From: Michael Krufky <mkrufky@linuxtv.org>

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 linux/drivers/media/video/tda9887.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'linux')

diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index bd4173e41..f262055c9 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -29,14 +29,14 @@ static int tda9887_debug;
 module_param_named(debug, tda9887_debug, int, 0644);
 
 #define tda9887_info(fmt, arg...) do {\
-	printk(KERN_INFO "%s %d-%04x: " fmt, priv->t->i2c->name, \
-			i2c_adapter_id(priv->t->i2c->adapter), \
-			priv->t->i2c->addr, ##arg); } while (0)
+	printk(KERN_INFO "tda9887 %d-%04x: " fmt, \
+			i2c_adapter_id(priv->i2c_props.adap), \
+			priv->i2c_props.addr, ##arg); } while (0)
 #define tda9887_dbg(fmt, arg...) do {\
 	if (tda9887_debug) \
-		printk(KERN_INFO "%s %d-%04x: " fmt, priv->t->i2c->name, \
-			i2c_adapter_id(priv->t->i2c->adapter), \
-			priv->t->i2c->addr, ##arg); } while (0)
+		printk(KERN_INFO "tda9887 %d-%04x: " fmt, \
+			i2c_adapter_id(priv->i2c_props.adap), \
+			priv->i2c_props.addr, ##arg); } while (0)
 
 struct tda9887_priv {
 	struct tuner_i2c_props i2c_props;
-- 
cgit v1.2.3


From 72459008a1643c4804ee6688426d7c29a66a545b Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 16 Dec 2007 17:27:23 -0500
Subject: tuner: add set_config to struct analog_tuner_ops

From: Michael Krufky <mkrufky@linuxtv.org>

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 linux/drivers/media/video/tuner-core.c   | 14 ++++++++++++++
 linux/drivers/media/video/tuner-driver.h |  3 +++
 2 files changed, 17 insertions(+)

(limited to 'linux')

diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 479afb1f6..47aafed34 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -183,6 +183,19 @@ static int fe_has_signal(struct dvb_frontend *fe)
 	return strength;
 }
 
+static int fe_set_config(struct dvb_frontend *fe, void *priv_cfg)
+{
+	struct dvb_tuner_ops *fe_tuner_ops = &fe->ops.tuner_ops;
+	struct tuner *t = fe->analog_demod_priv;
+
+	if (fe_tuner_ops->set_config)
+		return fe_tuner_ops->set_config(fe, priv_cfg);
+
+	tuner_warn("Tuner frontend module has no way to set config\n");
+
+	return 0;
+}
+
 static void tuner_status(struct dvb_frontend *fe);
 
 static struct analog_tuner_ops tuner_core_ops = {
@@ -190,6 +203,7 @@ static struct analog_tuner_ops tuner_core_ops = {
 	.standby        = fe_standby,
 	.release        = fe_release,
 	.has_signal     = fe_has_signal,
+	.set_config     = fe_set_config,
 	.tuner_status   = tuner_status
 };
 
diff --git a/linux/drivers/media/video/tuner-driver.h b/linux/drivers/media/video/tuner-driver.h
index 65ced4350..7f43dc68a 100644
--- a/linux/drivers/media/video/tuner-driver.h
+++ b/linux/drivers/media/video/tuner-driver.h
@@ -45,6 +45,9 @@ struct analog_tuner_ops {
 	void (*standby)(struct dvb_frontend *fe);
 	void (*release)(struct dvb_frontend *fe);
 	int  (*i2c_gate_ctrl)(struct dvb_frontend *fe, int enable);
+
+	/** This is to allow setting tuner-specific configuration */
+	int (*set_config)(struct dvb_frontend *fe, void *priv_cfg);
 };
 
 struct tuner {
-- 
cgit v1.2.3


From e204914b6924b0eda3d4a8adbe8334c5ed27d457 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 16 Dec 2007 17:53:32 -0500
Subject: tuner: convert tda9887 to use TUNER_SET_CONFIG

From: Michael Krufky <mkrufky@linuxtv.org>

Use TUNER_SET_CONFIG to set configuration in tda9887's private state
structure, rather than storing tda9887-specific configuration within
struct tuner.

Update handling of TUNER_SET_CONFIG by tuner-core, to call
&t->fe.ops.analog_demod_ops rather than &t->fe.ops.tuner_ops

analog_demod_ops.set_config passes the request to tuner_ops.set_config,
so this does not break other drivers.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 linux/drivers/media/video/tda9887.c      | 47 ++++++++++++++++++++------------
 linux/drivers/media/video/tuner-core.c   | 12 ++------
 linux/drivers/media/video/tuner-driver.h |  3 --
 3 files changed, 33 insertions(+), 29 deletions(-)

(limited to 'linux')

diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index f262055c9..77e40d0ec 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -42,6 +42,7 @@ struct tda9887_priv {
 	struct tuner_i2c_props i2c_props;
 
 	unsigned char 	   data[4];
+	unsigned int       config;
 
 	struct tuner *t;
 };
@@ -484,31 +485,31 @@ static int tda9887_set_insmod(struct dvb_frontend *fe)
 	return 0;
 }
 
-static int tda9887_set_config(struct dvb_frontend *fe)
+static int tda9887_do_config(struct dvb_frontend *fe)
 {
 	struct tda9887_priv *priv = fe->analog_demod_priv;
 	struct tuner *t = priv->t;
 	char *buf = priv->data;
 
-	if (t->tda9887_config & TDA9887_PORT1_ACTIVE)
+	if (priv->config & TDA9887_PORT1_ACTIVE)
 		buf[1] &= ~cOutputPort1Inactive;
-	if (t->tda9887_config & TDA9887_PORT1_INACTIVE)
+	if (priv->config & TDA9887_PORT1_INACTIVE)
 		buf[1] |= cOutputPort1Inactive;
-	if (t->tda9887_config & TDA9887_PORT2_ACTIVE)
+	if (priv->config & TDA9887_PORT2_ACTIVE)
 		buf[1] &= ~cOutputPort2Inactive;
-	if (t->tda9887_config & TDA9887_PORT2_INACTIVE)
+	if (priv->config & TDA9887_PORT2_INACTIVE)
 		buf[1] |= cOutputPort2Inactive;
 
-	if (t->tda9887_config & TDA9887_QSS)
+	if (priv->config & TDA9887_QSS)
 		buf[1] |= cQSS;
-	if (t->tda9887_config & TDA9887_INTERCARRIER)
+	if (priv->config & TDA9887_INTERCARRIER)
 		buf[1] &= ~cQSS;
 
-	if (t->tda9887_config & TDA9887_AUTOMUTE)
+	if (priv->config & TDA9887_AUTOMUTE)
 		buf[1] |= cAutoMuteFmActive;
-	if (t->tda9887_config & TDA9887_DEEMPHASIS_MASK) {
+	if (priv->config & TDA9887_DEEMPHASIS_MASK) {
 		buf[2] &= ~0x60;
-		switch (t->tda9887_config & TDA9887_DEEMPHASIS_MASK) {
+		switch (priv->config & TDA9887_DEEMPHASIS_MASK) {
 		case TDA9887_DEEMPHASIS_NONE:
 			buf[2] |= cDeemphasisOFF;
 			break;
@@ -520,21 +521,22 @@ static int tda9887_set_config(struct dvb_frontend *fe)
 			break;
 		}
 	}
-	if (t->tda9887_config & TDA9887_TOP_SET) {
+	if (priv->config & TDA9887_TOP_SET) {
 		buf[2] &= ~cTopMask;
-		buf[2] |= (t->tda9887_config >> 8) & cTopMask;
+		buf[2] |= (priv->config >> 8) & cTopMask;
 	}
-	if ((t->tda9887_config & TDA9887_INTERCARRIER_NTSC) && (t->std & V4L2_STD_NTSC))
+	if ((priv->config & TDA9887_INTERCARRIER_NTSC) &&
+	    (t->std & V4L2_STD_NTSC))
 		buf[1] &= ~cQSS;
-	if (t->tda9887_config & TDA9887_GATING_18)
+	if (priv->config & TDA9887_GATING_18)
 		buf[3] &= ~cGating_36;
 
 	if (t->mode == V4L2_TUNER_RADIO) {
-		if (t->tda9887_config & TDA9887_RIF_41_3) {
+		if (priv->config & TDA9887_RIF_41_3) {
 			buf[3] &= ~cVideoIFMask;
 			buf[3] |= cRadioIF_41_30;
 		}
-		if (t->tda9887_config & TDA9887_GAIN_NORMAL)
+		if (priv->config & TDA9887_GAIN_NORMAL)
 			buf[3] &= ~cTunerGainLow;
 	}
 
@@ -581,7 +583,7 @@ static void tda9887_configure(struct dvb_frontend *fe)
 	priv->data[1] |= cOutputPort1Inactive;
 	priv->data[1] |= cOutputPort2Inactive;
 
-	tda9887_set_config(fe);
+	tda9887_do_config(fe);
 	tda9887_set_insmod(fe);
 
 	if (t->mode == T_STANDBY) {
@@ -640,6 +642,16 @@ static void tda9887_set_params(struct dvb_frontend *fe,
 	tda9887_configure(fe);
 }
 
+static int tda9887_set_config(struct dvb_frontend *fe, void *priv_cfg)
+{
+	struct tda9887_priv *priv = fe->analog_demod_priv;
+
+	priv->config = *(unsigned int *)priv_cfg;
+	tda9887_configure(fe);
+
+	return 0;
+}
+
 static void tda9887_release(struct dvb_frontend *fe)
 {
 	kfree(fe->analog_demod_priv);
@@ -655,6 +667,7 @@ static struct analog_tuner_ops tda9887_tuner_ops = {
 	.tuner_status   = tda9887_tuner_status,
 	.get_afc        = tda9887_get_afc,
 	.release        = tda9887_release,
+	.set_config     = tda9887_set_config,
 };
 
 int tda9887_attach(struct tuner *t)
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 47aafed34..5b5a38eaf 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -877,25 +877,19 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
 #endif
 	case TUNER_SET_CONFIG:
 	{
-		struct dvb_tuner_ops *fe_tuner_ops = &t->fe.ops.tuner_ops;
+		struct analog_tuner_ops *ops = t->fe.ops.analog_demod_ops;
 		struct v4l2_priv_tun_config *cfg = arg;
 
 		if (t->type != cfg->tuner)
 			break;
 
-		if (t->type == TUNER_TDA9887) {
-			t->tda9887_config = *(unsigned int *)cfg->priv;
-			set_freq(client, t->tv_freq);
-			break;
-		}
-
-		if (NULL == fe_tuner_ops->set_config) {
+		if ((NULL == ops) || (NULL == ops->set_config)) {
 			tuner_warn("Tuner frontend module has no way to "
 				   "set config\n");
 			break;
 		}
-		fe_tuner_ops->set_config(&t->fe, cfg->priv);
 
+		ops->set_config(&t->fe, cfg->priv);
 		break;
 	}
 	/* --- v4l ioctls --- */
diff --git a/linux/drivers/media/video/tuner-driver.h b/linux/drivers/media/video/tuner-driver.h
index 7f43dc68a..417753b7c 100644
--- a/linux/drivers/media/video/tuner-driver.h
+++ b/linux/drivers/media/video/tuner-driver.h
@@ -69,9 +69,6 @@ struct tuner {
 
 	struct dvb_frontend fe;
 
-	/* used by tda9887 */
-	unsigned int       tda9887_config;
-
 	unsigned int config;
 	int (*tuner_callback) (void *dev, int command,int arg);
 };
-- 
cgit v1.2.3


From ebba1f853c5fce4cb1921b1b1c976aa7861f4594 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 16 Dec 2007 18:05:00 -0500
Subject: tda9887: maintain private state independent of struct tuner

From: Michael Krufky <mkrufky@linuxtv.org>

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 linux/drivers/media/video/tda9887.c | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'linux')

diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index 77e40d0ec..039afe418 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -43,8 +43,9 @@ struct tda9887_priv {
 
 	unsigned char 	   data[4];
 	unsigned int       config;
-
-	struct tuner *t;
+	unsigned int       mode;
+	unsigned int       audmode;
+	v4l2_std_id        std;
 };
 
 /* ---------------------------------------------------------------------- */
@@ -406,19 +407,18 @@ static void dump_write_message(struct dvb_frontend *fe, unsigned char *buf)
 static int tda9887_set_tvnorm(struct dvb_frontend *fe)
 {
 	struct tda9887_priv *priv = fe->analog_demod_priv;
-	struct tuner *t = priv->t;
 	struct tvnorm *norm = NULL;
 	char *buf = priv->data;
 	int i;
 
-	if (t->mode == V4L2_TUNER_RADIO) {
-		if (t->audmode == V4L2_TUNER_MODE_MONO)
+	if (priv->mode == V4L2_TUNER_RADIO) {
+		if (priv->audmode == V4L2_TUNER_MODE_MONO)
 			norm = &radio_mono;
 		else
 			norm = &radio_stereo;
 	} else {
 		for (i = 0; i < ARRAY_SIZE(tvnorms); i++) {
-			if (tvnorms[i].std & t->std) {
+			if (tvnorms[i].std & priv->std) {
 				norm = tvnorms+i;
 				break;
 			}
@@ -488,7 +488,6 @@ static int tda9887_set_insmod(struct dvb_frontend *fe)
 static int tda9887_do_config(struct dvb_frontend *fe)
 {
 	struct tda9887_priv *priv = fe->analog_demod_priv;
-	struct tuner *t = priv->t;
 	char *buf = priv->data;
 
 	if (priv->config & TDA9887_PORT1_ACTIVE)
@@ -526,12 +525,12 @@ static int tda9887_do_config(struct dvb_frontend *fe)
 		buf[2] |= (priv->config >> 8) & cTopMask;
 	}
 	if ((priv->config & TDA9887_INTERCARRIER_NTSC) &&
-	    (t->std & V4L2_STD_NTSC))
+	    (priv->std & V4L2_STD_NTSC))
 		buf[1] &= ~cQSS;
 	if (priv->config & TDA9887_GATING_18)
 		buf[3] &= ~cGating_36;
 
-	if (t->mode == V4L2_TUNER_RADIO) {
+	if (priv->mode == V4L2_TUNER_RADIO) {
 		if (priv->config & TDA9887_RIF_41_3) {
 			buf[3] &= ~cVideoIFMask;
 			buf[3] |= cRadioIF_41_30;
@@ -561,7 +560,6 @@ static int tda9887_status(struct dvb_frontend *fe)
 static void tda9887_configure(struct dvb_frontend *fe)
 {
 	struct tda9887_priv *priv = fe->analog_demod_priv;
-	struct tuner *t = priv->t;
 	int rc;
 
 	memset(priv->data,0,sizeof(priv->data));
@@ -586,9 +584,8 @@ static void tda9887_configure(struct dvb_frontend *fe)
 	tda9887_do_config(fe);
 	tda9887_set_insmod(fe);
 
-	if (t->mode == T_STANDBY) {
+	if (priv->mode == T_STANDBY)
 		priv->data[1] |= cForcedMuteAudioON;
-	}
 
 	tda9887_dbg("writing: b=0x%02x c=0x%02x e=0x%02x\n",
 		priv->data[1],priv->data[2],priv->data[3]);
@@ -633,12 +630,21 @@ static int tda9887_get_afc(struct dvb_frontend *fe)
 
 static void tda9887_standby(struct dvb_frontend *fe)
 {
+	struct tda9887_priv *priv = fe->analog_demod_priv;
+
+	priv->mode = T_STANDBY;
+
 	tda9887_configure(fe);
 }
 
 static void tda9887_set_params(struct dvb_frontend *fe,
 			       struct analog_parameters *params)
 {
+	struct tda9887_priv *priv = fe->analog_demod_priv;
+
+	priv->mode    = params->mode;
+	priv->audmode = params->audmode;
+	priv->std     = params->std;
 	tda9887_configure(fe);
 }
 
@@ -681,7 +687,6 @@ int tda9887_attach(struct tuner *t)
 
 	priv->i2c_props.addr = t->i2c->addr;
 	priv->i2c_props.adap = t->i2c->adapter;
-	priv->t = t;
 
 	strlcpy(t->i2c->name, "tda9887", sizeof(t->i2c->name));
 
-- 
cgit v1.2.3


From 29f28adf65d38e079fc3f90a62920be6f9b27d0b Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 16 Dec 2007 18:11:46 -0500
Subject: tda9887: remove dependency on struct tuner

From: Michael Krufky <mkrufky@linuxtv.org>

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 linux/drivers/media/video/tda9887.c    | 22 +++++++++++-----------
 linux/drivers/media/video/tda9887.h    | 13 +++++++++----
 linux/drivers/media/video/tuner-core.c |  2 +-
 3 files changed, 21 insertions(+), 16 deletions(-)

(limited to 'linux')

diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index 039afe418..2eb554d06 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -13,6 +13,7 @@
 #endif
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
+#include "tuner-driver.h"
 #include "tuner-i2c.h"
 #include "tda9887.h"
 
@@ -676,26 +677,25 @@ static struct analog_tuner_ops tda9887_tuner_ops = {
 	.set_config     = tda9887_set_config,
 };
 
-int tda9887_attach(struct tuner *t)
+struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
+				    struct i2c_adapter *i2c_adap,
+				    u8 i2c_addr)
 {
 	struct tda9887_priv *priv = NULL;
 
 	priv = kzalloc(sizeof(struct tda9887_priv), GFP_KERNEL);
 	if (priv == NULL)
-		return -ENOMEM;
-	t->fe.analog_demod_priv = priv;
+		return NULL;
+	fe->analog_demod_priv = priv;
 
-	priv->i2c_props.addr = t->i2c->addr;
-	priv->i2c_props.adap = t->i2c->adapter;
+	priv->i2c_props.addr = i2c_addr;
+	priv->i2c_props.adap = i2c_adap;
 
-	strlcpy(t->i2c->name, "tda9887", sizeof(t->i2c->name));
+	tda9887_info("tda988[5/6/7] found\n");
 
-	tda9887_info("tda988[5/6/7] found @ 0x%x (%s)\n", t->i2c->addr,
-		     t->i2c->driver->driver.name);
+	fe->ops.analog_demod_ops = &tda9887_tuner_ops;
 
-	t->fe.ops.analog_demod_ops = &tda9887_tuner_ops;
-
-	return 0;
+	return fe;
 }
 EXPORT_SYMBOL_GPL(tda9887_attach);
 
diff --git a/linux/drivers/media/video/tda9887.h b/linux/drivers/media/video/tda9887.h
index b879f0ec2..8f873a8e6 100644
--- a/linux/drivers/media/video/tda9887.h
+++ b/linux/drivers/media/video/tda9887.h
@@ -17,16 +17,21 @@
 #ifndef __TDA9887_H__
 #define __TDA9887_H__
 
-#include "tuner-driver.h"
+#include <linux/i2c.h>
+#include "dvb_frontend.h"
 
 /* ------------------------------------------------------------------------ */
 #if defined(CONFIG_TUNER_TDA9887) || (defined(CONFIG_TUNER_TDA9887_MODULE) && defined(MODULE))
-extern int tda9887_attach(struct tuner *t);
+extern struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
+					   struct i2c_adapter *i2c_adap,
+					   u8 i2c_addr);
 #else
-static inline int tda9887_attach(struct tuner *t)
+static inline struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
+						  struct i2c_adapter *i2c_adap,
+						  u8 i2c_addr)
 {
 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
-	return -EINVAL;
+	return NULL;
 }
 #endif
 
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 5b5a38eaf..45b955c3c 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -437,7 +437,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
 		break;
 	}
 	case TUNER_TDA9887:
-		tda9887_attach(t);
+		tda9887_attach(&t->fe, t->i2c->adapter, t->i2c->addr);
 		break;
 	default:
 		attach_simple_tuner(t);
-- 
cgit v1.2.3


From f2cffffe592e4b1dc2cfbf0f4be509edea199d5a Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 16 Dec 2007 19:20:21 -0500
Subject: tda9887: use printk macros from tuner-i2c.h

From: Michael Krufky <mkrufky@linuxtv.org>

replace tda9887_info and tda9887_dbg printk macros with
tuner_info and tuner_dbg, defined in tuner-i2c.h

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 linux/drivers/media/video/tda9887.c | 145 +++++++++++++++++-------------------
 1 file changed, 70 insertions(+), 75 deletions(-)

(limited to 'linux')

diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index 2eb554d06..fa328768f 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -26,18 +26,11 @@
    Used as part of several tuners
 */
 
-static int tda9887_debug;
-module_param_named(debug, tda9887_debug, int, 0644);
-
-#define tda9887_info(fmt, arg...) do {\
-	printk(KERN_INFO "tda9887 %d-%04x: " fmt, \
-			i2c_adapter_id(priv->i2c_props.adap), \
-			priv->i2c_props.addr, ##arg); } while (0)
-#define tda9887_dbg(fmt, arg...) do {\
-	if (tda9887_debug) \
-		printk(KERN_INFO "tda9887 %d-%04x: " fmt, \
-			i2c_adapter_id(priv->i2c_props.adap), \
-			priv->i2c_props.addr, ##arg); } while (0)
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "enable verbose debug messages");
+
+#define PREFIX "tda9887"
 
 struct tda9887_priv {
 	struct tuner_i2c_props i2c_props;
@@ -299,12 +292,12 @@ static void dump_read_message(struct dvb_frontend *fe, unsigned char *buf)
 		"+ 37.5 kHz",
 		"+ 12.5 kHz",
 	};
-	tda9887_info("read: 0x%2x\n", buf[0]);
-	tda9887_info("  after power on : %s\n", (buf[0] & 0x01) ? "yes" : "no");
-	tda9887_info("  afc            : %s\n", afc[(buf[0] >> 1) & 0x0f]);
-	tda9887_info("  fmif level     : %s\n", (buf[0] & 0x20) ? "high" : "low");
-	tda9887_info("  afc window     : %s\n", (buf[0] & 0x40) ? "in" : "out");
-	tda9887_info("  vfi level      : %s\n", (buf[0] & 0x80) ? "high" : "low");
+	tuner_info("read: 0x%2x\n", buf[0]);
+	tuner_info("  after power on : %s\n", (buf[0] & 0x01) ? "yes" : "no");
+	tuner_info("  afc            : %s\n", afc[(buf[0] >> 1) & 0x0f]);
+	tuner_info("  fmif level     : %s\n", (buf[0] & 0x20) ? "high" : "low");
+	tuner_info("  afc window     : %s\n", (buf[0] & 0x40) ? "in" : "out");
+	tuner_info("  vfi level      : %s\n", (buf[0] & 0x80) ? "high" : "low");
 }
 
 static void dump_write_message(struct dvb_frontend *fe, unsigned char *buf)
@@ -349,58 +342,60 @@ static void dump_write_message(struct dvb_frontend *fe, unsigned char *buf)
 		"44 MHz",
 	};
 
-	tda9887_info("write: byte B 0x%02x\n",buf[1]);
-	tda9887_info("  B0   video mode      : %s\n",
-	       (buf[1] & 0x01) ? "video trap" : "sound trap");
-	tda9887_info("  B1   auto mute fm    : %s\n",
-	       (buf[1] & 0x02) ? "yes" : "no");
-	tda9887_info("  B2   carrier mode    : %s\n",
-	       (buf[1] & 0x04) ? "QSS" : "Intercarrier");
-	tda9887_info("  B3-4 tv sound/radio  : %s\n",
-	       sound[(buf[1] & 0x18) >> 3]);
-	tda9887_info("  B5   force mute audio: %s\n",
-	       (buf[1] & 0x20) ? "yes" : "no");
-	tda9887_info("  B6   output port 1   : %s\n",
-	       (buf[1] & 0x40) ? "high (inactive)" : "low (active)");
-	tda9887_info("  B7   output port 2   : %s\n",
-	       (buf[1] & 0x80) ? "high (inactive)" : "low (active)");
-
-	tda9887_info("write: byte C 0x%02x\n",buf[2]);
-	tda9887_info("  C0-4 top adjustment  : %s dB\n", adjust[buf[2] & 0x1f]);
-	tda9887_info("  C5-6 de-emphasis     : %s\n", deemph[(buf[2] & 0x60) >> 5]);
-	tda9887_info("  C7   audio gain      : %s\n",
-	       (buf[2] & 0x80) ? "-6" : "0");
-
-	tda9887_info("write: byte E 0x%02x\n",buf[3]);
-	tda9887_info("  E0-1 sound carrier   : %s\n",
-	       carrier[(buf[3] & 0x03)]);
-	tda9887_info("  E6   l pll gating   : %s\n",
-	       (buf[3] & 0x40) ? "36" : "13");
+	tuner_info("write: byte B 0x%02x\n", buf[1]);
+	tuner_info("  B0   video mode      : %s\n",
+		   (buf[1] & 0x01) ? "video trap" : "sound trap");
+	tuner_info("  B1   auto mute fm    : %s\n",
+		   (buf[1] & 0x02) ? "yes" : "no");
+	tuner_info("  B2   carrier mode    : %s\n",
+		   (buf[1] & 0x04) ? "QSS" : "Intercarrier");
+	tuner_info("  B3-4 tv sound/radio  : %s\n",
+		   sound[(buf[1] & 0x18) >> 3]);
+	tuner_info("  B5   force mute audio: %s\n",
+		   (buf[1] & 0x20) ? "yes" : "no");
+	tuner_info("  B6   output port 1   : %s\n",
+		   (buf[1] & 0x40) ? "high (inactive)" : "low (active)");
+	tuner_info("  B7   output port 2   : %s\n",
+		   (buf[1] & 0x80) ? "high (inactive)" : "low (active)");
+
+	tuner_info("write: byte C 0x%02x\n", buf[2]);
+	tuner_info("  C0-4 top adjustment  : %s dB\n",
+		   adjust[buf[2] & 0x1f]);
+	tuner_info("  C5-6 de-emphasis     : %s\n",
+		   deemph[(buf[2] & 0x60) >> 5]);
+	tuner_info("  C7   audio gain      : %s\n",
+		   (buf[2] & 0x80) ? "-6" : "0");
+
+	tuner_info("write: byte E 0x%02x\n", buf[3]);
+	tuner_info("  E0-1 sound carrier   : %s\n",
+		   carrier[(buf[3] & 0x03)]);
+	tuner_info("  E6   l pll gating   : %s\n",
+		   (buf[3] & 0x40) ? "36" : "13");
 
 	if (buf[1] & 0x08) {
 		/* radio */
-		tda9887_info("  E2-4 video if        : %s\n",
-		       rif[(buf[3] & 0x0c) >> 2]);
-		tda9887_info("  E7   vif agc output  : %s\n",
-		       (buf[3] & 0x80)
-		       ? ((buf[3] & 0x10) ? "fm-agc radio" : "sif-agc radio")
-		       : "fm radio carrier afc");
+		tuner_info("  E2-4 video if        : %s\n",
+			   rif[(buf[3] & 0x0c) >> 2]);
+		tuner_info("  E7   vif agc output  : %s\n",
+			   (buf[3] & 0x80)
+			   ? ((buf[3] & 0x10) ? "fm-agc radio" :
+						"sif-agc radio")
+			   : "fm radio carrier afc");
 	} else {
 		/* video */
-		tda9887_info("  E2-4 video if        : %s\n",
-		       vif[(buf[3] & 0x1c) >> 2]);
-		tda9887_info("  E5   tuner gain      : %s\n",
-		       (buf[3] & 0x80)
-		       ? ((buf[3] & 0x20) ? "external" : "normal")
-		       : ((buf[3] & 0x20) ? "minimum"  : "normal"));
-		tda9887_info("  E7   vif agc output  : %s\n",
-		       (buf[3] & 0x80)
-		       ? ((buf[3] & 0x20)
-			  ? "pin3 port, pin22 vif agc out"
-			  : "pin22 port, pin3 vif acg ext in")
-		       : "pin3+pin22 port");
+		tuner_info("  E2-4 video if        : %s\n",
+			   vif[(buf[3] & 0x1c) >> 2]);
+		tuner_info("  E5   tuner gain      : %s\n",
+			   (buf[3] & 0x80)
+			   ? ((buf[3] & 0x20) ? "external" : "normal")
+			   : ((buf[3] & 0x20) ? "minimum"  : "normal"));
+		tuner_info("  E7   vif agc output  : %s\n",
+			   (buf[3] & 0x80) ? ((buf[3] & 0x20)
+				? "pin3 port, pin22 vif agc out"
+				: "pin22 port, pin3 vif acg ext in")
+				: "pin3+pin22 port");
 	}
-	tda9887_info("--\n");
+	tuner_info("--\n");
 }
 
 /* ---------------------------------------------------------------------- */
@@ -426,11 +421,11 @@ static int tda9887_set_tvnorm(struct dvb_frontend *fe)
 		}
 	}
 	if (NULL == norm) {
-		tda9887_dbg("Unsupported tvnorm entry - audio muted\n");
+		tuner_dbg("Unsupported tvnorm entry - audio muted\n");
 		return -1;
 	}
 
-	tda9887_dbg("configure for: %s\n",norm->name);
+	tuner_dbg("configure for: %s\n", norm->name);
 	buf[1] = norm->b;
 	buf[2] = norm->c;
 	buf[3] = norm->e;
@@ -553,7 +548,7 @@ static int tda9887_status(struct dvb_frontend *fe)
 
 	memset(buf,0,sizeof(buf));
 	if (1 != (rc = tuner_i2c_xfer_recv(&priv->i2c_props,buf,1)))
-		tda9887_info("i2c i/o error: rc == %d (should be 1)\n",rc);
+		tuner_info("i2c i/o error: rc == %d (should be 1)\n", rc);
 	dump_read_message(fe, buf);
 	return 0;
 }
@@ -588,15 +583,15 @@ static void tda9887_configure(struct dvb_frontend *fe)
 	if (priv->mode == T_STANDBY)
 		priv->data[1] |= cForcedMuteAudioON;
 
-	tda9887_dbg("writing: b=0x%02x c=0x%02x e=0x%02x\n",
-		priv->data[1],priv->data[2],priv->data[3]);
-	if (tda9887_debug > 1)
+	tuner_dbg("writing: b=0x%02x c=0x%02x e=0x%02x\n",
+		  priv->data[1], priv->data[2], priv->data[3]);
+	if (debug > 1)
 		dump_write_message(fe, priv->data);
 
 	if (4 != (rc = tuner_i2c_xfer_send(&priv->i2c_props,priv->data,4)))
-		tda9887_info("i2c i/o error: rc == %d (should be 4)\n",rc);
+		tuner_info("i2c i/o error: rc == %d (should be 4)\n", rc);
 
-	if (tda9887_debug > 2) {
+	if (debug > 2) {
 		msleep_interruptible(1000);
 		tda9887_status(fe);
 	}
@@ -607,8 +602,8 @@ static void tda9887_configure(struct dvb_frontend *fe)
 static void tda9887_tuner_status(struct dvb_frontend *fe)
 {
 	struct tda9887_priv *priv = fe->analog_demod_priv;
-	tda9887_info("Data bytes: b=0x%02x c=0x%02x e=0x%02x\n",
-		     priv->data[1], priv->data[2], priv->data[3]);
+	tuner_info("Data bytes: b=0x%02x c=0x%02x e=0x%02x\n",
+		   priv->data[1], priv->data[2], priv->data[3]);
 }
 
 static int tda9887_get_afc(struct dvb_frontend *fe)
@@ -691,7 +686,7 @@ struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
 	priv->i2c_props.addr = i2c_addr;
 	priv->i2c_props.adap = i2c_adap;
 
-	tda9887_info("tda988[5/6/7] found\n");
+	tuner_info("tda988[5/6/7] found\n");
 
 	fe->ops.analog_demod_ops = &tda9887_tuner_ops;
 
-- 
cgit v1.2.3


From 792fe12a080524a1a417780cc115efe7384a3223 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 16 Dec 2007 20:02:26 -0500
Subject: tuner: remove struct tuner from tuner-driver.h

From: Michael Krufky <mkrufky@linuxtv.org>

struct tuner holds state for tuner-core, only -- move it into tuner-core.c

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 linux/drivers/media/video/tuner-core.c   | 21 +++++++++++++++++++++
 linux/drivers/media/video/tuner-driver.h | 23 -----------------------
 2 files changed, 21 insertions(+), 23 deletions(-)

(limited to 'linux')

diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 45b955c3c..73976746b 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -41,6 +41,27 @@
 #define PREFIX t->i2c->driver->driver.name
 #endif
 
+struct tuner {
+	/* device */
+	struct dvb_frontend fe;
+	struct i2c_client   *i2c;
+	struct list_head    list;
+	unsigned int        using_v4l2:1;
+
+	/* keep track of the current settings */
+	v4l2_std_id         std;
+	unsigned int        tv_freq;
+	unsigned int        radio_freq;
+	unsigned int        audmode;
+
+	unsigned int        mode;
+	unsigned int        mode_mask; /* Combination of allowable modes */
+
+	unsigned int        type; /* chip type id */
+	unsigned int        config;
+	int (*tuner_callback) (void *dev, int command, int arg);
+};
+
 /* standard i2c insmod options */
 static unsigned short normal_i2c[] = {
 #if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE))
diff --git a/linux/drivers/media/video/tuner-driver.h b/linux/drivers/media/video/tuner-driver.h
index 417753b7c..7b1adfaf7 100644
--- a/linux/drivers/media/video/tuner-driver.h
+++ b/linux/drivers/media/video/tuner-driver.h
@@ -50,27 +50,4 @@ struct analog_tuner_ops {
 	int (*set_config)(struct dvb_frontend *fe, void *priv_cfg);
 };
 
-struct tuner {
-	/* device */
-	struct i2c_client *i2c;
-	struct list_head list;  /* list of tuners */
-
-	unsigned int type;	/* chip type */
-
-	unsigned int mode;
-	unsigned int mode_mask;	/* Combination of allowable modes */
-
-	unsigned int tv_freq;	/* keep track of the current settings */
-	unsigned int radio_freq;
-	unsigned int audmode;
-	v4l2_std_id  std;
-
-	int          using_v4l2;
-
-	struct dvb_frontend fe;
-
-	unsigned int config;
-	int (*tuner_callback) (void *dev, int command,int arg);
-};
-
 #endif /* __TUNER_DRIVER_H__ */
-- 
cgit v1.2.3


From a5484362451f73f18dafd3dbcf9fedac5ed07ee4 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 16 Dec 2007 23:21:08 -0500
Subject: tuner: remove unneeded #includes from tuner-driver.h

From: Michael Krufky <mkrufky@linuxtv.org>

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 linux/drivers/media/video/tuner-driver.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'linux')

diff --git a/linux/drivers/media/video/tuner-driver.h b/linux/drivers/media/video/tuner-driver.h
index 7b1adfaf7..5eaa30ccb 100644
--- a/linux/drivers/media/video/tuner-driver.h
+++ b/linux/drivers/media/video/tuner-driver.h
@@ -22,8 +22,6 @@
 #ifndef __TUNER_DRIVER_H__
 #define __TUNER_DRIVER_H__
 
-#include <linux/videodev2.h>
-#include <linux/i2c.h>
 #include "dvb_frontend.h"
 
 extern unsigned const int tuner_count;
-- 
cgit v1.2.3


From a45db7876a01ca11ac6b66b14f274a4916856306 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Mon, 17 Dec 2007 07:49:33 -0500
Subject: tda9887: initialize mode to T_STANDBY at startup

From: Michael Krufky <mkrufky@linuxtv.org>

Ensure that the audio is muted at attach-time

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 linux/drivers/media/video/tda9887.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux')

diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index fa328768f..8377facca 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -685,6 +685,7 @@ struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
 
 	priv->i2c_props.addr = i2c_addr;
 	priv->i2c_props.adap = i2c_adap;
+	priv->mode = T_STANDBY;
 
 	tuner_info("tda988[5/6/7] found\n");
 
-- 
cgit v1.2.3