[linux-dvb] [PATCH/RFC] remove DMX_GET_EVENT and associated data structures

[Andreas Oberritter]

From: Andreas Oberritter <obi at linuxtv.org>

The ioctl DMX_GET_EVENT has never been implemented.

Signed-off-by: Andreas Oberritter <obi at linuxtv.org>
---

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.

Mauro, please don't commit this patch yet. It should first be discussed
at the list.

diff -r 480984c42c2d linux/drivers/media/dvb/dvb-core/dmxdev.c
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.c	Tue Mar 14 20:12:07 2006 +0100
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c	Tue Mar 14 20:15:43 2006 +0100
@@ -865,9 +865,6 @@ static int dvb_demux_do_ioctl(struct ino
 		mutex_unlock(&dmxdevfilter->mutex);
 		break;
 
-	case DMX_GET_EVENT:
-		break;
-
 	case DMX_GET_PES_PIDS:
 		if (!dmxdev->demux->get_pes_pids) {
 			ret = -EINVAL;
diff -r 480984c42c2d linux/include/linux/dvb/dmx.h
--- a/linux/include/linux/dvb/dmx.h	Tue Mar 14 20:12:07 2006 +0100
+++ b/linux/include/linux/dvb/dmx.h	Tue Mar 14 20:15:43 2006 +0100
@@ -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];
@@ -130,17 +116,6 @@ struct dmx_pes_filter_params
 	dmx_output_t   output;
 	dmx_pes_type_t pes_type;
 	__u32          flags;
-};
-
-
-struct dmx_event
-{
-	dmx_event_t         event;
-	time_t              timeStamp;
-	union
-	{
-		dmx_scrambling_status_t scrambling;
-	} u;
 };
 
 typedef struct dmx_caps {
@@ -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)