From 22aa0206bb461a8f476d143ec02cc93c8f477ffe Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@linuxtv.org>
Date: Thu, 11 Sep 2008 23:52:32 -0300
Subject: [PATCH] --- yaml --- r: 113960 b: refs/heads/master c:
 ee33c525c4d09756156cd4c18e6586da900eb310 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/dvb/dvb-core/dvb_frontend.c | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 88957d17c045..1c22a629ed71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65af619d84ee2d3a1faacbbeded374d0b313d3a9
+refs/heads/master: ee33c525c4d09756156cd4c18e6586da900eb310
diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
index ce1de403e99e..7e9cd7921314 100644
--- a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -993,6 +993,42 @@ int is_legacy_delivery_system(fe_delivery_system_t s)
 	return 0;
 }
 
+/* Synchronise the legacy tuning parameters into the cache, so that demodulator
+ * drivers can use a single set_frontend tuning function, regardless of whether
+ * it's being used for the legacy or new API, reducing code and complexity.
+ */
+void dtv_property_cache_sync(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)
+{
+	struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+
+	c->frequency = p->frequency;
+	c->inversion = p->inversion;
+
+	switch (fe->ops.info.type) {
+	case FE_QPSK:
+		c->symbol_rate = p->u.qpsk.symbol_rate;
+		c->fec_inner = p->u.qpsk.fec_inner;
+		break;
+	case FE_QAM:
+		c->symbol_rate = p->u.qam.symbol_rate;
+		c->fec_inner = p->u.qam.fec_inner;
+		c->modulation = p->u.qam.modulation;
+		break;
+	case FE_OFDM:
+		c->bandwidth = p->u.ofdm.bandwidth;
+		c->code_rate_HP = p->u.ofdm.code_rate_HP;
+		c->code_rate_LP = p->u.ofdm.code_rate_LP;
+		c->modulation = p->u.ofdm.constellation;
+		c->transmission_mode = p->u.ofdm.transmission_mode;
+		c->guard_interval = p->u.ofdm.guard_interval;
+		c->hierarchy = p->u.ofdm.hierarchy_information;
+		break;
+	case FE_ATSC:
+		c->modulation = p->u.vsb.modulation;
+		break;
+	}
+}
+
 int dtv_property_cache_submit(struct dvb_frontend *fe)
 {
 
@@ -1548,6 +1584,8 @@ static int dvb_frontend_ioctl_legacy(struct inode *inode, struct file *file,
 	case FE_SET_FRONTEND: {
 		struct dvb_frontend_tune_settings fetunesettings;
 
+		dtv_property_cache_sync(fe, &fepriv->parameters);
+
 		if(fe->dtv_property_cache.state == DTV_TUNE) {
 			if (dvb_frontend_check_parameters(fe, &fepriv->parameters) < 0) {
 				err = -EINVAL;