summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/linux/dvb/dmx.h39
-rw-r--r--linux/include/linux/dvb/frontend.h42
-rw-r--r--linux/include/linux/dvb/net.h10
3 files changed, 42 insertions, 49 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)
diff --git a/linux/include/linux/dvb/frontend.h b/linux/include/linux/dvb/frontend.h
index 68b61355b..a0f3157d0 100644
--- a/linux/include/linux/dvb/frontend.h
+++ b/linux/include/linux/dvb/frontend.h
@@ -68,14 +68,14 @@ typedef enum fe_caps {
struct dvb_frontend_info {
char name[128];
fe_type_t type;
- u32 frequency_min;
- u32 frequency_max;
- u32 frequency_stepsize;
- u32 frequency_tolerance;
- u32 symbol_rate_min;
- u32 symbol_rate_max;
- u32 symbol_rate_tolerance; /* ppm */
- u32 notifier_delay; /* ms */
+ __u32 frequency_min;
+ __u32 frequency_max;
+ __u32 frequency_stepsize;
+ __u32 frequency_tolerance;
+ __u32 symbol_rate_min;
+ __u32 symbol_rate_max;
+ __u32 symbol_rate_tolerance; /* ppm */
+ __u32 notifier_delay; /* ms */
fe_caps_t caps;
};
@@ -85,16 +85,16 @@ struct dvb_frontend_info {
* the meaning of this struct...
*/
struct dvb_diseqc_master_cmd {
- u8 msg [6]; /* { framing, address, command, data [3] } */
- u8 msg_len; /* valid values are 3...6 */
+ __u8 msg [6]; /* { framing, address, command, data [3] } */
+ __u8 msg_len; /* valid values are 3...6 */
};
struct dvb_diseqc_slave_reply {
- u8 msg [4]; /* { framing, data [3] } */
- u8 msg_len; /* valid values are 0...4, 0 means no msg */
- int timeout; /* return from ioctl after timeout ms with */
-}; /* errorcode when no message was received */
+ __u8 msg [4]; /* { framing, data [3] } */
+ __u8 msg_len; /* valid values are 0...4, 0 means no msg */
+ int timeout; /* return from ioctl after timeout ms with */
+}; /* errorcode when no message was received */
typedef enum fe_sec_voltage {
@@ -191,13 +191,13 @@ typedef enum fe_hierarchy {
struct dvb_qpsk_parameters {
- u32 symbol_rate; /* symbol rate in Symbols per second */
+ __u32 symbol_rate; /* symbol rate in Symbols per second */
fe_code_rate_t fec_inner; /* forward error correction (see above) */
};
struct dvb_qam_parameters {
- u32 symbol_rate; /* symbol rate in Symbols per second */
+ __u32 symbol_rate; /* symbol rate in Symbols per second */
fe_code_rate_t fec_inner; /* forward error correction (see above) */
fe_modulation_t modulation; /* modulation type (see above) */
};
@@ -215,7 +215,7 @@ struct dvb_ofdm_parameters {
struct dvb_frontend_parameters {
- u32 frequency; /* (absolute) frequency in Hz for QAM/OFDM */
+ __u32 frequency; /* (absolute) frequency in Hz for QAM/OFDM */
/* intermediate frequency in kHz for QPSK */
fe_spectral_inversion_t inversion;
union {
@@ -245,10 +245,10 @@ struct dvb_frontend_event {
#define FE_ENABLE_HIGH_LNB_VOLTAGE _IO('o', 68) /* int */
#define FE_READ_STATUS _IOR('o', 69, fe_status_t)
-#define FE_READ_BER _IOR('o', 70, u32)
-#define FE_READ_SIGNAL_STRENGTH _IOR('o', 71, u16)
-#define FE_READ_SNR _IOR('o', 72, u16)
-#define FE_READ_UNCORRECTED_BLOCKS _IOR('o', 73, u32)
+#define FE_READ_BER _IOR('o', 70, __u32)
+#define FE_READ_SIGNAL_STRENGTH _IOR('o', 71, __u16)
+#define FE_READ_SNR _IOR('o', 72, __u16)
+#define FE_READ_UNCORRECTED_BLOCKS _IOR('o', 73, __u32)
#define FE_SET_FRONTEND _IOW('o', 76, struct dvb_frontend_parameters)
#define FE_GET_FRONTEND _IOR('o', 77, struct dvb_frontend_parameters)
diff --git a/linux/include/linux/dvb/net.h b/linux/include/linux/dvb/net.h
index 5bf03b81e..4b8fa5177 100644
--- a/linux/include/linux/dvb/net.h
+++ b/linux/include/linux/dvb/net.h
@@ -24,16 +24,12 @@
#ifndef _DVBNET_H_
#define _DVBNET_H_
-#ifdef __KERNEL__
-#include <linux/types.h>
-#else
-#include <stdint.h>
-#endif
+#include <asm/types.h>
struct dvb_net_if {
- uint16_t pid;
- uint16_t if_num;
+ __u16 pid;
+ __u16 if_num;
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-18 17:44:15 +0000