diff options
author | Andreas Oberritter <obi@linuxtv.org> | 2006-04-05 15:36:51 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 00:57:47 -0400 |
commit | 62838084b4c4c83cd511893132e2d8da84f48813 (patch) | |
tree | 9abb37c5cd1b76fbef5b1b9c852309c6671cf00d | |
parent | 68ef505e31bb182131c208d139c9b6da33d8d330 (diff) |
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: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/dvb/dvb-core/dmxdev.c | 3 | ||||
-rw-r--r-- | include/linux/dvb/dmx.h | 26 |
2 files changed, 0 insertions, 29 deletions
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c index 04578df3f249..988499dfddf8 100644 --- a/drivers/media/dvb/dvb-core/dmxdev.c +++ b/drivers/media/dvb/dvb-core/dmxdev.c | |||
@@ -872,9 +872,6 @@ static int dvb_demux_do_ioctl(struct inode *inode, struct file *file, | |||
872 | mutex_unlock(&dmxdevfilter->mutex); | 872 | mutex_unlock(&dmxdevfilter->mutex); |
873 | break; | 873 | break; |
874 | 874 | ||
875 | case DMX_GET_EVENT: | ||
876 | break; | ||
877 | |||
878 | case DMX_GET_PES_PIDS: | 875 | case DMX_GET_PES_PIDS: |
879 | if (!dmxdev->demux->get_pes_pids) { | 876 | if (!dmxdev->demux->get_pes_pids) { |
880 | ret = -EINVAL; | 877 | ret = -EINVAL; |
diff --git a/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h index 2787b8a22ff1..c6a2353c4e68 100644 --- a/include/linux/dvb/dmx.h +++ b/include/linux/dvb/dmx.h | |||
@@ -88,20 +88,6 @@ typedef enum | |||
88 | #define DMX_PES_PCR DMX_PES_PCR0 | 88 | #define DMX_PES_PCR DMX_PES_PCR0 |
89 | 89 | ||
90 | 90 | ||
91 | typedef enum | ||
92 | { | ||
93 | DMX_SCRAMBLING_EV, | ||
94 | DMX_FRONTEND_EV | ||
95 | } dmx_event_t; | ||
96 | |||
97 | |||
98 | typedef enum | ||
99 | { | ||
100 | DMX_SCRAMBLING_OFF, | ||
101 | DMX_SCRAMBLING_ON | ||
102 | } dmx_scrambling_status_t; | ||
103 | |||
104 | |||
105 | typedef struct dmx_filter | 91 | typedef struct dmx_filter |
106 | { | 92 | { |
107 | __u8 filter[DMX_FILTER_SIZE]; | 93 | __u8 filter[DMX_FILTER_SIZE]; |
@@ -132,17 +118,6 @@ struct dmx_pes_filter_params | |||
132 | __u32 flags; | 118 | __u32 flags; |
133 | }; | 119 | }; |
134 | 120 | ||
135 | |||
136 | struct dmx_event | ||
137 | { | ||
138 | dmx_event_t event; | ||
139 | time_t timeStamp; | ||
140 | union | ||
141 | { | ||
142 | dmx_scrambling_status_t scrambling; | ||
143 | } u; | ||
144 | }; | ||
145 | |||
146 | typedef struct dmx_caps { | 121 | typedef struct dmx_caps { |
147 | __u32 caps; | 122 | __u32 caps; |
148 | int num_decoders; | 123 | int num_decoders; |
@@ -171,7 +146,6 @@ struct dmx_stc { | |||
171 | #define DMX_SET_FILTER _IOW('o', 43, struct dmx_sct_filter_params) | 146 | #define DMX_SET_FILTER _IOW('o', 43, struct dmx_sct_filter_params) |
172 | #define DMX_SET_PES_FILTER _IOW('o', 44, struct dmx_pes_filter_params) | 147 | #define DMX_SET_PES_FILTER _IOW('o', 44, struct dmx_pes_filter_params) |
173 | #define DMX_SET_BUFFER_SIZE _IO('o', 45) | 148 | #define DMX_SET_BUFFER_SIZE _IO('o', 45) |
174 | #define DMX_GET_EVENT _IOR('o', 46, struct dmx_event) | ||
175 | #define DMX_GET_PES_PIDS _IOR('o', 47, __u16[5]) | 149 | #define DMX_GET_PES_PIDS _IOR('o', 47, __u16[5]) |
176 | #define DMX_GET_CAPS _IOR('o', 48, dmx_caps_t) | 150 | #define DMX_GET_CAPS _IOR('o', 48, dmx_caps_t) |
177 | #define DMX_SET_SOURCE _IOW('o', 49, dmx_source_t) | 151 | #define DMX_SET_SOURCE _IOW('o', 49, dmx_source_t) |