[v2,1/5] DVB: Add basic API support for DVB-T2 and bump minor version

Commit Message

Andreas Oberritter May 8, 2011, 10:38 p.m. UTC

On 05/09/2011 12:22 AM, Andreas Oberritter wrote:
> 
> Please also include the following (only compile-tested) lines within this commit:
> 
> From 4329b836a6590421b178710160fcca3b39f64e18 Mon Sep 17 00:00:00 2001
> From: Andreas Oberritter <[e-mail]>
> Date: Sun, 8 May 2011 22:14:07 +0000
> Subject: [PATCH] DVB: dvb_frontend: add PLP ID to property cache
> 
> Signed-off-by: Andreas Oberritter <[e-mail]>
> ---
>  drivers/media/dvb/dvb-core/dvb_frontend.c |    6 ++++++
>  drivers/media/dvb/dvb-core/dvb_frontend.h |    3 +++
>  2 files changed, 9 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
> index dc3457c..5af1d67 100644
> --- a/drivers/media/dvb/dvb-core/dvb_frontend.c
> +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
> @@ -1323,6 +1323,9 @@ static int dtv_property_process_get(struct dvb_frontend *fe,
>  	case DTV_ISDBS_TS_ID:
>  		tvp->u.data = fe->dtv_property_cache.isdbs_ts_id;
>  		break;
> +	case DTV_DVBT2_PLP_ID:
> +		tvp->u.data = c->dvbt2_plp_id;
> +		break;

Sorry, this depends on a changeset I haven't submitted yet and thus won't compile
inside your tree. See below for a fixed patch.

>  	default:
>  		r = -1;
>  	}
> @@ -1478,6 +1481,9 @@ static int dtv_property_process_set(struct dvb_frontend *fe,
>  	case DTV_ISDBS_TS_ID:
>  		fe->dtv_property_cache.isdbs_ts_id = tvp->u.data;
>  		break;
> +	case DTV_DVBT2_PLP_ID:
> +		c->dvbt2_plp_id = tvp->u.data;
> +		break;
>  	default:
>  		r = -1;
>  	}
> diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
> index 3b86050..fb2b13f 100644
> --- a/drivers/media/dvb/dvb-core/dvb_frontend.h
> +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
> @@ -358,6 +358,9 @@ struct dtv_frontend_properties {
>  
>  	/* ISDB-T specifics */
>  	u32			isdbs_ts_id;
> +
> +	/* DVB-T2 specifics */
> +	u32			dvbt2_plp_id;
>  };
>  
>  struct dvb_frontend {

From 6e7abb85241e7aef5783f9c216e829de5fe90cb7 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <[e-mail]>
Date: Sun, 8 May 2011 22:14:07 +0000
Subject: [PATCH] DVB: dvb_frontend: add PLP ID to property cache

Signed-off-by: Andreas Oberritter <[e-mail]>
---
 drivers/media/dvb/dvb-core/dvb_frontend.c |    6 ++++++
 drivers/media/dvb/dvb-core/dvb_frontend.h |    3 +++
 2 files changed, 9 insertions(+), 0 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index dc3457c..d04ef09 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1323,6 +1323,9 @@  static int dtv_property_process_get(struct dvb_frontend *fe,
 	case DTV_ISDBS_TS_ID:
 		tvp->u.data = fe->dtv_property_cache.isdbs_ts_id;
 		break;
+	case DTV_DVBT2_PLP_ID:
+		tvp->u.data = fe->dtv_property_cache.dvbt2_plp_id;
+		break;
 	default:
 		r = -1;
 	}
@@ -1478,6 +1481,9 @@  static int dtv_property_process_set(struct dvb_frontend *fe,
 	case DTV_ISDBS_TS_ID:
 		fe->dtv_property_cache.isdbs_ts_id = tvp->u.data;
 		break;
+	case DTV_DVBT2_PLP_ID:
+		fe->dtv_property_cache.dvbt2_plp_id = tvp->u.data;
+		break;
 	default:
 		r = -1;
 	}
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 3b86050..fb2b13f 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -358,6 +358,9 @@  struct dtv_frontend_properties {
 
 	/* ISDB-T specifics */
 	u32			isdbs_ts_id;
+
+	/* DVB-T2 specifics */
+	u32			dvbt2_plp_id;
 };
 
 struct dvb_frontend {