aboutsummaryrefslogtreecommitdiffstats
path: root/dvb-c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-09-05 15:05:42 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-09-05 15:05:42 -0300
commit06e54ff221c2e3126a7dfbd63e9814431511b558 (patch)
treeeb13b8eac5ca9006e8993442a4bf1d1261a19f1c /dvb-c
parent78988921cd3cdef0d94ba111fbcf7d813e07e02a (diff)
downloaddtv-scan-tables-06e54ff221c2e3126a7dfbd63e9814431511b558.tar.gz
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>
Diffstat (limited to '')
-rw-r--r--dvb-c/at-Innsbruck54
-rw-r--r--dvb-c/at-Kabel-Braunau216
-rw-r--r--dvb-c/at-Kabelsignal324
-rw-r--r--dvb-c/at-KarrerNet207
-rw-r--r--dvb-c/at-Liwest252
-rw-r--r--dvb-c/at-SalzburgAG54
-rw-r--r--dvb-c/at-Vienna9
-rw-r--r--dvb-c/be-IN.DI-Integan126
-rw-r--r--dvb-c/br-Net-Digital9
-rw-r--r--dvb-c/ch-Bern-upc-cablecom9
-rw-r--r--dvb-c/ch-GGA-Pratteln315
-rw-r--r--dvb-c/ch-Rega-Sense227
-rw-r--r--dvb-c/ch-Video20009
-rw-r--r--dvb-c/ch-Zuerich-upc-cablecom9
-rw-r--r--dvb-c/ch-interGGA243
-rw-r--r--dvb-c/cz-Moravianet108
-rw-r--r--dvb-c/de-Berlin27
-rw-r--r--dvb-c/de-Brandenburg-Havel252
-rw-r--r--dvb-c/de-Kabel_BW9
-rw-r--r--dvb-c/de-Kabel_Deutschland-Hannover243
-rw-r--r--dvb-c/de-Muenchen189
-rw-r--r--dvb-c/de-NetAachen315
-rw-r--r--dvb-c/de-Primacom270
-rw-r--r--dvb-c/de-Unitymedia288
-rw-r--r--dvb-c/de-iesy162
-rw-r--r--dvb-c/de-komro-Rosenheim252
-rw-r--r--dvb-c/de-neftv261
-rw-r--r--dvb-c/dk-Aarhus-Antenneforening9
-rw-r--r--dvb-c/dk-Copenhagen-AFDK72
-rw-r--r--dvb-c/dk-Odense72
-rw-r--r--dvb-c/es-Euskaltel126
-rw-r--r--dvb-c/fi-HTV324
-rw-r--r--dvb-c/fi-Joensuu-Tikka99
-rw-r--r--dvb-c/fi-TTV18
-rw-r--r--dvb-c/fi-Turku189
-rw-r--r--dvb-c/fi-dna261
-rw-r--r--dvb-c/fi-jkl72
-rw-r--r--dvb-c/fi-sonera216
-rw-r--r--dvb-c/fi-vaasa-oncable99
-rw-r--r--dvb-c/fr-noos-numericable351
-rw-r--r--dvb-c/hu-Digikabel153
-rw-r--r--dvb-c/lu-Ettelbruck-ACE144
-rw-r--r--dvb-c/nl-Delta9
-rw-r--r--dvb-c/nl-REKAM-CAIW_Gouda18
-rw-r--r--dvb-c/nl-Ziggo36
-rw-r--r--dvb-c/nl-upc9
-rw-r--r--dvb-c/no-Oslo-CanalDigital108
-rw-r--r--dvb-c/no-Oslo-Get189
-rw-r--r--dvb-c/ro-DigiTV225
-rw-r--r--dvb-c/se-Gothnet126
-rw-r--r--dvb-c/se-comhem207
51 files changed, 6729 insertions, 842 deletions
diff --git a/dvb-c/at-Innsbruck b/dvb-c/at-Innsbruck
index ab920a3e..89833ea5 100644
--- a/dvb-c/at-Innsbruck
+++ b/dvb-c/at-Innsbruck
@@ -1,8 +1,50 @@
# scan config for Innsbruck Telesystem cable provider
# freq sr fec mod
-C 450000000 6875000 NONE QAM64
-C 490000000 6875000 NONE QAM64
-C 442000000 6875000 NONE QAM64
-C 546000000 6875000 NONE QAM64
-C 554000000 6875000 NONE QAM64
-C 562000000 6875000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 450000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 490000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 546000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 554000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 562000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/at-Kabel-Braunau b/dvb-c/at-Kabel-Braunau
index 1d935676..4111c3ba 100644
--- a/dvb-c/at-Kabel-Braunau
+++ b/dvb-c/at-Kabel-Braunau
@@ -1,26 +1,194 @@
# Kabel Braunau
# freq sr fec mod
-C 386000000 6900000 NONE QAM64
-C 394000000 6875000 NONE QAM64
-C 402000000 6875000 NONE QAM64
-C 410000000 6875000 NONE QAM64
-C 418000000 6875000 NONE QAM64
-C 426000000 6875000 NONE QAM64
-C 434000000 6875000 NONE QAM64
-C 458000000 6875000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 474000000 6900000 NONE QAM64
-C 482000000 6111000 NONE QAM64
-C 490000000 6111000 NONE QAM64
-C 498000000 6875000 NONE QAM64
-C 506000000 6111000 NONE QAM64
-C 514000000 6111000 NONE QAM64
-C 522000000 6428000 NONE QAM128
-C 530000000 6428000 NONE QAM128
-C 546000000 6875000 NONE QAM64
-C 554000000 6875000 NONE QAM64
-C 562000000 6875000 NONE QAM64
-C 570000000 6111000 NONE QAM64
-C 578000000 6900000 NONE QAM256
-C 586000000 6900000 NONE QAM256
-C 594000000 6875000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 458000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 466000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 474000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 482000000
+ SYMBOL_RATE = 6111000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 490000000
+ SYMBOL_RATE = 6111000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 498000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 506000000
+ SYMBOL_RATE = 6111000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 514000000
+ SYMBOL_RATE = 6111000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 522000000
+ SYMBOL_RATE = 6428000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 530000000
+ SYMBOL_RATE = 6428000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 546000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 554000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 562000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 570000000
+ SYMBOL_RATE = 6111000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 578000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 586000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 594000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/at-Kabelsignal b/dvb-c/at-Kabelsignal
index 4f7ec113..a2730472 100644
--- a/dvb-c/at-Kabelsignal
+++ b/dvb-c/at-Kabelsignal
@@ -1,38 +1,290 @@
# kabelsignal
# freq sr fec mod
-C 314000000 6900000 NONE QAM256
-C 322000000 6900000 NONE QAM256
-C 330000000 6900000 NONE QAM256
-C 338000000 6900000 NONE QAM256
-C 346000000 6900000 NONE QAM256
-C 354000000 6900000 NONE QAM256
-C 362000000 6900000 NONE QAM256
-C 370000000 6900000 NONE QAM256
-C 378000000 6900000 NONE QAM256
-C 386000000 6900000 NONE QAM256
-C 394000000 6900000 NONE QAM256
-C 402000000 6900000 NONE QAM256
-C 410000000 6900000 NONE QAM256
-C 418000000 6900000 NONE QAM256
-C 426000000 6900000 NONE QAM256
-C 434000000 6900000 NONE QAM256
-C 442000000 6900000 NONE QAM256
-C 450000000 6900000 NONE QAM256
-C 666000000 6900000 NONE QAM256
-C 674000000 6900000 NONE QAM256
-C 682000000 6900000 NONE QAM256
-C 690000000 6900000 NONE QAM256
-C 698000000 6900000 NONE QAM256
-C 706000000 6900000 NONE QAM256
-C 714000000 6900000 NONE QAM256
-C 722000000 6900000 NONE QAM256
-C 730000000 6900000 NONE QAM256
-C 738000000 6900000 NONE QAM256
-C 746000000 6900000 NONE QAM256
-C 762000000 6900000 NONE QAM256
-C 770000000 6900000 NONE QAM256
-C 778000000 6900000 NONE QAM256
-C 786000000 6900000 NONE QAM256
-C 794000000 6900000 NONE QAM256
-C 802000000 6900000 NONE QAM256
-C 810000000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 314000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 322000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 330000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 338000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 450000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 666000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 674000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 682000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 690000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 698000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 706000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 714000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 722000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 730000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 738000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 746000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 762000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 770000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 778000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 786000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 794000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 802000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 810000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/at-KarrerNet b/dvb-c/at-KarrerNet
index a00c6a25..371c63be 100644
--- a/dvb-c/at-KarrerNet
+++ b/dvb-c/at-KarrerNet
@@ -1,26 +1,187 @@
# Kabel St. Florian bei Linz/AT KarrerNet
# 2009-01-10
# freq sr fec mod
-C 442000000 6900000 NONE QAM64
-C 458000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 474000000 6900000 NONE QAM64
-C 482000000 6900000 NONE QAM64
-C 490000000 6900000 NONE QAM64
-C 498000000 6900000 NONE QAM64
-C 506000000 6900000 NONE QAM64
-C 514000000 6900000 NONE QAM64
-C 522000000 6900000 NONE QAM64
-C 530000000 6900000 NONE QAM64
-C 538000000 6900000 NONE QAM64
-C 546000000 6900000 NONE QAM64
-C 554000000 6900000 NONE QAM64
-C 562000000 6900000 NONE QAM64
-C 570000000 6900000 NONE QAM64
-C 578000000 6900000 NONE QAM64
-C 586000000 6900000 NONE QAM64
-C 610000000 6900000 NONE QAM64
-C 386000000 6900000 NONE QAM256
-C 394000000 6900000 NONE QAM256
-C 410000000 6900000 NONE QAM256
-C 434000000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 458000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 466000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 474000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 482000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 490000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 498000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 506000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 514000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 522000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 530000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 538000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 546000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 554000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 562000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 570000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 578000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 586000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 610000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/at-Liwest b/dvb-c/at-Liwest
index ad44f93f..f3b0cadc 100644
--- a/dvb-c/at-Liwest
+++ b/dvb-c/at-Liwest
@@ -1,31 +1,227 @@
# Kabel Linz/AT Liwest
# 2006-08-01
# freq sr fec mod
-C 394000000 6900000 NONE QAM64
-C 402000000 6900000 NONE QAM64
-C 410000000 6875000 NONE QAM64
-C 418000000 6900000 NONE QAM64
-C 426000000 6900000 NONE QAM64
-C 434000000 6900000 NONE QAM64
-C 442000000 6900000 NONE QAM64
-C 506000000 6900000 NONE QAM64
-C 514000000 6900000 NONE QAM64
-C 522000000 6900000 NONE QAM64
-C 530000000 6900000 NONE QAM64
-C 538000000 6900000 NONE QAM64
-C 546000000 6900000 NONE QAM64
-C 554000000 6900000 NONE QAM64
-C 562000000 6900000 NONE QAM64
-C 570000000 6900000 NONE QAM64
-C 578000000 6900000 NONE QAM64
-C 586000000 6900000 NONE QAM64
-C 594000000 6900000 NONE QAM64
-C 666000000 6900000 NONE QAM64
-C 674000000 6900000 NONE QAM64
-C 682000000 6900000 NONE QAM64
-C 586000000 6900000 NONE QAM256
-C 634000000 6900000 NONE QAM256
-C 642000000 6900000 NONE QAM256
-C 650000000 6900000 NONE QAM256
-C 658000000 6900000 NONE QAM256
-C 690000000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 506000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 514000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 522000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 530000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 538000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 546000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 554000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 562000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 570000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 578000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 586000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 594000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 666000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 674000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 682000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 586000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 634000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 642000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 650000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 658000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 690000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/at-SalzburgAG b/dvb-c/at-SalzburgAG
index 9a032427..0a9e364e 100644
--- a/dvb-c/at-SalzburgAG
+++ b/dvb-c/at-SalzburgAG
@@ -1,8 +1,50 @@
# scan config for Salzburg AG cable provider
# freq sr fec mod
-C 306000000 6900000 NONE QAM64
-C 370000000 6900000 NONE QAM64
-C 410000000 6900000 NONE QAM64
-C 418000000 6900000 NONE QAM64
-C 426000000 6900000 NONE QAM64
-C 442000000 6900000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 306000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/at-Vienna b/dvb-c/at-Vienna
index 2c3d29cc..dbce4a99 100644
--- a/dvb-c/at-Vienna
+++ b/dvb-c/at-Vienna
@@ -1,3 +1,10 @@
# Kabel Vienna
# freq sr fec mod
-C 377750000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 377750000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/be-IN.DI-Integan b/dvb-c/be-IN.DI-Integan
index ca46717d..16ecffad 100644
--- a/dvb-c/be-IN.DI-Integan
+++ b/dvb-c/be-IN.DI-Integan
@@ -1,16 +1,114 @@
# Integan DVB-C (Belgium, IN.DI region)
# freq sr fec mod
-C 330000000 6875000 NONE QAM256
-C 338000000 6875000 NONE QAM256
-C 346000000 6875000 NONE QAM256
-C 354000000 6875000 NONE QAM256
-C 362000000 6875000 NONE QAM64
-C 370000000 6875000 NONE QAM256
-C 378000000 6875000 NONE QAM256
-C 386000000 6875000 NONE QAM256
-C 394000000 6875000 NONE QAM256
-C 458000000 6875000 NONE QAM256
-C 466000000 6875000 NONE QAM256
-C 474000000 6875000 NONE QAM256
-C 482000000 6875000 NONE QAM256
-C 586000000 6875000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 330000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 338000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 458000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 466000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 474000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 482000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 586000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/br-Net-Digital b/dvb-c/br-Net-Digital
index 8900124d..19738343 100644
--- a/dvb-c/br-Net-Digital
+++ b/dvb-c/br-Net-Digital
@@ -3,4 +3,11 @@
# freq sr fec mod
# Found on Sao Jose dos Campos, SP
-C 573000000 5217000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 573000000
+ SYMBOL_RATE = 5217000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/ch-Bern-upc-cablecom b/dvb-c/ch-Bern-upc-cablecom
index e4498852..2053d6cf 100644
--- a/dvb-c/ch-Bern-upc-cablecom
+++ b/dvb-c/ch-Bern-upc-cablecom
@@ -1,4 +1,11 @@
# upc cablecom
# Berne, Switzerland
# freq sr fec mod
-C 426000000 6900000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/ch-GGA-Pratteln b/dvb-c/ch-GGA-Pratteln
index 64b16710..2581d812 100644
--- a/dvb-c/ch-GGA-Pratteln
+++ b/dvb-c/ch-GGA-Pratteln
@@ -5,38 +5,283 @@
# 2012-12-17
# freq sr fec mod Comment
-C 314000000 6900000 NONE QAM256
-C 362000000 6900000 NONE QAM256
-C 378000000 6900000 NONE QAM256
-C 394000000 6900000 NONE QAM256
-C 474000000 6900000 NONE QAM256
-C 482000000 6900000 NONE QAM256 # Teleclub
-C 570000000 6900000 NONE QAM256
-C 578000000 6900000 NONE QAM256
-C 586000000 6900000 NONE QAM256
-C 594000000 6900000 NONE QAM256
-C 602000000 6900000 NONE QAM256
-C 658000000 6900000 NONE QAM256
-C 666000000 6900000 NONE QAM256
-C 674000000 6900000 NONE QAM256 # Intertainment
-C 682000000 6900000 NONE QAM256 # Intertainment
-C 690000000 6900000 NONE QAM256 # Intertainment
-C 698000000 6900000 NONE QAM256
-C 706000000 6900000 NONE QAM256
-C 714000000 6900000 NONE QAM256
-C 722000000 6900000 NONE QAM256
-C 730000000 6900000 NONE QAM256
-C 738000000 6900000 NONE QAM256 # Intertainment
-C 746000000 6900000 NONE QAM256
-C 754000000 6900000 NONE QAM256 # Intertainment
-C 762000000 6900000 NONE QAM256
-C 770000000 6900000 NONE QAM256
-C 778000000 6900000 NONE QAM256
-C 786000000 6900000 NONE QAM256
-C 794000000 6900000 NONE QAM256
-C 802000000 6900000 NONE QAM256
-C 810000000 6900000 NONE QAM256
-C 818000000 6900000 NONE QAM256
-C 826000000 6900000 NONE QAM256
-C 834000000 6900000 NONE QAM256
-C 842000000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 314000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 474000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[Teleclub]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 482000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 570000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 578000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 586000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 594000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 602000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 658000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 666000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[Intertainment]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 674000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[Intertainment]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 682000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[Intertainment]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 690000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 698000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 706000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 714000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 722000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 730000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[Intertainment]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 738000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 746000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[Intertainment]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 754000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 762000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 770000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 778000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 786000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 794000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 802000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 810000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 818000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 826000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 834000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 842000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/ch-Rega-Sense b/dvb-c/ch-Rega-Sense
index b072e510..6b5beff4 100644
--- a/dvb-c/ch-Rega-Sense
+++ b/dvb-c/ch-Rega-Sense
@@ -2,33 +2,208 @@
# freq sr fec mod
# Pay TV
-C 434000000 6900000 NONE QAM64 # Teleclub
-C 714000000 6900000 NONE QAM64
-C 722000000 6900000 NONE QAM64
+[Teleclub]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 714000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 722000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
# Basis offer
-C 125000000 6900000 NONE QAM64
-C 450000000 6900000 NONE QAM64
-C 458000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 474000000 6900000 NONE QAM64
-C 482000000 6900000 NONE QAM64
-C 514000000 6900000 NONE QAM64
-C 522000000 6900000 NONE QAM64
-C 578000000 6900000 NONE QAM64
-C 586000000 6900000 NONE QAM64
-C 634000000 6900000 NONE QAM64
-C 642000000 6900000 NONE QAM64
-C 650000000 6900000 NONE QAM64
-C 658000000 6900000 NONE QAM64
-C 666000000 6900000 NONE QAM64
-C 682000000 6900000 NONE QAM64
-C 698000000 6900000 NONE QAM64
-C 730000000 6900000 NONE QAM64
-
-C 618000000 6900000 NONE QAM256
-C 674000000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 125000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 450000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 458000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 466000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 474000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 482000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 514000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 522000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 578000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 586000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 634000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 642000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 650000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 658000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 666000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 682000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 698000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 730000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 618000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 674000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
# HDTV
-C 642000000 6900000 NONE QAM256
-C 690000000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 642000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 690000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/ch-Video2000 b/dvb-c/ch-Video2000
index e3e47e5d..865c90ec 100644
--- a/dvb-c/ch-Video2000
+++ b/dvb-c/ch-Video2000
@@ -2,4 +2,11 @@
# Canton of Neuchatel, Switzerland
# freq sr fec mod
-C 306000000 6900000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 306000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/ch-Zuerich-upc-cablecom b/dvb-c/ch-Zuerich-upc-cablecom
index c4cf340c..a639f823 100644
--- a/dvb-c/ch-Zuerich-upc-cablecom
+++ b/dvb-c/ch-Zuerich-upc-cablecom
@@ -1,4 +1,11 @@
# upc cablecom
# Zurich, Switzerland
# freq sr fec mod
-C 410000000 6900000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/ch-interGGA b/dvb-c/ch-interGGA
index f49575bd..50457dcc 100644
--- a/dvb-c/ch-interGGA
+++ b/dvb-c/ch-interGGA
@@ -5,30 +5,219 @@
# 2012-12-18
# freq sr fec mod Comment
-C 474000000 6900000 NONE QAM256
-C 482000000 6900000 NONE QAM256
-C 490000000 6900000 NONE QAM256
-C 498000000 6900000 NONE QAM256
-C 506000000 6900000 NONE QAM256
-C 514000000 6900000 NONE QAM256
-C 522000000 6900000 NONE QAM256
-C 530000000 6900000 NONE QAM256
-C 602000000 6900000 NONE QAM256
-C 610000000 6900000 NONE QAM256
-C 618000000 6900000 NONE QAM256
-C 626000000 6900000 NONE QAM256
-C 634000000 6900000 NONE QAM256
-C 642000000 6900000 NONE QAM256
-C 650000000 6900000 NONE QAM256
-C 658000000 6900000 NONE QAM256
-C 666000000 6900000 NONE QAM256
-C 674000000 6900000 NONE QAM256
-C 682000000 6900000 NONE QAM256
-C 690000000 6900000 NONE QAM256
-C 698000000 6900000 NONE QAM256
-C 706000000 6900000 NONE QAM256
-C 714000000 6900000 NONE QAM256
-C 722000000 6900000 NONE QAM256
-C 730000000 6900000 NONE QAM256
-C 738000000 6900000 NONE QAM256
-C 746000000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 474000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 482000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 490000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 498000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 506000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 514000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 522000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 530000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 602000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 610000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 618000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 626000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 634000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 642000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 650000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 658000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 666000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 674000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 682000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 690000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 698000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 706000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 714000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 722000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 730000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 738000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 746000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/cz-Moravianet b/dvb-c/cz-Moravianet
index 39b379af..457f83b5 100644
--- a/dvb-c/cz-Moravianet
+++ b/dvb-c/cz-Moravianet
@@ -10,15 +10,99 @@
# 2008-12-03
#
# freq sr fec mod
-C 218000000 6900000 NONE QAM64
-C 226000000 6900000 NONE QAM64
-C 234000000 6900000 NONE QAM64
-C 242000000 6900000 NONE QAM64
-C 250000000 6900000 NONE QAM64
-C 258000000 6900000 NONE QAM64
-C 266000000 6900000 NONE QAM64
-C 274000000 6900000 NONE QAM64
-C 282000000 6900000 NONE QAM64
-C 290000000 6900000 NONE QAM64
-C 298000000 6900000 NONE QAM64
-C 306000000 6900000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 218000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 226000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 234000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 242000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 250000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 258000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 266000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 274000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 282000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 290000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 298000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 306000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/de-Berlin b/dvb-c/de-Berlin
index 550ba767..b93ff6ba 100644
--- a/dvb-c/de-Berlin
+++ b/dvb-c/de-Berlin
@@ -1,5 +1,26 @@
# Kabel Berlin
# freq sr fec mod
-C 394000000 6900000 NONE QAM64
-C 113000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 113000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 466000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/de-Brandenburg-Havel b/dvb-c/de-Brandenburg-Havel
index 088f113f..d0417ad1 100644
--- a/dvb-c/de-Brandenburg-Havel
+++ b/dvb-c/de-Brandenburg-Havel
@@ -1,30 +1,226 @@
# Brandenburg an der Havel
# freq sr fec mod
-C 378000000 6900000 NONE QAM64
-C 386000000 6900000 NONE QAM64
-C 394000000 6900000 NONE QAM64
-C 402000000 6900000 NONE QAM64
-C 410000000 6900000 NONE QAM64
-C 418000000 6900000 NONE QAM64
-C 426000000 6875000 NONE QAM64
-C 434000000 6900000 NONE QAM64
-C 442000000 6900000 NONE QAM64
-C 450000000 6900000 NONE QAM64
-C 458000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 490000000 6900000 NONE QAM256
-C 498000000 6900000 NONE QAM256
-C 506000000 6900000 NONE QAM256
-C 530000000 6900000 NONE QAM256
-C 538000000 6900000 NONE QAM256
-C 546000000 6900000 NONE QAM256
-C 554000000 6900000 NONE QAM256
-C 562000000 6900000 NONE QAM256
-C 570000000 6900000 NONE QAM64
-C 578000000 6900000 NONE QAM256
-C 586000000 6900000 NONE QAM64
-C 594000000 6900000 NONE QAM64
-C 602000000 6900000 NONE QAM64
-C 610000000 6900000 NONE QAM64
-C 618000000 6900000 NONE QAM64
-C 626000000 6900000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 450000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 458000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 466000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 490000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 498000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 506000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 530000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 538000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 546000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 554000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 562000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 570000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 578000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 586000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 594000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 602000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 610000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 618000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 626000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/de-Kabel_BW b/dvb-c/de-Kabel_BW
index 9a8d6e9f..f2015cfb 100644
--- a/dvb-c/de-Kabel_BW
+++ b/dvb-c/de-Kabel_BW
@@ -13,4 +13,11 @@
# Dirk Ritter <dirk@GNUmatic.de>
#
# freq sr fec mod
-C 114000000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 114000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/de-Kabel_Deutschland-Hannover b/dvb-c/de-Kabel_Deutschland-Hannover
index e60b7448..c4323845 100644
--- a/dvb-c/de-Kabel_Deutschland-Hannover
+++ b/dvb-c/de-Kabel_Deutschland-Hannover
@@ -1,30 +1,219 @@
# Kabel Deutschland
# Created from http://helpdesk.kdgforum.de/sendb/belegung-188.html
# freq sr fec mod
-C 114000000 6900000 NONE QAM256
-C 122000000 6900000 NONE QAM64
-C 130000000 6900000 NONE QAM256
-C 330000000 6900000 NONE QAM256
-C 338000000 6900000 NONE QAM256
-C 346000000 6900000 NONE QAM256
-C 354000000 6900000 NONE QAM256
-C 362000000 6900000 NONE QAM256
-C 370000000 6900000 NONE QAM256
-C 378000000 6900000 NONE QAM256
-C 386000000 6900000 NONE QAM256
-C 394000000 6900000 NONE QAM256
-C 402000000 6900000 NONE QAM256
-C 410000000 6900000 NONE QAM256
-C 426000000 6900000 NONE QAM256
-C 434000000 6900000 NONE QAM256
-C 442000000 6900000 NONE QAM256
-C 450000000 6900000 NONE QAM256
-C 458000000 6900000 NONE QAM256
-C 466000000 6900000 NONE QAM256
-C 498000000 6900000 NONE QAM256
-C 522000000 6900000 NONE QAM256
-C 530000000 6900000 NONE QAM256
-C 538000000 6900000 NONE QAM256
-C 610000000 6900000 NONE QAM64
-C 618000000 6900000 NONE QAM256
-C 626000000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 114000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 122000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 130000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 330000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 338000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 450000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 458000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 466000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 498000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 522000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 530000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 538000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 610000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 618000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 626000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/de-Muenchen b/dvb-c/de-Muenchen
index e7f5b3ad..e6f63795 100644
--- a/dvb-c/de-Muenchen
+++ b/dvb-c/de-Muenchen
@@ -4,24 +4,171 @@
# Cable Content: Cablevista GmbH - http://www.cablevista.de
#
# freq sr fec mod
-C 113000000 6900000 NONE QAM64
-C 121000000 6900000 NONE QAM64
-C 346000000 6900000 NONE QAM64
-C 354000000 6900000 NONE QAM64
-C 362000000 6900000 NONE QAM64
-C 370000000 6900000 NONE QAM64
-C 378000000 6900000 NONE QAM64
-C 386000000 6900000 NONE QAM64
-C 394000000 6900000 NONE QAM64
-C 402000000 6900000 NONE QAM64
-C 410000000 6900000 NONE QAM64
-C 418000000 6900000 NONE QAM64
-C 426000000 6900000 NONE QAM64
-C 434000000 6900000 NONE QAM64
-C 442000000 6900000 NONE QAM64
-C 450000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 482000000 6900000 NONE QAM64
-C 322000000 6900000 NONE QAM256
-C 458000000 6900000 NONE QAM256
-C 490000000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 113000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 121000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 450000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 466000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 482000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 322000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 458000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 490000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/de-NetAachen b/dvb-c/de-NetAachen
index 9cf2db9a..58ee5949 100644
--- a/dvb-c/de-NetAachen
+++ b/dvb-c/de-NetAachen
@@ -10,38 +10,283 @@
#
# C[2] [plp_id] [data_slice_id] [system_id] <freq> <sr> <fec> <mod> [# comment]
#------------------------------------------------------------------------------
-C 113000000 6900000 AUTO QAM256 # NetCologne
-C 642000000 6900000 AUTO QAM256 # NetCologne
-C 618000000 6900000 AUTO QAM256 # NetCologne
-C 634000000 6900000 AUTO QAM256 # NetCologne
-C 626000000 6900000 AUTO QAM256 # NetCologne
-C 562000000 6900000 AUTO QAM256 # NetCologne
-C 402000000 6900000 AUTO QAM256 # NetCologne
-C 121000000 6900000 AUTO QAM256 # NetCologne
-C 570000000 6900000 AUTO QAM256 # NetCologne
-C 394000000 6900000 AUTO QAM256 # NetCologne
-C 586000000 6900000 AUTO QAM256 # NetCologne
-C 650000000 6900000 AUTO QAM256 # NetCologne
-C 658000000 6900000 AUTO QAM256 # NetCologne
-C 666000000 6900000 AUTO QAM256 # NetCologne
-C 674000000 6900000 AUTO QAM256 # NetCologne
-C 682000000 6900000 AUTO QAM256 # NetCologne
-C 690000000 6900000 AUTO QAM256
-C 714000000 6900000 AUTO QAM256
-C 602000000 6900000 AUTO QAM256
-C 410000000 6900000 AUTO QAM256 # NetCologne
-C 418000000 6900000 AUTO QAM256 # NetCologne
-C 530000000 6900000 AUTO QAM256 # NetCologne
-C 538000000 6900000 AUTO QAM256 # NetCologne
-C 346000000 6900000 AUTO QAM256 # NetCologne
-C 338000000 6900000 AUTO QAM256 # NetCologne
-C 129000000 6900000 AUTO QAM256 # NetCologne
-C 354000000 6900000 AUTO QAM64 # BetaDigital
-C 362000000 6900000 AUTO QAM64 # BetaDigital
-C 370000000 6900000 AUTO QAM64 # BetaDigital
-C 386000000 6900000 AUTO QAM64 # BetaDigital
-C 378000000 6900000 AUTO QAM64 # BetaDigital
-C 610000000 6900000 AUTO QAM256
-C 578000000 6900000 AUTO QAM256
-C 698000000 6900000 AUTO QAM256
-C 706000000 6900000 AUTO QAM256
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 113000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 642000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 618000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 634000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 626000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 562000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 121000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 570000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 586000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 650000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 658000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 666000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 674000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 682000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 690000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 714000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 602000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 530000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 538000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 338000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 129000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[BetaDigital]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[BetaDigital]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[BetaDigital]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[BetaDigital]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[BetaDigital]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 610000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 578000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 698000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 706000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/de-Primacom b/dvb-c/de-Primacom
index 9b8dd24a..f89a86ef 100644
--- a/dvb-c/de-Primacom
+++ b/dvb-c/de-Primacom
@@ -9,33 +9,243 @@
#
# C[2] [plp_id] [data_slice_id] [system_id] <freq> <sr> <fec> <mod> [# comment]
#------------------------------------------------------------------------------
-C 121000000 6900000 NONE QAM64 # PrimaCom A.G.
-C 169000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 314000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 338000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 346000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 354000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 362000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 370000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 378000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 386000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 394000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 402000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 410000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 746000000 6900000 NONE QAM64 # PrimaCom A.G.
-C 754000000 6900000 NONE QAM64 # PrimaCom A.G.
-C 762000000 6900000 NONE QAM64 # PrimaCom A.G.
-C 418000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 330000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 434000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 442000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 450000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 458000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 466000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 129000000 6900000 NONE QAM64 # PrimaCom A.G.
-C 137000000 6900000 NONE QAM64 # PrimaCom A.G.
-C 145000000 6900000 NONE QAM64 # PrimaCom A.G.
-C 306000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 322000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 153000000 6900000 NONE QAM256 # PrimaCom A.G.
-C 161000000 6900000 NONE QAM256 # PrimaCom A.G.
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 121000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 169000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 314000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 338000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 746000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 754000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 762000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 330000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 450000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 458000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 466000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 129000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 137000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 145000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 306000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 322000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 153000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[PrimaCom A.G.]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 161000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/de-Unitymedia b/dvb-c/de-Unitymedia
index b01020dd..0323d1af 100644
--- a/dvb-c/de-Unitymedia
+++ b/dvb-c/de-Unitymedia
@@ -2,35 +2,259 @@
# Created from http://www.unitymedia.de/service/soforthilfe/frequenzen.html
# and http://www.unitymedia.de/images/UnityDigitalTV_Lineup_01-07-2009.pdf
# freq sr fec mod
-C 113000000 6900000 NONE QAM256
-C 121000000 6900000 NONE QAM256
-C 346000000 6900000 NONE QAM256
-C 354000000 6900000 NONE QAM64
-C 362000000 6900000 NONE QAM64
-C 370000000 6900000 NONE QAM64
-C 378000000 6900000 NONE QAM64
-C 386000000 6900000 NONE QAM64
-C 394000000 6900000 NONE QAM64
-C 402000000 6900000 NONE QAM256
-C 410000000 6900000 NONE QAM256
-C 418000000 6900000 NONE QAM256
-C 426000000 6900000 NONE QAM256
-C 434000000 6900000 NONE QAM256
-C 442000000 6900000 NONE QAM256
-C 450000000 6900000 NONE QAM256
-C 458000000 6900000 NONE QAM256
-C 466000000 6900000 NONE QAM256
-C 522000000 6900000 NONE QAM256
-C 530000000 6900000 NONE QAM256
-C 538000000 6900000 NONE QAM256
-C 546000000 6900000 NONE QAM256
-C 554000000 6900000 NONE QAM256
-C 562000000 6900000 NONE QAM256
-C 570000000 6900000 NONE QAM256
-C 650000000 6900000 NONE QAM256
-C 658000000 6900000 NONE QAM256
-C 666000000 6900000 NONE QAM256
-C 674000000 6900000 NONE QAM256
-C 682000000 6900000 NONE QAM256
-C 690000000 6900000 NONE QAM256
-C 698000000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 113000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 121000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 450000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 458000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 466000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 522000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 530000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 538000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 546000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 554000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 562000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 570000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 650000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 658000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 666000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 674000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 682000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 690000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 698000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/de-iesy b/dvb-c/de-iesy
index 6726bb77..6b3630e8 100644
--- a/dvb-c/de-iesy
+++ b/dvb-c/de-iesy
@@ -1,20 +1,146 @@
# Unity Media (iesy Hessen, ish Nordrhein-Westfalen)
# freq sr fec mod
-C 113000000 6900000 NONE QAM64
-C 121000000 6900000 NONE QAM64
-C 346000000 6900000 NONE QAM256
-C 354000000 6900000 NONE QAM64
-C 362000000 6900000 NONE QAM64
-C 370000000 6900000 NONE QAM64
-C 378000000 6900000 NONE QAM64
-C 386000000 6900000 NONE QAM64
-C 394000000 6900000 NONE QAM64
-C 402000000 6900000 NONE QAM256
-C 410000000 6900000 NONE QAM64
-C 426000000 6900000 NONE QAM64
-C 434000000 6900000 NONE QAM256
-C 442000000 6900000 NONE QAM256
-C 450000000 6900000 NONE QAM64
-C 458000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 538000000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 113000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 121000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 450000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 458000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 466000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 538000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/de-komro-Rosenheim b/dvb-c/de-komro-Rosenheim
index 624513ee..49ffa5b9 100644
--- a/dvb-c/de-komro-Rosenheim
+++ b/dvb-c/de-komro-Rosenheim
@@ -1,30 +1,226 @@
# komro (Rosenheim)
# freq sr fec mod
-C 113000000 6900000 NONE QAM64
-C 121000000 6900000 NONE QAM64
-C 338000000 6900000 NONE QAM256
-C 394000000 6900000 NONE QAM256
-C 450000000 6900000 NONE QAM64
-C 458000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 522000000 6900000 NONE QAM256
-C 530000000 6900000 NONE QAM256
-C 602000000 6900000 NONE QAM256
-C 610000000 6900000 NONE QAM256
-C 626000000 6900000 NONE QAM256
-C 642000000 6900000 NONE QAM256
-C 650000000 6900000 NONE QAM256
-C 658000000 6900000 NONE QAM64
-C 666000000 6900000 NONE QAM64
-C 682000000 6900000 NONE QAM64
-C 690000000 6900000 NONE QAM256
-C 698000000 6900000 NONE QAM256
-C 706000000 6900000 NONE QAM256
-C 714000000 6900000 NONE QAM256
-C 722000000 6900000 NONE QAM256
-C 730000000 6900000 NONE QAM64
-C 738000000 6900000 NONE QAM64
-C 746000000 6900000 NONE QAM64
-C 754000000 6900000 NONE QAM64
-C 762000000 6900000 NONE QAM256
-C 778000000 6900000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 113000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 121000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 338000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 450000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 458000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 466000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 522000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 530000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 602000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 610000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 626000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 642000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 650000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 658000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 666000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 682000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 690000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 698000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 706000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 714000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 722000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 730000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 738000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 746000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 754000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 762000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 778000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/de-neftv b/dvb-c/de-neftv
index 4de6b42f..abf0f022 100644
--- a/dvb-c/de-neftv
+++ b/dvb-c/de-neftv
@@ -2,33 +2,236 @@
# (Nuernberg, Erlangen, Fuerth and Herzogenaurach (herzomedia))
# freq sr fec mod
-C 113000000 6900000 NONE QAM64
-C 346000000 6875000 NONE QAM64
-C 354000000 6875000 NONE QAM64
-C 362000000 6875000 NONE QAM64
-C 370000000 6875000 NONE QAM64
-C 378000000 6875000 NONE QAM64
-C 386000000 6875000 NONE QAM64
-C 394000000 6875000 NONE QAM64
-C 402000000 6875000 NONE QAM64
-C 410000000 6900000 NONE QAM64
-C 418000000 6875000 NONE QAM64
-C 426000000 6900000 NONE QAM64
-C 434000000 6900000 NONE QAM64
-C 442000000 6900000 NONE QAM256
-C 450000000 6900000 NONE QAM256
-C 458000000 6875000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 113000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 450000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 458000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
# The following channel is only available in Herzogenaurach
-C 466000000 6900000 NONE QAM64
-C 474000000 6875000 NONE QAM64
-C 490000000 6875000 NONE QAM64
-C 498000000 6875000 NONE QAM64
-C 514000000 6875000 NONE QAM64
-C 522000000 6900000 NONE QAM64
-C 546000000 6875000 NONE QAM64
-C 618000000 6900000 NONE QAM64
-C 634000000 6900000 NONE QAM64
-C 786000000 6900000 NONE QAM256
-C 794000000 6900000 NONE QAM64
-C 802000000 6900000 NONE QAM64
-C 810000000 6900000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 466000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 474000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 490000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 498000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 514000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 522000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 546000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 618000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 634000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 786000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 794000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 802000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 810000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/dk-Aarhus-Antenneforening b/dvb-c/dk-Aarhus-Antenneforening
index 2a2f464c..3d0ae13e 100644
--- a/dvb-c/dk-Aarhus-Antenneforening
+++ b/dvb-c/dk-Aarhus-Antenneforening
@@ -1,2 +1,9 @@
# freq sr fec mod
-C 346000000 6900000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/dk-Copenhagen-AFDK b/dvb-c/dk-Copenhagen-AFDK
index 2baa66dc..1773cc30 100644
--- a/dvb-c/dk-Copenhagen-AFDK
+++ b/dvb-c/dk-Copenhagen-AFDK
@@ -1,11 +1,67 @@
# AFDK, Copenhagen
# http://www.afdk.tv/
# freq sr fec mod
-C 386000000 6875000 NONE QAM64
-C 394000000 6875000 NONE QAM64
-C 402000000 6875000 NONE QAM64
-C 490000000 6875000 NONE QAM64
-C 602000000 6875000 NONE QAM64
-C 610000000 6875000 NONE QAM64
-C 618000000 6875000 NONE QAM64
-C 794000000 6875000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 490000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 602000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 610000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 618000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 794000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/dk-Odense b/dvb-c/dk-Odense
index 06a00c29..6fac9c87 100644
--- a/dvb-c/dk-Odense
+++ b/dvb-c/dk-Odense
@@ -1,10 +1,66 @@
# Glentevejs Antennelaug (Denmark / Odense)
# freq sr fec mod
-C 442000000 6900000 NONE QAM64
-C 434000000 6875000 NONE QAM256
-C 255000000 5000000 NONE QAM256
-C 506000000 6875000 NONE QAM256
-C 562000000 6875000 NONE QAM256
-C 610000000 6875000 NONE QAM256
-C 754000000 6875000 NONE QAM256
-C 770000000 6875000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 255000000
+ SYMBOL_RATE = 5000000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 506000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 562000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 610000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 754000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 770000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/es-Euskaltel b/dvb-c/es-Euskaltel
index 46603e4f..bf5926b8 100644
--- a/dvb-c/es-Euskaltel
+++ b/dvb-c/es-Euskaltel
@@ -3,17 +3,115 @@
# file automatically generated by w_scan
# (http://free.pages.at/wirbel4vdr/w_scan/index2.html)
# freq sr fec mod
-C 714000000 6875000 NONE QAM64
-C 722000000 6875000 NONE QAM64
-C 730000000 6875000 NONE QAM64
-C 738000000 6875000 NONE QAM64
-C 746000000 6875000 NONE QAM64
-C 754000000 6875000 NONE QAM64
-C 762000000 6875000 NONE QAM64
-C 770000000 6875000 NONE QAM64
-C 778000000 6875000 NONE QAM64
-C 786000000 6875000 NONE QAM64
-C 794000000 6875000 NONE QAM64
-C 802000000 6875000 NONE QAM64
-C 810000000 6875000 NONE QAM64
-C 818000000 6875000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 714000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 722000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 730000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 738000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 746000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 754000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 762000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 770000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 778000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 786000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 794000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 802000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 810000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 818000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/fi-HTV b/dvb-c/fi-HTV
index 22314566..d23d93b1 100644
--- a/dvb-c/fi-HTV
+++ b/dvb-c/fi-HTV
@@ -1,38 +1,290 @@
# HTV
# freq sr fec mod
-C 274000000 6900000 NONE QAM128
-C 282000000 6900000 NONE QAM128
-C 162000000 6900000 NONE QAM64
-C 170000000 6900000 NONE QAM128
-C 290000000 6900000 NONE QAM128
-C 146000000 6900000 NONE QAM128
-C 154000000 6900000 NONE QAM128
-C 138000000 6900000 NONE QAM128
-C 266000000 6900000 NONE QAM128
-C 362000000 6900000 NONE QAM128
-C 298000000 6900000 NONE QAM128
-C 354000000 6900000 NONE QAM128
-C 370000000 6900000 NONE QAM128
-C 378000000 6900000 NONE QAM128
-C 394000000 6900000 NONE QAM128
-C 386000000 6900000 NONE QAM128
-C 258000000 6900000 NONE QAM128
-C 250000000 6900000 NONE QAM128
-C 314000000 6900000 NONE QAM128
-C 306000000 6900000 NONE QAM64
-C 322000000 6900000 NONE QAM128
-C 330000000 6900000 NONE QAM256
-C 338000000 6900000 NONE QAM256
-C 346000000 6900000 NONE QAM128
-C 234000000 6900000 NONE QAM256
-C 210000000 6900000 NONE QAM256
-C 218000000 6900000 NONE QAM256
-C 226000000 6900000 NONE QAM256
-C 178000000 6900000 NONE QAM256
-C 186000000 6900000 NONE QAM256
-C 194000000 6900000 NONE QAM256
-C 202000000 6900000 NONE QAM256
-C 514000000 6900000 NONE QAM256
-C 522000000 6900000 NONE QAM256
-C 530000000 6900000 NONE QAM256
-C 554000000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 274000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 282000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 162000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 170000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 290000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 146000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 154000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 138000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 266000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 298000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 258000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 250000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 314000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 306000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 322000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 330000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 338000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 234000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 210000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 218000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 226000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 178000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 186000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 194000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 202000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 514000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 522000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 530000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 554000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/fi-Joensuu-Tikka b/dvb-c/fi-Joensuu-Tikka
index d74462f3..df8dbe11 100644
--- a/dvb-c/fi-Joensuu-Tikka
+++ b/dvb-c/fi-Joensuu-Tikka
@@ -1,13 +1,90 @@
# DVB-C, Tikka Media, Joensuu, Finland
# freq sr fec mod
-C 154000000 6900000 NONE QAM128
-C 162000000 6900000 NONE QAM128
-C 170000000 6900000 NONE QAM128
-C 402000000 6900000 NONE QAM128
-C 410000000 6900000 NONE QAM128
-C 418000000 6900000 NONE QAM128
-C 426000000 6900000 NONE QAM128
-C 434000000 6900000 NONE QAM128
-C 458000000 6900000 NONE QAM128
-C 466000000 6900000 NONE QAM128
-C 474000000 6900000 NONE QAM128
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 154000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 162000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 170000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 458000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 466000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 474000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
diff --git a/dvb-c/fi-TTV b/dvb-c/fi-TTV
index 68cfbcd1..310719cf 100644
--- a/dvb-c/fi-TTV
+++ b/dvb-c/fi-TTV
@@ -1,4 +1,18 @@
# TTV
# freq sr fec mod
-C 418000000 6900000 NONE QAM128
-C 346000000 6900000 NONE QAM128
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
diff --git a/dvb-c/fi-Turku b/dvb-c/fi-Turku
index d11c11f6..d8c7da66 100644
--- a/dvb-c/fi-Turku
+++ b/dvb-c/fi-Turku
@@ -1,23 +1,170 @@
# Turun Kaapelitelevisio Oy (Turku)
# freq sr fec mod
-C 146000000 6900000 NONE QAM128
-C 154000000 6900000 NONE QAM128
-C 162000000 6900000 NONE QAM128
-C 234000000 6900000 NONE QAM256
-C 242000000 6900000 NONE QAM256
-C 250000000 6900000 NONE QAM256
-C 258000000 6900000 NONE QAM256
-C 266000000 6900000 NONE QAM256
-C 290000000 6900000 NONE QAM128
-C 298000000 6900000 NONE QAM128
-C 322000000 6900000 NONE QAM128
-C 330000000 6900000 NONE QAM128
-C 338000000 6900000 NONE QAM128
-C 362000000 6900000 NONE QAM128
-C 378000000 6900000 NONE QAM128
-C 386000000 6900000 NONE QAM128
-C 402000000 6900000 NONE QAM128
-C 410000000 6900000 NONE QAM128
-C 418000000 6900000 NONE QAM128
-C 426000000 6900000 NONE QAM128
-C 442000000 6900000 NONE QAM128
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 146000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 154000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 162000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 234000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 242000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 250000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 258000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 266000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 290000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 298000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 322000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 330000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 338000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
diff --git a/dvb-c/fi-dna b/dvb-c/fi-dna
index 38a3afb2..40bdd634 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
+
diff --git a/dvb-c/fi-jkl b/dvb-c/fi-jkl
index ad9811b1..cdfd6783 100644
--- a/dvb-c/fi-jkl
+++ b/dvb-c/fi-jkl
@@ -1,10 +1,66 @@
# OnCable (Finland / Jyväskylä)
# freq sr fec mod
-C 514000000 6900000 NONE QAM128
-C 426000000 6900000 NONE QAM128
-C 162000000 6900000 NONE QAM128
-C 418000000 6900000 NONE QAM128
-C 490000000 6900000 NONE QAM128
-C 498000000 6900000 NONE QAM128
-C 402000000 6900000 NONE QAM128
-C 410000000 6900000 NONE QAM128
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 514000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 162000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 490000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 498000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
diff --git a/dvb-c/fi-sonera b/dvb-c/fi-sonera
index e6049828..fa1326a1 100644
--- a/dvb-c/fi-sonera
+++ b/dvb-c/fi-sonera
@@ -2,27 +2,195 @@
# Maksuttomat kanavat ovat 242,250,314,370 ja 410 MHz:n muxeissa
#
# freq      sr      fec  mod
-C 234000000 6900000 NONE QAM256
-C 242000000 6900000 NONE QAM256
-C 250000000 6900000 NONE QAM256
-C 258000000 6900000 NONE QAM256
-C 266000000 6900000 NONE QAM256
-C 274000000 6900000 NONE QAM256
-C 298000000 6900000 NONE QAM256
-C 306000000 6900000 NONE QAM256
-C 314000000 6900000 NONE QAM256
-C 322000000 6900000 NONE QAM256
-C 338000000 6900000 NONE QAM256
-C 346000000 6900000 AUTO QAM256
-C 354000000 6900000 AUTO QAM256
-C 362000000 6900000 AUTO QAM256
-C 370000000 6900000 AUTO QAM256
-C 378000000 6900000 AUTO QAM256
-C 386000000 6900000 AUTO QAM256
-C 394000000 6900000 AUTO QAM256
-C 402000000 6900000 AUTO QAM256
-C 410000000 6900000 AUTO QAM256
-C 418000000 6900000 AUTO QAM256
-C 426000000 6900000 AUTO QAM256
-C 434000000 6900000 AUTO QAM256
-C 330000000 6900000 AUTO QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 234000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 242000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 250000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 258000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 266000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 274000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 298000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 306000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 314000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 322000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 338000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 330000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/fi-vaasa-oncable b/dvb-c/fi-vaasa-oncable
index 380ccf72..375180f0 100644
--- a/dvb-c/fi-vaasa-oncable
+++ b/dvb-c/fi-vaasa-oncable
@@ -1,13 +1,90 @@
# OnCable (Finland / Vaasa)
# freq sr fec mod
-C 386000000 6875000 NONE QAM64
-C 394000000 6875000 NONE QAM64
-C 143000000 6875000 NONE QAM64
-C 434000000 6875000 NONE QAM64
-C 362000000 6875000 NONE QAM64
-C 418000000 6875000 NONE QAM64
-C 426000000 6875000 NONE QAM64
-C 314000000 6875000 NONE QAM64
-C 410000000 6875000 NONE QAM64
-C 442000000 6875000 NONE QAM64
-C 306000000 6875000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 143000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 314000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 306000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/fr-noos-numericable b/dvb-c/fr-noos-numericable
index 61e4b1e5..1249b371 100644
--- a/dvb-c/fr-noos-numericable
+++ b/dvb-c/fr-noos-numericable
@@ -1,41 +1,314 @@
# Cable en France
# freq sr fec mod
-C 123000000 6875000 NONE QAM64
-C 131000000 6875000 NONE QAM64
-C 139000000 6875000 NONE QAM64
-C 147000000 6875000 NONE QAM64
-C 155000000 6875000 NONE QAM64
-C 163000000 6875000 NONE QAM64
-C 171000000 6875000 NONE QAM64
-C 179000000 6875000 NONE QAM64
-C 187000000 6875000 NONE QAM64
-C 195000000 6875000 NONE QAM64
-C 203000000 6875000 NONE QAM64
-C 211000000 6875000 NONE QAM64
-C 219000000 6875000 NONE QAM64
-C 227000000 6875000 NONE QAM64
-C 235000000 6875000 NONE QAM64
-C 243000000 6875000 NONE QAM64
-C 251000000 6875000 NONE QAM64
-C 259000000 6875000 NONE QAM64
-C 267000000 6875000 NONE QAM64
-C 275000000 6875000 NONE QAM64
-C 283000000 6875000 NONE QAM64
-C 291000000 6875000 NONE QAM64
-C 299000000 6875000 NONE QAM64
-C 315000000 6875000 NONE QAM64
-C 323000000 6875000 NONE QAM64
-C 339000000 6875000 NONE QAM64
-C 347000000 6875000 NONE QAM64
-C 706000000 6875000 NONE QAM64
-C 714000000 6875000 NONE QAM64
-C 722000000 6875000 NONE QAM64
-C 730000000 6875000 NONE QAM64
-C 738000000 6875000 NONE QAM64
-C 746000000 6875000 NONE QAM64
-C 748000000 6875000 NONE QAM64
-C 754000000 6875000 NONE QAM64
-C 762000000 6875000 NONE QAM64
-C 834000000 6875000 NONE QAM64
-C 842000000 6875000 NONE QAM64
-C 850000000 6875000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 123000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 131000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 139000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 147000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 155000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 163000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 171000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 179000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 187000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 195000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 203000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 211000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 219000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 227000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 235000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 243000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 251000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 259000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 267000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 275000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 283000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 291000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 299000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 315000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 323000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 339000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 347000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 706000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 714000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 722000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 730000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 738000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 746000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 748000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 754000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 762000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 834000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 842000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 850000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/hu-Digikabel b/dvb-c/hu-Digikabel
index 3442d526..08d506b8 100644
--- a/dvb-c/hu-Digikabel
+++ b/dvb-c/hu-Digikabel
@@ -6,20 +6,139 @@
# Szazhalombatta, Bekescsaba, Bekes, Eger, Komlo, Oroszlany
# In some of the cities not all the frequencies are available.
# freq sr fec mod
-C 121000000 6900000 NONE QAM256
-C 354000000 6900000 NONE QAM256
-C 362000000 6900000 NONE QAM256
-C 370000000 6900000 NONE QAM256
-C 378000000 6900000 NONE QAM256
-C 386000000 6900000 NONE QAM256
-C 394000000 6900000 NONE QAM256
-C 402000000 6900000 NONE QAM256
-C 410000000 6900000 NONE QAM256
-C 746000000 6900000 NONE QAM256
-C 754000000 6900000 NONE QAM256
-C 762000000 6900000 NONE QAM256
-C 770000000 6900000 NONE QAM256
-C 778000000 6900000 NONE QAM256
-C 786000000 6900000 NONE QAM256
-C 794000000 6900000 NONE QAM256
-C 850000000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 121000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 746000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 754000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 762000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 770000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 778000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 786000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 794000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 850000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/lu-Ettelbruck-ACE b/dvb-c/lu-Ettelbruck-ACE
index a0222b52..4a567fee 100644
--- a/dvb-c/lu-Ettelbruck-ACE
+++ b/dvb-c/lu-Ettelbruck-ACE
@@ -2,19 +2,131 @@
# (http://antenne-ettelbruck.lu)
# Luxembourg - Ettelbruck
# freq sr fec mod
-C 634000000 6900000 NONE QAM64
-C 642000000 6900000 NONE QAM64
-C 650000000 6900000 NONE QAM64
-C 666000000 6900000 NONE QAM64
-C 674000000 6900000 NONE QAM64
-C 682000000 6900000 NONE QAM64
-C 690000000 6900000 NONE QAM64
-C 698000000 6900000 NONE QAM64
-C 706000000 6900000 NONE QAM64
-C 714000000 6900000 NONE QAM64
-C 656000000 3450000 NONE QAM64
-C 660000000 3450000 NONE QAM64
-C 720000000 3450000 NONE QAM64
-C 732000000 3450000 NONE QAM64
-C 724000000 3450000 NONE QAM64
-C 728000000 3450000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 634000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 642000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 650000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 666000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 674000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 682000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 690000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 698000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 706000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 714000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 656000000
+ SYMBOL_RATE = 3450000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 660000000
+ SYMBOL_RATE = 3450000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 720000000
+ SYMBOL_RATE = 3450000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 732000000
+ SYMBOL_RATE = 3450000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 724000000
+ SYMBOL_RATE = 3450000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 728000000
+ SYMBOL_RATE = 3450000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/nl-Delta b/dvb-c/nl-Delta
index ac6548f9..d278f8da 100644
--- a/dvb-c/nl-Delta
+++ b/dvb-c/nl-Delta
@@ -5,4 +5,11 @@
# transponders.
#
#
-C 402000000 6875000 NONE QAM64 # Main Frequency
+[Main Frequency]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/nl-REKAM-CAIW_Gouda b/dvb-c/nl-REKAM-CAIW_Gouda
index 1f9d01c9..4cd60bde 100644
--- a/dvb-c/nl-REKAM-CAIW_Gouda
+++ b/dvb-c/nl-REKAM-CAIW_Gouda
@@ -1,4 +1,18 @@
# REKAM / Caiway, Gouda, Netherlands
# freq sr fec mod
-C 163000000 6875000 NONE QAM64
-C 770000000 6900000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 163000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 770000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/nl-Ziggo b/dvb-c/nl-Ziggo
index 037cca18..dfbf304e 100644
--- a/dvb-c/nl-Ziggo
+++ b/dvb-c/nl-Ziggo
@@ -8,7 +8,35 @@
# http://blob.ziggo.nl/dynamic/NL_HOME/PDF-UPLOAD/Gebruikers-Handleiding-DigitaleTV.pdf
# Chapter 4
#
-C 372000000 6875000 NONE QAM64 # Main Frequency Ziggo/Casema
-C 514000000 6875000 NONE QAM64 # Main Frequency Ziggo/Multikabel
-C 356000000 6875000 NONE QAM64 # Main Frequency Ziggo/@Home Zuid
-C 369000000 6875000 NONE QAM64 # Main Frequency Ziggo/@Home Noord
+[Main Frequency Ziggo/Casema]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 372000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[Main Frequency Ziggo/Multikabel]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 514000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[Main Frequency Ziggo/@Home Zuid]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 356000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[Main Frequency Ziggo/@Home Noord]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 369000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/nl-upc b/dvb-c/nl-upc
index 83c89518..d14165c2 100644
--- a/dvb-c/nl-upc
+++ b/dvb-c/nl-upc
@@ -4,4 +4,11 @@
# a network scan to find other
# transponders.
-C 164000000 6900000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 164000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/no-Oslo-CanalDigital b/dvb-c/no-Oslo-CanalDigital
index 96f454e9..160c19f8 100644
--- a/dvb-c/no-Oslo-CanalDigital
+++ b/dvb-c/no-Oslo-CanalDigital
@@ -1,13 +1,97 @@
# no-oslo-CanalDigital (cable)
-C 354000000 6950000 NONE QAM64
-C 362000000 6950000 NONE QAM64
-C 370000000 6950000 NONE QAM64
-C 378000000 6950000 NONE QAM64
-C 386000000 6950000 NONE QAM64
-C 394000000 6950000 NONE QAM64
-C 402000000 6950000 NONE QAM64
-C 410000000 6950000 NONE QAM64
-C 418000000 6950000 NONE QAM64
-C 426000000 6950000 NONE QAM64
-C 450000000 6950000 NONE QAM64
-C 474000000 6950000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6950000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6950000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6950000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6950000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6950000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6950000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6950000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6950000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6950000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6950000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 450000000
+ SYMBOL_RATE = 6950000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 474000000
+ SYMBOL_RATE = 6950000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/no-Oslo-Get b/dvb-c/no-Oslo-Get
index 42e17bbb..05ac4639 100644
--- a/dvb-c/no-Oslo-Get
+++ b/dvb-c/no-Oslo-Get
@@ -1,22 +1,169 @@
# no-Oslo-Get (cable)
-C 241000000 6900000 NONE QAM256
-C 272000000 6900000 NONE QAM256
-C 280000000 6900000 NONE QAM256
-C 290000000 6900000 NONE QAM256
-C 298000000 6900000 NONE QAM256
-C 306000000 6900000 NONE QAM256
-C 314000000 6900000 NONE QAM256
-C 322000000 6900000 NONE QAM256
-C 330000000 6900000 NONE QAM256
-C 338000000 6900000 NONE QAM256
-C 346000000 6900000 NONE QAM256
-C 354000000 6900000 NONE QAM256
-C 362000000 6900000 NONE QAM256
-C 370000000 6900000 NONE QAM256
-C 378000000 6900000 NONE QAM256
-C 386000000 6900000 NONE QAM256
-C 394000000 6900000 NONE QAM256
-C 410000000 6900000 NONE QAM256
-C 442000000 6952000 NONE QAM256
-C 482000000 6900000 NONE QAM256
-C 498000000 6900000 NONE QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 241000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 272000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 280000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 290000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 298000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 306000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 314000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 322000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 330000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 338000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6952000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 482000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 498000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/dvb-c/ro-DigiTV b/dvb-c/ro-DigiTV
index c15b24d1..fe6cb6ae 100644
--- a/dvb-c/ro-DigiTV
+++ b/dvb-c/ro-DigiTV
@@ -1,26 +1,201 @@
# From http://www.rcs-rds.ro/personal-tv?t=cablu&pachet=digital
-C 306000000 6900000 NONE QAM64
-C 314000000 6900000 NONE QAM64
-C 322000000 6900000 NONE QAM64
-C 330000000 6900000 NONE QAM256
-C 338000000 6900000 NONE QAM256
-C 346000000 6900000 NONE QAM64
-C 354000000 6900000 NONE QAM64
-C 362000000 6900000 NONE QAM64
-C 370000000 6900000 NONE QAM64
-C 378000000 6900000 NONE QAM64
-C 386000000 6900000 NONE QAM64
-C 394000000 6900000 NONE QAM64
-C 402000000 6900000 NONE QAM64
-C 410000000 6900000 NONE QAM64
-C 418000000 6900000 NONE QAM64
-C 426000000 6900000 NONE QAM64
-C 434000000 6900000 NONE QAM64
-C 442000000 6900000 NONE QAM64
-C 450000000 6900000 NONE QAM64
-C 458000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 474000000 6900000 NONE QAM64
-C 482000000 6900000 NONE QAM64
-C 490000000 6900000 NONE QAM64
-C 498000000 6900000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 306000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 314000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 322000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 330000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 338000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 426000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 450000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 458000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 466000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 474000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 482000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 490000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 498000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/se-Gothnet b/dvb-c/se-Gothnet
index 8b04ef76..3f4f70fd 100644
--- a/dvb-c/se-Gothnet
+++ b/dvb-c/se-Gothnet
@@ -3,21 +3,119 @@
# freq sr fec mod
# Free channels
-C 490000000 6875000 NONE QAM64
-C 498000000 6875000 NONE QAM64
-C 506000000 6875000 NONE QAM64
-C 514000000 6875000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 490000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 498000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 506000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 514000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
# SPA channels
-C 682000000 6900000 NONE QAM64
-C 690000000 6900000 NONE QAM64
-C 698000000 6900000 NONE QAM64
-C 706000000 6900000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 682000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 690000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 698000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 706000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
# Canal Digital channels
-C 314000000 7000000 NONE QAM64
-C 322000000 7000000 NONE QAM64
-C 346000000 7000000 NONE QAM64
-C 354000000 7000000 NONE QAM64
-C 362000000 7000000 NONE QAM64
-C 370000000 7000000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 314000000
+ SYMBOL_RATE = 7000000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 322000000
+ SYMBOL_RATE = 7000000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 7000000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 7000000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 7000000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 7000000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
diff --git a/dvb-c/se-comhem b/dvb-c/se-comhem
index 7452c7f0..e1ca6030 100644
--- a/dvb-c/se-comhem
+++ b/dvb-c/se-comhem
@@ -1,25 +1,186 @@
# com hem
# freq sr fec mod
-C 289500000 6875000 NONE QAM64
-C 298000000 6875000 NONE QAM64
-C 306000000 6875000 NONE QAM64
-C 314000000 6875000 NONE QAM64
-C 322000000 6875000 NONE QAM64
-C 338000000 6875000 NONE QAM64
-C 346000000 6875000 NONE QAM64
-C 354000000 6875000 NONE QAM64
-C 362000000 6875000 NONE QAM64
-C 370000000 6875000 NONE QAM64
-C 378000000 6875000 NONE QAM64
-C 386000000 6875000 NONE QAM64
-C 394000000 6875000 NONE QAM64
-C 402000000 6875000 NONE QAM64
-C 418000000 6875000 NONE QAM64
-C 434000000 6875000 NONE QAM64
-C 442000000 6875000 NONE QAM64
-C 450000000 6875000 NONE QAM64
-C 458000000 6875000 NONE QAM64
-C 714000000 6875000 NONE QAM64
-C 722000000 6875000 NONE QAM64
-C 738000000 6875000 NONE QAM64
-C 786000000 6875000 NONE QAM64
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 289500000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 298000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 306000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 314000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 322000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 338000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 434000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 442000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 450000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 458000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 714000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 722000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 738000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 786000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/64
+ INVERSION = AUTO
+