Convert existing tables to DVBv5 format

All comments were preserved on this conversion, thanks to a
temporary patch for libdvbv5.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

1 files changed, 288 insertions, 24 deletions

diff --git a/dvb-t/es-Cadiz b/dvb-t/es-Cadiz
index 2e1e490d..7b2d439e 100644
--- a/dvb-t/es-Cadiz
+++ b/dvb-t/es-Cadiz
@@ -2,30 +2,294 @@
 # Info obtained from Spanish Government (Ministerio de Industria) at URL:
 # <http://www.minetur.gob.es/telecomunicaciones/infraestructuras/paginas/tdt_ict.aspx>
 # T freq bw fec_hi fec_lo mod transm-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C21 # MPE2
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C23 # RGE1
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C24 # RGE1
+[C21 # MPE2]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C23 # RGE1]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C24 # RGE1]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C24 # TL02CA Arcos
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C27 # RGE2
+[C27 # RGE2]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C27 # TL06CA Olvera
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C28 # TL01CA Algeciras
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C30 # TL05CA Jerez
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C33 # RGE2 (Main)
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C38 # MPE3
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C41 # MPE2
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C43 # TL08CA Medina
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C44 # MPE1
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C46 # AND
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C49 # MPE3 (Main)
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C50 # TL07CA Ubrique
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C52 # RGE2
+[C28 # TL01CA Algeciras]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C30 # TL05CA Jerez]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C33 # RGE2 (Main)]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C38 # MPE3]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C41 # MPE2]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C43 # TL08CA Medina]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C44 # MPE1]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C46 # AND]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C49 # MPE3 (Main)]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C50 # TL07CA Ubrique]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C52 # RGE2]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C52 # TL04CA Chiclana
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C53 # MPE1 (Main)
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C54 # TL03CA Cadiz
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C55 # MPE2 (Main)
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C57 # RGE1 (Main)
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C59 # AND (Main)
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C64 # RGE1
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C67 # MD67
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C68 # MD68
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C69 # MD69
+[C53 # MPE1 (Main)]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C54 # TL03CA Cadiz]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C55 # MPE2 (Main)]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C57 # RGE1 (Main)]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C59 # AND (Main)]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C64 # RGE1]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 818000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C67 # MD67]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 842000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C68 # MD68]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 850000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C69 # MD69]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 858000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+