From d17170a8b0b02765c8a0015b2a5f8c7671637c06 Mon Sep 17 00:00:00 2001
From: Trent Piepho <xyzzy@speakeasy.org>
Date: Thu, 6 Apr 2006 06:03:09 -0300
Subject: [PATCH] --- yaml --- r: 29847 b: refs/heads/master c:
 0dbbc0a7ce1acc3a20857f25aa656bf2f5925766 h: refs/heads/master i:   29845:
 b6de9502af5b67607bc435936a53e22b45c06031   29843:
 7e1c2523e50f07ba89a307d3b7763188311e20bf   29839:
 507d1cd75d9558be7fb1c4edbb4bd8246290a959 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/media/dvb/frontends/or51132.c | 39 +++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4e2cfe6b57c7..da8c699e3f15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e142e7c4186821f03890ff223925cdc7fc963742
+refs/heads/master: 0dbbc0a7ce1acc3a20857f25aa656bf2f5925766
diff --git a/trunk/drivers/media/dvb/frontends/or51132.c b/trunk/drivers/media/dvb/frontends/or51132.c
index 619856b076cd..c25ec73440e7 100644
--- a/trunk/drivers/media/dvb/frontends/or51132.c
+++ b/trunk/drivers/media/dvb/frontends/or51132.c
@@ -400,6 +400,44 @@ static int or51132_set_parameters(struct dvb_frontend* fe,
 	return 0;
 }
 
+static int or51132_get_parameters(struct dvb_frontend* fe,
+				  struct dvb_frontend_parameters *param)
+{
+	struct or51132_state* state = fe->demodulator_priv;
+	u8 buf[2];
+
+	/* Receiver Status */
+	buf[0]=0x04;
+	buf[1]=0x00;
+	msleep(30); /* 30ms */
+	if (i2c_writebytes(state,state->config->demod_address,buf,2)) {
+		printk(KERN_WARNING "or51132: get_parameters write error\n");
+		return -EREMOTEIO;
+	}
+	msleep(30); /* 30ms */
+	if (i2c_readbytes(state,state->config->demod_address,buf,2)) {
+		printk(KERN_WARNING "or51132: get_parameters read error\n");
+		return -EREMOTEIO;
+	}
+	switch(buf[0]) {
+		case 0x06: param->u.vsb.modulation = VSB_8; break;
+		case 0x43: param->u.vsb.modulation = QAM_64; break;
+		case 0x45: param->u.vsb.modulation = QAM_256; break;
+		default:
+			printk(KERN_WARNING "or51132: unknown status 0x%02x\n",
+			       buf[0]);
+			return -EREMOTEIO;
+	}
+
+	/* FIXME: Read frequency from frontend, take AFC into account */
+	param->frequency = state->current_frequency;
+
+	/* FIXME: How to read inversion setting? Receiver 6 register? */
+	param->inversion = INVERSION_AUTO;
+
+	return 0;
+}
+
 static int or51132_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
 	struct or51132_state* state = fe->demodulator_priv;
@@ -618,6 +656,7 @@ static struct dvb_frontend_ops or51132_ops = {
 	.sleep = or51132_sleep,
 
 	.set_frontend = or51132_set_parameters,
+	.get_frontend = or51132_get_parameters,
 	.get_tune_settings = or51132_get_tune_settings,
 
 	.read_status = or51132_read_status,