Merge tag 'upstream/0+git20141009.d26b627'

Upstream version 0+git20141009.d26b627

1 files changed, 85 insertions, 7 deletions

diff --git a/dvb-t/uk-BristolKingsWeston b/dvb-t/uk-BristolKingsWeston
index 814f06a..37fa9e1 100644
--- a/dvb-t/uk-BristolKingsWeston
+++ b/dvb-t/uk-BristolKingsWeston
@@ -7,10 +7,88 @@
 #
 # T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
 #----------------------------------------------------------------------------------------------
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE         # C43 BBC A
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE         # C40 D3&4
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE         # C53 SDN
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE         # C57 ARQ A
-T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE         # C60- ARQ B
-T2 674000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0   # C46 BBC B HD
-T 546000000 8MHz 3/4 NONE QPSK 8k 1/32 NONE         # C30 L-BSL
+[C43 BBC A]
+	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/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[C40 D3&4]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	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
+
+[C53 SDN]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	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
+
+[C57 ARQ A]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	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
+
+[C60- ARQ B]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 785833000
+	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
+
+[C46 BBC B HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 674000000
+	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
+
+[C30 L-BSL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	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
+