diff options
author | Antti Palosaari <crope@iki.fi> | 2012-08-12 21:33:21 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-13 15:01:17 -0400 |
commit | 224b6642f5e82a1b21f6b552c799fa02e527d542 (patch) | |
tree | e73e68bcaf805c4cacb44c32865dd73395504f30 /include/linux/dvb/frontend.h | |
parent | 991452a21b76e5e1bba2fcf9c024ab69067f5656 (diff) |
[media] add DTMB support for DVB API
Cc: Patrick Boettcher <pboettcher@kernellabs.com>
Cc: Andreas Oberritter <obi@linuxtv.org>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: Patrick Boettcher <pboettcher@kernellabs.com>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/linux/dvb/frontend.h')
-rw-r--r-- | include/linux/dvb/frontend.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h index f50d4058c5fb..2dd5823b59b9 100644 --- a/include/linux/dvb/frontend.h +++ b/include/linux/dvb/frontend.h | |||
@@ -152,6 +152,7 @@ typedef enum fe_code_rate { | |||
152 | FEC_AUTO, | 152 | FEC_AUTO, |
153 | FEC_3_5, | 153 | FEC_3_5, |
154 | FEC_9_10, | 154 | FEC_9_10, |
155 | FEC_2_5, | ||
155 | } fe_code_rate_t; | 156 | } fe_code_rate_t; |
156 | 157 | ||
157 | 158 | ||
@@ -169,6 +170,7 @@ typedef enum fe_modulation { | |||
169 | APSK_16, | 170 | APSK_16, |
170 | APSK_32, | 171 | APSK_32, |
171 | DQPSK, | 172 | DQPSK, |
173 | QAM_4_NR, | ||
172 | } fe_modulation_t; | 174 | } fe_modulation_t; |
173 | 175 | ||
174 | typedef enum fe_transmit_mode { | 176 | typedef enum fe_transmit_mode { |
@@ -179,6 +181,8 @@ typedef enum fe_transmit_mode { | |||
179 | TRANSMISSION_MODE_1K, | 181 | TRANSMISSION_MODE_1K, |
180 | TRANSMISSION_MODE_16K, | 182 | TRANSMISSION_MODE_16K, |
181 | TRANSMISSION_MODE_32K, | 183 | TRANSMISSION_MODE_32K, |
184 | TRANSMISSION_MODE_C1, | ||
185 | TRANSMISSION_MODE_C3780, | ||
182 | } fe_transmit_mode_t; | 186 | } fe_transmit_mode_t; |
183 | 187 | ||
184 | #if defined(__DVB_CORE__) || !defined (__KERNEL__) | 188 | #if defined(__DVB_CORE__) || !defined (__KERNEL__) |
@@ -202,6 +206,9 @@ typedef enum fe_guard_interval { | |||
202 | GUARD_INTERVAL_1_128, | 206 | GUARD_INTERVAL_1_128, |
203 | GUARD_INTERVAL_19_128, | 207 | GUARD_INTERVAL_19_128, |
204 | GUARD_INTERVAL_19_256, | 208 | GUARD_INTERVAL_19_256, |
209 | GUARD_INTERVAL_PN420, | ||
210 | GUARD_INTERVAL_PN595, | ||
211 | GUARD_INTERVAL_PN945, | ||
205 | } fe_guard_interval_t; | 212 | } fe_guard_interval_t; |
206 | 213 | ||
207 | 214 | ||
@@ -213,6 +220,11 @@ typedef enum fe_hierarchy { | |||
213 | HIERARCHY_AUTO | 220 | HIERARCHY_AUTO |
214 | } fe_hierarchy_t; | 221 | } fe_hierarchy_t; |
215 | 222 | ||
223 | enum fe_interleaving { | ||
224 | INTERLEAVING_NONE, | ||
225 | INTERLEAVING_240, | ||
226 | INTERLEAVING_720, | ||
227 | }; | ||
216 | 228 | ||
217 | #if defined(__DVB_CORE__) || !defined (__KERNEL__) | 229 | #if defined(__DVB_CORE__) || !defined (__KERNEL__) |
218 | struct dvb_qpsk_parameters { | 230 | struct dvb_qpsk_parameters { |
@@ -337,7 +349,9 @@ struct dvb_frontend_event { | |||
337 | #define DTV_ATSCMH_SCCC_CODE_MODE_C 58 | 349 | #define DTV_ATSCMH_SCCC_CODE_MODE_C 58 |
338 | #define DTV_ATSCMH_SCCC_CODE_MODE_D 59 | 350 | #define DTV_ATSCMH_SCCC_CODE_MODE_D 59 |
339 | 351 | ||
340 | #define DTV_MAX_COMMAND DTV_ATSCMH_SCCC_CODE_MODE_D | 352 | #define DTV_INTERLEAVING 60 |
353 | |||
354 | #define DTV_MAX_COMMAND DTV_INTERLEAVING | ||
341 | 355 | ||
342 | typedef enum fe_pilot { | 356 | typedef enum fe_pilot { |
343 | PILOT_ON, | 357 | PILOT_ON, |
@@ -366,7 +380,7 @@ typedef enum fe_delivery_system { | |||
366 | SYS_ISDBC, | 380 | SYS_ISDBC, |
367 | SYS_ATSC, | 381 | SYS_ATSC, |
368 | SYS_ATSCMH, | 382 | SYS_ATSCMH, |
369 | SYS_DMBTH, | 383 | SYS_DTMB, |
370 | SYS_CMMB, | 384 | SYS_CMMB, |
371 | SYS_DAB, | 385 | SYS_DAB, |
372 | SYS_DVBT2, | 386 | SYS_DVBT2, |
@@ -374,8 +388,9 @@ typedef enum fe_delivery_system { | |||
374 | SYS_DVBC_ANNEX_C, | 388 | SYS_DVBC_ANNEX_C, |
375 | } fe_delivery_system_t; | 389 | } fe_delivery_system_t; |
376 | 390 | ||
377 | 391 | /* backward compatibility */ | |
378 | #define SYS_DVBC_ANNEX_AC SYS_DVBC_ANNEX_A | 392 | #define SYS_DVBC_ANNEX_AC SYS_DVBC_ANNEX_A |
393 | #define SYS_DMBTH SYS_DTMB /* DMB-TH is legacy name, use DTMB instead */ | ||
379 | 394 | ||
380 | /* ATSC-MH */ | 395 | /* ATSC-MH */ |
381 | 396 | ||