diff options
Diffstat (limited to 'linux/include/linux/dvb/dmx.h')
| -rw-r--r-- | linux/include/linux/dvb/dmx.h | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/linux/include/linux/dvb/dmx.h b/linux/include/linux/dvb/dmx.h index 089b21734..d8c60ad0a 100644 --- a/linux/include/linux/dvb/dmx.h +++ b/linux/include/linux/dvb/dmx.h @@ -24,12 +24,9 @@ #ifndef _DVBDMX_H_ #define _DVBDMX_H_ -#ifdef __KERNEL__ -#include <linux/types.h> -#else -#include <stdint.h> -#include <time.h> -#endif +#include <asm/types.h> +#include <linux/time.h> + #define DMX_FILTER_SIZE 16 @@ -103,18 +100,18 @@ typedef enum typedef struct dmx_filter { - uint8_t filter[DMX_FILTER_SIZE]; - uint8_t mask[DMX_FILTER_SIZE]; - uint8_t 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 { - uint16_t pid; - dmx_filter_t filter; - uint32_t timeout; - uint32_t flags; + u16 pid; + dmx_filter_t filter; + u32 timeout; + u32 flags; #define DMX_CHECK_CRC 1 #define DMX_ONESHOT 2 #define DMX_IMMEDIATE_START 4 @@ -124,11 +121,11 @@ struct dmx_sct_filter_params struct dmx_pes_filter_params { - uint16_t pid; - dmx_input_t input; - dmx_output_t output; - dmx_pes_type_t pes_type; - uint32_t flags; + u16 pid; + dmx_input_t input; + dmx_output_t output; + dmx_pes_type_t pes_type; + u32 flags; }; @@ -143,7 +140,7 @@ struct dmx_event }; typedef struct dmx_caps { - uint32_t caps; + u32 caps; int num_decoders; } dmx_caps_t; @@ -161,7 +158,7 @@ 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 */ - uint64_t stc; /* output: stc in 'base'*90 kHz units */ + u64 stc; /* output: stc in 'base'*90 kHz units */ }; @@ -171,7 +168,7 @@ struct dmx_stc { #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,uint16_t[5]) +#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) |