Imported Upstream version 0+git20141009.d26b627upstream/0+git20141009.d26b627

2 files changed, 132 insertions, 11 deletions

diff --git a/dvb-t/au-Adelaide b/dvb-t/au-Adelaide
index 923e701..58e8ca0 100644
--- a/dvb-t/au-Adelaide
+++ b/dvb-t/au-Adelaide
@@ -1,14 +1,80 @@
 # Australia / Adelaide / Mt Lofty
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # ABC
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 226500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # Seven
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 177500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # Nine
-T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 191625000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # Ten
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 219500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # SBS
-T 564500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 564500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # 3D Trial Australia
-T 536625000 7MHz 3/4 NONE QAM16 8k 1/8 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 536625000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/16
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
diff --git a/dvb-t/au-AdelaideFoothills b/dvb-t/au-AdelaideFoothills
index 466a354..dbd6bfd 100644
--- a/dvb-t/au-AdelaideFoothills
+++ b/dvb-t/au-AdelaideFoothills
@@ -1,12 +1,67 @@
 # Australia / Adelaide / Grenfell Street
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # ABC
-T 781625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 781625000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # Seven
-T 711500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 711500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # Nine
-T 795500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 795500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # Ten
-T 732500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 732500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # SBS
-T 760500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 760500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+