Merge tag 'upstream/0+git20141009.d26b627'

Upstream version 0+git20141009.d26b627

1 files changed, 192 insertions, 24 deletions

diff --git a/dvb-s/Telstar12-15.0W b/dvb-s/Telstar12-15.0W
index db14a6e..9dd367a 100644
--- a/dvb-s/Telstar12-15.0W
+++ b/dvb-s/Telstar12-15.0W
@@ -1,26 +1,194 @@
 # Telstar 12 15.0W
 # freq pol sr fec
-S 10988000 H 2893000 3/4
-S 10992000 H 2893000 3/4
-S 11060000 H 19279000 3/4
-S 11123000 V 19279000 3/4
-S 11124000 H 18386000 3/4
-S 11150000 H 18386000 3/4
-S 11150000 V 19279000 3/4
-S 11531000 H 3198000 7/8
-S 11566000 H 4284000 3/4
-S 11677000 V 2200000 1/2
-S 11709000 V 3195000 AUTO
-S 11806000 V 7596000 3/4
-S 11963000 H 14714000 3/4
-S 12082000 H 3935000 3/4
-S 12117000 H 4772000 AUTO
-S 12159000 H 7777000 2/3
-S 12166000 H 3503000 3/4
-S 12173000 H 3503000 3/4
-S 12524000 V 26470000 3/4
-S 12547000 H 11900000 2/3
-S 12589000 V 4503000 1/2
-S 12608000 H 19279000 2/3
-S 12615000 V 11939000 2/3
-S 12645000 H 3255000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10988000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2893000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10992000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2893000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11060000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 19279000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11123000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 19279000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11124000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 18386000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11150000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 18386000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11150000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 19279000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11531000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3198000
+	INNER_FEC = 7/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11566000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4284000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11677000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2200000
+	INNER_FEC = 1/2
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11709000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3195000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11806000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 7596000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11963000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 14714000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12082000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3935000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12117000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4772000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12159000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7777000
+	INNER_FEC = 2/3
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12166000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3503000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12173000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3503000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12524000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 26470000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12547000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 11900000
+	INNER_FEC = 2/3
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12589000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4503000
+	INNER_FEC = 1/2
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12608000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 19279000
+	INNER_FEC = 2/3
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12615000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 11939000
+	INNER_FEC = 2/3
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12645000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3255000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+