Imported Upstream version 0+git20141009.d26b627upstream/0+git20141009.d26b627

1 files changed, 152 insertions, 19 deletions

diff --git a/dvb-s/ExpressAM2-80.0E b/dvb-s/ExpressAM2-80.0E
index 0a9a990..9dfcfc0 100644
--- a/dvb-s/ExpressAM2-80.0E
+++ b/dvb-s/ExpressAM2-80.0E
@@ -1,16 +1,93 @@
 # Express AM2 @ 80E
 # freq pol sr fec
-S 10973000 V 4444000 AUTO
-S 10991000 V 4444000 AUTO
-S 11044000 H 44948000 AUTO
-S 11081000 V 5064000 AUTO
-S 11088000 V 4548000 AUTO
-S 11191000 H 3255000 AUTO
-S 11462000 V 3200000 AUTO
-S 11478000 H 4400000 AUTO
-S 11544000 V 44950000 AUTO
-S 11606000 V 44948000 AUTO
-S 11650000 V 3500000 AUTO
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10973000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4444000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10991000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4444000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11044000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 44948000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11081000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5064000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11088000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4548000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11191000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3255000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11462000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3200000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11478000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4400000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11544000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 44950000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11606000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 44948000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11650000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 
 # Express AM2 @ 80E C-BAND
 # Generated by Roman Kashcheev
@@ -18,18 +95,74 @@ S 11650000 V 3500000 AUTO
 # freq pol sr fec
 
 # RSCC
-S 3525000 V 31106000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3525000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 31106000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 # TRK Sever
-S 3558000 V 3215000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3558000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3215000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 # TRV Muji
-S 3562000 V 3225000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3562000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3225000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 # OTV Sakhalin
-S 3625000 V 3000000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3625000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 # RSCC
-S 3675000 V 33483000 7/8
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3675000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 33483000
+	INNER_FEC = 7/8
+	INVERSION = AUTO
+
 # 5 Kanal
-S 3929000 H 8705000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3929000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 8705000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 # TV Centr
-S 4147000 V 27500000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4147000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 # Blagovest Telekanal
-S 4175000 V 6510000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4175000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 6510000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+