Commit 62838084 authored by Andreas Oberritter's avatar Andreas Oberritter Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3727): Remove DMX_GET_EVENT and associated data structures 



The ioctl DMX_GET_EVENT has never been implemented.
I guess no software is using it because of its lack of implementation.
Future software won't use it, too, because this API doesn't make much
sense the way it is: Frontend events have their own different API.
Scrambling events can't be generated in a useful way by the hardware I
know of.

Signed-off-by: default avatarAndreas Oberritter <obi@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 68ef505e

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

+0 −3
Original line number Diff line number Diff line
@@ -872,9 +872,6 @@ static int dvb_demux_do_ioctl(struct inode *inode, struct file *file, 
		mutex_unlock(&dmxdevfilter->mutex);

		break;



	case DMX_GET_EVENT:

		break;



	case DMX_GET_PES_PIDS:

		if (!dmxdev->demux->get_pes_pids) {

			ret = -EINVAL;

include/linux/dvb/dmx.h

+0 −26
Original line number Diff line number Diff line
@@ -88,20 +88,6 @@ typedef enum 
#define DMX_PES_PCR      DMX_PES_PCR0





typedef enum

{

	DMX_SCRAMBLING_EV,

	DMX_FRONTEND_EV

} dmx_event_t;





typedef enum

{

	DMX_SCRAMBLING_OFF,

	DMX_SCRAMBLING_ON

} dmx_scrambling_status_t;





typedef struct dmx_filter

{

	__u8  filter[DMX_FILTER_SIZE];
@@ -132,17 +118,6 @@ struct dmx_pes_filter_params 
	__u32          flags;

};





struct dmx_event

{

	dmx_event_t         event;

	time_t              timeStamp;

	union

	{

		dmx_scrambling_status_t scrambling;

	} u;

};



typedef struct dmx_caps {

	__u32 caps;

	int num_decoders;
@@ -171,7 +146,6 @@ struct dmx_stc { 
#define DMX_SET_FILTER           _IOW('o', 43, struct dmx_sct_filter_params)

#define DMX_SET_PES_FILTER       _IOW('o', 44, struct dmx_pes_filter_params)

#define DMX_SET_BUFFER_SIZE      _IO('o', 45)

#define DMX_GET_EVENT            _IOR('o', 46, struct dmx_event)

#define DMX_GET_PES_PIDS         _IOR('o', 47, __u16[5])

#define DMX_GET_CAPS             _IOR('o', 48, dmx_caps_t)

#define DMX_SET_SOURCE           _IOW('o', 49, dmx_source_t)