From b42ee9569d2b79420ffc6f113c7cb94bd335b2aa Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 6 Oct 2008 19:44:04 -0400 Subject: S2API: Remove the hardcoded command limit during validation From: Steven Toth This means that when developers add new commands then they'll be see the DTV_MAX_COMMAND define and will be more likely to modify it, without having to modify the command validation code. Priority: normal Signed-off-by: Steven Toth --- linux/include/linux/dvb/frontend.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'linux/include') diff --git a/linux/include/linux/dvb/frontend.h b/linux/include/linux/dvb/frontend.h index d28f21796..367e18da0 100644 --- a/linux/include/linux/dvb/frontend.h +++ b/linux/include/linux/dvb/frontend.h @@ -301,6 +301,8 @@ struct dvb_frontend_event { #endif #define DTV_API_VERSION 35 +#define DTV_MAX_COMMAND DTV_API_VERSION + typedef enum fe_pilot { PILOT_ON, PILOT_OFF, -- cgit v1.2.3 From 31c81249db3eef850974230edaf630efdadfcb22 Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 6 Oct 2008 20:06:48 -0400 Subject: S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16 From: Steven Toth ... and cleanup any drivers using them. I've also removed NBC_QPSK and modified the cx24116 driver to check the delivery_type also, removing some excess namespace baggage. Priority: normal Signed-off-by: Steven Toth --- linux/include/linux/dvb/frontend.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'linux/include') diff --git a/linux/include/linux/dvb/frontend.h b/linux/include/linux/dvb/frontend.h index 367e18da0..80f7d9217 100644 --- a/linux/include/linux/dvb/frontend.h +++ b/linux/include/linux/dvb/frontend.h @@ -164,9 +164,8 @@ typedef enum fe_modulation { QAM_AUTO, VSB_8, VSB_16, - _8PSK, - _16APSK, - NBC_QPSK, + PSK_8, + APSK_16, DQPSK, } fe_modulation_t; -- cgit v1.2.3 From 35dfa5543c3557464747e67b89107fc28f902b47 Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 6 Oct 2008 20:31:48 -0400 Subject: S2API: frontend.h cleanup From: Brandon Philips From the author: "Reviewing the code briefly and saw this. You can't change more than DTV_IOCTL_MAX_MSGS at once, not 16." Priority: normal Signed-off-by: Steven Toth Signed-off-by: Brandon Philips --- linux/include/linux/dvb/frontend.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linux/include') diff --git a/linux/include/linux/dvb/frontend.h b/linux/include/linux/dvb/frontend.h index 80f7d9217..bd3d104ac 100644 --- a/linux/include/linux/dvb/frontend.h +++ b/linux/include/linux/dvb/frontend.h @@ -359,14 +359,14 @@ struct dtv_property { int result; } __attribute__ ((packed)); -/* No more than 16 properties during any given ioctl */ +/* num of properties cannot exceed DTV_IOCTL_MAX_MSGS per ioctl */ +#define DTV_IOCTL_MAX_MSGS 64 + struct dtv_properties { __u32 num; struct dtv_property *props; }; -#define DTV_IOCTL_MAX_MSGS 64 - #define FE_SET_PROPERTY _IOW('o', 82, struct dtv_properties) #define FE_GET_PROPERTY _IOR('o', 83, struct dtv_properties) -- cgit v1.2.3 From 3a13c060ab3b0907e4749fa6914a3ddbeba1c0a6 Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 6 Oct 2008 20:55:46 -0400 Subject: S2API: Added support for DTV_CODE_RATE_HP/LP From: Steven Toth Reports from users that using the new API for tuning DTV was failing, and the cache was missing some essential items. Priority: normal Signed-off-by: Steven Toth --- linux/include/linux/dvb/frontend.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'linux/include') diff --git a/linux/include/linux/dvb/frontend.h b/linux/include/linux/dvb/frontend.h index bd3d104ac..2dba65a58 100644 --- a/linux/include/linux/dvb/frontend.h +++ b/linux/include/linux/dvb/frontend.h @@ -299,8 +299,11 @@ struct dvb_frontend_event { #define DTV_ISDB_LAYERC_TIME_INTERLEAVING 34 #endif #define DTV_API_VERSION 35 +#define DTV_API_VERSION 35 +#define DTV_CODE_RATE_HP 36 +#define DTV_CODE_RATE_LP 37 -#define DTV_MAX_COMMAND DTV_API_VERSION +#define DTV_MAX_COMMAND DTV_CODE_RATE_LP typedef enum fe_pilot { PILOT_ON, -- cgit v1.2.3 From 77e4006bebedd63a6602c7672794fe8f4ad5752b Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 6 Oct 2008 20:56:59 -0400 Subject: S2API: Add support fot DTV_GUARD_INTERVAL and DTV_TRANSMISSION_MODE From: Steven Toth Tuning DVB-T via the S2API was failing, missing some essential items. Priority: normal Signed-off-by: Steven Toth --- linux/include/linux/dvb/frontend.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'linux/include') diff --git a/linux/include/linux/dvb/frontend.h b/linux/include/linux/dvb/frontend.h index 2dba65a58..313ba84e6 100644 --- a/linux/include/linux/dvb/frontend.h +++ b/linux/include/linux/dvb/frontend.h @@ -302,8 +302,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, -- cgit v1.2.3 From 4bfe022c9d8c09b8c4e8a2b429609bd4b73c2fea Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 6 Oct 2008 21:01:47 -0400 Subject: S2API: Added support for DTV_HIERARCHY From: Steven Toth A user tuning DVB-T via the S2API reports that this was not implemented, and his tuning was failing. Priority: normal Signed-off-by: Steven Toth --- linux/include/linux/dvb/frontend.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'linux/include') diff --git a/linux/include/linux/dvb/frontend.h b/linux/include/linux/dvb/frontend.h index 313ba84e6..79fb7bd86 100644 --- a/linux/include/linux/dvb/frontend.h +++ b/linux/include/linux/dvb/frontend.h @@ -304,8 +304,9 @@ struct dvb_frontend_event { #define DTV_CODE_RATE_LP 37 #define DTV_GUARD_INTERVAL 38 #define DTV_TRANSMISSION_MODE 39 +#define DTV_HIERARCHY 40 -#define DTV_MAX_COMMAND DTV_TRANSMISSION_MODE +#define DTV_MAX_COMMAND DTV_HIERARCHY typedef enum fe_pilot { PILOT_ON, -- cgit v1.2.3 From df92010269289adcd89ced7550b514004c6896ad Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Tue, 7 Oct 2008 16:30:45 -0400 Subject: S2API: Ensure we have a reasonable ROLLOFF default From: Darron Broad From the author: Non-initialised cache values get a reasonble default. Priority: normal Signed-off-by: Steven Toth Signed-off-by: Darron Broad --- linux/include/linux/dvb/frontend.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux/include') diff --git a/linux/include/linux/dvb/frontend.h b/linux/include/linux/dvb/frontend.h index 79fb7bd86..72cb8ae55 100644 --- a/linux/include/linux/dvb/frontend.h +++ b/linux/include/linux/dvb/frontend.h @@ -315,9 +315,9 @@ typedef enum fe_pilot { } fe_pilot_t; typedef enum fe_rolloff { + ROLLOFF_35, /* Implied value in DVB-S, default for DVB-S2 */ ROLLOFF_20, ROLLOFF_25, - ROLLOFF_35, ROLLOFF_AUTO, } fe_rolloff_t; -- cgit v1.2.3