Convert existing tables to DVBv5 format

All comments were preserved on this conversion, thanks to a
temporary patch for libdvbv5.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

1 files changed, 432 insertions, 48 deletions

diff --git a/dvb-s/Astra-23.5E b/dvb-s/Astra-23.5E
index 6e45dbf..ed505ea 100644
--- a/dvb-s/Astra-23.5E
+++ b/dvb-s/Astra-23.5E
@@ -1,44 +1,303 @@
 # Astra 23.5E
 # freq pol sr fec
-S 10758000 V 22000000 7/8
-S 10788000 V 22000000 5/6
-S 10802000 H 22000000 5/6
-S 10842000 V 13333000 5/6
-S 10862000 H 22000000 5/6
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10758000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 7/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10788000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10802000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10842000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 13333000
+	INNER_FEC = 5/6
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10862000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	INVERSION = AUTO
+
 # Astra2Connect
 # S2 10891250 H 22000000 3/4 AUTO 8PSK
-S 11475000 V 27500000 3/4
-S 11515000 H 27500000 3/4
-S2 11515000 V 28500000 9/10 AUTO QPSK
-S2 11555000 H 28500000 9/10 AUTO QPSK
-S2 11555000 V 28500000 9/10 AUTO QPSK
-S2 11592000 V 28500000 9/10 AUTO QPSK
-S2 11595000 H 28500000 9/10 AUTO QPSK
-S2 11635000 H 28500000 9/10 AUTO QPSK
-S2 11635000 V 28500000 9/10 AUTO QPSK
-S 11675000 H 27500000 3/4
-S2 11675000 V 28500000 9/10 AUTO QPSK
-S2 11719000 H 27500000 9/10 AUTO QPSK
-S 11739000 V 27500000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11475000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11515000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11515000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 28500000
+	INNER_FEC = 9/10
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11555000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 28500000
+	INNER_FEC = 9/10
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11555000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 28500000
+	INNER_FEC = 9/10
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11592000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 28500000
+	INNER_FEC = 9/10
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11595000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 28500000
+	INNER_FEC = 9/10
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11635000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 28500000
+	INNER_FEC = 9/10
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11635000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 28500000
+	INNER_FEC = 9/10
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11675000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11675000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 28500000
+	INNER_FEC = 9/10
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11719000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 9/10
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11739000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 # Astra2Connect
 # S2 11758000 H 27500000 5/6 AUTO 8PSK
-S2 11778000 V 27500000 9/10 AUTO QPSK
-S 11798000 H 27500000 3/4
-S2 11817000 V 27500000 9/10 AUTO QPSK
-S 11836000 H 29900000 3/4
-S2 11856000 V 27500000 5/6 AUTO QPSK
-S 11875000 H 27500000 3/4
-S 11914000 H 27500000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11778000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 9/10
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11798000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11817000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 9/10
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11836000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 29900000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11856000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 5/6
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11875000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11914000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 # Astra2Connect
 # S2 11954000 H 27500000 3/4 AUTO 8PSK
-S 11992000 H 27500000 3/4
-S 12012000 V 27500000 3/4
-S2 12032000 H 27500000 9/10 AUTO QPSK
-S 12070000 H 27500000 3/4
-S2 12109000 H 27500000 9/10 AUTO QPSK
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11992000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12012000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12032000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 9/10
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12070000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12109000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 9/10
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 # Astra2Connect
 # S2 12148000 H 27500000 3/4 AUTO 8PSK
-S 12168000 V 27500000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12168000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 # Astra2Connect
 # S2 12226000 H 27500000 3/5 AUTO 8PSK
 # Astra2Connect
@@ -47,20 +306,145 @@ S 12168000 V 27500000 3/4
 # S2 12344000 H 28200000 5/6 AUTO 8PSK
 # Astra2Connect
 # S2 12382000 H 27500000 3/4 AUTO 8PSK
-S 12525000 H 27500000 3/4
-S 12525000 V 27500000 3/4
-S 12565000 H 27500000 2/3
-S 12565000 V 27500000 3/4
-S2 12605000 H 28500000 9/10 AUTO QPSK
-S2 12605000 V 28500000 9/10 AUTO QPSK
-S 12630000 V 6000000 3/4
-S 12631000 H 6666000 7/8
-S 12636000 V 2277000 5/6
-S 12641000 H 2220000 7/8
-S 12644000 H 2170000 3/4
-S 12649000 H 5600000 5/6
-S 12661000 H 2170000 5/6
-S 12685000 V 27500000 3/4
-S 12696000 H 3255000 1/2
-S 12711000 H 6111000 AUTO
-S 12725000 V 27500000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12525000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12525000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12565000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 2/3
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12565000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12605000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 28500000
+	INNER_FEC = 9/10
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12605000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 28500000
+	INNER_FEC = 9/10
+	ROLLOFF = AUTO
+	MODULATION = QPSK
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12630000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 6000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12631000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6666000
+	INNER_FEC = 7/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12636000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2277000
+	INNER_FEC = 5/6
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12641000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2220000
+	INNER_FEC = 7/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12644000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2170000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12649000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5600000
+	INNER_FEC = 5/6
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12661000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2170000
+	INNER_FEC = 5/6
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12685000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12696000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3255000
+	INNER_FEC = 1/2
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12711000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6111000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12725000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+