Merge tag 'upstream/0+git20141009.d26b627'

Upstream version 0+git20141009.d26b627

1 files changed, 312 insertions, 39 deletions

diff --git a/dvb-s/Galaxy28-89.0W b/dvb-s/Galaxy28-89.0W
index 79592bd..cefb320 100644
--- a/dvb-s/Galaxy28-89.0W
+++ b/dvb-s/Galaxy28-89.0W
@@ -1,42 +1,315 @@
 # Galaxy 28 @ 89W
 # Intelsat Americas 8 @ 89W
 # freq pol sr fec
-S 11717000 H 04411000 AUTO
-S 11747000 H 06620000 AUTO
-S 11756000 H 06620000 AUTO
-S 11780000 H 29000000 AUTO
-S 11800000 H 27500000 AUTO
-S 11825000 H 04552000 AUTO
-S 11865000 H 03700000 AUTO
-S 11882000 H 04883000 AUTO
-S 11925000 H 03979000 AUTO
-S 11930000 H 03979000 AUTO
-S 11935000 H 03979000 AUTO
-S 11936000 H 06000000 AUTO
-S 11940000 H 03979000 AUTO
-S 11945000 H 03979000 AUTO
-S 11950000 H 03979000 AUTO
-S 11955000 H 03979000 AUTO
-S 11960000 H 28800000 AUTO
-S 11965000 H 03979000 AUTO
-S 11970000 H 03979000 AUTO
-S 11970000 V 03979000 AUTO
-S 11975000 H 03979000 AUTO
-S 11980000 H 03979000 AUTO
-S 11985000 H 03979000 AUTO
-S 11989000 V 06111000 AUTO
-S 11990000 H 03979000 AUTO
-S 11995000 H 03979000 AUTO
-S 12000000 H 28800000 AUTO
-S 12009000 V 06111000 AUTO
-S 12032000 H 06666000 AUTO
-S 12092000 H 02314000 AUTO
-S 12114000 H 14398000 AUTO
-S 12134000 H 04000000 AUTO
-S 12164000 H 03979000 AUTO
-S 12170000 H 03979000 AUTO
-S 12175000 H 03979000 AUTO
-S 12180000 H 03979000 AUTO
-S 12185000 H 03979000 AUTO
-S 12191000 H 03979000 AUTO
-S 12196000 H 03979000 AUTO
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11717000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4411000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11747000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6620000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11756000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6620000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11780000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 29000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11800000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11825000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4552000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11865000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3700000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11882000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4883000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11925000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11930000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11935000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11936000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11940000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11945000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11950000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11955000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11960000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 28800000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11965000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11970000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11970000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11975000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11980000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11985000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11989000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 6111000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11990000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11995000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12000000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 28800000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12009000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 6111000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12032000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6666000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12092000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2314000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12114000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 14398000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12134000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12164000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12170000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12175000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12180000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12185000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12191000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12196000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3979000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+