History

[media] frontend: move legacy typedefs to the end

Just userspace need those typedefs. So, put it in the compat part of the header.

Mauro Carvalho Chehab committed 11 years ago

Commit b1e28ff1 parent af6392d1 file · +16 −43Browse files

Showing the changes to include/uapi (1 of 1 file). Show all

Unified · Split

include/uapi/linux/dvb/frontend.h+16−43
@@ -35,9 +35,6 @@ enum fe_type { · 34 unmodified lines
3535 FE_ATSC
3636 };
3737
38−typedef enum fe_type fe_type_t;
39−
40−
4138 enum fe_caps {
4239 FE_IS_STUPID = 0,
4340 FE_CAN_INVERSION_AUTO = 0x1,
@@ -72,9 +69,6 @@ enum fe_caps { · 28 unmodified lines
7269 FE_CAN_MUTE_TS = 0x80000000 /* frontend can stop spurious TS data output */
7370 };
7471
75−typedef enum fe_caps fe_caps_t;
76−
77−
7872 struct dvb_frontend_info {
7973 char name[128];
8074 enum fe_type type; /* DEPRECATED. Use DTV_ENUM_DELSYS instead */
@@ -99,39 +93,28 @@ struct dvb_diseqc_master_cmd { · 18 unmodified lines
9993 __u8 msg_len; /* valid values are 3...6 */
10094 };
10195
102−
10396 struct dvb_diseqc_slave_reply {
10497 __u8 msg [4]; /* { framing, data [3] } */
10598 __u8 msg_len; /* valid values are 0...4, 0 means no msg */
10699 int timeout; /* return from ioctl after timeout ms with */
107100 }; /* errorcode when no message was received */
108101
109−
110102 enum fe_sec_voltage {
111103 SEC_VOLTAGE_13,
112104 SEC_VOLTAGE_18,
113105 SEC_VOLTAGE_OFF
114106 };
115107
116−typedef enum fe_sec_voltage fe_sec_voltage_t;
117−
118−
119108 enum fe_sec_tone_mode {
120109 SEC_TONE_ON,
121110 SEC_TONE_OFF
122111 };
123112
124−typedef enum fe_sec_tone_mode fe_sec_tone_mode_t;
125−
126−
127113 enum fe_sec_mini_cmd {
128114 SEC_MINI_A,
129115 SEC_MINI_B
130116 };
131117
132−typedef enum fe_sec_mini_cmd fe_sec_mini_cmd_t;
133−
134−
135118 /**
136119 * enum fe_status - enumerates the possible frontend status
137120 * @FE_HAS_SIGNAL: found something above the noise level
@@ -143,7 +126,6 @@ typedef enum fe_sec_mini_cmd fe_sec_mini_cmd_t; · 5 unmodified lines
143126 * @FE_REINIT: frontend was reinitialized, application is recommended
144127 * to reset DiSEqC, tone and parameters
145128 */
146−
147129 enum fe_status {
148130 FE_HAS_SIGNAL = 0x01,
149131 FE_HAS_CARRIER = 0x02,
@@ -154,16 +136,12 @@ enum fe_status { · 4 unmodified lines
154136 FE_REINIT = 0x40,
155137 };
156138
157−typedef enum fe_status fe_status_t;
158−
159139 enum fe_spectral_inversion {
160140 INVERSION_OFF,
161141 INVERSION_ON,
162142 INVERSION_AUTO
163143 };
164144
165−typedef enum fe_spectral_inversion fe_spectral_inversion_t;
166−
167145 enum fe_code_rate {
168146 FEC_NONE = 0,
169147 FEC_1_2,
@@ -180,9 +158,6 @@ enum fe_code_rate { · 10 unmodified lines
180158 FEC_2_5,
181159 };
182160
183−typedef enum fe_code_rate fe_code_rate_t;
184−
185−
186161 enum fe_modulation {
187162 QPSK,
188163 QAM_16,
@@ -200,8 +175,6 @@ enum fe_modulation { · 11 unmodified lines
200175 QAM_4_NR,
201176 };
202177
203−typedef enum fe_modulation fe_modulation_t;
204−
205178 enum fe_transmit_mode {
206179 TRANSMISSION_MODE_2K,
207180 TRANSMISSION_MODE_8K,
@@ -214,9 +187,6 @@ enum fe_transmit_mode { · 6 unmodified lines
214187 TRANSMISSION_MODE_C3780,
215188 };
216189
217−typedef enum fe_transmit_mode fe_transmit_mode_t;
218−
219−
220190 enum fe_guard_interval {
221191 GUARD_INTERVAL_1_32,
222192 GUARD_INTERVAL_1_16,
@@ -231,8 +201,6 @@ enum fe_guard_interval { · 8 unmodified lines
231201 GUARD_INTERVAL_PN945,
232202 };
233203
234−typedef enum fe_guard_interval fe_guard_interval_t;
235−
236204 enum fe_hierarchy {
237205 HIERARCHY_NONE,
238206 HIERARCHY_1,
@@ -241,8 +209,6 @@ enum fe_hierarchy { · 2 unmodified lines
241209 HIERARCHY_AUTO
242210 };
243211
244−typedef enum fe_hierarchy fe_hierarchy_t;
245−
246212 enum fe_interleaving {
247213 INTERLEAVING_NONE,
248214 INTERLEAVING_AUTO,
@@ -349,8 +315,6 @@ enum fe_pilot { · 100 unmodified lines
349315 PILOT_AUTO,
350316 };
351317
352−typedef enum fe_pilot fe_pilot_t;
353−
354318 enum fe_rolloff {
355319 ROLLOFF_35, /* Implied value in DVB-S, default for DVB-S2 */
356320 ROLLOFF_20,
@@ -358,8 +322,6 @@ enum fe_rolloff { · 1 unmodified line
358322 ROLLOFF_AUTO,
359323 };
360324
361−typedef enum fe_rolloff fe_rolloff_t;
362−
363325 enum fe_delivery_system {
364326 SYS_UNDEFINED,
365327 SYS_DVBC_ANNEX_A,
@@ -382,8 +344,6 @@ enum fe_delivery_system { · 16 unmodified lines
382344 SYS_DVBC_ANNEX_C,
383345 };
384346
385−typedef enum fe_delivery_system fe_delivery_system_t;
386−
387347 /* backward compatibility */
388348 #define SYS_DVBC_ANNEX_AC SYS_DVBC_ANNEX_A
389349 #define SYS_DMBTH SYS_DTMB /* DMB-TH is legacy name, use DTMB instead */
@@ -536,7 +496,23 @@ enum fe_bandwidth { · 146 unmodified lines
536496 BANDWIDTH_1_712_MHZ,
537497 };
538498
499+/* This is needed for legacy userspace support */
500+typedef enum fe_sec_voltage fe_sec_voltage_t;
501+typedef enum fe_caps fe_caps_t;
502+typedef enum fe_type fe_type_t;
503+typedef enum fe_sec_tone_mode fe_sec_tone_mode_t;
504+typedef enum fe_sec_mini_cmd fe_sec_mini_cmd_t;
505+typedef enum fe_status fe_status_t;
506+typedef enum fe_spectral_inversion fe_spectral_inversion_t;
507+typedef enum fe_code_rate fe_code_rate_t;
508+typedef enum fe_modulation fe_modulation_t;
509+typedef enum fe_transmit_mode fe_transmit_mode_t;
539510 typedef enum fe_bandwidth fe_bandwidth_t;
511+typedef enum fe_guard_interval fe_guard_interval_t;
512+typedef enum fe_hierarchy fe_hierarchy_t;
513+typedef enum fe_pilot fe_pilot_t;
514+typedef enum fe_rolloff fe_rolloff_t;
515+typedef enum fe_delivery_system fe_delivery_system_t;
540516
541517 struct dvb_qpsk_parameters {
542518 __u32 symbol_rate; /* symbol rate in Symbols per second */
@@ -563,7 +539,6 @@ struct dvb_ofdm_parameters { · 20 unmodified lines
563539 fe_hierarchy_t hierarchy_information;
564540 };
565541
566−
567542 struct dvb_frontend_parameters {
568543 __u32 frequency; /* (absolute) frequency in Hz for QAM/OFDM/ATSC */
569544 /* intermediate frequency in kHz for QPSK */
@@ -585,7 +560,6 @@ struct dvb_frontend_event { · 15 unmodified lines
585560 #define FE_SET_PROPERTY _IOW('o', 82, struct dtv_properties)
586561 #define FE_GET_PROPERTY _IOR('o', 83, struct dtv_properties)
587562
588−
589563 /**
590564 * When set, this flag will disable any zigzagging or other "normal" tuning
591565 * behaviour. Additionally, there will be no automatic monitoring of the lock
@@ -595,7 +569,6 @@ struct dvb_frontend_event { · 3 unmodified lines
595569 */
596570 #define FE_TUNE_MODE_ONESHOT 0x01
597571
598−
599572 #define FE_GET_INFO _IOR('o', 61, struct dvb_frontend_info)
600573
601574 #define FE_DISEQC_RESET_OVERLOAD _IO('o', 62)