diff options
Diffstat (limited to 'include/uapi/linux/dvb')
| -rw-r--r-- | include/uapi/linux/dvb/ca.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/dvb/dmx.h | 5 | ||||
| -rw-r--r-- | include/uapi/linux/dvb/frontend.h | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/include/uapi/linux/dvb/ca.h b/include/uapi/linux/dvb/ca.h index 24fc38efbc2b..cb150029fdff 100644 --- a/include/uapi/linux/dvb/ca.h +++ b/include/uapi/linux/dvb/ca.h | |||
| @@ -139,7 +139,7 @@ struct ca_descr { | |||
| 139 | #define CA_SEND_MSG _IOW('o', 133, struct ca_msg) | 139 | #define CA_SEND_MSG _IOW('o', 133, struct ca_msg) |
| 140 | #define CA_SET_DESCR _IOW('o', 134, struct ca_descr) | 140 | #define CA_SET_DESCR _IOW('o', 134, struct ca_descr) |
| 141 | 141 | ||
| 142 | #if !defined (__KERNEL__) | 142 | #if !defined(__KERNEL__) |
| 143 | 143 | ||
| 144 | /* This is needed for legacy userspace support */ | 144 | /* This is needed for legacy userspace support */ |
| 145 | typedef struct ca_slot_info ca_slot_info_t; | 145 | typedef struct ca_slot_info ca_slot_info_t; |
diff --git a/include/uapi/linux/dvb/dmx.h b/include/uapi/linux/dvb/dmx.h index 4e3f3a2fe83f..4aa5f6a1815a 100644 --- a/include/uapi/linux/dvb/dmx.h +++ b/include/uapi/linux/dvb/dmx.h | |||
| @@ -189,8 +189,7 @@ struct dmx_sct_filter_params { | |||
| 189 | * @pes_type: Type of the pes filter, as specified by &enum dmx_pes_type. | 189 | * @pes_type: Type of the pes filter, as specified by &enum dmx_pes_type. |
| 190 | * @flags: Demux PES flags. | 190 | * @flags: Demux PES flags. |
| 191 | */ | 191 | */ |
| 192 | struct dmx_pes_filter_params | 192 | struct dmx_pes_filter_params { |
| 193 | { | ||
| 194 | __u16 pid; | 193 | __u16 pid; |
| 195 | enum dmx_input input; | 194 | enum dmx_input input; |
| 196 | enum dmx_output output; | 195 | enum dmx_output output; |
| @@ -221,7 +220,7 @@ struct dmx_stc { | |||
| 221 | #define DMX_ADD_PID _IOW('o', 51, __u16) | 220 | #define DMX_ADD_PID _IOW('o', 51, __u16) |
| 222 | #define DMX_REMOVE_PID _IOW('o', 52, __u16) | 221 | #define DMX_REMOVE_PID _IOW('o', 52, __u16) |
| 223 | 222 | ||
| 224 | #if !defined (__KERNEL__) | 223 | #if !defined(__KERNEL__) |
| 225 | 224 | ||
| 226 | /* This is needed for legacy userspace support */ | 225 | /* This is needed for legacy userspace support */ |
| 227 | typedef enum dmx_output dmx_output_t; | 226 | typedef enum dmx_output dmx_output_t; |
diff --git a/include/uapi/linux/dvb/frontend.h b/include/uapi/linux/dvb/frontend.h index fc2edb6014fe..861cacd5711f 100644 --- a/include/uapi/linux/dvb/frontend.h +++ b/include/uapi/linux/dvb/frontend.h | |||
| @@ -907,7 +907,7 @@ struct dtv_properties { | |||
| 907 | #define FE_SET_PROPERTY _IOW('o', 82, struct dtv_properties) | 907 | #define FE_SET_PROPERTY _IOW('o', 82, struct dtv_properties) |
| 908 | #define FE_GET_PROPERTY _IOR('o', 83, struct dtv_properties) | 908 | #define FE_GET_PROPERTY _IOR('o', 83, struct dtv_properties) |
| 909 | 909 | ||
| 910 | #if defined(__DVB_CORE__) || !defined (__KERNEL__) | 910 | #if defined(__DVB_CORE__) || !defined(__KERNEL__) |
| 911 | 911 | ||
| 912 | /* | 912 | /* |
| 913 | * DEPRECATED: Everything below is deprecated in favor of DVBv5 API | 913 | * DEPRECATED: Everything below is deprecated in favor of DVBv5 API |
| @@ -982,8 +982,8 @@ struct dvb_ofdm_parameters { | |||
| 982 | }; | 982 | }; |
| 983 | 983 | ||
| 984 | struct dvb_frontend_parameters { | 984 | struct dvb_frontend_parameters { |
| 985 | __u32 frequency; /* (absolute) frequency in Hz for DVB-C/DVB-T/ATSC */ | 985 | __u32 frequency; /* (absolute) frequency in Hz for DVB-C/DVB-T/ATSC */ |
| 986 | /* intermediate frequency in kHz for DVB-S */ | 986 | /* intermediate frequency in kHz for DVB-S */ |
| 987 | fe_spectral_inversion_t inversion; | 987 | fe_spectral_inversion_t inversion; |
| 988 | union { | 988 | union { |
| 989 | struct dvb_qpsk_parameters qpsk; /* DVB-S */ | 989 | struct dvb_qpsk_parameters qpsk; /* DVB-S */ |
