From 6f1f367c00902021c6aad9d0e4e8f0a1d7d1c3b0 Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@linuxtv.org>
Date: Mon, 6 Oct 2008 21:56:59 -0300
Subject: [PATCH] --- yaml --- r: 114103 b: refs/heads/master c:
 b87625f0ccbbc67efba356e73502fa9bbb784b1c h: refs/heads/master i:   114101:
 f20395070db13c954126be89f8a78cff21d8bcfc   114099:
 46cf28ae19acc9601203779702ef841464854d83   114095:
 aec1f0120344dd87d50cbe71f3720e6866f09f2f v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/dvb/dvb-core/dvb_frontend.c | 32 +++++++++++++++++++
 trunk/include/linux/dvb/frontend.h            |  4 ++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d101f5582616..38cc6f4997b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4de91be46b73ec6743b9d76155550e49507723c
+refs/heads/master: b87625f0ccbbc67efba356e73502fa9bbb784b1c
diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
index 104f40b7171d..0ddc2f4ecd4a 100644
--- a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -840,6 +840,16 @@ struct dtv_cmds_h dtv_cmds[] = {
 		.cmd	= DTV_CODE_RATE_LP,
 		.set	= 1,
 	},
+	[DTV_GUARD_INTERVAL] = {
+		.name	= "DTV_GUARD_INTERVAL",
+		.cmd	= DTV_GUARD_INTERVAL,
+		.set	= 1,
+	},
+	[DTV_TRANSMISSION_MODE] = {
+		.name	= "DTV_TRANSMISSION_MODE",
+		.cmd	= DTV_TRANSMISSION_MODE,
+		.set	= 1,
+	},
 	/* Get */
 	[DTV_DISEQC_SLAVE_REPLY] = {
 		.name	= "DTV_DISEQC_SLAVE_REPLY",
@@ -862,6 +872,16 @@ struct dtv_cmds_h dtv_cmds[] = {
 		.cmd	= DTV_CODE_RATE_LP,
 		.set	= 0,
 	},
+	[DTV_GUARD_INTERVAL] = {
+		.name	= "DTV_GUARD_INTERVAL",
+		.cmd	= DTV_GUARD_INTERVAL,
+		.set	= 0,
+	},
+	[DTV_TRANSMISSION_MODE] = {
+		.name	= "DTV_TRANSMISSION_MODE",
+		.cmd	= DTV_TRANSMISSION_MODE,
+		.set	= 0,
+	},
 };
 
 void dtv_property_dump(struct dtv_property *tvp)
@@ -1147,6 +1167,12 @@ int dtv_property_process_get(struct dvb_frontend *fe, struct dtv_property *tvp,
 	case DTV_CODE_RATE_LP:
 		tvp->u.data = fe->dtv_property_cache.code_rate_LP;
 		break;
+	case DTV_GUARD_INTERVAL:
+		tvp->u.data = fe->dtv_property_cache.guard_interval;
+		break;
+	case DTV_TRANSMISSION_MODE:
+		tvp->u.data = fe->dtv_property_cache.transmission_mode;
+		break;
 	default:
 		r = -1;
 	}
@@ -1234,6 +1260,12 @@ int dtv_property_process_set(struct dvb_frontend *fe, struct dtv_property *tvp,
 	case DTV_CODE_RATE_LP:
 		fe->dtv_property_cache.code_rate_LP = tvp->u.data;
 		break;
+	case DTV_GUARD_INTERVAL:
+		fe->dtv_property_cache.guard_interval = tvp->u.data;
+		break;
+	case DTV_TRANSMISSION_MODE:
+		fe->dtv_property_cache.transmission_mode = tvp->u.data;
+		break;
 	default:
 		r = -1;
 	}
diff --git a/trunk/include/linux/dvb/frontend.h b/trunk/include/linux/dvb/frontend.h
index 6675edfab3fc..5578fba208f4 100644
--- a/trunk/include/linux/dvb/frontend.h
+++ b/trunk/include/linux/dvb/frontend.h
@@ -271,8 +271,10 @@ struct dvb_frontend_event {
 #define DTV_API_VERSION				35
 #define DTV_CODE_RATE_HP			36
 #define DTV_CODE_RATE_LP			37
+#define DTV_GUARD_INTERVAL			38
+#define DTV_TRANSMISSION_MODE			39
 
-#define DTV_MAX_COMMAND				DTV_CODE_RATE_LP
+#define DTV_MAX_COMMAND				DTV_TRANSMISSION_MODE
 
 typedef enum fe_pilot {
 	PILOT_ON,