Merge tag 'upstream/0+git20141009.d26b627'

Upstream version 0+git20141009.d26b627

1 files changed, 448 insertions, 56 deletions

diff --git a/dvb-s/EutelsatW2-16E b/dvb-s/EutelsatW2-16E
index 40023a8..5b2ba88 100644
--- a/dvb-s/EutelsatW2-16E
+++ b/dvb-s/EutelsatW2-16E
@@ -1,59 +1,451 @@
 # Eutelsat W2 @ 16E
 # freq pol sr fec
 
-S 10957000 H 2821000 AUTO
-S 10968000 H 6400000 AUTO
-S 10972000 V 27500000 AUTO
-S 10976000 H 6400000 AUTO
-S 10989000 H 6400000 AUTO
-S 10997000 H 6400000 AUTO
-S 11005000 H 6400000 AUTO
-S 11011000 V 27500000 AUTO
-S 11015000 H 6400000 AUTO
-S 11025000 H 2894000 AUTO
-S 11046000 H 10555000 AUTO
-S 11057000 H 3327000 AUTO
-S 11061000 H 5722000 AUTO
-S 11078000 H 5208000 AUTO
-S 11092000 V 32000000 AUTO
-S 11094000 H 2734000 AUTO
-S 11132000 V 14185000 AUTO
-S 11178000 V 27500000 AUTO
-S 11192000 H 2667000 AUTO
-S 11267000 H 2170000 AUTO
-S 11276000 H 11100000 AUTO
-S 11294000 H 13333000 AUTO
-S 11304000 V 30000000 AUTO
-S 11324000 H 27500000 AUTO
-S 11428000 V 30000000 AUTO
-S 11449000 H 27500000 AUTO
-S 11471000 V 29950000 AUTO
-S 11492000 H 29950000 AUTO
-S 11513000 V 29950000 AUTO
-S 11534000 H 30000000 AUTO
-S 11554000 V 30000000 AUTO
-S 11575000 H 30000000 AUTO
-S 11594000 V 28800000 AUTO
-S 11617000 H 29950000 AUTO
-S 11634000 V 17578000 AUTO
-S 11658000 H 30000000 AUTO
-S 11659000 V 17578000 AUTO
-S 11682000 V 14468000 AUTO
-S 12538000 V 4340000 AUTO
-S 12549000 V 2894000 AUTO
-S 12555000 H 5632000 AUTO
-S 12557000 V 2156000 AUTO
-S 12562000 H 5632000 AUTO
-S 12563000 V 2222000 AUTO
-S 12568000 H 3703000 AUTO
-S 12625000 V 4444000 AUTO
-S 12633000 V 4883000 AUTO
-S 12642000 V 3418000 AUTO
-S 12650000 H 15000000 AUTO
-S 12656000 V 4883000 AUTO
-S 12677000 V 6111000 AUTO
-S 12683000 H 2894000 AUTO
-S 12703000 H 2748000 AUTO
-S 12716000 H 6000000 AUTO
-S 12723000 H 3000000 AUTO
-S 12733000 V 16277000 AUTO
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10957000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2821000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10968000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6400000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10972000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10976000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6400000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10989000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6400000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10997000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6400000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11005000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6400000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11011000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11015000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6400000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11025000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2894000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11046000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 10555000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11057000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3327000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11061000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5722000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11078000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5208000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11092000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 32000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11094000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2734000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11132000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 14185000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11178000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11192000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2667000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11267000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2170000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11276000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 11100000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11294000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 13333000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11304000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11324000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11428000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11449000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11471000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29950000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11492000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 29950000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11513000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29950000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11534000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11554000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11575000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11594000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 28800000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11617000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 29950000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11634000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 17578000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11658000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11659000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 17578000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11682000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 14468000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12538000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4340000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12549000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2894000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12555000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5632000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12557000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2156000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12562000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5632000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12563000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2222000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12568000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3703000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12625000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4444000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12633000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4883000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12642000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3418000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12650000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 15000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12656000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4883000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12677000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 6111000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12683000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2894000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12703000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2748000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12716000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12723000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12733000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 16277000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+