Merge tag 'upstream/0+git20141009.d26b627'

Upstream version 0+git20141009.d26b627

1 files changed, 232 insertions, 29 deletions

diff --git a/dvb-c/fi-dna b/dvb-c/fi-dna
index 38a3afb..40bdd63 100644
--- a/dvb-c/fi-dna
+++ b/dvb-c/fi-dna
@@ -3,32 +3,235 @@
 # http://www.dna.fi/YKSITYISILLE/TV/KAAPELITV/Sivut/Taajuudet.aspx
 #
 # freq      sr      fec  mod
-C 154000000 6875000 NONE QAM128
-C 162000000 6875000 NONE QAM128
-C 162000000 6875000 NONE QAM256
-C 170000000 6875000 NONE QAM128
-C 226000000 6875000 NONE QAM128
-C 234000000 6875000 NONE QAM128
-C 242000000 6875000 NONE QAM128
-C 242000000 6875000 NONE QAM256
-C 250000000 6875000 NONE QAM256
-C 258000000 6875000 NONE QAM256
-C 266000000 6875000 NONE QAM256
-C 274000000 6875000 NONE QAM256
-C 282000000 6875000 NONE QAM256
-C 290000000 6875000 NONE QAM256
-C 298000000 6875000 NONE QAM128
-C 298000000 6875000 NONE QAM256
-C 306000000 6875000 NONE QAM128
-C 314000000 6875000 NONE QAM128
-C 322000000 6875000 NONE QAM128
-C 330000000 6875000 NONE QAM128
-C 338000000 6875000 NONE QAM128
-C 346000000 6875000 NONE QAM128
-C 354000000 6875000 NONE QAM128
-C 362000000 6875000 NONE QAM128
-C 362000000 6875000 NONE QAM256
-C 370000000 6875000 NONE QAM128
-C 378000000 6875000 NONE QAM128
-C 386000000 6875000 NONE QAM128
-C 394000000 6875000 NONE QAM128
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 154000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 162000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 162000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 170000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 226000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 234000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 242000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 242000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 250000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 258000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 266000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 274000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 282000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 290000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 298000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 298000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 306000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 314000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 322000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 330000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 338000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 346000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 354000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 362000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 362000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 370000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 378000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 386000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 394000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+