diff options
| author | Andreas Oberritter <devnull@localhost> | 2003-03-22 17:13:22 +0000 |
|---|---|---|
| committer | Andreas Oberritter <devnull@localhost> | 2003-03-22 17:13:22 +0000 |
| commit | 608f661ed9ab0308516945deeff525b72bbb83be (patch) | |
| tree | 150238156d6f9edcc0006b75fac5e556417b9cb5 /linux | |
| parent | 63cb0c2e9b4d11a118ca8225f872f743302981e7 (diff) | |
| download | mediapointer-dvb-s2-608f661ed9ab0308516945deeff525b72bbb83be.tar.gz mediapointer-dvb-s2-608f661ed9ab0308516945deeff525b72bbb83be.tar.bz2 | |
fixed userspace types
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/include/linux/dvb/dmx.h | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/linux/include/linux/dvb/dmx.h b/linux/include/linux/dvb/dmx.h index d8c60ad0a..62e621770 100644 --- a/linux/include/linux/dvb/dmx.h +++ b/linux/include/linux/dvb/dmx.h @@ -25,7 +25,11 @@ #define _DVBDMX_H_ #include <asm/types.h> +#ifdef __KERNEL__ #include <linux/time.h> +#else +#include <time.h> +#endif #define DMX_FILTER_SIZE 16 @@ -100,18 +104,18 @@ typedef enum typedef struct dmx_filter { - u8 filter[DMX_FILTER_SIZE]; - u8 mask[DMX_FILTER_SIZE]; - u8 mode[DMX_FILTER_SIZE]; + __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; + __u16 pid; dmx_filter_t filter; - u32 timeout; - u32 flags; + __u32 timeout; + __u32 flags; #define DMX_CHECK_CRC 1 #define DMX_ONESHOT 2 #define DMX_IMMEDIATE_START 4 @@ -121,11 +125,11 @@ struct dmx_sct_filter_params struct dmx_pes_filter_params { - u16 pid; + __u16 pid; dmx_input_t input; dmx_output_t output; dmx_pes_type_t pes_type; - u32 flags; + __u32 flags; }; @@ -140,7 +144,7 @@ struct dmx_event }; typedef struct dmx_caps { - u32 caps; + __u32 caps; int num_decoders; } dmx_caps_t; @@ -158,20 +162,20 @@ typedef enum { 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 */ + __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_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) -#define DMX_GET_STC _IOWR('o',50,struct dmx_stc) +#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_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) +#define DMX_GET_STC _IOWR('o', 50, struct dmx_stc) #endif /*_DVBDMX_H_*/ |