Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8de8594a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] dvb-core: be sure that drivers won't use DVBv3 internally 



Now that all frontends are implementing DVBv5, don't export the
DVBv3 specific stuff to the drivers. Only the core should be
aware of that, as it will keep providing DVBv3 backward compatibility.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a7d44baa

drivers/media/dvb/dvb-core/dvb_frontend.c

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
 * Or, point your browser to http://www.gnu.org/copyleft/gpl.html

 */



/* Enables DVBv3 compatibility bits at the headers */

#define __DVB_CORE__



#include <linux/string.h>

#include <linux/kernel.h>

#include <linux/sched.h>

drivers/media/dvb/dvb-core/dvb_frontend.h

+2 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ struct dvb_frontend_ops { 
	int (*get_property)(struct dvb_frontend* fe, struct dtv_property* tvp);

};



#ifdef __DVB_CORE__

#define MAX_EVENT 8



struct dvb_fe_events {
@@ -325,6 +326,7 @@ struct dvb_fe_events { 
	wait_queue_head_t	  wait_queue;

	struct mutex		  mtx;

};

#endif



struct dtv_frontend_properties {

include/linux/dvb/frontend.h

+4 −2
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ typedef enum fe_transmit_mode { 
	TRANSMISSION_MODE_32K,

} fe_transmit_mode_t;



#if defined(__DVB_CORE__) || !defined (__KERNEL__)

typedef enum fe_bandwidth {

	BANDWIDTH_8_MHZ,

	BANDWIDTH_7_MHZ,
@@ -190,7 +191,7 @@ typedef enum fe_bandwidth { 
	BANDWIDTH_10_MHZ,

	BANDWIDTH_1_712_MHZ,

} fe_bandwidth_t;



#endif



typedef enum fe_guard_interval {

	GUARD_INTERVAL_1_32,
@@ -213,6 +214,7 @@ typedef enum fe_hierarchy { 
} fe_hierarchy_t;





#if defined(__DVB_CORE__) || !defined (__KERNEL__)

struct dvb_qpsk_parameters {

	__u32		symbol_rate;  /* symbol rate in Symbols per second */

	fe_code_rate_t	fec_inner;    /* forward error correction (see above) */
@@ -251,11 +253,11 @@ struct dvb_frontend_parameters { 
	} u;

};





struct dvb_frontend_event {

	fe_status_t status;

	struct dvb_frontend_parameters parameters;

};

#endif



/* S2API Commands */

#define DTV_UNDEFINED		0