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, 85 insertions, 7 deletions

diff --git a/dvb-t/uk-Nottingham b/dvb-t/uk-Nottingham
index 7e13ff71..4aacea31 100644
--- a/dvb-t/uk-Nottingham
+++ b/dvb-t/uk-Nottingham
@@ -7,10 +7,88 @@
 #
 # T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
 #----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE         # C27 BBC A
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE         # C24 D3&4
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE         # C51 SDN
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE         # C52 ARQ A
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE         # C48 ARQ B
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0   # C21+ BBC B HD
-T 706000000 8MHz 3/4 NONE QPSK 8k 1/32 NONE         # C50 L-NOT
+[C27 BBC A]
+	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/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C24 D3&4]
+	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/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C51 SDN]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C52 ARQ A]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C48 ARQ B]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C21+ BBC B HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 474167000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[C50 L-NOT]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+