History

media: dvb: add DVB-C2 and DVB-S2X parameter values

Extend the DVB frontend parameter enums with additional values specified by the DVB-C2 (ETSI EN 302 769) and DVB-S2X (ETSI EN 302 307-2) standards to be ready for frontend drivers for such receivers. While most parameters will be "read-only" due to being autodetected by the receiver and only being reported back for informational purposes, the addition of SYS_DVBC2 to the delivery systems enum is required, because there are DVB-C2 capable receivers which are not capable of DVB-C/C2 autodetection and thus need this enum value to be explicitly instructed to search for a DVB-C2 signal. As for DVB-S2X, as that is an extension to DVB-S2, the same delivery system enum as for DVB-S2 can be used. Add the additional enum values and comments to the documentation.

Robert Schlabbach committed 4 years ago

Commit 6508a501 parent e2a22712 files · +74 −10Browse files

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

Unified · Split

include/uapi/linux/dvb/frontend.h+58−1
@@ -296,6 +296,22 @@ enum fe_spectral_inversion { · 295 unmodified lines
296 * @FEC_3_5: Forward Error Correction Code 3/5296 * @FEC_3_5: Forward Error Correction Code 3/5
297 * @FEC_9_10: Forward Error Correction Code 9/10297 * @FEC_9_10: Forward Error Correction Code 9/10
298 * @FEC_2_5: Forward Error Correction Code 2/5298 * @FEC_2_5: Forward Error Correction Code 2/5
299 * @FEC_1_3: Forward Error Correction Code 1/3
300 * @FEC_1_4: Forward Error Correction Code 1/4
301 * @FEC_5_9: Forward Error Correction Code 5/9
302 * @FEC_7_9: Forward Error Correction Code 7/9
303 * @FEC_8_15: Forward Error Correction Code 8/15
304 * @FEC_11_15: Forward Error Correction Code 11/15
305 * @FEC_13_18: Forward Error Correction Code 13/18
306 * @FEC_9_20: Forward Error Correction Code 9/20
307 * @FEC_11_20: Forward Error Correction Code 11/20
308 * @FEC_23_36: Forward Error Correction Code 23/36
309 * @FEC_25_36: Forward Error Correction Code 25/36
310 * @FEC_13_45: Forward Error Correction Code 13/45
311 * @FEC_26_45: Forward Error Correction Code 26/45
312 * @FEC_28_45: Forward Error Correction Code 28/45
313 * @FEC_32_45: Forward Error Correction Code 32/45
314 * @FEC_77_90: Forward Error Correction Code 77/90
299 *315 *
300 * Please note that not all FEC types are supported by a given standard.316 * Please note that not all FEC types are supported by a given standard.
301 */317 */
@@ -313,6 +329,22 @@ enum fe_code_rate { · 11 unmodified lines
313 FEC_3_5,329 FEC_3_5,
314 FEC_9_10,330 FEC_9_10,
315 FEC_2_5,331 FEC_2_5,
332 FEC_1_3,
333 FEC_1_4,
334 FEC_5_9,
335 FEC_7_9,
336 FEC_8_15,
337 FEC_11_15,
338 FEC_13_18,
339 FEC_9_20,
340 FEC_11_20,
341 FEC_23_36,
342 FEC_25_36,
343 FEC_13_45,
344 FEC_26_45,
345 FEC_28_45,
346 FEC_32_45,
347 FEC_77_90,
316};348};
317 349
318/**350/**
@@ -331,6 +363,13 @@ enum fe_code_rate { · 12 unmodified lines
331 * @APSK_32: 32-APSK modulation363 * @APSK_32: 32-APSK modulation
332 * @DQPSK: DQPSK modulation364 * @DQPSK: DQPSK modulation
333 * @QAM_4_NR: 4-QAM-NR modulation365 * @QAM_4_NR: 4-QAM-NR modulation
366 * @QAM-1024: 1024-QAM modulation
367 * @QAM-4096: 4096-QAM modulation
368 * @APSK_8_L: 8APSK-L modulation
369 * @APSK_16_L: 16APSK-L modulation
370 * @APSK_32_L: 32APSK-L modulation
371 * @APSK_64: 64APSK modulation
372 * @APSK_64_L: 64APSK-L modulation
334 *373 *
335 * Please note that not all modulations are supported by a given standard.374 * Please note that not all modulations are supported by a given standard.
336 *375 *
@@ -350,6 +389,13 @@ enum fe_modulation { · 13 unmodified lines
350 APSK_32,389 APSK_32,
351 DQPSK,390 DQPSK,
352 QAM_4_NR,391 QAM_4_NR,
392 QAM_1024,
393 QAM_4096,
394 APSK_8_L,
395 APSK_16_L,
396 APSK_32_L,
397 APSK_64,
398 APSK_64_L,
353};399};
354 400
355/**401/**
@@ -404,6 +450,7 @@ enum fe_transmit_mode { · 48 unmodified lines
404 * @GUARD_INTERVAL_PN420: PN length 420 (1/4)450 * @GUARD_INTERVAL_PN420: PN length 420 (1/4)
405 * @GUARD_INTERVAL_PN595: PN length 595 (1/6)451 * @GUARD_INTERVAL_PN595: PN length 595 (1/6)
406 * @GUARD_INTERVAL_PN945: PN length 945 (1/9)452 * @GUARD_INTERVAL_PN945: PN length 945 (1/9)
453 * @GUARD_INTERVAL_1_64: Guard interval 1/64
407 *454 *
408 * Please note that not all guard intervals are supported by a given standard.455 * Please note that not all guard intervals are supported by a given standard.
409 */456 */
@@ -419,6 +466,7 @@ enum fe_guard_interval { · 9 unmodified lines
419 GUARD_INTERVAL_PN420,466 GUARD_INTERVAL_PN420,
420 GUARD_INTERVAL_PN595,467 GUARD_INTERVAL_PN595,
421 GUARD_INTERVAL_PN945,468 GUARD_INTERVAL_PN945,
469 GUARD_INTERVAL_1_64,
422};470};
423 471
424/**472/**
@@ -571,6 +619,9 @@ enum fe_pilot { · 146 unmodified lines
571 * @ROLLOFF_20: Roloff factor: α=20%619 * @ROLLOFF_20: Roloff factor: α=20%
572 * @ROLLOFF_25: Roloff factor: α=25%620 * @ROLLOFF_25: Roloff factor: α=25%
573 * @ROLLOFF_AUTO: Auto-detect the roloff factor.621 * @ROLLOFF_AUTO: Auto-detect the roloff factor.
622 * @ROLLOFF_15: Rolloff factor: α=15%
623 * @ROLLOFF_10: Rolloff factor: α=10%
624 * @ROLLOFF_5: Rolloff factor: α=5%
574 *625 *
575 * .. note:626 * .. note:
576 *627 *
@@ -581,6 +632,9 @@ enum fe_rolloff { · 4 unmodified lines
581 ROLLOFF_20,632 ROLLOFF_20,
582 ROLLOFF_25,633 ROLLOFF_25,
583 ROLLOFF_AUTO,634 ROLLOFF_AUTO,
635 ROLLOFF_15,
636 ROLLOFF_10,
637 ROLLOFF_5,
584};638};
585 639
586/**640/**
@@ -594,6 +648,8 @@ enum fe_rolloff { · 7 unmodified lines
594 * Cable TV: DVB-C following ITU-T J.83 Annex B spec (ClearQAM)648 * Cable TV: DVB-C following ITU-T J.83 Annex B spec (ClearQAM)
595 * @SYS_DVBC_ANNEX_C:649 * @SYS_DVBC_ANNEX_C:
596 * Cable TV: DVB-C following ITU-T J.83 Annex C spec650 * Cable TV: DVB-C following ITU-T J.83 Annex C spec
651 * @SYS_DVBC2:
652 * Cable TV: DVB-C2
597 * @SYS_ISDBC:653 * @SYS_ISDBC:
598 * Cable TV: ISDB-C (no drivers yet)654 * Cable TV: ISDB-C (no drivers yet)
599 * @SYS_DVBT:655 * @SYS_DVBT:
@@ -611,7 +667,7 @@ enum fe_rolloff { · 11 unmodified lines
611 * @SYS_DVBS:667 * @SYS_DVBS:
612 * Satellite TV: DVB-S668 * Satellite TV: DVB-S
613 * @SYS_DVBS2:669 * @SYS_DVBS2:
614 * Satellite TV: DVB-S2670 * Satellite TV: DVB-S2 and DVB-S2X
615 * @SYS_TURBO:671 * @SYS_TURBO:
616 * Satellite TV: DVB-S Turbo672 * Satellite TV: DVB-S Turbo
617 * @SYS_ISDBS:673 * @SYS_ISDBS:
@@ -645,6 +701,7 @@ enum fe_delivery_system { · 27 unmodified lines
645 SYS_DVBT2,701 SYS_DVBT2,
646 SYS_TURBO,702 SYS_TURBO,
647 SYS_DVBC_ANNEX_C,703 SYS_DVBC_ANNEX_C,
704 SYS_DVBC2,
648};705};
649 706
650/* backward compatibility definitions for delivery systems */707/* backward compatibility definitions for delivery systems */