Merge tag 'upstream/0+git20141009.d26b627'

Upstream version 0+git20141009.d26b627

1 files changed, 552 insertions, 69 deletions

diff --git a/dvb-s/Satmex-5-116.8W b/dvb-s/Satmex-5-116.8W
index f0522bf..96c804d 100644
--- a/dvb-s/Satmex-5-116.8W
+++ b/dvb-s/Satmex-5-116.8W
@@ -1,72 +1,555 @@
 # Satmex 5 @ 116.8W
 # freq pol sr fec
 
-S 12034000 H 02532000 AUTO
-S 12175000 H 04232000 AUTO
-S 4060000 H 19510000 AUTO
-S 3905000 V 02963000 AUTO
-S 4084000 H 03162000 AUTO
-S 3767000 H 01620000 AUTO
-S 11975000 H 05000000 AUTO
-S 11960000 H 02000000 AUTO
-S 4180000 H 19510000 AUTO
-S 4115000 H 03253000 AUTO
-S 3840000 V 29270000 AUTO
-S 4160000 V 29270000 AUTO
-S 3940000 H 28125000 AUTO
-S 4052000 V 04307000 AUTO
-S 12024000 H 03000000 AUTO
-S 4134000 H 03617000 AUTO
-S 12028000 H 03255000 AUTO
-S 12060000 V 03078000 AUTO
-S 4012000 V 03131000 AUTO
-S 3949000 V 03255000 AUTO
-S 4076000 H 02962000 AUTO
-S 3749000 H 04070000 AUTO
-S 3744000 H 04480000 AUTO
-S 3755000 H 04000000 AUTO
-S 3869000 H 03000000 AUTO
-S 3876000 H 02170000 AUTO
-S 3879000 H 01984000 AUTO
-S 3957000 V 02600000 AUTO
-S 3975000 V 03131000 AUTO
-S 3982000 H 02531000 AUTO
-S 3832000 H 02500000 AUTO
-S 3953000 V 02597000 AUTO
-S 3987000 V 08860000 AUTO
-S 3996000 V 02170000 AUTO
-S 3748000 V 02100000 AUTO
-S 3932000 V 02500000 AUTO
-S 3914000 V 03223000 AUTO
-S 3888000 H 05351000 AUTO
-S 3805000 V 04679000 AUTO
-S 4001000 V 04100000 AUTO
-S 4023000 H 06400000 AUTO
-S 12176000 H 03985000 AUTO
-S 4108000 H 02666000 AUTO
-S 4038000 V 07675000 AUTO
-S 3809000 V 03100000 AUTO
-S 4080000 V 29270000 AUTO
-S 3910000 H 02500000 AUTO
-S 4164000 H 01733000 AUTO
-S 12193000 V 07885000 AUTO
-S 12164000 V 02000000 AUTO
-S 12044000 V 04340000 AUTO
-S 3720000 V 27000000 AUTO
-S 3922000 V 09760000 AUTO
-S 3797000 V 03200000 AUTO
-S 3968000 V 07500000 AUTO
-S 4037000 H 02222000 AUTO
-S 4046000 H 02441000 AUTO
-S 4080000 H 02441000 AUTO
-S 3773000 V 02892000 AUTO
-S 3767000 V 02893000 AUTO
-S 3935000 V 04440000 AUTO
-S 3972000 H 03364000 AUTO
-S 3905000 H 02400000 AUTO
-S 4007000 V 05582000 AUTO
-S 3885000 H 03000000 AUTO
-S 3826000 H 02712000 AUTO
-S 3944000 V 03410000 AUTO
-S 3915000 H 01520000 AUTO
-S 3876000 V 02920000 AUTO
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12034000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2532000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12175000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4232000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4060000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 19510000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3905000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2963000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4084000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3162000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3767000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 1620000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11975000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11960000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4180000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 19510000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4115000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3253000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3840000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29270000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4160000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29270000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3940000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 28125000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4052000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4307000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12024000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4134000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3617000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12028000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3255000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12060000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3078000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4012000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3131000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3949000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3255000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4076000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2962000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3749000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4070000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3744000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4480000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3755000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3869000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3876000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2170000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3879000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 1984000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3957000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2600000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3975000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3131000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3982000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2531000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3832000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3953000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2597000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3987000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 8860000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3996000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2170000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3748000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2100000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3932000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3914000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3223000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3888000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5351000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3805000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4679000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4001000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4100000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4023000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6400000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12176000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3985000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4108000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2666000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4038000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 7675000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3809000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3100000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4080000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29270000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3910000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4164000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 1733000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12193000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 7885000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12164000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12044000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4340000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3720000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3922000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 9760000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3797000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3200000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3968000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 7500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4037000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2222000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4046000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2441000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4080000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2441000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3773000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2892000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3767000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2893000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3935000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4440000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3972000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3364000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3905000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2400000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4007000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5582000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3885000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3826000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2712000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3944000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3410000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3915000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 1520000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3876000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2920000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+