1 files changed, 1 insertions, 129 deletions

diff --git a/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h
index f078f3ac82d4..0be6d8f2b52b 100644
--- a/include/linux/dvb/dmx.h
+++ b/include/linux/dvb/dmx.h
@@ -20,138 +20,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
-
 #ifndef _DVBDMX_H_
 #define _DVBDMX_H_
 
-#include <linux/types.h>
-#ifdef __KERNEL__
 #include <linux/time.h>
-#else
-#include <time.h>
-#endif
-
-
-#define DMX_FILTER_SIZE 16
-
-typedef enum
-{
-        DMX_OUT_DECODER, /* Streaming directly to decoder. */
-        DMX_OUT_TAP,     /* Output going to a memory buffer */
-                         /* (to be retrieved via the read command).*/
-        DMX_OUT_TS_TAP,  /* Output multiplexed into a new TS  */
-                         /* (to be retrieved by reading from the */
-                         /* logical DVR device).                 */
-        DMX_OUT_TSDEMUX_TAP /* Like TS_TAP but retrieved from the DMX device */
-} dmx_output_t;
-
-
-typedef enum
-{
-        DMX_IN_FRONTEND, /* Input from a front-end device.  */
-        DMX_IN_DVR       /* Input from the logical DVR device.  */
-} dmx_input_t;
-
-
-typedef enum
-{
-        DMX_PES_AUDIO0,
-        DMX_PES_VIDEO0,
-        DMX_PES_TELETEXT0,
-        DMX_PES_SUBTITLE0,
-        DMX_PES_PCR0,
-
-        DMX_PES_AUDIO1,
-        DMX_PES_VIDEO1,
-        DMX_PES_TELETEXT1,
-        DMX_PES_SUBTITLE1,
-        DMX_PES_PCR1,
-
-        DMX_PES_AUDIO2,
-        DMX_PES_VIDEO2,
-        DMX_PES_TELETEXT2,
-        DMX_PES_SUBTITLE2,
-        DMX_PES_PCR2,
-
-        DMX_PES_AUDIO3,
-        DMX_PES_VIDEO3,
-        DMX_PES_TELETEXT3,
-        DMX_PES_SUBTITLE3,
-        DMX_PES_PCR3,
-
-        DMX_PES_OTHER
-} dmx_pes_type_t;
-
-#define DMX_PES_AUDIO    DMX_PES_AUDIO0
-#define DMX_PES_VIDEO    DMX_PES_VIDEO0
-#define DMX_PES_TELETEXT DMX_PES_TELETEXT0
-#define DMX_PES_SUBTITLE DMX_PES_SUBTITLE0
-#define DMX_PES_PCR      DMX_PES_PCR0
-
-
-typedef struct dmx_filter
-{
-        __u8  filter[DMX_FILTER_SIZE];
-        __u8  mask[DMX_FILTER_SIZE];
-        __u8  mode[DMX_FILTER_SIZE];
-} dmx_filter_t;
-
-
-struct dmx_sct_filter_params
-{
-        __u16          pid;
-        dmx_filter_t   filter;
-        __u32          timeout;
-        __u32          flags;
-#define DMX_CHECK_CRC       1
-#define DMX_ONESHOT         2
-#define DMX_IMMEDIATE_START 4
-#define DMX_KERNEL_CLIENT   0x8000
-};
-
-
-struct dmx_pes_filter_params
-{
-        __u16          pid;
-        dmx_input_t    input;
-        dmx_output_t   output;
-        dmx_pes_type_t pes_type;
-        __u32          flags;
-};
-
-typedef struct dmx_caps {
-        __u32 caps;
-        int num_decoders;
-} dmx_caps_t;
-
-typedef enum {
-        DMX_SOURCE_FRONT0 = 0,
-        DMX_SOURCE_FRONT1,
-        DMX_SOURCE_FRONT2,
-        DMX_SOURCE_FRONT3,
-        DMX_SOURCE_DVR0   = 16,
-        DMX_SOURCE_DVR1,
-        DMX_SOURCE_DVR2,
-        DMX_SOURCE_DVR3
-} dmx_source_t;
-
-struct dmx_stc {
-        unsigned int num;       /* input : which STC? 0..N */
-        unsigned int base;      /* output: divisor for stc to get 90 kHz clock */
-        __u64 stc;              /* output: stc in 'base'*90 kHz units */
-};
-
-
-#define DMX_START                _IO('o', 41)
-#define DMX_STOP                 _IO('o', 42)
-#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_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)
-#define DMX_GET_STC              _IOWR('o', 50, struct dmx_stc)
-#define DMX_ADD_PID              _IOW('o', 51, __u16)
-#define DMX_REMOVE_PID           _IOW('o', 52, __u16)
+#include <uapi/linux/dvb/dmx.h>
 
 #endif /*_DVBDMX_H_*/