aboutsummaryrefslogtreecommitdiffstats
path: root/dvb-t
diff options
context:
space:
mode:
authorChristoph Pfister <pfister@linuxtv.org>2008-07-22 20:50:52 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-07-22 20:50:52 +0200
commit301863eba2ab462da8067a8d08a3312b6d31a2f3 (patch)
treef85b4910e32f3a32607edd6c982b7acba629133d /dvb-t
parent51aebb1ae71bc8bcfbbd67f2033c0c7a7062d977 (diff)
downloaddtv-scan-tables-301863eba2ab462da8067a8d08a3312b6d31a2f3.tar.gz
make scan files syntax more strict /3
fec of the low priority stream is NONE if hierarchy is disabled the replaced values are either AUTO, 1/2 (that's due to EN300468 signalling) or are the same as the fec of the high priority stream
Diffstat (limited to 'dvb-t')
-rw-r--r--dvb-t/au-Cairns8
-rw-r--r--dvb-t/au-Canberra-Black-Mt4
-rw-r--r--dvb-t/au-canberra4
-rw-r--r--dvb-t/ch-Citycable24
-rw-r--r--dvb-t/de-Bremen14
-rw-r--r--dvb-t/de-Hamburg4
-rw-r--r--dvb-t/de-Osnabrueck6
-rw-r--r--dvb-t/de-Rostock4
-rw-r--r--dvb-t/de-Schwerin4
-rw-r--r--dvb-t/es-Albacete12
-rw-r--r--dvb-t/es-Alicante14
-rw-r--r--dvb-t/es-Bilbao12
-rw-r--r--dvb-t/es-Carceres18
-rw-r--r--dvb-t/es-Donostia12
-rw-r--r--dvb-t/es-Las_Palmas10
-rw-r--r--dvb-t/es-Madrid16
-rw-r--r--dvb-t/es-Malaga12
-rw-r--r--dvb-t/es-Santander8
-rw-r--r--dvb-t/es-Valladolid10
-rw-r--r--dvb-t/es-Zaragoza10
-rw-r--r--dvb-t/it-Aosta12
-rw-r--r--dvb-t/it-Bari16
-rw-r--r--dvb-t/it-Bologna26
-rw-r--r--dvb-t/it-Bolzano2
-rw-r--r--dvb-t/it-Cagliari38
-rw-r--r--dvb-t/it-Caivano8
-rw-r--r--dvb-t/it-Catania22
-rw-r--r--dvb-t/it-Conero6
-rw-r--r--dvb-t/it-Firenze18
-rw-r--r--dvb-t/it-Genova10
-rw-r--r--dvb-t/it-Livorno12
-rw-r--r--dvb-t/it-Milano14
-rw-r--r--dvb-t/it-Palermo18
-rw-r--r--dvb-t/it-Pisa16
-rw-r--r--dvb-t/it-Roma14
-rw-r--r--dvb-t/it-Sassari40
-rw-r--r--dvb-t/it-Varese10
-rw-r--r--dvb-t/it-Venezia14
-rw-r--r--dvb-t/lv-Riga12
-rw-r--r--dvb-t/nz-Waiatarua6
-rw-r--r--dvb-t/se-Karlstad_Sormon6
41 files changed, 263 insertions, 263 deletions
diff --git a/dvb-t/au-Cairns b/dvb-t/au-Cairns
index d9c62083..430045d8 100644
--- a/dvb-t/au-Cairns
+++ b/dvb-t/au-Cairns
@@ -1,12 +1,12 @@
# Australia / Cairns (Mt Bellenden-Ker transmitters)
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC VHF 8
-T 191500000 7MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 191500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# SEVEN VHF 11
T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# WIN VHF 12
-T 226500000 7MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# TEN VHF 6 (Expected Start Date Dec 2006)
-T 177500000 7MHz 3/4 1/2 QAM64 8k 1/16 NONE
+T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# SBS UHF 29
-T 536500000 7MHz 2/3 2/3 QAM64 8k 1/8 NONE
+T 536500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-Canberra-Black-Mt b/dvb-t/au-Canberra-Black-Mt
index a6751005..bdaa33c1 100644
--- a/dvb-t/au-Canberra-Black-Mt
+++ b/dvb-t/au-Canberra-Black-Mt
@@ -1,12 +1,12 @@
# Australia / Canberra / Black Mt
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC
-T 205500000 7MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 205500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# Prime
T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# WIN
T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# Ten
-T 177500000 7MHz 3/4 1/2 QAM64 8k 1/16 NONE
+T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# SBS
T 543500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-canberra b/dvb-t/au-canberra
index 18c0fdaa..792844df 100644
--- a/dvb-t/au-canberra
+++ b/dvb-t/au-canberra
@@ -1,12 +1,12 @@
# Australia / Canberra / Woden
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC
-T 205625000 7MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 205625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# Seven
T 177500000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
# Nine
T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# Ten
-T 219500000 7MHz 3/4 1/2 QAM64 8k 1/16 NONE
+T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# SBS
T 543500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/ch-Citycable b/dvb-t/ch-Citycable
index 3de688e5..6ed64f03 100644
--- a/dvb-t/ch-Citycable
+++ b/dvb-t/ch-Citycable
@@ -1,14 +1,14 @@
# Lausanne - Switzerland (DVB-T on CityCable cable network)
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 522000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 554000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 570000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 578000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 586000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 610000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 618000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 626000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 658000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 730000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 746000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
+T 498000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 522000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 554000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 570000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 578000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 586000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 610000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 618000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 626000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 658000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 730000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 746000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/de-Bremen b/dvb-t/de-Bremen
index bc05505c..8969f77d 100644
--- a/dvb-t/de-Bremen
+++ b/dvb-t/de-Bremen
@@ -1,9 +1,9 @@
# DVB-T Bremen/Unterweser
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 AUTO QAM16 8k 1/4 NONE
-T 538000000 8MHz 2/3 1/2 QAM16 8k 1/4 NONE
-T 562000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
-T 642000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
-T 666000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
-T 698000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
-T 746000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
+T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/de-Hamburg b/dvb-t/de-Hamburg
index a3658e5e..878ca8cf 100644
--- a/dvb-t/de-Hamburg
+++ b/dvb-t/de-Hamburg
@@ -3,13 +3,13 @@
T 205500000 7MHz 3/4 NONE QAM16 8k 1/8 NONE # CH09: NDR, WDR, MDR, Bayrisches Fernsehen
T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, Info/3sat, Doku/KiKa
T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 514000000 8MHz 3/4 AUTO QAM16 8k 1/4 NONE #ARD, MDR S-Anhalt, NDR MV, NDR SH, rbb Berlin
+T 514000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE #ARD, MDR S-Anhalt, NDR MV, NDR SH, rbb Berlin
T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: Sat.1, N24, ProSieben, KABEL1
T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: Das Erste Hamburg, Eins Extra, arte, Phoenix
T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: RTL Television, RTL2, Super RTL, VOX
T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: HH1, Eurosport, Terra Nova, Neun Live
-T 738000000 8MHz 3/4 AUTO QAM16 8k 1/4 NONE #ZDF, Doku/KiKa, Info/3sat
+T 738000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE #ZDF, Doku/KiKa, Info/3sat
T 754000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH56: NDR, MDR, WDR, hr
T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/de-Osnabrueck b/dvb-t/de-Osnabrueck
index 9bbb58e7..8a7ac030 100644
--- a/dvb-t/de-Osnabrueck
+++ b/dvb-t/de-Osnabrueck
@@ -1,5 +1,5 @@
# DVB-T Osnabrueck/Lingen
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 AUTO QAM16 8k 1/4 NONE
-T 778000000 8MHz 2/3 AUTO QAM16 8k 1/4 NONE
-T 602000000 8MHz 2/3 AUTO QAM16 8k 1/4 NONE
+T 634000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/de-Rostock b/dvb-t/de-Rostock
index 8e2dc75b..4dcdbe59 100644
--- a/dvb-t/de-Rostock
+++ b/dvb-t/de-Rostock
@@ -1,4 +1,4 @@
# DVB-T Rostock
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 1/2 QAM16 8k 1/4 NONE # ARD / NDR
-T 674000000 8MHz 2/3 1/2 QAM16 8k 1/4 NONE # ZDF
+T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # ARD / NDR
+T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # ZDF
diff --git a/dvb-t/de-Schwerin b/dvb-t/de-Schwerin
index 9f0ffd88..b0ca7e61 100644
--- a/dvb-t/de-Schwerin
+++ b/dvb-t/de-Schwerin
@@ -1,4 +1,4 @@
# DVB-T Schwerin M/V
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 3/4 AUTO QAM16 8k 1/4 NONE #ARD, MDR S-Anhalt, NDR MV, NDR SH, rbb Berlin
-T 738000000 8MHz 3/4 AUTO QAM16 8k 1/4 NONE #ZDF, Doku/KiKa, Info/3sat
+T 514000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE #ARD, MDR S-Anhalt, NDR MV, NDR SH, rbb Berlin
+T 738000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE #ZDF, Doku/KiKa, Info/3sat
diff --git a/dvb-t/es-Albacete b/dvb-t/es-Albacete
index ea67c6fc..419156b7 100644
--- a/dvb-t/es-Albacete
+++ b/dvb-t/es-Albacete
@@ -1,8 +1,8 @@
# Spain, Albacete
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 59: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 63: CLMTV
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 59: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: CLMTV
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
diff --git a/dvb-t/es-Alicante b/dvb-t/es-Alicante
index a804b38c..c8b5620d 100644
--- a/dvb-t/es-Alicante
+++ b/dvb-t/es-Alicante
@@ -1,9 +1,9 @@
# DVB-T Alicante, Spain
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 55: TV3, K33/33, 3/24, Canal 300
-T 770000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 58: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 63: Telemadrid, La Otra, Onda 6
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 55: TV3, K33/33, 3/24, Canal 300
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 58: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: Telemadrid, La Otra, Onda 6
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
diff --git a/dvb-t/es-Bilbao b/dvb-t/es-Bilbao
index 6d1b18a8..83313634 100644
--- a/dvb-t/es-Bilbao
+++ b/dvb-t/es-Bilbao
@@ -1,6 +1,6 @@
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 67: CNN+. Cuatro, La Sexta, 40 latino TV
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 69: Antena 3, La Sexta 2, Neo, Nova, Telehit, Onda Cero, Europa FM, Onda Melodia
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 63: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 794000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 61: ETB1, ETB2, ETB-Sat, Canal Vasco, Euskadi Irratia, Radio Euskadi, Euskadi Gastea, Radio EITB
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: CNN+. Cuatro, La Sexta, 40 latino TV
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, La Sexta 2, Neo, Nova, Telehit, Onda Cero, Europa FM, Onda Melodia
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 61: ETB1, ETB2, ETB-Sat, Canal Vasco, Euskadi Irratia, Radio Euskadi, Euskadi Gastea, Radio EITB
diff --git a/dvb-t/es-Carceres b/dvb-t/es-Carceres
index a809c6d4..3d3f77c4 100644
--- a/dvb-t/es-Carceres
+++ b/dvb-t/es-Carceres
@@ -1,10 +1,10 @@
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 39: 8Madrid, TMT-Popular TV, Kiss TV, Intereconomía TV
-T 706000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 50: EsMadrid TV, Ver-t, EM2, Libertad Digital TV
-T 770000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 58: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 63: Telemadrid, La Otra, Onda 6
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
-T 794000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 61: Canal Extremadura, Extremadura Television
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 39: 8Madrid, TMT-Popular TV, Kiss TV, Intereconomía TV
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 50: EsMadrid TV, Ver-t, EM2, Libertad Digital TV
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 58: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: Telemadrid, La Otra, Onda 6
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 61: Canal Extremadura, Extremadura Television
diff --git a/dvb-t/es-Donostia b/dvb-t/es-Donostia
index 7ea5f501..b8f233a7 100644
--- a/dvb-t/es-Donostia
+++ b/dvb-t/es-Donostia
@@ -1,14 +1,14 @@
# The channels with 1/32 guard-interval are French and should be perfectly visible
# here. However I have only managed to get a lock for the channel 57 of the French ones.
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 32: CNN+, Cuatro, La Sexta 1, 40 Latino TV, EPG Soge V2 5
-T 626000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 40: Antena 3, Antena.Neox, Antena.Nova, Telehit, Onda Cero, Europa FM, Onda Melodia, A3Lanzadera, A3Portal, EPGA3, A3Ticker
+T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 32: CNN+, Cuatro, La Sexta 1, 40 Latino TV, EPG Soge V2 5
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 40: Antena 3, Antena.Neox, Antena.Nova, Telehit, Onda Cero, Europa FM, Onda Melodia, A3Lanzadera, A3Portal, EPGA3, A3Ticker
T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Canal 42: Direct8, TMC, BFM, iTele, Europe2TV, Gulli
T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Canal 49: M6, W9, NT1
T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Canal 51: Canal+, Canal+ Cinema, Canal+ Sport
T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Canal 57: TF1, NRJ12, Eurosport, TPS Star, LCI
-T 786000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 60: ETB1, ETB2, ETB-Sat, Canal Vasco, Euskadi Irratia, Radio Euskadi, Euskadi Gaztea, Radio Etb, TGov, Eguraldi
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 63: TVE1, TVE2, 24H TVE, Clan/TVE 50 anos, RNE, RNEC, RNE3, Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 60: ETB1, ETB2, ETB-Sat, Canal Vasco, Euskadi Irratia, Radio Euskadi, Euskadi Gaztea, Radio Etb, TGov, Eguraldi
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: TVE1, TVE2, 24H TVE, Clan/TVE 50 anos, RNE, RNEC, RNE3, Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat
T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Canal 65: France 2, France 3, France 4, France 5, Arte, LCP
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 66: Net TV, Teledeporte, Veo TV1, Veo TV2, Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 68: Fly Music, Tele 5, Tele 5 Estrellas, Tele 5 Sport
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Net TV, Teledeporte, Veo TV1, Veo TV2, Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Fly Music, Tele 5, Tele 5 Estrellas, Tele 5 Sport
diff --git a/dvb-t/es-Las_Palmas b/dvb-t/es-Las_Palmas
index 04759374..c68abe38 100644
--- a/dvb-t/es-Las_Palmas
+++ b/dvb-t/es-Las_Palmas
@@ -1,8 +1,8 @@
# Funciona correctamente en Las Palmas de Gran Canaria (24-4-2007)
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 786000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 60: TVE1, TVE2, 24H TVE, Clan/TVE, RNE, RNEC, RNE3, Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 60: TVE1, TVE2, 24H TVE, Clan/TVE, RNE, RNEC, RNE3, Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat
T 826000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 65: TV C, TV C2
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 66: Net TV, Teledeporte, Veo TV1, SETenVeo, Radio Intereconomía Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 67: CNN+, Cuatro, La Sexta 1, 40 Latino TV, EPG Soge V2 5
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 68: Fly Music, Punto Radio, Tele 5, Tele 5 Estrellas, Tele 5 Sport
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena.Neox, Antena.Nova, Telehit, Onda Cero, Europa FM, Onda Melodia, A3Lanzadera, A3Portal, EPGA3, A3Ticker
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Net TV, Teledeporte, Veo TV1, SETenVeo, Radio Intereconomía Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: CNN+, Cuatro, La Sexta 1, 40 Latino TV, EPG Soge V2 5
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Fly Music, Punto Radio, Tele 5, Tele 5 Estrellas, Tele 5 Sport
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena.Neox, Antena.Nova, Telehit, Onda Cero, Europa FM, Onda Melodia, A3Lanzadera, A3Portal, EPGA3, A3Ticker
diff --git a/dvb-t/es-Madrid b/dvb-t/es-Madrid
index 5834bd1a..650436aa 100644
--- a/dvb-t/es-Madrid
+++ b/dvb-t/es-Madrid
@@ -1,8 +1,8 @@
-T 618000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 39: 8Madrid, TMT-Popular TV, Kiss TV, Intereconomía TV
-T 706000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 50: EsMadrid TV, Ver-t, EM2, Libertad Digital TV
-T 770000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 58: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 63: Telemadrid, La Otra, Onda 6
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 39: 8Madrid, TMT-Popular TV, Kiss TV, Intereconomía TV
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 50: EsMadrid TV, Ver-t, EM2, Libertad Digital TV
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 58: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: Telemadrid, La Otra, Onda 6
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
diff --git a/dvb-t/es-Malaga b/dvb-t/es-Malaga
index 66ec9000..290e1860 100644
--- a/dvb-t/es-Malaga
+++ b/dvb-t/es-Malaga
@@ -1,9 +1,9 @@
# DVB-T Malaga (Andalucia) by Pedro Leon 4 Mayo 2007
# T freq bw fec_hi fec_lo mod transm-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # C57 La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # C63 Canal Sur, Canal 2 Andalucia
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # C66 TELEDEPORTE, VEO, *Canal Ingenieria, SETenVEO, Tienda en VEO, NET TV, Radio Intereconomia
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # C67 CUATRO, CNN+, 40 LATINO, laSexta
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # C68 Telecinco, T5 Estrellas, T5 Sport, FLYMUSIC, PUNTO RADIO
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # C69 ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, *tvtv DIGITAL, ONDA CERO, EUROPA FM, ONDA MELODIA, Telehit
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C57 La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C63 Canal Sur, Canal 2 Andalucia
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C66 TELEDEPORTE, VEO, *Canal Ingenieria, SETenVEO, Tienda en VEO, NET TV, Radio Intereconomia
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C67 CUATRO, CNN+, 40 LATINO, laSexta
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C68 Telecinco, T5 Estrellas, T5 Sport, FLYMUSIC, PUNTO RADIO
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C69 ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, *tvtv DIGITAL, ONDA CERO, EUROPA FM, ONDA MELODIA, Telehit
# * Canales de datos o MHT
diff --git a/dvb-t/es-Santander b/dvb-t/es-Santander
index 94326d4b..214badbe 100644
--- a/dvb-t/es-Santander
+++ b/dvb-t/es-Santander
@@ -1,7 +1,7 @@
# file automatically generated by w_scan
# (http://wirbel.htpc-forum.de/w_scan/index2.html)
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 2/3 QAM64 8k 1/4 NONE
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/es-Valladolid b/dvb-t/es-Valladolid
index 25cb74ad..961554b4 100644
--- a/dvb-t/es-Valladolid
+++ b/dvb-t/es-Valladolid
@@ -1,7 +1,7 @@
# DVB-T Valladolid
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 57: Clan TVE, 24H TVE, La 2, TVE 1, RNE1, RNE3, RNC
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 57: Clan TVE, 24H TVE, La 2, TVE 1, RNE1, RNE3, RNC
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
diff --git a/dvb-t/es-Zaragoza b/dvb-t/es-Zaragoza
index 95588b62..b9a3c90a 100644
--- a/dvb-t/es-Zaragoza
+++ b/dvb-t/es-Zaragoza
@@ -1,7 +1,7 @@
# DVB-T Zaragoza (Aragón) [Spain] [es-Zaragoza]
# Generated by Víctor Martínez Romanos <vmromanos@gmail.com>
-T 794000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 63: TVE 1, TVE 2, 24H, CLAN/50, RNE1, RNEC, RNE3
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 66: TELEDEPORTE, VEO TV, VEO 2, NET TV
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 67: CUATRO, CNN+, 40 LATINO, LA SEXTA 1
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 68: T5 ESTRELLAS, T5 SPORT, TELECINCO, FLYMUSIC
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 69: ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, LA SEXTA 2
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: TVE 1, TVE 2, 24H, CLAN/50, RNE1, RNEC, RNE3
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: TELEDEPORTE, VEO TV, VEO 2, NET TV
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: CUATRO, CNN+, 40 LATINO, LA SEXTA 1
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: T5 ESTRELLAS, T5 SPORT, TELECINCO, FLYMUSIC
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, LA SEXTA 2
diff --git a/dvb-t/it-Aosta b/dvb-t/it-Aosta
index 486407d3..28c32ae9 100644
--- a/dvb-t/it-Aosta
+++ b/dvb-t/it-Aosta
@@ -8,14 +8,14 @@
# inviare una maila kaffeine-user@lists.sf.net per aggiornare/correggere questo file...
#
# MUX-A RAI
-T 226500000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 226500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 1
-T 474000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MBONE
-T 746000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX DFREE
-T 762000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 2
-T 770000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# TIMB1
-T 786000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Bari b/dvb-t/it-Bari
index 5be8ac4f..efcc8523 100644
--- a/dvb-t/it-Bari
+++ b/dvb-t/it-Bari
@@ -1,18 +1,18 @@
# Italy, Bari
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# MUX-A RAI
-T 219500000 7MHz 2/3 AUTO QAM64 8k 1/32 NONE
+T 219500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-B RAI
-T 546000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 1
-T 514000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX DFREE
-T 226500000 7MHz 2/3 AUTO QAM64 8k 1/32 NONE
+T 226500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 2
-T 826000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MBONE
-T 498000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# TIMB1
-T 530000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# TeleNorba, TelePuglia, altro...
-T 794000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Bologna b/dvb-t/it-Bologna
index dcd8e350..8f5a1360 100644
--- a/dvb-t/it-Bologna
+++ b/dvb-t/it-Bologna
@@ -1,28 +1,28 @@
# DVB-T Collserola (Barcelona)
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#TeleSanterno
-T 186000000 7MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 186000000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
#RaiA
-T 203500000 7MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 203500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
#Sestarete / Rete 7
-T 212500000 7MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 212500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
#Modena
-T 219500000 7MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 219500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
#ReteA, Camera e Senato
-T 594000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
#Sestarete / Rete 7
-T 610000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
#DFree
-T 634000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
#Mediaset Mux-B
-T 698000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
#La7
-T 714000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
#RaiB
-T 722000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
#Mediaset Mux-A
-T 794000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
#TeleSanterno
-T 802000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
#LA7-2
-T 842000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Bolzano b/dvb-t/it-Bolzano
index de50c1e3..f4a8e9b1 100644
--- a/dvb-t/it-Bolzano
+++ b/dvb-t/it-Bolzano
@@ -2,4 +2,4 @@
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#RAS DVB-t NETWORK
-T 698000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
+T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/it-Cagliari b/dvb-t/it-Cagliari
index 9dcaf53b..d2566bd1 100644
--- a/dvb-t/it-Cagliari
+++ b/dvb-t/it-Cagliari
@@ -1,31 +1,31 @@
# DVB-T Cagliari
# MUX DFREE
-T 730000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX LA7/MTV
-T 474000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET1
-T 826000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET2
-T 562000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 562000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-A RAI
-T 546000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 530000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-B RAI
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# TCS
-T 658000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# VIDEOLINA
-T 610000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# TIMEDIA MUX A
-T 818000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 650000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# T 474000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# TIMEDIA MUX B
-T 177500000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 602000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# T 177500000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 177500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# T 177500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# SUPER TV
-# T 650000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+# T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Caivano b/dvb-t/it-Caivano
index c823a6f4..96eabc97 100644
--- a/dvb-t/it-Caivano
+++ b/dvb-t/it-Caivano
@@ -5,10 +5,10 @@
#################################
# MUX LA7/MTV
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 1
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 2
-T 706000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-A RAI
-T 722000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Catania b/dvb-t/it-Catania
index c4d08492..bf1e1c51 100644
--- a/dvb-t/it-Catania
+++ b/dvb-t/it-Catania
@@ -2,26 +2,26 @@
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# MUX DFREE (Canale 5,Italia1,SportItalia,LCI,RadioItalia Tv)
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 690000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 618000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX LA7/MTV (La 7,MTV ITALIA,Canale D,Music Box)
-#T 586000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+#T 586000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX RTI (Rete 4,Class News,Sole 24 Ore TV,BBC World)
-T 586000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 586000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 1
-T 226500000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 226500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 2
-T 818000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 650000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-A RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
-T 610000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-B RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
-T 482000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Conero b/dvb-t/it-Conero
index 318775fd..2d481388 100644
--- a/dvb-t/it-Conero
+++ b/dvb-t/it-Conero
@@ -1,8 +1,8 @@
# Italia / Conero (it-Conero) -- mailto: simon <f.simon@email.it>
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# C50
-T 706000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# C46
-T 674000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# C21
-T 474000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Firenze b/dvb-t/it-Firenze
index 2ebe9e64..eca721a8 100644
--- a/dvb-t/it-Firenze
+++ b/dvb-t/it-Firenze
@@ -1,20 +1,20 @@
# This channel list is made by Michele Ficarra
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# MUX-A RAI
-T 554000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 554000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-B RAI
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 1
-T 682000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 2
-T 826000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX La7/MTV
-T 618000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX DFREE
-T 738000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MBON
-T 778000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX Digitoscana
-T 219500000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 219500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX Tele37
-T 786000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Genova b/dvb-t/it-Genova
index 5b5c6704..5a1b6ddd 100644
--- a/dvb-t/it-Genova
+++ b/dvb-t/it-Genova
@@ -1,12 +1,12 @@
# Italia / Genova (it-Genova) - Angelo Conforti <angeloxx@angeloxx.it>
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# MUX-A RAI
-T 498000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-B RAI
-T 219500000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 219500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX La7/MTV
-T 682000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX DFREE
-T 770000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX Mediaset
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Livorno b/dvb-t/it-Livorno
index bf83a4a7..075d8b4e 100644
--- a/dvb-t/it-Livorno
+++ b/dvb-t/it-Livorno
@@ -2,14 +2,14 @@
# Thanks to: Alessandro Guarguaglini, Stefano Lenzi
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# MUX-A RAI
-T 698000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-B RAI
-T 658000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 1
-T 618000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 2
-T 754000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX La7/MTV
-T 818000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX DFREE
-T 586000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 586000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Milano b/dvb-t/it-Milano
index 2b70cd10..5854044b 100644
--- a/dvb-t/it-Milano
+++ b/dvb-t/it-Milano
@@ -1,15 +1,15 @@
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# MUX-A RAI
-T 818000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-B RAI
-T 482000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-A MEDIASET
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-A MEDIASET-2
-T 618000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX La7/MTV
-T 506000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX DFREE
-T 706000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX DFREE 2
-T 538000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Palermo b/dvb-t/it-Palermo
index 8043acdb..7d0c8b42 100644
--- a/dvb-t/it-Palermo
+++ b/dvb-t/it-Palermo
@@ -2,22 +2,22 @@
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# MUX DFREE (Canale 5,Italia1,SportItalia,LCI,RadioItalia Tv)
-T 754000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 602000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX LA7/MTV (La 7,MTV ITALIA,Canale D,Music Box)
-#T 730000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+#T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX RTI (Rete 4,Class News,Sole 24 Ore TV,BBC World)
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 2
-T 682000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 650000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-A RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
-T 610000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-B RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
-T 482000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Pisa b/dvb-t/it-Pisa
index 59904023..8723d99e 100644
--- a/dvb-t/it-Pisa
+++ b/dvb-t/it-Pisa
@@ -2,17 +2,17 @@
# Thanks to: Alessandro Guarguaglini, Stefano Lenzi
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# MUX-A RAI
-T 698000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-B RAI
-T 658000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 1
-T 634000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 618000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX DFREE
-T 746000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 2
-T 754000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MBONE
-T 818000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX TIMB1
-T 762000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Roma b/dvb-t/it-Roma
index 44630745..7e849009 100644
--- a/dvb-t/it-Roma
+++ b/dvb-t/it-Roma
@@ -1,16 +1,16 @@
# DVB-T Roma
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# MUX DFREE
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX La7/MTV
-T 730000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 1
-T 626000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET 2
-T 762000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-A RAI
-T 698000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-B RAI
-T 186000000 7MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 186000000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
# SUPER 3
-T 538000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Sassari b/dvb-t/it-Sassari
index c81254e2..23ba8174 100644
--- a/dvb-t/it-Sassari
+++ b/dvb-t/it-Sassari
@@ -1,33 +1,33 @@
# DVB-T Sassari Channels List by frippertronics@alice.it ;)
# MUX DFREE
-T 746000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX LA7/MTV
-T 826000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET1
-T 802000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX MEDIASET2
-T 634000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-A RAI
-T 786000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 530000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX-B RAI
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MBONE
-T 738000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# TCS
-T 658000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# VIDEOLINA
-T 610000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# TIMEDIA MUX A
-T 818000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 650000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# T 474000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# TIMEDIA MUX B
-T 177500000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 602000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# T 177500000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 177500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# T 177500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# SUPER TV
-# T 650000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+# T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Varese b/dvb-t/it-Varese
index 045b56c3..7ee9bb5e 100644
--- a/dvb-t/it-Varese
+++ b/dvb-t/it-Varese
@@ -5,12 +5,12 @@
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# MUX-A RAI VHF H2 226,5 O CAMPO DEI FIORI
-T 226500000 7MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 226500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX DFREE UHF C50 706 V CAMPO DEI FIORI
-T 706000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX LA7-MTV UHF C37 602 V CAMPO DEI FIORI
-T 602000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX RTI UHF C26 514 O CAMPO DEI FIORI PRIMA CAPPELLA
-T 514000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# MUX RTI UHF C38 514 V CAMPO DEI FIORI ALBERGO
-T 610000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Venezia b/dvb-t/it-Venezia
index be454e40..af9f4a1d 100644
--- a/dvb-t/it-Venezia
+++ b/dvb-t/it-Venezia
@@ -4,16 +4,16 @@
# According to Eurosat 1/2006
#
# C50 - MediaSet
-T 706000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# C37 - Rai A - Doesn't work in Mestre though
-T 602000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# C23 -Rai B
-T 490000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# C64 DFree
-T 818000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# C65 La 7
-T 826000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# C58 Mediaset 2
-T 770000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
# C36 DFree
-T 594000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/lv-Riga b/dvb-t/lv-Riga
index 0fb9b9a6..98478e04 100644
--- a/dvb-t/lv-Riga
+++ b/dvb-t/lv-Riga
@@ -8,12 +8,12 @@
T 610000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE # Weak signal! Vājš signāls! Слабый сигнал!
# Baltkom TV
-T 650000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
-T 658000000 8MHz 1/2 1/2 QPSK 8k 1/4 NONE
-T 666000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
-T 690000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
-T 778000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
-T 834000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 650000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 658000000 8MHz 1/2 NONE QPSK 8k 1/4 NONE
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 778000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 834000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
# WARNING!
# Some applications detect incorrect guard-interval.
diff --git a/dvb-t/nz-Waiatarua b/dvb-t/nz-Waiatarua
index 2fbea4fc..d6c7dac2 100644
--- a/dvb-t/nz-Waiatarua
+++ b/dvb-t/nz-Waiatarua
@@ -6,8 +6,8 @@
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# Multiplex DA
-T 538000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 538000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
# Multiplex DB
-T 570000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 570000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
# Multiplex DC
-T 666000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/se-Karlstad_Sormon b/dvb-t/se-Karlstad_Sormon
index c9cb8e25..658bc70d 100644
--- a/dvb-t/se-Karlstad_Sormon
+++ b/dvb-t/se-Karlstad_Sormon
@@ -2,8 +2,8 @@
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# Channels
# Mux3=30
-T 546000000 8MHz 2/3 1/2 QAM64 8k 1/8 NONE
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
# Mux4=42
-T 642000000 8MHz 2/3 1/2 QAM64 8k 1/8 NONE
+T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
# Mux1=43
-T 650000000 8MHz 2/3 1/2 QAM64 8k 1/8 NONE
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE