aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-09-05 18:05:42 (GMT)
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-09-05 18:05:42 (GMT)
commit06e54ff221c2e3126a7dfbd63e9814431511b558 (patch)
treeeb13b8eac5ca9006e8993442a4bf1d1261a19f1c
parent78988921cd3cdef0d94ba111fbcf7d813e07e02a (diff)
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>
-rw-r--r--atsc/ca-AB-Calgary28
-rw-r--r--atsc/us-ATSC-center-frequencies-8VSB476
-rw-r--r--atsc/us-CA-SF-Bay-Area91
-rw-r--r--atsc/us-CO-Denver133
-rw-r--r--atsc/us-Cable-EIA-542-HRC-center-frequencies-QAM256875
-rw-r--r--atsc/us-Cable-EIA-542-IRC-center_frequencies-QAM256875
-rw-r--r--atsc/us-Cable-HRC-center-frequencies-QAM256875
-rw-r--r--atsc/us-Cable-IRC-center-frequencies-QAM256875
-rw-r--r--atsc/us-Cable-Standard-center-frequencies-QAM2561099
-rw-r--r--atsc/us-ID-Boise42
-rw-r--r--atsc/us-MA-Boston77
-rw-r--r--atsc/us-MI-Lansing35
-rw-r--r--atsc/us-NTSC-center-frequencies-8VSB476
-rw-r--r--atsc/us-PA-Philadelphia56
-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
-rw-r--r--dvb-s/ABS1-75.0E72
-rw-r--r--dvb-s/AMC1-103w18
-rw-r--r--dvb-s/AMC16-85.0W27
-rw-r--r--dvb-s/AMC4-101w63
-rw-r--r--dvb-s/AMC5-79w18
-rw-r--r--dvb-s/AMC6-72w369
-rw-r--r--dvb-s/AMC9-83.0W135
-rw-r--r--dvb-s/Agila2_C-146.0E162
-rw-r--r--dvb-s/Amazonas-61.0W459
-rw-r--r--dvb-s/Amos-4w414
-rw-r--r--dvb-s/Anik-F1-107.3W36
-rw-r--r--dvb-s/Apstar6_C-134.0E27
-rw-r--r--dvb-s/AsiaSat2_C-100.5E135
-rw-r--r--dvb-s/AsiaSat3S_C-105.5E288
-rw-r--r--dvb-s/Asiasat4_C-122.2E63
-rw-r--r--dvb-s/Astra-19.2E9
-rw-r--r--dvb-s/Astra-23.5E480
-rw-r--r--dvb-s/Astra-28.2E792
-rw-r--r--dvb-s/Astra-31.5E57
-rw-r--r--dvb-s/Atlantic-Bird-1-12.5W300
-rw-r--r--dvb-s/Atlantic-Bird-3-5.0W392
-rw-r--r--dvb-s/BrasilSat-B1-75.0W72
-rw-r--r--dvb-s/BrasilSat-B2-65.0W279
-rw-r--r--dvb-s/BrasilSat-B4-70.0W324
-rw-r--r--dvb-s/BrasilsatB4-84.0W738
-rw-r--r--dvb-s/ChinaSat5A-87.5E27
-rw-r--r--dvb-s/Estrela-do-Sul-63.0W216
-rw-r--r--dvb-s/Eurobird1-28.5E27
-rw-r--r--dvb-s/Eutelsat9-9.0E126
-rw-r--r--dvb-s/EutelsatW2-16E504
-rw-r--r--dvb-s/Express-3A-11.0W9
-rw-r--r--dvb-s/ExpressAM1-40.0E27
-rw-r--r--dvb-s/ExpressAM2-80.0E171
-rw-r--r--dvb-s/ExpressAM22-53.0E54
-rw-r--r--dvb-s/Galaxy10R-123w63
-rw-r--r--dvb-s/Galaxy17-91.0W414
-rw-r--r--dvb-s/Galaxy19-97.0W144
-rw-r--r--dvb-s/Galaxy25-93.0W531
-rw-r--r--dvb-s/Galaxy27-129w9
-rw-r--r--dvb-s/Galaxy28-89.0W351
-rw-r--r--dvb-s/Galaxy3C-95.0W9
-rw-r--r--dvb-s/Hispasat-30.0W360
-rw-r--r--dvb-s/Hotbird-13.0E880
-rw-r--r--dvb-s/IA7-129w9
-rw-r--r--dvb-s/Insat2E_C-83.0E261
-rw-r--r--dvb-s/Insat3A_C-93.5E180
-rw-r--r--dvb-s/Insat4A_C-83.0E261
-rw-r--r--dvb-s/Insat4B_C-93.5E135
-rw-r--r--dvb-s/Intel4-72.0E36
-rw-r--r--dvb-s/Intel904-60.0E99
-rw-r--r--dvb-s/Intelsat-1002-1.0W162
-rw-r--r--dvb-s/Intelsat-11-43.0W9
-rw-r--r--dvb-s/Intelsat-12-45.0E114
-rw-r--r--dvb-s/Intelsat-1R-45.0W369
-rw-r--r--dvb-s/Intelsat-3R-43.0W288
-rw-r--r--dvb-s/Intelsat-6B-43.0W126
-rw-r--r--dvb-s/Intelsat-705-50.0W36
-rw-r--r--dvb-s/Intelsat-707-53.0W18
-rw-r--r--dvb-s/Intelsat-805-55.5W576
-rw-r--r--dvb-s/Intelsat-9-58.0W495
-rw-r--r--dvb-s/Intelsat-903-34.5W36
-rw-r--r--dvb-s/Intelsat-905-24.5W54
-rw-r--r--dvb-s/Intelsat-907-27.5W54
-rw-r--r--dvb-s/Intelsat8_C-166.0E99
-rw-r--r--dvb-s/JCSat3A_C-128.0E36
-rw-r--r--dvb-s/Measat3_C-91.5E144
-rw-r--r--dvb-s/NSS-10-37.5W81
-rw-r--r--dvb-s/NSS-7-22.0W198
-rw-r--r--dvb-s/NSS-806-40.5W945
-rw-r--r--dvb-s/Nahuel-1-71.8W72
-rw-r--r--dvb-s/Nilesat101+102-7.0W351
-rw-r--r--dvb-s/OptusC1-156E162
-rw-r--r--dvb-s/OptusD1-160.0E18
-rw-r--r--dvb-s/PAS-43.0W36
-rw-r--r--dvb-s/PalapaC2_C-113.0E99
-rw-r--r--dvb-s/SBS6-74w9
-rw-r--r--dvb-s/SES2-87.0W63
-rw-r--r--dvb-s/ST1_C-80.0E63
-rw-r--r--dvb-s/Satmex-5-116.8W621
-rw-r--r--dvb-s/Satmex-6-113.0W144
-rw-r--r--dvb-s/Sirius-5.0E540
-rw-r--r--dvb-s/Telecom2-8.0W135
-rw-r--r--dvb-s/Telkom1_C-108.0E126
-rw-r--r--dvb-s/Telstar10_C-76.5E171
-rw-r--r--dvb-s/Telstar12-15.0W216
-rw-r--r--dvb-s/Telstar18_C-138.0E36
-rw-r--r--dvb-s/Thaicom1A_C-120.0E54
-rw-r--r--dvb-s/Thaicom2_C-78.5E81
-rw-r--r--dvb-s/Thaicom5_C-78.5E189
-rw-r--r--dvb-s/Thor-1.0W567
-rw-r--r--dvb-s/Turksat-42.0E918
-rw-r--r--dvb-s/Vinasat1_C-132.0E18
-rw-r--r--dvb-s/Yamal201-90.0E207
-rw-r--r--dvb-t/ad-Andorra52
-rw-r--r--dvb-t/ar-Argentina714
-rw-r--r--dvb-t/at-All637
-rw-r--r--dvb-t/au-Adelaide78
-rw-r--r--dvb-t/au-AdelaideFoothills65
-rw-r--r--dvb-t/au-Ballarat65
-rw-r--r--dvb-t/au-Bendigo340
-rw-r--r--dvb-t/au-Brisbane78
-rw-r--r--dvb-t/au-Cairns65
-rw-r--r--dvb-t/au-Canberra-Black-Mt65
-rw-r--r--dvb-t/au-Coonabarabran54
-rw-r--r--dvb-t/au-Darwin65
-rw-r--r--dvb-t/au-Devonport91
-rw-r--r--dvb-t/au-FraserCoast-Bundaberg65
-rw-r--r--dvb-t/au-GoldCoast104
-rw-r--r--dvb-t/au-Goulburn-Rocky_Hill65
-rw-r--r--dvb-t/au-Hervey_Bay-Ghost_Hill78
-rw-r--r--dvb-t/au-Hobart65
-rw-r--r--dvb-t/au-Mackay65
-rw-r--r--dvb-t/au-Melbourne78
-rw-r--r--dvb-t/au-Melbourne-Selby64
-rw-r--r--dvb-t/au-Melbourne-Upwey65
-rw-r--r--dvb-t/au-MidNorthCoast130
-rw-r--r--dvb-t/au-Newcastle65
-rw-r--r--dvb-t/au-Perth65
-rw-r--r--dvb-t/au-Perth_Roleystone65
-rw-r--r--dvb-t/au-SpencerGulf39
-rw-r--r--dvb-t/au-SunshineCoast65
-rw-r--r--dvb-t/au-Sutherland52
-rw-r--r--dvb-t/au-Sydney78
-rw-r--r--dvb-t/au-Sydney_Kings_Cross65
-rw-r--r--dvb-t/au-Tamworth195
-rw-r--r--dvb-t/au-Townsville65
-rw-r--r--dvb-t/au-WaggaWagga65
-rw-r--r--dvb-t/au-Wollongong130
-rw-r--r--dvb-t/au-canberra65
-rw-r--r--dvb-t/au-unknown13
-rw-r--r--dvb-t/auto-Australia1300
-rw-r--r--dvb-t/auto-Default741
-rw-r--r--dvb-t/auto-Taiwan169
-rw-r--r--dvb-t/auto-With167kHzOffsets2015
-rw-r--r--dvb-t/ax-Smedsbole26
-rw-r--r--dvb-t/be-All65
-rw-r--r--dvb-t/bg-Sofia53
-rw-r--r--dvb-t/br-Brazil714
-rw-r--r--dvb-t/ca-AB-Calgary42
-rw-r--r--dvb-t/ch-All364
-rw-r--r--dvb-t/ch-Citycable351
-rw-r--r--dvb-t/ch-Geneva156
-rw-r--r--dvb-t/cz-All520
-rw-r--r--dvb-t/de-Baden-Wuerttemberg208
-rw-r--r--dvb-t/de-Bayern247
-rw-r--r--dvb-t/de-Berlin117
-rw-r--r--dvb-t/de-Brandenburg52
-rw-r--r--dvb-t/de-Bremen78
-rw-r--r--dvb-t/de-Hamburg104
-rw-r--r--dvb-t/de-Hessen208
-rw-r--r--dvb-t/de-Mecklenburg-Vorpommern117
-rw-r--r--dvb-t/de-Niedersachsen286
-rw-r--r--dvb-t/de-Nordrhein-Westfalen247
-rw-r--r--dvb-t/de-Rheinland-Pfalz104
-rw-r--r--dvb-t/de-Saarland52
-rw-r--r--dvb-t/de-Sachsen143
-rw-r--r--dvb-t/de-Sachsen-Anhalt130
-rw-r--r--dvb-t/de-Schleswig-Holstein195
-rw-r--r--dvb-t/de-Thueringen91
-rw-r--r--dvb-t/dk-All247
-rw-r--r--dvb-t/ee-All421
-rw-r--r--dvb-t/es-Albacete156
-rw-r--r--dvb-t/es-Alfabia156
-rw-r--r--dvb-t/es-Alicante91
-rw-r--r--dvb-t/es-Alpicat78
-rw-r--r--dvb-t/es-Asturias78
-rw-r--r--dvb-t/es-BaixoMinho78
-rw-r--r--dvb-t/es-Bilbao78
-rw-r--r--dvb-t/es-Cadiz312
-rw-r--r--dvb-t/es-Carceres117
-rw-r--r--dvb-t/es-Collserola130
-rw-r--r--dvb-t/es-Donostia130
-rw-r--r--dvb-t/es-Granada78
-rw-r--r--dvb-t/es-Huesca130
-rw-r--r--dvb-t/es-Las_Palmas156
-rw-r--r--dvb-t/es-Lugo78
-rw-r--r--dvb-t/es-Madrid143
-rw-r--r--dvb-t/es-Malaga79
-rw-r--r--dvb-t/es-Muros-Noia91
-rw-r--r--dvb-t/es-Mussara78
-rw-r--r--dvb-t/es-Pamplona91
-rw-r--r--dvb-t/es-Rocacorba6
-rw-r--r--dvb-t/es-SC_Tenerife156
-rw-r--r--dvb-t/es-Santander52
-rw-r--r--dvb-t/es-Santiago_de_Compostela91
-rw-r--r--dvb-t/es-Sevilla247
-rw-r--r--dvb-t/es-Tenerife156
-rw-r--r--dvb-t/es-Valencia104
-rw-r--r--dvb-t/es-Valladolid65
-rw-r--r--dvb-t/es-Vilamarxant26
-rw-r--r--dvb-t/es-Vitoria-Gasteiz78
-rw-r--r--dvb-t/es-Zaragoza65
-rw-r--r--dvb-t/fi-Aanekoski52
-rw-r--r--dvb-t/fi-Aanekoski_Konginkangas52
-rw-r--r--dvb-t/fi-Ahtari26
-rw-r--r--dvb-t/fi-Alajarvi52
-rw-r--r--dvb-t/fi-Anjalankoski_Ruotila65
-rw-r--r--dvb-t/fi-DNA-Espoo39
-rw-r--r--dvb-t/fi-DNA-Eurajoki39
-rw-r--r--dvb-t/fi-DNA-Hameenlinna39
-rw-r--r--dvb-t/fi-DNA-Hamina39
-rw-r--r--dvb-t/fi-DNA-Hausjarvi39
-rw-r--r--dvb-t/fi-DNA-Helsinki39
-rw-r--r--dvb-t/fi-DNA-Jokioinen39
-rw-r--r--dvb-t/fi-DNA-Jyvaskyla39
-rw-r--r--dvb-t/fi-DNA-Kaarina39
-rw-r--r--dvb-t/fi-DNA-Kajaani39
-rw-r--r--dvb-t/fi-DNA-Kangasala39
-rw-r--r--dvb-t/fi-DNA-Karkkila39
-rw-r--r--dvb-t/fi-DNA-Kiiminki39
-rw-r--r--dvb-t/fi-DNA-Kokkola39
-rw-r--r--dvb-t/fi-DNA-Kontiolahti39
-rw-r--r--dvb-t/fi-DNA-Kouvola39
-rw-r--r--dvb-t/fi-DNA-Kuopio39
-rw-r--r--dvb-t/fi-DNA-Lahti39
-rw-r--r--dvb-t/fi-DNA-Lappeenranta39
-rw-r--r--dvb-t/fi-DNA-Lohja39
-rw-r--r--dvb-t/fi-DNA-Loviisa39
-rw-r--r--dvb-t/fi-DNA-Mikkeli39
-rw-r--r--dvb-t/fi-DNA-Nousiainen39
-rw-r--r--dvb-t/fi-DNA-Nurmijarvi39
-rw-r--r--dvb-t/fi-DNA-Porvoo39
-rw-r--r--dvb-t/fi-DNA-Salo39
-rw-r--r--dvb-t/fi-DNA-Savonlinna39
-rw-r--r--dvb-t/fi-DNA-Seinajoki39
-rw-r--r--dvb-t/fi-DNA-Tyrnava39
-rw-r--r--dvb-t/fi-DNA-Ulvila39
-rw-r--r--dvb-t/fi-DNA-Vaasa39
-rw-r--r--dvb-t/fi-DNA-Valkeakoski39
-rw-r--r--dvb-t/fi-DNA-Vesilahti39
-rw-r--r--dvb-t/fi-DNA-Ylivieska39
-rw-r--r--dvb-t/fi-Enontekio_Ahovaara26
-rw-r--r--dvb-t/fi-Enontekio_Hetta26
-rw-r--r--dvb-t/fi-Enontekio_Kuttanen26
-rw-r--r--dvb-t/fi-Espoo78
-rw-r--r--dvb-t/fi-Eurajoki65
-rw-r--r--dvb-t/fi-Fiskars52
-rw-r--r--dvb-t/fi-Haapavesi52
-rw-r--r--dvb-t/fi-Hameenkyro_Kyroskoski52
-rw-r--r--dvb-t/fi-Hameenlinna_Painokangas39
-rw-r--r--dvb-t/fi-Hanko52
-rw-r--r--dvb-t/fi-Hartola39
-rw-r--r--dvb-t/fi-Heinavesi39
-rw-r--r--dvb-t/fi-Heinola52
-rw-r--r--dvb-t/fi-Hyrynsalmi39
-rw-r--r--dvb-t/fi-Hyrynsalmi_Kyparavaara39
-rw-r--r--dvb-t/fi-Hyrynsalmi_Paljakka39
-rw-r--r--dvb-t/fi-Hyvinkaa52
-rw-r--r--dvb-t/fi-Ii_Raiskio26
-rw-r--r--dvb-t/fi-Iisalmi26
-rw-r--r--dvb-t/fi-Ikaalinen52
-rw-r--r--dvb-t/fi-Ikaalinen_Riitiala52
-rw-r--r--dvb-t/fi-Inari26
-rw-r--r--dvb-t/fi-Inari_Janispaa26
-rw-r--r--dvb-t/fi-Inari_Naatamo26
-rw-r--r--dvb-t/fi-Ivalo_Saarineitamovaara26
-rw-r--r--dvb-t/fi-Jalasjarvi52
-rw-r--r--dvb-t/fi-Jamsa_Halli52
-rw-r--r--dvb-t/fi-Jamsa_Kaipola52
-rw-r--r--dvb-t/fi-Jamsa_Matkosvuori52
-rw-r--r--dvb-t/fi-Jamsa_Ouninpohja39
-rw-r--r--dvb-t/fi-Jamsankoski52
-rw-r--r--dvb-t/fi-Joensuu_Vestinkallio39
-rw-r--r--dvb-t/fi-Joroinen_Puukkola39
-rw-r--r--dvb-t/fi-Joutsa_Lankia52
-rw-r--r--dvb-t/fi-Joutseno65
-rw-r--r--dvb-t/fi-Juupajoki_Kopsamo39
-rw-r--r--dvb-t/fi-Juva52
-rw-r--r--dvb-t/fi-Jyvaskyla78
-rw-r--r--dvb-t/fi-Jyvaskyla_Vaajakoski39
-rw-r--r--dvb-t/fi-Kaavi_Sivakkavaara39
-rw-r--r--dvb-t/fi-Kajaani_Pollyvaara39
-rw-r--r--dvb-t/fi-Kalajoki39
-rw-r--r--dvb-t/fi-Kangaslampi52
-rw-r--r--dvb-t/fi-Kangasniemi_Turkinmaki52
-rw-r--r--dvb-t/fi-Kankaanpaa52
-rw-r--r--dvb-t/fi-Karigasniemi26
-rw-r--r--dvb-t/fi-Karkkila52
-rw-r--r--dvb-t/fi-Karstula39
-rw-r--r--dvb-t/fi-Karvia39
-rw-r--r--dvb-t/fi-Kaunispaa26
-rw-r--r--dvb-t/fi-Kemijarvi_Suomutunturi26
-rw-r--r--dvb-t/fi-Kerimaki52
-rw-r--r--dvb-t/fi-Keuruu52
-rw-r--r--dvb-t/fi-Keuruu_Haapamaki52
-rw-r--r--dvb-t/fi-Kihnio52
-rw-r--r--dvb-t/fi-Kiihtelysvaara26
-rw-r--r--dvb-t/fi-Kilpisjarvi26
-rw-r--r--dvb-t/fi-Kittila_Levitunturi26
-rw-r--r--dvb-t/fi-Kolari_Vuolittaja26
-rw-r--r--dvb-t/fi-Koli52
-rw-r--r--dvb-t/fi-Korpilahti_Vaarunvuori52
-rw-r--r--dvb-t/fi-Korppoo52
-rw-r--r--dvb-t/fi-Kruunupyy65
-rw-r--r--dvb-t/fi-Kuhmo_Haukela39
-rw-r--r--dvb-t/fi-Kuhmo_Lentiira39
-rw-r--r--dvb-t/fi-Kuhmo_Niva39
-rw-r--r--dvb-t/fi-Kuhmoinen52
-rw-r--r--dvb-t/fi-Kuhmoinen_Harjunsalmi52
-rw-r--r--dvb-t/fi-Kuhmoinen_Puukkoinen39
-rw-r--r--dvb-t/fi-Kuopio65
-rw-r--r--dvb-t/fi-Kurikka_Kesti52
-rw-r--r--dvb-t/fi-Kustavi_Viherlahti52
-rw-r--r--dvb-t/fi-Kuusamo_Hamppulampi26
-rw-r--r--dvb-t/fi-Kyyjarvi_Noposenaho39
-rw-r--r--dvb-t/fi-Lahti78
-rw-r--r--dvb-t/fi-Lapua65
-rw-r--r--dvb-t/fi-Laukaa52
-rw-r--r--dvb-t/fi-Laukaa_Vihtavuori52
-rw-r--r--dvb-t/fi-Lavia39
-rw-r--r--dvb-t/fi-Lohja52
-rw-r--r--dvb-t/fi-Loimaa52
-rw-r--r--dvb-t/fi-Luhanka52
-rw-r--r--dvb-t/fi-Luopioinen52
-rw-r--r--dvb-t/fi-Mantta52
-rw-r--r--dvb-t/fi-Mantyharju39
-rw-r--r--dvb-t/fi-Mikkeli52
-rw-r--r--dvb-t/fi-Muonio_Olostunturi26
-rw-r--r--dvb-t/fi-Nilsia52
-rw-r--r--dvb-t/fi-Nilsia_Keski-Siikajarvi39
-rw-r--r--dvb-t/fi-Nilsia_Pisa39
-rw-r--r--dvb-t/fi-Nokia52
-rw-r--r--dvb-t/fi-Nokia_Siuro52
-rw-r--r--dvb-t/fi-Nummi-Pusula_Hyonola52
-rw-r--r--dvb-t/fi-Nuorgam_Njallavaara26
-rw-r--r--dvb-t/fi-Nuorgam_raja26
-rw-r--r--dvb-t/fi-Nurmes_Konnanvaara52
-rw-r--r--dvb-t/fi-Nurmes_Kortevaara39
-rw-r--r--dvb-t/fi-Orivesi_Talviainen39
-rw-r--r--dvb-t/fi-Oulu78
-rw-r--r--dvb-t/fi-Padasjoki52
-rw-r--r--dvb-t/fi-Padasjoki_Arrakoski52
-rw-r--r--dvb-t/fi-Paltamo_Kivesvaara39
-rw-r--r--dvb-t/fi-Parainen_Houtskari52
-rw-r--r--dvb-t/fi-Parikkala52
-rw-r--r--dvb-t/fi-Parkano_Sopukallio52
-rw-r--r--dvb-t/fi-Pello26
-rw-r--r--dvb-t/fi-Pello_Ratasvaara26
-rw-r--r--dvb-t/fi-Perho52
-rw-r--r--dvb-t/fi-Pernaja39
-rw-r--r--dvb-t/fi-Pieksamaki_Halkokumpu39
-rw-r--r--dvb-t/fi-Pihtipudas39
-rw-r--r--dvb-t/fi-Porvoo_Suomenkyla52
-rw-r--r--dvb-t/fi-Posio26
-rw-r--r--dvb-t/fi-Pudasjarvi39
-rw-r--r--dvb-t/fi-Pudasjarvi_Iso-Syote39
-rw-r--r--dvb-t/fi-Pudasjarvi_Kangasvaara26
-rw-r--r--dvb-t/fi-Puolanka52
-rw-r--r--dvb-t/fi-Pyhatunturi26
-rw-r--r--dvb-t/fi-Pyhavuori39
-rw-r--r--dvb-t/fi-Pylkonmaki_Karankajarvi39
-rw-r--r--dvb-t/fi-Raahe_Mestauskallio52
-rw-r--r--dvb-t/fi-Raahe_Piehinki39
-rw-r--r--dvb-t/fi-Ranua_Haasionmaa26
-rw-r--r--dvb-t/fi-Ranua_Leppiaho26
-rw-r--r--dvb-t/fi-Rautavaara_Angervikko52
-rw-r--r--dvb-t/fi-Rautjarvi_Simpele39
-rw-r--r--dvb-t/fi-Ristijarvi39
-rw-r--r--dvb-t/fi-Rovaniemi39
-rw-r--r--dvb-t/fi-Rovaniemi_Kaihuanvaara26
-rw-r--r--dvb-t/fi-Rovaniemi_Karhuvaara26
-rw-r--r--dvb-t/fi-Rovaniemi_Marasenkallio26
-rw-r--r--dvb-t/fi-Rovaniemi_Rantalaki26
-rw-r--r--dvb-t/fi-Rovaniemi_Sonka26
-rw-r--r--dvb-t/fi-Rovaniemi_Sorviselka26
-rw-r--r--dvb-t/fi-Ruka39
-rw-r--r--dvb-t/fi-Ruovesi_Storminiemi52
-rw-r--r--dvb-t/fi-Saarijarvi52
-rw-r--r--dvb-t/fi-Saarijarvi_Kalmari39
-rw-r--r--dvb-t/fi-Saarijarvi_Mahlu39
-rw-r--r--dvb-t/fi-Salla_Hirvasvaara26
-rw-r--r--dvb-t/fi-Salla_Ihistysjanka26
-rw-r--r--dvb-t/fi-Salla_Naruska26
-rw-r--r--dvb-t/fi-Salla_Sallatunturi26
-rw-r--r--dvb-t/fi-Salla_Sarivaara26
-rw-r--r--dvb-t/fi-Salo_Isokyla52
-rw-r--r--dvb-t/fi-Savukoski_Martti26
-rw-r--r--dvb-t/fi-Savukoski_Tanhua26
-rw-r--r--dvb-t/fi-Siilinjarvi52
-rw-r--r--dvb-t/fi-Simo_Viantie39
-rw-r--r--dvb-t/fi-Sipoo_Norrkulla52
-rw-r--r--dvb-t/fi-Sodankyla_Pittiovaara26
-rw-r--r--dvb-t/fi-Sodankyla_Vuotso26
-rw-r--r--dvb-t/fi-Sulkava_Vaatalanmaki39
-rw-r--r--dvb-t/fi-Suomussalmi_Ala-Vuokki26
-rw-r--r--dvb-t/fi-Suomussalmi_Ammansaari26
-rw-r--r--dvb-t/fi-Suomussalmi_Juntusranta26
-rw-r--r--dvb-t/fi-Suomussalmi_Myllylahti26
-rw-r--r--dvb-t/fi-Sysma_Liikola52
-rw-r--r--dvb-t/fi-Taivalkoski26
-rw-r--r--dvb-t/fi-Taivalkoski_Taivalvaara26
-rw-r--r--dvb-t/fi-Tammela65
-rw-r--r--dvb-t/fi-Tammisaari52
-rw-r--r--dvb-t/fi-Tampere78
-rw-r--r--dvb-t/fi-Tampere_Pyynikki65
-rw-r--r--dvb-t/fi-Tervola39
-rw-r--r--dvb-t/fi-Turku78
-rw-r--r--dvb-t/fi-Utsjoki26
-rw-r--r--dvb-t/fi-Utsjoki_Nuvvus26
-rw-r--r--dvb-t/fi-Utsjoki_Outakoski26
-rw-r--r--dvb-t/fi-Utsjoki_Polvarniemi26
-rw-r--r--dvb-t/fi-Utsjoki_Rovisuvanto26
-rw-r--r--dvb-t/fi-Utsjoki_Tenola26
-rw-r--r--dvb-t/fi-Uusikaupunki_Orivo52
-rw-r--r--dvb-t/fi-Vaala39
-rw-r--r--dvb-t/fi-Vaasa39
-rw-r--r--dvb-t/fi-Valtimo39
-rw-r--r--dvb-t/fi-Vammala_Jyranvuori52
-rw-r--r--dvb-t/fi-Vammala_Roismala39
-rw-r--r--dvb-t/fi-Vammala_Savi39
-rw-r--r--dvb-t/fi-Vantaa_Hakunila52
-rw-r--r--dvb-t/fi-Varpaisjarvi_Honkamaki52
-rw-r--r--dvb-t/fi-Virrat_Lappavuori52
-rw-r--r--dvb-t/fi-Vuokatti52
-rw-r--r--dvb-t/fi-Ylitornio_Ainiovaara39
-rw-r--r--dvb-t/fi-Ylitornio_Raanujarvi26
-rw-r--r--dvb-t/fi-Yllas26
-rw-r--r--dvb-t/fi-Yllasjarvi26
-rw-r--r--dvb-t/fr-All520
-rw-r--r--dvb-t/gr-Athens39
-rw-r--r--dvb-t/hk-HongKong91
-rw-r--r--dvb-t/hr-All338
-rw-r--r--dvb-t/hu-Bekescsaba39
-rw-r--r--dvb-t/hu-Budapest39
-rw-r--r--dvb-t/hu-Csavoly-Kiskoros26
-rw-r--r--dvb-t/hu-Debrecen-Komadi39
-rw-r--r--dvb-t/hu-Fehergyarmat26
-rw-r--r--dvb-t/hu-Gerecse-Dorog-Tatabanya39
-rw-r--r--dvb-t/hu-Gyor39
-rw-r--r--dvb-t/hu-Kabhegy-Kaposvar-Tamasi26
-rw-r--r--dvb-t/hu-Karancs-Nagy-Hideg-hegy-Balassagyarmat-Godollo-Salgotarjan-Vac39
-rw-r--r--dvb-t/hu-Karcag39
-rw-r--r--dvb-t/hu-Kecskemet39
-rw-r--r--dvb-t/hu-Kekes-Cegled-Eger-Miskolctapolca-Ozd39
-rw-r--r--dvb-t/hu-Miskolc-Aggtelek-Fony39
-rw-r--r--dvb-t/hu-Mor-Siofok-Veszprem-Zirc39
-rw-r--r--dvb-t/hu-Nagykanizsa-Barcs-Keszthely39
-rw-r--r--dvb-t/hu-Nyiregyhaza-Tokaj-Kazincbarcika-Saly-Satoraljaujhely39
-rw-r--r--dvb-t/hu-Pecs-Siklos26
-rw-r--r--dvb-t/hu-Sopron-Koszeg39
-rw-r--r--dvb-t/hu-Szeged39
-rw-r--r--dvb-t/hu-Szekesfehervar39
-rw-r--r--dvb-t/hu-Szentes-Battonya26
-rw-r--r--dvb-t/hu-Szolnok39
-rw-r--r--dvb-t/hu-Szombathely-Vasvar-Lenti-Zalaegerszeg39
-rw-r--r--dvb-t/hu-Uzd-Bonyhad-Dunaujvaros-Szekszard-Szigetvar39
-rw-r--r--dvb-t/ie-CairnHill26
-rw-r--r--dvb-t/ie-ClermontCarn26
-rw-r--r--dvb-t/ie-Dungarvan26
-rw-r--r--dvb-t/ie-HolywellHill26
-rw-r--r--dvb-t/ie-Kippure26
-rw-r--r--dvb-t/ie-Maghera26
-rw-r--r--dvb-t/ie-MountLeinster26
-rw-r--r--dvb-t/ie-Mullaghanish26
-rw-r--r--dvb-t/ie-SpurHill26
-rw-r--r--dvb-t/ie-ThreeRock26
-rw-r--r--dvb-t/ie-Truskmore26
-rw-r--r--dvb-t/ie-WoodcockHill26
-rw-r--r--dvb-t/il-All26
-rw-r--r--dvb-t/ir-Tehran26
-rw-r--r--dvb-t/is-Reykjavik234
-rw-r--r--dvb-t/it-All741
-rw-r--r--dvb-t/lt-All313
-rw-r--r--dvb-t/lu-All52
-rw-r--r--dvb-t/lv-Riga94
-rw-r--r--dvb-t/nl-All522
-rw-r--r--dvb-t/no-Trondelag_Stjordal39
-rw-r--r--dvb-t/nz-AucklandInfill39
-rw-r--r--dvb-t/nz-AucklandWaiatarua39
-rw-r--r--dvb-t/nz-Christchurch39
-rw-r--r--dvb-t/nz-Dunedin39
-rw-r--r--dvb-t/nz-Hamilton39
-rw-r--r--dvb-t/nz-HawkesBayMtErin39
-rw-r--r--dvb-t/nz-HawkesBayNapier39
-rw-r--r--dvb-t/nz-Manawatu39
-rw-r--r--dvb-t/nz-Tauranga39
-rw-r--r--dvb-t/nz-Waikato39
-rw-r--r--dvb-t/nz-WellingtonInfill39
-rw-r--r--dvb-t/nz-WellingtonKaukau39
-rw-r--r--dvb-t/nz-WellingtonNgarara39
-rw-r--r--dvb-t/pl-Czestochowa39
-rw-r--r--dvb-t/pl-Gdansk26
-rw-r--r--dvb-t/pl-Krakow78
-rw-r--r--dvb-t/pl-Rzeszow13
-rw-r--r--dvb-t/pl-Warszawa10
-rw-r--r--dvb-t/pl-Wroclaw13
-rw-r--r--dvb-t/pt-All91
-rw-r--r--dvb-t/ro-Bucharest39
-rw-r--r--dvb-t/ru-Krasnodar56
-rw-r--r--dvb-t/ru-Novosibirsk56
-rw-r--r--dvb-t/ru-Volgodonsk56
-rw-r--r--dvb-t/se-Alvdalen_Brunnsberg13
-rw-r--r--dvb-t/se-Alvdalsasen13
-rw-r--r--dvb-t/se-Alvsbyn65
-rw-r--r--dvb-t/se-Amot13
-rw-r--r--dvb-t/se-Ange_Snoberg52
-rw-r--r--dvb-t/se-Angebo13
-rw-r--r--dvb-t/se-Angelholm_Vegeholm65
-rw-r--r--dvb-t/se-Arvidsjaur_Jultrask52
-rw-r--r--dvb-t/se-Aspeboda13
-rw-r--r--dvb-t/se-Atvidaberg26
-rw-r--r--dvb-t/se-Avesta_Krylbo26
-rw-r--r--dvb-t/se-Backefors65
-rw-r--r--dvb-t/se-Bankeryd26
-rw-r--r--dvb-t/se-Bergsjo_Balleberget13
-rw-r--r--dvb-t/se-Bergvik13
-rw-r--r--dvb-t/se-Bollebygd26
-rw-r--r--dvb-t/se-Bollnas52
-rw-r--r--dvb-t/se-Boras_Dalsjofors65
-rw-r--r--dvb-t/se-Boras_Sjobo26
-rw-r--r--dvb-t/se-Borlange_Idkerberget52
-rw-r--r--dvb-t/se-Borlange_Nygardarna26
-rw-r--r--dvb-t/se-Bottnaryd_Ryd13
-rw-r--r--dvb-t/se-Bromsebro26
-rw-r--r--dvb-t/se-Bruzaholm13
-rw-r--r--dvb-t/se-Byxelkrok26
-rw-r--r--dvb-t/se-Dadran13
-rw-r--r--dvb-t/se-Dalfors13
-rw-r--r--dvb-t/se-Dalstuga13
-rw-r--r--dvb-t/se-Degerfors52
-rw-r--r--dvb-t/se-Delary13
-rw-r--r--dvb-t/se-Djura13
-rw-r--r--dvb-t/se-Drevdagen13
-rw-r--r--dvb-t/se-Duvnas13
-rw-r--r--dvb-t/se-Duvnas_Basna13
-rw-r--r--dvb-t/se-Edsbyn13
-rw-r--r--dvb-t/se-Emmaboda_Balshult52
-rw-r--r--dvb-t/se-Enviken26
-rw-r--r--dvb-t/se-Fagersta26
-rw-r--r--dvb-t/se-Falerum_Centrum13
-rw-r--r--dvb-t/se-Falun_Lovberget52
-rw-r--r--dvb-t/se-Farila13
-rw-r--r--dvb-t/se-Faro_Ajkerstrask26
-rw-r--r--dvb-t/se-Farosund_Bunge65
-rw-r--r--dvb-t/se-Filipstad_Klockarhojden52
-rw-r--r--dvb-t/se-Finnveden52
-rw-r--r--dvb-t/se-Fredriksberg13
-rw-r--r--dvb-t/se-Fritsla13
-rw-r--r--dvb-t/se-Furudal13
-rw-r--r--dvb-t/se-Gallivare52
-rw-r--r--dvb-t/se-Garpenberg_Kuppgarden13
-rw-r--r--dvb-t/se-Gavle_Skogmur52
-rw-r--r--dvb-t/se-Gnarp13
-rw-r--r--dvb-t/se-Gnesta26
-rw-r--r--dvb-t/se-Gnosjo_Marieholm13
-rw-r--r--dvb-t/se-Goteborg_Brudaremossen65
-rw-r--r--dvb-t/se-Goteborg_Slattadamm65
-rw-r--r--dvb-t/se-Gullbrandstorp13
-rw-r--r--dvb-t/se-Gunnarsbo13
-rw-r--r--dvb-t/se-Gusum13
-rw-r--r--dvb-t/se-Hagfors_Varmullsasen52
-rw-r--r--dvb-t/se-Hallaryd13
-rw-r--r--dvb-t/se-Hallbo13
-rw-r--r--dvb-t/se-Halmstad_Hamnen26
-rw-r--r--dvb-t/se-Halmstad_Oskarstrom52
-rw-r--r--dvb-t/se-Harnosand_Harnon52
-rw-r--r--dvb-t/se-Hassela13
-rw-r--r--dvb-t/se-Havdhem65
-rw-r--r--dvb-t/se-Hedemora13
-rw-r--r--dvb-t/se-Helsingborg_Olympia65
-rw-r--r--dvb-t/se-Hennan13
-rw-r--r--dvb-t/se-Hestra_Aspas13
-rw-r--r--dvb-t/se-Hjo_Grevback13
-rw-r--r--dvb-t/se-Hofors52
-rw-r--r--dvb-t/se-Hogfors13
-rw-r--r--dvb-t/se-Hogsby_Virstad26
-rw-r--r--dvb-t/se-Holsbybrunn_Holsbyholm13
-rw-r--r--dvb-t/se-Horby_Sallerup91
-rw-r--r--dvb-t/se-Horken13
-rw-r--r--dvb-t/se-Hudiksvall_Forsa52
-rw-r--r--dvb-t/se-Hudiksvall_Galgberget26
-rw-r--r--dvb-t/se-Huskvarna13
-rw-r--r--dvb-t/se-Idre13
-rw-r--r--dvb-t/se-Ingatorp13
-rw-r--r--dvb-t/se-Ingvallsbenning13
-rw-r--r--dvb-t/se-Irevik26
-rw-r--r--dvb-t/se-Jamjo26
-rw-r--r--dvb-t/se-Jarnforsen13
-rw-r--r--dvb-t/se-Jarvso13
-rw-r--r--dvb-t/se-Jokkmokk_Tjalmejaure52
-rw-r--r--dvb-t/se-Jonkoping_Bondberget52
-rw-r--r--dvb-t/se-Kalix52
-rw-r--r--dvb-t/se-Karbole13
-rw-r--r--dvb-t/se-Karlsborg_Vaberget13
-rw-r--r--dvb-t/se-Karlshamn52
-rw-r--r--dvb-t/se-Karlskrona_Vamo52
-rw-r--r--dvb-t/se-Karlstad_Sormon39
-rw-r--r--dvb-t/se-Kaxholmen_Vistakulle13
-rw-r--r--dvb-t/se-Kinnastrom13
-rw-r--r--dvb-t/se-Kiruna_Kirunavaara52
-rw-r--r--dvb-t/se-Kisa65
-rw-r--r--dvb-t/se-Knared13
-rw-r--r--dvb-t/se-Kopmanholmen52
-rw-r--r--dvb-t/se-Kopparberg26
-rw-r--r--dvb-t/se-Kramfors_Lugnvik52
-rw-r--r--dvb-t/se-Kristinehamn_Utsiktsberget52
-rw-r--r--dvb-t/se-Kungsater13
-rw-r--r--dvb-t/se-Kungsberget_GI13
-rw-r--r--dvb-t/se-Langshyttan13
-rw-r--r--dvb-t/se-Langshyttan_Engelsfors13
-rw-r--r--dvb-t/se-Leksand_Karingberget13
-rw-r--r--dvb-t/se-Lerdala13
-rw-r--r--dvb-t/se-Lilltjara_Digerberget13
-rw-r--r--dvb-t/se-Limedsforsen13
-rw-r--r--dvb-t/se-Lindshammar_Ramkvilla13
-rw-r--r--dvb-t/se-Linkoping_Vattentornet65
-rw-r--r--dvb-t/se-Ljugarn26
-rw-r--r--dvb-t/se-Loffstrand52
-rw-r--r--dvb-t/se-Lonneberga26
-rw-r--r--dvb-t/se-Lorstrand13
-rw-r--r--dvb-t/se-Ludvika_Bjorkasen26
-rw-r--r--dvb-t/se-Lumsheden_Trekanten13
-rw-r--r--dvb-t/se-Lycksele_Knaften52
-rw-r--r--dvb-t/se-Mahult13
-rw-r--r--dvb-t/se-Malmo_Jagersro65
-rw-r--r--dvb-t/se-Malung26
-rw-r--r--dvb-t/se-Mariannelund13
-rw-r--r--dvb-t/se-Markaryd_Hualtet26
-rw-r--r--dvb-t/se-Matfors52
-rw-r--r--dvb-t/se-Molndal_Vasterberget65
-rw-r--r--dvb-t/se-Mora_Eldris52
-rw-r--r--dvb-t/se-Motala_Ervasteby65
-rw-r--r--dvb-t/se-Mullsjo_Torestorp26
-rw-r--r--dvb-t/se-Nassjo52
-rw-r--r--dvb-t/se-Navekvarn13
-rw-r--r--dvb-t/se-Norrahammar13
-rw-r--r--dvb-t/se-Norrkoping_Krokek65
-rw-r--r--dvb-t/se-Norrtalje_Sodra_Bergen65
-rw-r--r--dvb-t/se-Nykoping13
-rw-r--r--dvb-t/se-Orebro_Lockhyttan65
-rw-r--r--dvb-t/se-Ornskoldsvik_As65
-rw-r--r--dvb-t/se-Oskarshamn52
-rw-r--r--dvb-t/se-Ostersund_Brattasen65
-rw-r--r--dvb-t/se-Osthammar_Valo65
-rw-r--r--dvb-t/se-Overkalix52
-rw-r--r--dvb-t/se-Oxberg13
-rw-r--r--dvb-t/se-Pajala6
-rw-r--r--dvb-t/se-Paulistom13
-rw-r--r--dvb-t/se-Rattvik13
-rw-r--r--dvb-t/se-Rengsjo13
-rw-r--r--dvb-t/se-Rorbacksnas13
-rw-r--r--dvb-t/se-Sagmyra13
-rw-r--r--dvb-t/se-Salen13
-rw-r--r--dvb-t/se-Salfjallet13
-rw-r--r--dvb-t/se-Sarna_Mickeltemplet13
-rw-r--r--dvb-t/se-Satila13
-rw-r--r--dvb-t/se-Saxdalen13
-rw-r--r--dvb-t/se-Siljansnas_Uvberget13
-rw-r--r--dvb-t/se-Skarstad13
-rw-r--r--dvb-t/se-Skattungbyn13
-rw-r--r--dvb-t/se-Skelleftea65
-rw-r--r--dvb-t/se-Skene_Nycklarberget13
-rw-r--r--dvb-t/se-Skovde65
-rw-r--r--dvb-t/se-Smedjebacken_Uvberget52
-rw-r--r--dvb-t/se-Soderhamn26
-rw-r--r--dvb-t/se-Soderkoping26
-rw-r--r--dvb-t/se-Sodertalje_Ragnhildsborg78
-rw-r--r--dvb-t/se-Solleftea_Hallsta52
-rw-r--r--dvb-t/se-Solleftea_Multra52
-rw-r--r--dvb-t/se-Sorsjon13
-rw-r--r--dvb-t/se-Stockholm_Marieberg65
-rw-r--r--dvb-t/se-Stockholm_Nacka78
-rw-r--r--dvb-t/se-Stora_Skedvi13
-rw-r--r--dvb-t/se-Storfjaten13
-rw-r--r--dvb-t/se-Storuman52
-rw-r--r--dvb-t/se-Stromstad65
-rw-r--r--dvb-t/se-Styrsjobo13
-rw-r--r--dvb-t/se-Sundborn13
-rw-r--r--dvb-t/se-Sundsbruk52
-rw-r--r--dvb-t/se-Sundsvall_S_Stadsberget65
-rw-r--r--dvb-t/se-Sunne_Blabarskullen52
-rw-r--r--dvb-t/se-Svartnas13
-rw-r--r--dvb-t/se-Sveg_Brickan52
-rw-r--r--dvb-t/se-Taberg13
-rw-r--r--dvb-t/se-Tandadalen13
-rw-r--r--dvb-t/se-Tasjo52
-rw-r--r--dvb-t/se-Tollsjo13
-rw-r--r--dvb-t/se-Torsby_Bada52
-rw-r--r--dvb-t/se-Tranas_Bredkarr26
-rw-r--r--dvb-t/se-Tranemo13
-rw-r--r--dvb-t/se-Transtrand_Bolheden26
-rw-r--r--dvb-t/se-Traryd_Betas26
-rw-r--r--dvb-t/se-Trollhattan65
-rw-r--r--dvb-t/se-Trosa26
-rw-r--r--dvb-t/se-Tystberga13
-rw-r--r--dvb-t/se-Uddevalla_Herrestad65
-rw-r--r--dvb-t/se-Ullared13
-rw-r--r--dvb-t/se-Ulricehamn26
-rw-r--r--dvb-t/se-Ulvshyttan_Porjus13
-rw-r--r--dvb-t/se-Uppsala_Rickomberga13
-rw-r--r--dvb-t/se-Uppsala_Vedyxa65
-rw-r--r--dvb-t/se-Vaddo_Elmsta26
-rw-r--r--dvb-t/se-Valdemarsvik26
-rw-r--r--dvb-t/se-Vannas_Granlundsberget52
-rw-r--r--dvb-t/se-Vansbro_Hummelberget13
-rw-r--r--dvb-t/se-Varberg_Grimeton52
-rw-r--r--dvb-t/se-Vasteras_Lillharad65
-rw-r--r--dvb-t/se-Vastervik_Farhult52
-rw-r--r--dvb-t/se-Vaxbo13
-rw-r--r--dvb-t/se-Vessigebro13
-rw-r--r--dvb-t/se-Vetlanda_Nye13
-rw-r--r--dvb-t/se-Vikmanshyttan13
-rw-r--r--dvb-t/se-Virserum52
-rw-r--r--dvb-t/se-Visby_Follingbo65
-rw-r--r--dvb-t/se-Visby_Hamnen65
-rw-r--r--dvb-t/se-Visingso13
-rw-r--r--dvb-t/se-Vislanda_Nydala52
-rw-r--r--dvb-t/se-Voxna13
-rw-r--r--dvb-t/se-Ystad_Metallgatan65
-rw-r--r--dvb-t/se-Yttermalung13
-rw-r--r--dvb-t/si-Ljubljana26
-rw-r--r--dvb-t/sk-BanskaBystrica26
-rw-r--r--dvb-t/sk-BanskaStiavnica26
-rw-r--r--dvb-t/sk-Bardejov26
-rw-r--r--dvb-t/sk-Bratislava39
-rw-r--r--dvb-t/sk-Cadca26
-rw-r--r--dvb-t/sk-Detva26
-rw-r--r--dvb-t/sk-Hnusta26
-rw-r--r--dvb-t/sk-Kosice26
-rw-r--r--dvb-t/sk-KralovskyChlmec26
-rw-r--r--dvb-t/sk-Krompachy26
-rw-r--r--dvb-t/sk-Lucenec26
-rw-r--r--dvb-t/sk-Medzev26
-rw-r--r--dvb-t/sk-Namestovo26
-rw-r--r--dvb-t/sk-Nitra26
-rw-r--r--dvb-t/sk-Poprad39
-rw-r--r--dvb-t/sk-PovazskaBystrica26
-rw-r--r--dvb-t/sk-Presov26
-rw-r--r--dvb-t/sk-Prievidza26
-rw-r--r--dvb-t/sk-Revuca26
-rw-r--r--dvb-t/sk-Roznava26
-rw-r--r--dvb-t/sk-Ruzomberok26
-rw-r--r--dvb-t/sk-Snina26
-rw-r--r--dvb-t/sk-StaraLubovna26
-rw-r--r--dvb-t/sk-Sturovo26
-rw-r--r--dvb-t/sk-Trencin26
-rw-r--r--dvb-t/sk-Zilina26
-rw-r--r--dvb-t/tw-All143
-rw-r--r--dvb-t/ua-Kharkov56
-rw-r--r--dvb-t/ua-Kiev56
-rw-r--r--dvb-t/ua-Lozovaya56
-rw-r--r--dvb-t/ua-Odessa56
-rw-r--r--dvb-t/ug-All41
-rw-r--r--dvb-t/uk-Aberdare79
-rw-r--r--dvb-t/uk-Angus79
-rw-r--r--dvb-t/uk-BeaconHill79
-rw-r--r--dvb-t/uk-Belmont93
-rw-r--r--dvb-t/uk-Bilsdale93
-rw-r--r--dvb-t/uk-BlackHill106
-rw-r--r--dvb-t/uk-Blaenplwyf79
-rw-r--r--dvb-t/uk-BluebellHill79
-rw-r--r--dvb-t/uk-Bressay79
-rw-r--r--dvb-t/uk-BrierleyHill92
-rw-r--r--dvb-t/uk-BristolIlchesterCrescent92
-rw-r--r--dvb-t/uk-BristolKingsWeston92
-rw-r--r--dvb-t/uk-Bromsgrove79
-rw-r--r--dvb-t/uk-BrougherMountain93
-rw-r--r--dvb-t/uk-Caldbeck79
-rw-r--r--dvb-t/uk-CaradonHill79
-rw-r--r--dvb-t/uk-Carmel79
-rw-r--r--dvb-t/uk-Chatton79
-rw-r--r--dvb-t/uk-Chesterfield79
-rw-r--r--dvb-t/uk-Craigkelly106
-rw-r--r--dvb-t/uk-CrystalPalace93
-rw-r--r--dvb-t/uk-Darvel79
-rw-r--r--dvb-t/uk-Divis93
-rw-r--r--dvb-t/uk-Dover79
-rw-r--r--dvb-t/uk-Durris79
-rw-r--r--dvb-t/uk-Eitshal79
-rw-r--r--dvb-t/uk-EmleyMoor106
-rw-r--r--dvb-t/uk-Fenham79
-rw-r--r--dvb-t/uk-Fenton79
-rw-r--r--dvb-t/uk-Ferryside53
-rw-r--r--dvb-t/uk-Guildford79
-rw-r--r--dvb-t/uk-Hannington93
-rw-r--r--dvb-t/uk-Hastings79
-rw-r--r--dvb-t/uk-Heathfield79
-rw-r--r--dvb-t/uk-HemelHempstead79
-rw-r--r--dvb-t/uk-HuntshawCross79
-rw-r--r--dvb-t/uk-Idle79
-rw-r--r--dvb-t/uk-KeelylangHill79
-rw-r--r--dvb-t/uk-Keighley79
-rw-r--r--dvb-t/uk-KilveyHill79
-rw-r--r--dvb-t/uk-KnockMore79
-rw-r--r--dvb-t/uk-Lancaster79
-rw-r--r--dvb-t/uk-LarkStoke79
-rw-r--r--dvb-t/uk-Limavady79
-rw-r--r--dvb-t/uk-Llanddona79
-rw-r--r--dvb-t/uk-Malvern79
-rw-r--r--dvb-t/uk-Mendip79
-rw-r--r--dvb-t/uk-Midhurst79
-rw-r--r--dvb-t/uk-MoelyParc79
-rw-r--r--dvb-t/uk-Nottingham92
-rw-r--r--dvb-t/uk-OliversMount79
-rw-r--r--dvb-t/uk-Oxford79
-rw-r--r--dvb-t/uk-PendleForest79
-rw-r--r--dvb-t/uk-Plympton79
-rw-r--r--dvb-t/uk-PontopPike106
-rw-r--r--dvb-t/uk-Pontypool79
-rw-r--r--dvb-t/uk-Preseli79
-rw-r--r--dvb-t/uk-Redruth79
-rw-r--r--dvb-t/uk-Reigate79
-rw-r--r--dvb-t/uk-RidgeHill79
-rw-r--r--dvb-t/uk-Rosemarkie79
-rw-r--r--dvb-t/uk-Rosneath79
-rw-r--r--dvb-t/uk-Rowridge106
-rw-r--r--dvb-t/uk-RumsterForest79
-rw-r--r--dvb-t/uk-Saddleworth79
-rw-r--r--dvb-t/uk-Salisbury79
-rw-r--r--dvb-t/uk-SandyHeath93
-rw-r--r--dvb-t/uk-Selkirk79
-rw-r--r--dvb-t/uk-Sheffield79
-rw-r--r--dvb-t/uk-StocklandHill79
-rw-r--r--dvb-t/uk-Storeton92
-rw-r--r--dvb-t/uk-Sudbury79
-rw-r--r--dvb-t/uk-SuttonColdfield106
-rw-r--r--dvb-t/uk-Tacolneston79
-rw-r--r--dvb-t/uk-TheWrekin79
-rw-r--r--dvb-t/uk-Torosay79
-rw-r--r--dvb-t/uk-TunbridgeWells79
-rw-r--r--dvb-t/uk-Waltham106
-rw-r--r--dvb-t/uk-Wenvoe106
-rw-r--r--dvb-t/uk-WhitehawkHill79
-rw-r--r--dvb-t/uk-WinterHill93
-rw-r--r--dvb-t/vn-Hanoi26
-rw-r--r--dvb-t/vn-Thaibinh26
891 files changed, 72141 insertions, 7439 deletions
diff --git a/atsc/ca-AB-Calgary b/atsc/ca-AB-Calgary
index 526fcc5..d1e01d1 100644
--- a/atsc/ca-AB-Calgary
+++ b/atsc/ca-AB-Calgary
@@ -9,7 +9,27 @@
#
# A[2] <freq> <mod> [# comment]
#------------------------------------------------------------------------------
-A 515000000 8VSB
-A 563000000 8VSB
-A 635000000 8VSB
-A 683000000 8VSB
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 515000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 563000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 635000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 683000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
diff --git a/atsc/us-ATSC-center-frequencies-8VSB b/atsc/us-ATSC-center-frequencies-8VSB
index 2e39de1..e744878 100644
--- a/atsc/us-ATSC-center-frequencies-8VSB
+++ b/atsc/us-ATSC-center-frequencies-8VSB
@@ -1,70 +1,410 @@
# US ATSC center frequencies, use if in doubt
-A 57028615 8VSB
-A 63028615 8VSB
-A 69028615 8VSB
-A 79028615 8VSB
-A 85028615 8VSB
-A 177028615 8VSB
-A 183028615 8VSB
-A 189028615 8VSB
-A 195028615 8VSB
-A 201028615 8VSB
-A 207028615 8VSB
-A 213028615 8VSB
-A 473028615 8VSB
-A 479028615 8VSB
-A 485028615 8VSB
-A 491028615 8VSB
-A 497028615 8VSB
-A 503028615 8VSB
-A 509028615 8VSB
-A 515028615 8VSB
-A 521028615 8VSB
-A 527028615 8VSB
-A 533028615 8VSB
-A 539028615 8VSB
-A 545028615 8VSB
-A 551028615 8VSB
-A 557028615 8VSB
-A 563028615 8VSB
-A 569028615 8VSB
-A 575028615 8VSB
-A 581028615 8VSB
-A 587028615 8VSB
-A 593028615 8VSB
-A 599028615 8VSB
-A 605028615 8VSB
-A 611028615 8VSB
-A 617028615 8VSB
-A 623028615 8VSB
-A 629028615 8VSB
-A 635028615 8VSB
-A 641028615 8VSB
-A 647028615 8VSB
-A 653028615 8VSB
-A 659028615 8VSB
-A 665028615 8VSB
-A 671028615 8VSB
-A 677028615 8VSB
-A 683028615 8VSB
-A 689028615 8VSB
-A 695028615 8VSB
-A 701028615 8VSB
-A 707028615 8VSB
-A 713028615 8VSB
-A 719028615 8VSB
-A 725028615 8VSB
-A 731028615 8VSB
-A 737028615 8VSB
-A 743028615 8VSB
-A 749028615 8VSB
-A 755028615 8VSB
-A 761028615 8VSB
-A 767028615 8VSB
-A 773028615 8VSB
-A 779028615 8VSB
-A 785028615 8VSB
-A 791028615 8VSB
-A 797028615 8VSB
-A 803028615 8VSB
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 57028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 63028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 69028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 79028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 85028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 177028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 183028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 189028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 195028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 201028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 207028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 213028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 473028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 479028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 485028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 491028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 497028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 503028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 509028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 515028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 521028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 527028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 533028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 539028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 545028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 551028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 557028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 563028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 569028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 575028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 581028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 587028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 593028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 599028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 605028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 611028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 617028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 623028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 629028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 635028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 641028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 647028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 653028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 659028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 665028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 671028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 677028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 683028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 689028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 695028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 701028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 707028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 713028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 719028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 725028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 731028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 737028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 743028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 749028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 755028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 761028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 767028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 773028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 779028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 785028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 791028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 797028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 803028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
diff --git a/atsc/us-CA-SF-Bay-Area b/atsc/us-CA-SF-Bay-Area
index 8cca4e0..e48e6e2 100644
--- a/atsc/us-CA-SF-Bay-Area
+++ b/atsc/us-CA-SF-Bay-Area
@@ -1,16 +1,81 @@
# initial tuning data for some frequencies of for the San Francisco Bay Area
# includes San Francisco, San Jose, Oakland...
-A 503000000 8VSB
-A 551000000 8VSB
-A 563000000 8VSB
-A 593000000 8VSB
-A 623000000 8VSB
-A 635000000 8VSB
-A 647000000 8VSB
-A 659000000 8VSB
-A 683000000 8VSB
-A 689000000 8VSB
-A 701000000 8VSB
-A 725000000 8VSB
-A 731000000 8VSB
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 503000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 551000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 563000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 593000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 623000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 635000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 647000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 659000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 683000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 689000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 701000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 725000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 731000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
diff --git a/atsc/us-CO-Denver b/atsc/us-CO-Denver
index 1df3b38..078ecb0 100644
--- a/atsc/us-CO-Denver
+++ b/atsc/us-CO-Denver
@@ -1,21 +1,116 @@
# main channels in Denver
-A 189028615 8VSB
-A 213028615 8VSB
-A 479028615 8VSB
-A 485028615 8VSB
-A 491028615 8VSB
-A 497028615 8VSB
-A 503028615 8VSB
-A 515028615 8VSB
-A 563028615 8VSB
-A 581028615 8VSB
-A 593028615 8VSB
-A 599028615 8VSB
-A 617028615 8VSB
-A 629028615 8VSB
-A 635028615 8VSB
-A 647028615 8VSB
-A 659028615 8VSB
-A 689028615 8VSB
-A 695028615 8VSB
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 189028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 213028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 479028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 485028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 491028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 497028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 503028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 515028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 563028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 581028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 593028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 599028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 617028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 629028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 635028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 647028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 659028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 689028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 695028615
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
diff --git a/atsc/us-Cable-EIA-542-HRC-center-frequencies-QAM256 b/atsc/us-Cable-EIA-542-HRC-center-frequencies-QAM256
index c0afed9..c541b1e 100644
--- a/atsc/us-Cable-EIA-542-HRC-center-frequencies-QAM256
+++ b/atsc/us-Cable-EIA-542-HRC-center-frequencies-QAM256
@@ -3,140 +3,765 @@
# Channels 1 to 125 are in ascending EIA/NCTA channel designation order
#1
-A 73753600 QAM256
-A 55752700 QAM256
-A 61753000 QAM256
-A 67753300 QAM256
-A 77753900 QAM256
-A 83754200 QAM256
-A 175758700 QAM256
-A 181759000 QAM256
-A 187759300 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 73753600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 55752700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 61753000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 67753300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 77753900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 83754200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 175758700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 181759000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 187759300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#10
-A 193759600 QAM256
-A 199759900 QAM256
-A 205760200 QAM256
-A 211760500 QAM256
-A 121756000 QAM256
-A 127756300 QAM256
-A 133756600 QAM256
-A 139756900 QAM256
-A 145757200 QAM256
-A 151757500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 193759600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 199759900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 205760200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 211760500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 121756000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 127756300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 133756600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 139756900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 145757200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 151757500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#20
-A 157757800 QAM256
-A 163758100 QAM256
-A 169758400 QAM256
-A 217760800 QAM256
-A 223761100 QAM256
-A 229761400 QAM256
-A 235761700 QAM256
-A 241762000 QAM256
-A 247762300 QAM256
-A 253762600 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 157757800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 163758100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 169758400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 217760800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 223761100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 229761400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 235761700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 241762000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 247762300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 253762600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#30
-A 259762900 QAM256
-A 265763200 QAM256
-A 271763500 QAM256
-A 277763800 QAM256
-A 283764100 QAM256
-A 289764400 QAM256
-A 295764700 QAM256
-A 301765000 QAM256
-A 307765300 QAM256
-A 313765600 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 259762900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 265763200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 271763500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 277763800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 283764100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 289764400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 295764700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 301765000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 307765300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 313765600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#40
-A 319765900 QAM256
-A 325766200 QAM256
-A 331766500 QAM256
-A 337766800 QAM256
-A 343767100 QAM256
-A 349767400 QAM256
-A 355767700 QAM256
-A 361768000 QAM256
-A 367768300 QAM256
-A 373768600 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 319765900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 325766200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 331766500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 337766800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 343767100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 349767400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 355767700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 361768000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 367768300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 373768600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#50
-A 379768900 QAM256
-A 385769200 QAM256
-A 391769500 QAM256
-A 397769800 QAM256
-A 403770100 QAM256
-A 409770400 QAM256
-A 415770700 QAM256
-A 421771000 QAM256
-A 427771300 QAM256
-A 433771600 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 379768900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 385769200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 391769500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 397769800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 403770100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 409770400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 415770700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 421771000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 427771300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 433771600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#60
-A 439771900 QAM256
-A 445772200 QAM256
-A 451772500 QAM256
-A 457772800 QAM256
-A 463773100 QAM256
-A 469773400 QAM256
-A 475773700 QAM256
-A 481774000 QAM256
-A 487774300 QAM256
-A 493774600 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 439771900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 445772200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 451772500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 457772800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 463773100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 469773400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 475773700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 481774000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 487774300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 493774600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#70
-A 499774900 QAM256
-A 505775200 QAM256
-A 511775500 QAM256
-A 517775800 QAM256
-A 523776100 QAM256
-A 529776400 QAM256
-A 535776700 QAM256
-A 541777000 QAM256
-A 547777300 QAM256
-A 553777600 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 499774900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 505775200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 511775500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 517775800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 523776100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 529776400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 535776700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 541777000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 547777300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 553777600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#80
-A 559777900 QAM256
-A 565778200 QAM256
-A 571778500 QAM256
-A 577778800 QAM256
-A 583779100 QAM256
-A 589779400 QAM256
-A 595779700 QAM256
-A 601780000 QAM256
-A 607780300 QAM256
-A 613780600 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 559777900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 565778200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 571778500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 577778800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 583779100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 589779400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 595779700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 601780000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 607780300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 613780600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#90
-A 619780900 QAM256
-A 625781200 QAM256
-A 631781500 QAM256
-A 637781800 QAM256
-A 643782100 QAM256
-A 91754500 QAM256
-A 97754800 QAM256
-A 103755100 QAM256
-A 109775000 QAM256
-A 115775000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 619780900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 625781200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 631781500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 637781800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 643782100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 91754500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 97754800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 103755100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 109775000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 115775000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#100
-A 649782400 QAM256
-A 655782700 QAM256
-A 661783000 QAM256
-A 667783300 QAM256
-A 673783600 QAM256
-A 679783900 QAM256
-A 685784200 QAM256
-A 691784500 QAM256
-A 697784800 QAM256
-A 703785100 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 649782400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 655782700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 661783000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 667783300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 673783600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 679783900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 685784200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 691784500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 697784800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 703785100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#110
-A 709785400 QAM256
-A 715785700 QAM256
-A 721786000 QAM256
-A 727786300 QAM256
-A 733786600 QAM256
-A 739786900 QAM256
-A 745787200 QAM256
-A 751787500 QAM256
-A 757787800 QAM256
-A 763788100 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 709785400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 715785700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 721786000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 727786300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 733786600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 739786900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 745787200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 751787500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 757787800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 763788100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#120
-A 769788400 QAM256
-A 775788700 QAM256
-A 781789000 QAM256
-A 787789300 QAM256
-A 793789600 QAM256
-A 799789900 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 769788400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 775788700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 781789000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 787789300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 793789600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 799789900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/atsc/us-Cable-EIA-542-IRC-center_frequencies-QAM256 b/atsc/us-Cable-EIA-542-IRC-center_frequencies-QAM256
index f18d5e5..1aa2a11 100644
--- a/atsc/us-Cable-EIA-542-IRC-center_frequencies-QAM256
+++ b/atsc/us-Cable-EIA-542-IRC-center_frequencies-QAM256
@@ -3,140 +3,765 @@
# Channels 1-125 are in ascending EIA/NCTA channel designation order
#1
-A 75012500 QAM256
-A 57025000 QAM256
-A 63012500 QAM256
-A 69012500 QAM256
-A 79012500 QAM256
-A 85012500 QAM256
-A 177012500 QAM256
-A 183012500 QAM256
-A 189012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 75012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 57025000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 63012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 69012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 79012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 85012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 177012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 183012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 189012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#10
-A 195012500 QAM256
-A 201012500 QAM256
-A 207012500 QAM256
-A 213012500 QAM256
-A 123012500 QAM256
-A 129012500 QAM256
-A 135012500 QAM256
-A 141012500 QAM256
-A 147012500 QAM256
-A 153012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 195012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 201012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 207012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 213012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 123012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 129012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 135012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 141012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 147012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 153012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#20
-A 159012500 QAM256
-A 165012500 QAM256
-A 171012500 QAM256
-A 219012500 QAM256
-A 225012500 QAM256
-A 231012500 QAM256
-A 237012500 QAM256
-A 243012500 QAM256
-A 249012500 QAM256
-A 255012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 159012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 165012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 171012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 219012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 225012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 231012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 237012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 243012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 249012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 255012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#30
-A 261012500 QAM256
-A 267012500 QAM256
-A 273012500 QAM256
-A 279012500 QAM256
-A 285012500 QAM256
-A 291012500 QAM256
-A 297012500 QAM256
-A 303012500 QAM256
-A 309012500 QAM256
-A 315012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 261012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 267012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 273012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 279012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 285012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 291012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 297012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 303012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 309012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 315012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#40
-A 321012500 QAM256
-A 327012500 QAM256
-A 333025000 QAM256
-A 339012500 QAM256
-A 345012500 QAM256
-A 351012500 QAM256
-A 357012500 QAM256
-A 363012500 QAM256
-A 369012500 QAM256
-A 375012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 321012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 327012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 333025000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 339012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 345012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 351012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 357012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 363012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 369012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 375012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#50
-A 381012500 QAM256
-A 387012500 QAM256
-A 393012500 QAM256
-A 399012500 QAM256
-A 405012500 QAM256
-A 411012500 QAM256
-A 417012500 QAM256
-A 423012500 QAM256
-A 429012500 QAM256
-A 435012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 381012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 387012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 393012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 399012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 405012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 411012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 417012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 423012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 429012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 435012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#60
-A 441012500 QAM256
-A 447012500 QAM256
-A 453012500 QAM256
-A 459012500 QAM256
-A 465012500 QAM256
-A 471012500 QAM256
-A 477012500 QAM256
-A 483012500 QAM256
-A 489012500 QAM256
-A 495012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 441012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 447012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 453012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 459012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 465012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 471012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 477012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 483012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 489012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 495012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#70
-A 501012500 QAM256
-A 507012500 QAM256
-A 513012500 QAM256
-A 519012500 QAM256
-A 525012500 QAM256
-A 531012500 QAM256
-A 537012500 QAM256
-A 543012500 QAM256
-A 549012500 QAM256
-A 555012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 501012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 507012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 513012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 519012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 525012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 531012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 537012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 543012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 549012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 555012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#80
-A 561012500 QAM256
-A 567012500 QAM256
-A 573012500 QAM256
-A 579012500 QAM256
-A 585012500 QAM256
-A 591012500 QAM256
-A 597012500 QAM256
-A 603012500 QAM256
-A 609012500 QAM256
-A 615012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 561012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 567012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 573012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 579012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 585012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 591012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 597012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 603012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 609012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 615012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#90
-A 621012500 QAM256
-A 627012500 QAM256
-A 633012500 QAM256
-A 639012500 QAM256
-A 645012500 QAM256
-A 93012500 QAM256
-A 99012500 QAM256
-A 105012500 QAM256
-A 111012500 QAM256
-A 117012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 621012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 627012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 633012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 639012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 645012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 93012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 99012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 105012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 111012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 117012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#100
-A 651012500 QAM256
-A 657012500 QAM256
-A 663012500 QAM256
-A 669012500 QAM256
-A 675012500 QAM256
-A 681012500 QAM256
-A 687012500 QAM256
-A 693012500 QAM256
-A 699012500 QAM256
-A 705012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 651012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 657012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 663012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 669012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 675012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 681012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 687012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 693012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 699012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 705012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#110
-A 711012500 QAM256
-A 717012500 QAM256
-A 723012500 QAM256
-A 729012500 QAM256
-A 735012500 QAM256
-A 741012500 QAM256
-A 747012500 QAM256
-A 753012500 QAM256
-A 759012500 QAM256
-A 765012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 711012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 717012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 723012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 729012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 735012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 741012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 747012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 753012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 759012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 765012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#120
-A 771012500 QAM256
-A 777012500 QAM256
-A 783012500 QAM256
-A 789012500 QAM256
-A 795012500 QAM256
-A 801012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 771012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 777012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 783012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 789012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 795012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 801012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/atsc/us-Cable-HRC-center-frequencies-QAM256 b/atsc/us-Cable-HRC-center-frequencies-QAM256
index 2bc3838..2e20b45 100644
--- a/atsc/us-Cable-HRC-center-frequencies-QAM256
+++ b/atsc/us-Cable-HRC-center-frequencies-QAM256
@@ -3,140 +3,765 @@
# Channels are in ascending EIA/NCTA channel designation order
#1
-A 73753600 QAM256
-A 55752700 QAM256
-A 61753000 QAM256
-A 67753300 QAM256
-A 77753900 QAM256
-A 83754200 QAM256
-A 175758700 QAM256
-A 181759000 QAM256
-A 187759300 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 73753600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 55752700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 61753000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 67753300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 77753900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 83754200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 175758700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 181759000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 187759300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#10
-A 193759600 QAM256
-A 199759900 QAM256
-A 205760200 QAM256
-A 211760500 QAM256
-A 121756000 QAM256
-A 127756300 QAM256
-A 133756600 QAM256
-A 139756900 QAM256
-A 145757200 QAM256
-A 151757500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 193759600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 199759900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 205760200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 211760500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 121756000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 127756300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 133756600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 139756900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 145757200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 151757500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#20
-A 157757800 QAM256
-A 163758100 QAM256
-A 169758400 QAM256
-A 217760800 QAM256
-A 223761100 QAM256
-A 229761400 QAM256
-A 235761700 QAM256
-A 241762000 QAM256
-A 247762300 QAM256
-A 253762600 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 157757800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 163758100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 169758400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 217760800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 223761100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 229761400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 235761700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 241762000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 247762300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 253762600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#30
-A 259762900 QAM256
-A 265763200 QAM256
-A 271763500 QAM256
-A 277763800 QAM256
-A 283764100 QAM256
-A 289764400 QAM256
-A 295764700 QAM256
-A 301765000 QAM256
-A 307765300 QAM256
-A 313765600 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 259762900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 265763200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 271763500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 277763800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 283764100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 289764400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 295764700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 301765000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 307765300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 313765600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#40
-A 319765900 QAM256
-A 325766200 QAM256
-A 331766500 QAM256
-A 337766800 QAM256
-A 343767100 QAM256
-A 349767400 QAM256
-A 355767700 QAM256
-A 361768000 QAM256
-A 367768300 QAM256
-A 373768600 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 319765900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 325766200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 331766500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 337766800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 343767100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 349767400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 355767700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 361768000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 367768300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 373768600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#50
-A 379768900 QAM256
-A 385769200 QAM256
-A 391769500 QAM256
-A 397769800 QAM256
-A 403770100 QAM256
-A 409770400 QAM256
-A 415770700 QAM256
-A 421771000 QAM256
-A 427771300 QAM256
-A 433771600 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 379768900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 385769200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 391769500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 397769800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 403770100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 409770400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 415770700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 421771000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 427771300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 433771600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#60
-A 439771900 QAM256
-A 445772200 QAM256
-A 451772500 QAM256
-A 457772800 QAM256
-A 463773100 QAM256
-A 469773400 QAM256
-A 475773700 QAM256
-A 481774000 QAM256
-A 487774300 QAM256
-A 493774600 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 439771900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 445772200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 451772500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 457772800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 463773100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 469773400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 475773700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 481774000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 487774300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 493774600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#70
-A 499774900 QAM256
-A 505775200 QAM256
-A 511775500 QAM256
-A 517775800 QAM256
-A 523776100 QAM256
-A 529776400 QAM256
-A 535776700 QAM256
-A 541777000 QAM256
-A 547777300 QAM256
-A 553777600 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 499774900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 505775200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 511775500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 517775800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 523776100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 529776400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 535776700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 541777000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 547777300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 553777600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#80
-A 559777900 QAM256
-A 565778200 QAM256
-A 571778500 QAM256
-A 577778800 QAM256
-A 583779100 QAM256
-A 589779400 QAM256
-A 595779700 QAM256
-A 601780000 QAM256
-A 607780300 QAM256
-A 613780600 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 559777900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 565778200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 571778500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 577778800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 583779100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 589779400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 595779700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 601780000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 607780300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 613780600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#90
-A 619780900 QAM256
-A 625781200 QAM256
-A 631781500 QAM256
-A 637781800 QAM256
-A 643782100 QAM256
-A 91754500 QAM256
-A 97754800 QAM256
-A 103755100 QAM256
-A 109755400 QAM256
-A 115755700 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 619780900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 625781200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 631781500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 637781800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 643782100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 91754500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 97754800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 103755100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 109755400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 115755700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#100
-A 649782400 QAM256
-A 655782700 QAM256
-A 661783000 QAM256
-A 667783300 QAM256
-A 673783600 QAM256
-A 679783900 QAM256
-A 685784200 QAM256
-A 691784500 QAM256
-A 697784800 QAM256
-A 703785100 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 649782400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 655782700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 661783000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 667783300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 673783600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 679783900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 685784200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 691784500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 697784800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 703785100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#110
-A 709785400 QAM256
-A 715785700 QAM256
-A 721786000 QAM256
-A 727786300 QAM256
-A 733786600 QAM256
-A 739786900 QAM256
-A 745787200 QAM256
-A 751787500 QAM256
-A 757787800 QAM256
-A 763788100 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 709785400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 715785700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 721786000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 727786300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 733786600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 739786900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 745787200
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 751787500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 757787800
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 763788100
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#120
-A 769788400 QAM256
-A 775788700 QAM256
-A 781789000 QAM256
-A 787789300 QAM256
-A 793789600 QAM256
-A 799789900 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 769788400
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 775788700
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 781789000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 787789300
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 793789600
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 799789900
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/atsc/us-Cable-IRC-center-frequencies-QAM256 b/atsc/us-Cable-IRC-center-frequencies-QAM256
index 72842e0..cd8c408 100644
--- a/atsc/us-Cable-IRC-center-frequencies-QAM256
+++ b/atsc/us-Cable-IRC-center-frequencies-QAM256
@@ -3,140 +3,765 @@
# Channels are in ascending EIA/NCTA channel designation order
#1
-A 75000000 QAM256
-A 57000000 QAM256
-A 63000000 QAM256
-A 69000000 QAM256
-A 79000000 QAM256
-A 85000000 QAM256
-A 177000000 QAM256
-A 183000000 QAM256
-A 189000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 75000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 57000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 63000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 69000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 79000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 85000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 177000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 183000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 189000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#10
-A 195000000 QAM256
-A 201000000 QAM256
-A 207000000 QAM256
-A 213000000 QAM256
-A 123000000 QAM256
-A 129000000 QAM256
-A 135000000 QAM256
-A 141000000 QAM256
-A 147000000 QAM256
-A 153000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 195000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 201000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 207000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 213000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 123000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 129000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 135000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 141000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 147000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 153000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#20
-A 159000000 QAM256
-A 165000000 QAM256
-A 171000000 QAM256
-A 219000000 QAM256
-A 225000000 QAM256
-A 231000000 QAM256
-A 237000000 QAM256
-A 243000000 QAM256
-A 249000000 QAM256
-A 255000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 159000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 165000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 171000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 219000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 225000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 231000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 237000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 243000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 249000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 255000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#30
-A 261000000 QAM256
-A 267000000 QAM256
-A 273000000 QAM256
-A 279000000 QAM256
-A 285000000 QAM256
-A 291000000 QAM256
-A 297000000 QAM256
-A 303000000 QAM256
-A 309000000 QAM256
-A 315000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 261000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 267000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 273000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 279000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 285000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 291000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 297000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 303000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 309000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 315000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#40
-A 321000000 QAM256
-A 327000000 QAM256
-A 333000000 QAM256
-A 339000000 QAM256
-A 345000000 QAM256
-A 351000000 QAM256
-A 357000000 QAM256
-A 363000000 QAM256
-A 369000000 QAM256
-A 375000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 321000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 327000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 333000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 339000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 345000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 351000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 357000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 363000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 369000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 375000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#50
-A 381000000 QAM256
-A 387000000 QAM256
-A 393000000 QAM256
-A 399000000 QAM256
-A 405000000 QAM256
-A 411000000 QAM256
-A 417000000 QAM256
-A 423000000 QAM256
-A 429000000 QAM256
-A 435000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 381000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 387000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 393000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 399000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 405000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 411000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 417000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 423000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 429000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 435000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#60
-A 441000000 QAM256
-A 447000000 QAM256
-A 453000000 QAM256
-A 459000000 QAM256
-A 465000000 QAM256
-A 471000000 QAM256
-A 477000000 QAM256
-A 483000000 QAM256
-A 489000000 QAM256
-A 495000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 441000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 447000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 453000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 459000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 465000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 471000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 477000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 483000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 489000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 495000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#70
-A 501000000 QAM256
-A 507000000 QAM256
-A 513000000 QAM256
-A 519000000 QAM256
-A 525000000 QAM256
-A 531000000 QAM256
-A 537000000 QAM256
-A 543000000 QAM256
-A 549000000 QAM256
-A 555000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 501000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 507000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 513000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 519000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 525000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 531000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 537000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 543000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 549000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 555000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#80
-A 561000000 QAM256
-A 567000000 QAM256
-A 573000000 QAM256
-A 579000000 QAM256
-A 585000000 QAM256
-A 591000000 QAM256
-A 597000000 QAM256
-A 603000000 QAM256
-A 609000000 QAM256
-A 615000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 561000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 567000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 573000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 579000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 585000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 591000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 597000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 603000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 609000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 615000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#90
-A 621000000 QAM256
-A 627000000 QAM256
-A 633000000 QAM256
-A 639000000 QAM256
-A 645000000 QAM256
-A 93000000 QAM256
-A 99000000 QAM256
-A 105000000 QAM256
-A 111000000 QAM256
-A 117000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 621000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 627000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 633000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 639000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 645000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 93000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 99000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 105000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 111000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 117000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#100
-A 651000000 QAM256
-A 657000000 QAM256
-A 663000000 QAM256
-A 669000000 QAM256
-A 675000000 QAM256
-A 681000000 QAM256
-A 687000000 QAM256
-A 693000000 QAM256
-A 699000000 QAM256
-A 705000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 651000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 657000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 663000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 669000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 675000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 681000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 687000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 693000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 699000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 705000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#110
-A 711000000 QAM256
-A 717000000 QAM256
-A 723000000 QAM256
-A 729000000 QAM256
-A 735000000 QAM256
-A 741000000 QAM256
-A 747000000 QAM256
-A 753000000 QAM256
-A 759000000 QAM256
-A 765000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 711000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 717000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 723000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 729000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 735000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 741000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 747000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 753000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 759000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 765000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#120
-A 771000000 QAM256
-A 777000000 QAM256
-A 783000000 QAM256
-A 789000000 QAM256
-A 795000000 QAM256
-A 801000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 771000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 777000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 783000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 789000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 795000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 801000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/atsc/us-Cable-Standard-center-frequencies-QAM256 b/atsc/us-Cable-Standard-center-frequencies-QAM256
index c20fe9c..b493128 100644
--- a/atsc/us-Cable-Standard-center-frequencies-QAM256
+++ b/atsc/us-Cable-Standard-center-frequencies-QAM256
@@ -2,175 +2,960 @@
# Channels are in ascending EIA/NCTA channel designation order
#2
-A 57000000 QAM256
-A 63000000 QAM256
-A 69000000 QAM256
-A 79000000 QAM256
-A 85000000 QAM256
-A 177000000 QAM256
-A 183000000 QAM256
-A 189000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 57000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 63000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 69000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 79000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 85000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 177000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 183000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 189000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#10
-A 195000000 QAM256
-A 201000000 QAM256
-A 207000000 QAM256
-A 213000000 QAM256
-A 123012500 QAM256
-A 129012500 QAM256
-A 135012500 QAM256
-A 141000000 QAM256
-A 147000000 QAM256
-A 153000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 195000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 201000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 207000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 213000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 123012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 129012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 135012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 141000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 147000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 153000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#20
-A 159000000 QAM256
-A 165000000 QAM256
-A 171000000 QAM256
-A 219000000 QAM256
-A 225000000 QAM256
-A 231012500 QAM256
-A 237012500 QAM256
-A 243012500 QAM256
-A 249012500 QAM256
-A 255012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 159000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 165000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 171000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 219000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 225000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 231012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 237012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 243012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 249012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 255012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#30
-A 261012500 QAM256
-A 267012500 QAM256
-A 273012500 QAM256
-A 279012500 QAM256
-A 285012500 QAM256
-A 291012500 QAM256
-A 297012500 QAM256
-A 303012500 QAM256
-A 309012500 QAM256
-A 315012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 261012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 267012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 273012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 279012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 285012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 291012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 297012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 303012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 309012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 315012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#40
-A 321012500 QAM256
-A 327012500 QAM256
-A 333025000 QAM256
-A 339012500 QAM256
-A 345012500 QAM256
-A 351012500 QAM256
-A 357012500 QAM256
-A 363012500 QAM256
-A 369012500 QAM256
-A 375012500 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 321012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 327012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 333025000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 339012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 345012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 351012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 357012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 363012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 369012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 375012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#50
-A 381012500 QAM256
-A 387012500 QAM256
-A 393012500 QAM256
-A 399012500 QAM256
-A 405000000 QAM256
-A 411000000 QAM256
-A 417000000 QAM256
-A 423000000 QAM256
-A 429000000 QAM256
-A 435000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 381012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 387012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 393012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 399012500
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 405000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 411000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 417000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 423000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 429000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 435000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#60
-A 441000000 QAM256
-A 447000000 QAM256
-A 453000000 QAM256
-A 459000000 QAM256
-A 465000000 QAM256
-A 471000000 QAM256
-A 477000000 QAM256
-A 483000000 QAM256
-A 489000000 QAM256
-A 495000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 441000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 447000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 453000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 459000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 465000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 471000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 477000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 483000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 489000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 495000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#70
-A 501000000 QAM256
-A 507000000 QAM256
-A 513000000 QAM256
-A 519000000 QAM256
-A 525000000 QAM256
-A 531000000 QAM256
-A 537000000 QAM256
-A 543000000 QAM256
-A 549000000 QAM256
-A 555000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 501000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 507000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 513000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 519000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 525000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 531000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 537000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 543000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 549000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 555000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#80
-A 561000000 QAM256
-A 567000000 QAM256
-A 573000000 QAM256
-A 579000000 QAM256
-A 585000000 QAM256
-A 591000000 QAM256
-A 597000000 QAM256
-A 603000000 QAM256
-A 609000000 QAM256
-A 615000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 561000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 567000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 573000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 579000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 585000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 591000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 597000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 603000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 609000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 615000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#90
-A 621000000 QAM256
-A 627000000 QAM256
-A 633000000 QAM256
-A 639000000 QAM256
-A 645000000 QAM256
-A 93000000 QAM256
-A 99000000 QAM256
-A 105000000 QAM256
-A 111025000 QAM256
-A 117025000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 621000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 627000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 633000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 639000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 645000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 93000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 99000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 105000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 111025000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 117025000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#100
-A 651000000 QAM256
-A 657000000 QAM256
-A 663000000 QAM256
-A 669000000 QAM256
-A 675000000 QAM256
-A 681000000 QAM256
-A 687000000 QAM256
-A 693000000 QAM256
-A 699000000 QAM256
-A 705000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 651000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 657000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 663000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 669000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 675000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 681000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 687000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 693000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 699000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 705000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#110
-A 711000000 QAM256
-A 717000000 QAM256
-A 723000000 QAM256
-A 729000000 QAM256
-A 735000000 QAM256
-A 741000000 QAM256
-A 747000000 QAM256
-A 753000000 QAM256
-A 759000000 QAM256
-A 765000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 711000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 717000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 723000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 729000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 735000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 741000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 747000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 753000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 759000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 765000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#120
-A 771000000 QAM256
-A 777000000 QAM256
-A 783000000 QAM256
-A 789000000 QAM256
-A 795000000 QAM256
-A 801000000 QAM256
-A 807000000 QAM256
-A 813000000 QAM256
-A 819000000 QAM256
-A 825000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 771000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 777000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 783000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 789000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 795000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 801000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 807000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 813000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 819000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 825000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#121
-A 831000000 QAM256
-A 837000000 QAM256
-A 843000000 QAM256
-A 849000000 QAM256
-A 855000000 QAM256
-A 861000000 QAM256
-A 867000000 QAM256
-A 873000000 QAM256
-A 879000000 QAM256
-A 885000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 831000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 837000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 843000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 849000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 855000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 861000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 867000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 873000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 879000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 885000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#122
-A 891000000 QAM256
-A 897000000 QAM256
-A 903000000 QAM256
-A 909000000 QAM256
-A 915000000 QAM256
-A 921000000 QAM256
-A 927000000 QAM256
-A 933000000 QAM256
-A 939000000 QAM256
-A 945000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 891000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 897000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 903000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 909000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 915000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 921000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 927000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 933000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 939000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 945000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
#123
-A 951000000 QAM256
-A 957000000 QAM256
-A 963000000 QAM256
-A 969000000 QAM256
-A 975000000 QAM256
-A 981000000 QAM256
-A 987000000 QAM256
-A 993000000 QAM256
-A 999000000 QAM256
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 951000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 957000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 963000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 969000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 975000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 981000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 987000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 993000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_B
+ FREQUENCY = 999000000
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
diff --git a/atsc/us-ID-Boise b/atsc/us-ID-Boise
index 9fe7cd2..dcef67c 100644
--- a/atsc/us-ID-Boise
+++ b/atsc/us-ID-Boise
@@ -1,8 +1,38 @@
# Boise, ID, USA
# A freq mod
-A 195000000 8VSB
-A 213000000 8VSB
-A 515000000 8VSB
-A 533000000 8VSB
-A 545000000 8VSB
-A 557000000 8VSB
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 195000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 213000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 515000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 533000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 545000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 557000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
diff --git a/atsc/us-MA-Boston b/atsc/us-MA-Boston
index 05f170a..2324402 100644
--- a/atsc/us-MA-Boston
+++ b/atsc/us-MA-Boston
@@ -1,13 +1,68 @@
# initial tuning data for Boston, MA
-A 503000000 8VSB
-A 509000000 8VSB
-A 527000000 8VSB
-A 563000000 8VSB
-A 569000000 8VSB
-A 575000000 8VSB
-A 581000000 8VSB
-A 623000000 8VSB
-A 635000000 8VSB
-A 641000000 8VSB
-A 647000000 8VSB
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 503000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 509000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 527000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 563000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 569000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 575000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 581000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 623000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 635000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 641000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 647000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
diff --git a/atsc/us-MI-Lansing b/atsc/us-MI-Lansing
index 167555f..41fb8d2 100644
--- a/atsc/us-MI-Lansing
+++ b/atsc/us-MI-Lansing
@@ -1,7 +1,32 @@
# initial tuning data for Lansing, MI
-A 617000000 8VSB
-A 695000000 8VSB
-A 719000000 8VSB
-A 731000000 8VSB
-A 743000000 8VSB
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 617000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 695000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 719000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 731000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 743000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
diff --git a/atsc/us-NTSC-center-frequencies-8VSB b/atsc/us-NTSC-center-frequencies-8VSB
index 6eb586c..8f153af 100644
--- a/atsc/us-NTSC-center-frequencies-8VSB
+++ b/atsc/us-NTSC-center-frequencies-8VSB
@@ -1,70 +1,410 @@
# US NTSC center frequencies, use if in doubt
-A 57000000 8VSB
-A 63000000 8VSB
-A 69000000 8VSB
-A 79000000 8VSB
-A 85000000 8VSB
-A 177000000 8VSB
-A 183000000 8VSB
-A 189000000 8VSB
-A 195000000 8VSB
-A 201000000 8VSB
-A 207000000 8VSB
-A 213000000 8VSB
-A 473000000 8VSB
-A 479000000 8VSB
-A 485000000 8VSB
-A 491000000 8VSB
-A 497000000 8VSB
-A 503000000 8VSB
-A 509000000 8VSB
-A 515000000 8VSB
-A 521000000 8VSB
-A 527000000 8VSB
-A 533000000 8VSB
-A 539000000 8VSB
-A 545000000 8VSB
-A 551000000 8VSB
-A 557000000 8VSB
-A 563000000 8VSB
-A 569000000 8VSB
-A 575000000 8VSB
-A 581000000 8VSB
-A 587000000 8VSB
-A 593000000 8VSB
-A 599000000 8VSB
-A 605000000 8VSB
-A 611000000 8VSB
-A 617000000 8VSB
-A 623000000 8VSB
-A 629000000 8VSB
-A 635000000 8VSB
-A 641000000 8VSB
-A 647000000 8VSB
-A 653000000 8VSB
-A 659000000 8VSB
-A 665000000 8VSB
-A 671000000 8VSB
-A 677000000 8VSB
-A 683000000 8VSB
-A 689000000 8VSB
-A 695000000 8VSB
-A 701000000 8VSB
-A 707000000 8VSB
-A 713000000 8VSB
-A 719000000 8VSB
-A 725000000 8VSB
-A 731000000 8VSB
-A 737000000 8VSB
-A 743000000 8VSB
-A 749000000 8VSB
-A 755000000 8VSB
-A 761000000 8VSB
-A 767000000 8VSB
-A 773000000 8VSB
-A 779000000 8VSB
-A 785000000 8VSB
-A 791000000 8VSB
-A 797000000 8VSB
-A 803000000 8VSB
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 57000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 63000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 69000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 79000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 85000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 177000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 183000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 189000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 195000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 201000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 207000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 213000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 473000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 479000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 485000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 491000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 497000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 503000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 509000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 515000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 521000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 527000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 533000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 539000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 545000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 551000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 557000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 563000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 569000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 575000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 581000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 587000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 593000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 599000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 605000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 611000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 617000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 623000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 629000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 635000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 641000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 647000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 653000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 659000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 665000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 671000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 677000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 683000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 689000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 695000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 701000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 707000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 713000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 719000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 725000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 731000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 737000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 743000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 749000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 755000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 761000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 767000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 773000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 779000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 785000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 791000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 797000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 803000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
diff --git a/atsc/us-PA-Philadelphia b/atsc/us-PA-Philadelphia
index eea9685..64a7e69 100644
--- a/atsc/us-PA-Philadelphia
+++ b/atsc/us-PA-Philadelphia
@@ -4,13 +4,53 @@
#A 515000000 8VSB
#A 545000000 8VSB
#A 551000000 8VSB
-A 575000000 8VSB
-A 581000000 8VSB
-A 593000000 8VSB
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 575000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 581000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 593000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
#A 641000000 8VSB
-A 647000000 8VSB
-A 713000000 8VSB
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 647000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 713000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
#A 719000000 8VSB
-A 773000000 8VSB
-A 785000000 8VSB
-A 791000000 8VSB
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 773000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 785000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 791000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
diff --git a/dvb-c/at-Innsbruck b/dvb-c/at-Innsbruck
index ab920a3..89833ea 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 1d93567..4111c3b 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 4f7ec11..a273047 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 a00c6a2..371c63b 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 ad44f93..f3b0cad 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 9a03242..0a9e364 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 2c3d29c..dbce4a9 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 ca46717..16ecffa 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 8900124..1973834 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 e449885..2053d6c 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 64b1671..2581d81 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 b072e51..6b5beff 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 e3e47e5..865c90e 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 c4cf340..a639f82 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 f49575b..50457dc 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 39b379a..457f83b 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 550ba76..b93ff6b 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 088f113..d0417ad 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 9a8d6e9..f2015cf 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 e60b744..c432384 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 e7f5b3a..e6f6379 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 9cf2db9..58ee594 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 9b8dd24..f89a86e 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 b01020d..0323d1a 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 6726bb7..6b3630e 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 624513e..49ffa5b 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 4de6b42..abf0f02 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 2a2f464..3d0ae13 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 2baa66d..1773cc3 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 06a00c2..6fac9c8 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 46603e4..bf5926b 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 2231456..d23d93b 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 d74462f..df8dbe1 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 68cfbcd..310719c 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 d11c11f..d8c7da6 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 38a3afb..40bdd63 100644
--- a/dvb-c/fi-dna
+++ b/dvb-c/fi-dna
@@ -3,32 +3,235 @@
# http://www.dna.fi/YKSITYISILLE/TV/KAAPELITV/Sivut/Taajuudet.aspx
#
# freq sr fec mod
-C 154000000 6875000 NONE QAM128
-C 162000000 6875000 NONE QAM128
-C 162000000 6875000 NONE QAM256
-C 170000000 6875000 NONE QAM128
-C 226000000 6875000 NONE QAM128
-C 234000000 6875000 NONE QAM128
-C 242000000 6875000 NONE QAM128
-C 242000000 6875000 NONE QAM256
-C 250000000 6875000 NONE QAM256
-C 258000000 6875000 NONE QAM256
-C 266000000 6875000 NONE QAM256
-C 274000000 6875000 NONE QAM256
-C 282000000 6875000 NONE QAM256
-C 290000000 6875000 NONE QAM256
-C 298000000 6875000 NONE QAM128
-C 298000000 6875000 NONE QAM256
-C 306000000 6875000 NONE QAM128
-C 314000000 6875000 NONE QAM128
-C 322000000 6875000 NONE QAM128
-C 330000000 6875000 NONE QAM128
-C 338000000 6875000 NONE QAM128
-C 346000000 6875000 NONE QAM128
-C 354000000 6875000 NONE QAM128
-C 362000000 6875000 NONE QAM128
-C 362000000 6875000 NONE QAM256
-C 370000000 6875000 NONE QAM128
-C 378000000 6875000 NONE QAM128
-C 386000000 6875000 NONE QAM128
-C 394000000 6875000 NONE QAM128
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 154000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 162000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 162000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 170000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 226000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 234000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 242000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 242000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 250000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 258000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 266000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 274000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 282000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 290000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 298000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 298000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 306000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 314000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 322000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 330000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 338000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6875000
+ INNER_FEC = NONE
+ MODULATION = QAM/128
+ INVERSION = AUTO
+
diff --git a/dvb-c/fi-jkl b/dvb-c/fi-jkl
index ad9811b..cdfd678 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 e604982..fa1326a 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 380ccf7..375180f 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 61e4b1e..1249b37 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 3442d52..08d506b 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 a0222b5..4a567fe 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 ac6548f..d278f8d 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 1f9d01c..4cd60bd 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 037cca1..dfbf304 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 83c8951..d14165c 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 96f454e..160c19f 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 42e17bb..05ac463 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 c15b24d..fe6cb6a 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 8b04ef7..3f4f70f 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 7452c7f..e1ca603 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
+
diff --git a/dvb-s/ABS1-75.0E b/dvb-s/ABS1-75.0E
index 26ea163..2183628 100644
--- a/dvb-s/ABS1-75.0E
+++ b/dvb-s/ABS1-75.0E
@@ -1,10 +1,66 @@
# ABS-1 @ 75E
# freq pol sr fec
-S 12518000 V 22000000 AUTO
-S 12548000 V 22000000 AUTO
-S 12579000 V 22000000 AUTO
-S 12640000 V 22000000 AUTO
-S 12670000 V 22000000 AUTO
-S 12693000 V 10000000 AUTO
-S 12704000 V 3900000 AUTO
-S 12740000 V 7408000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12518000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12548000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12579000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12640000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12670000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12693000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 10000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12704000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3900000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12740000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7408000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/AMC1-103w b/dvb-s/AMC1-103w
index f09dc62..bb9db84 100644
--- a/dvb-s/AMC1-103w
+++ b/dvb-s/AMC1-103w
@@ -1,5 +1,19 @@
# AMC 1 @ 103W
# freq pol sr fec
-S 11942000 V 20000000 AUTO
-S 12100000 V 20000000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11942000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12100000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/AMC16-85.0W b/dvb-s/AMC16-85.0W
index 0cd0611..8d89f91 100644
--- a/dvb-s/AMC16-85.0W
+++ b/dvb-s/AMC16-85.0W
@@ -1,6 +1,27 @@
# AMC 2 @ 85W
# freq pol sr fec
-S 11731000 H 13021000 AUTO
-S 11744000 H 13021000 AUTO
-S 11771000 H 13021000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11731000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13021000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11744000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13021000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11771000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13021000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/AMC4-101w b/dvb-s/AMC4-101w
index 681ab23..11397d5 100644
--- a/dvb-s/AMC4-101w
+++ b/dvb-s/AMC4-101w
@@ -1,10 +1,59 @@
# AMC 4 @ 101.0W
# freq pol sr fec
-S 11573000 V 7234000 AUTO
-S 11655000 V 30000000 AUTO
-S 11708000 V 2170000 AUTO
-S 11822000 H 5700000 AUTO
-S 11860000 H 28138000 AUTO
-S 12120000 V 30000000 AUTO
-S 12169000 H 3003000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11573000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7234000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11655000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11708000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11822000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5700000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11860000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28138000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12120000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12169000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3003000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/AMC5-79w b/dvb-s/AMC5-79w
index 0aeebc6..6d8f7ec 100644
--- a/dvb-s/AMC5-79w
+++ b/dvb-s/AMC5-79w
@@ -1,5 +1,19 @@
# AMC 5 @ 79W
# freq pol sr fec
-S 11742000 V 11110000 AUTO
-S 12182000 H 23000000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11742000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 11110000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12182000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 23000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/AMC6-72w b/dvb-s/AMC6-72w
index d7a136c..525972a 100644
--- a/dvb-s/AMC6-72w
+++ b/dvb-s/AMC6-72w
@@ -1,44 +1,331 @@
# AMC 6 @ 72W
# freq pol sr fec
-S 11482000 V 2656000 AUTO
-S 11494000 V 6560000 AUTO
-S 11499000 V 2964000 AUTO
-S 11505000 V 2963000 AUTO
-S 11546000 V 12000000 AUTO
-S 11548000 H 3002000 AUTO
-S 11552000 H 3002000 AUTO
-S 11557000 H 4392000 AUTO
-S 11563000 H 4392000 AUTO
-S 11570000 H 4392000 AUTO
-S 11576000 H 4392000 AUTO
-S 11586000 H 2652000 AUTO
-S 11603000 V 8500000 AUTO
-S 11605000 V 3600000 AUTO
-S 11611000 V 3400000 AUTO
-S 11628000 V 6560000 AUTO
-S 11637000 V 2800000 AUTO
-S 11641000 V 3702000 AUTO
-S 11648000 V 7500000 AUTO
-S 11667000 V 7400000 AUTO
-S 11674000 V 4000000 AUTO
-S 11680000 V 3255000 AUTO
-S 11703000 V 3979000 AUTO
-S 11709000 V 3979000 AUTO
-S 11715000 V 3979000 AUTO
-S 11746000 V 3979000 AUTO
-S 11748000 H 14015000 AUTO
-S 11752000 V 3979000 AUTO
-S 11763000 V 3979000 AUTO
-S 11817000 H 5000000 AUTO
-S 11874000 V 4000000 AUTO
-S 11986000 V 3979000 AUTO
-S 11995000 V 3979000 AUTO
-S 12004000 V 3979000 AUTO
-S 12013000 V 3979000 AUTO
-S 12025000 V 3979000 AUTO
-S 12031000 V 3979000 AUTO
-S 12046000 H 6111000 AUTO
-S 12055000 V 6890000 AUTO
-S 12144000 V 2573000 AUTO
-S 12188000 H 6511000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11482000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2656000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11494000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6560000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11499000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2964000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11505000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2963000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11546000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 12000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11548000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3002000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11552000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3002000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11557000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4392000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11563000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4392000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11570000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4392000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11576000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4392000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11586000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2652000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11603000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11605000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3600000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11611000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11628000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6560000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11637000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11641000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3702000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11648000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11667000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11674000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11680000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11703000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11709000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11715000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11746000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11748000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 14015000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11752000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11763000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11817000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11874000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11986000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11995000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12004000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12013000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12025000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12031000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12046000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12055000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6890000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12144000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2573000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12188000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6511000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/AMC9-83.0W b/dvb-s/AMC9-83.0W
index d4045d9..847ab2a 100644
--- a/dvb-s/AMC9-83.0W
+++ b/dvb-s/AMC9-83.0W
@@ -1,18 +1,123 @@
# AMC 9 @ 83W
# freq pol sr fec
-S 11745000 H 4232000 AUTO
-S 11751000 H 4232000 AUTO
-S 11757000 H 4232000 AUTO
-S 11763000 H 4232000 AUTO
-S 11769000 H 4232000 AUTO
-S 11775000 H 4232000 AUTO
-S 11826000 H 5632000 AUTO
-S 11864000 H 3979000 AUTO
-S 11871000 H 13000000 AUTO
-S 11889000 H 13025000 AUTO
-S 11926000 V 6511000 AUTO
-S 11953000 V 3979000 AUTO
-S 11960000 H 5000000 AUTO
-S 12002000 H 3979000 AUTO
-S 12011000 H 3979000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11745000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4232000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11751000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4232000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11757000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4232000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11763000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4232000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11769000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4232000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11775000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4232000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11826000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11864000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11871000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11889000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13025000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11926000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6511000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11953000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11960000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12002000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12011000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Agila2_C-146.0E b/dvb-s/Agila2_C-146.0E
index ac30747..5591e50 100644
--- a/dvb-s/Agila2_C-146.0E
+++ b/dvb-s/Agila2_C-146.0E
@@ -6,55 +6,181 @@
# freq pol sr fec
# Viva Prime Channel
-S 3725000 H 2345000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3725000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2345000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Zoe Philippines
-S 3774000 V 3300000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3774000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3300000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Da Ai TV indonesia
-S 3791000 H 3100000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3791000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3100000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Trinity Broadcasting Multiplex
-S 3791000 V 10091000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3791000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 10091000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Bayon TV
-S 3796000 H 3360000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3796000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3360000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# White Springs TV
-S 3846000 H 6110000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3846000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6110000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TCT World
-S 3854000 H 2603000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3854000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2603000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# CCTN
-S 3873000 V 2532000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3873000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2532000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# NBN Philippines
-S 3875000 H 3000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3875000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Al Masriyah
-S 3880000 H 2000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3880000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Viva Entertainment Multiplex
-S 3887000 H 6716000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3887000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6716000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# IBC13
-S 3896000 H 3000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3896000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# CTN Cambodia Multiplex
-S 3979000 V 9628000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3979000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 9628000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Divya TV
-S 3990000 V 13330000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3990000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 13330000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Familyland TV Network
-S 4164000 V 3735000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4164000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3735000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# MTV Philippines
-S 4171000 V 3213000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4171000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3213000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# The Old Path TV
-S 4183000 V 2170000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4183000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# UNTV
-S 4188000 V 2170000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4188000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Amazonas-61.0W b/dvb-s/Amazonas-61.0W
index 07fc1ba..b7471c1 100644
--- a/dvb-s/Amazonas-61.0W
+++ b/dvb-s/Amazonas-61.0W
@@ -1,54 +1,411 @@
# Amazonas @ 61.0W
# freq pol sr fec
-S 3957000 H 6666000 AUTO
-S 3966000 H 6666000 AUTO
-S 3975000 H 6666000 AUTO
-S 3993000 H 6666000 AUTO
-S 4137000 H 3409000 AUTO
-S 3941000 V 3480000 AUTO
-S 12092000 V 30000000 AUTO
-S 12132000 V 30000000 AUTO
-S 4174000 H 3330000 AUTO
-S 11128000 V 6666000 AUTO
-S 11185000 V 11800000 AUTO
-S 11049000 V 2000000 AUTO
-S 12052000 V 27000000 AUTO
-S 10975000 V 27000000 AUTO
-S 3631000 H 2785000 AUTO
-S 10975000 H 26666000 AUTO
-S 3677000 H 4400000 AUTO
-S 3985000 H 4444000 AUTO
-S 11810000 V 6666000 AUTO
-S 11921000 V 21740000 AUTO
-S 11943000 V 4750000 AUTO
-S 4168000 H 7307000 AUTO
-S 12052000 H 26667000 AUTO
-S 12172000 H 27500000 AUTO
-S 12092000 H 27500000 AUTO
-S 11175000 H 28880000 AUTO
-S 4154000 H 9615000 AUTO
-S 11099000 V 7576000 AUTO
-S 11885000 H 4890000 AUTO
-S 11882000 V 11343000 AUTO
-S 11133000 V 3111000 AUTO
-S 11078000 V 1862000 AUTO
-S 11912000 H 2222000 AUTO
-S 11906000 H 2220000 AUTO
-S 11108000 V 2170000 AUTO
-S 12132000 H 27500000 AUTO
-S 11135000 H 26667000 AUTO
-S 4144000 V 4540000 AUTO
-S 11808000 H 11111000 AUTO
-S 11972000 H 26667000 AUTO
-S 4156000 V 4540000 AUTO
-S 4149000 V 4540000 AUTO
-S 3948000 H 13300000 AUTO
-S 4178000 H 3333000 AUTO
-S 11844000 V 16600000 AUTO
-S 11095000 H 30000000 AUTO
-S 11790000 H 3600000 AUTO
-S 12172000 V 30000000 AUTO
-S 11015000 H 26666000 AUTO
-S 11055000 H 27500000 AUTO
-S 12012000 H 27500000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3957000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3966000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3975000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3993000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4137000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3409000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3941000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3480000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12092000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12132000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4174000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3330000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11128000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11185000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 11800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11049000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12052000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10975000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3631000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2785000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10975000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3677000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3985000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11810000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11921000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 21740000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11943000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4750000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4168000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7307000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12052000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26667000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12172000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12092000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11175000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28880000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4154000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 9615000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11099000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7576000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11885000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4890000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11882000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 11343000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11133000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11078000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1862000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11912000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11906000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2220000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11108000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12132000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11135000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26667000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4144000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4540000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11808000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 11111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11972000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26667000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4156000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4540000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4149000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4540000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3948000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13300000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]