Merge tag 'upstream/0+git20141009.d26b627'

Upstream version 0+git20141009.d26b627

1 files changed, 120 insertions, 10 deletions

diff --git a/dvb-t/au-Wollongong b/dvb-t/au-Wollongong
index 6fbf7bf..1f57daf 100644
--- a/dvb-t/au-Wollongong
+++ b/dvb-t/au-Wollongong
@@ -9,27 +9,126 @@
 # - http://www.dba.org.au/index.asp?query=true&sectionID=22&recLocation=Wollongong+%2D+North
 #
 # ABC UHF52
-T 697500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 697500000
+	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
+
 # Prime UHF46
-T 655500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 655500000
+	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
+
 # WIN UHF40
-T 613500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 613500000
+	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 UHF43
-T 634500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634500000
+	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 UHF54
-T 711625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 711625000
+	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
+
 #
 # Illawarra (Broadcast Australia Digital Television Tower KNIGHTS HILL)
 # - http://www.dba.org.au/index.asp?query=true&sectionID=22&recLocation=Wollongong+%2D+Illawarra
 #
 # ABC UHF51
-T 690500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690500000
+	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
+
 # Prime UHF38
-T 599500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 599500000
+	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
+
 # WIN UHF36
-T 585500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 585500000
+	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 UHF37
-T 592500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 592500000
+	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 - same as North
 #
 # Stanwell Park (Bald Hill STANWELL TOPS)
@@ -37,4 +136,15 @@ T 592500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 #
 # ABC, Prime, WIN, Ten are identical to Wollongong / North
 # SBS UHF49
-T 676500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 676500000
+	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
+