Imported Upstream version 1.1.1+rev1273upstream/1.1.1+rev1273

13 files changed, 242 insertions, 114 deletions

diff --git a/util/scan/dvb-c/at-KarrerNet b/util/scan/dvb-c/at-KarrerNet
new file mode 100644
index 0000000..27e143a
--- /dev/null
+++ b/util/scan/dvb-c/at-KarrerNet
@@ -0,0 +1,18 @@
+# Kabel St. Florian bei Linz/AT KarrerNet
+# 2009-01-10
+# freq sr fec mod
+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 522000000 6900000 NONE QAM64
+C 530000000 6900000 NONE QAM64
+C 538000000 6900000 NONE QAM64
+C 578000000 6900000 NONE QAM64
+C 402000000 6900000 NONE QAM256
+C 410000000 6900000 NONE QAM256
diff --git a/util/scan/dvb-c/at-SalzburgAG b/util/scan/dvb-c/at-SalzburgAG
index 58fd3ce..9a03242 100644
--- a/util/scan/dvb-c/at-SalzburgAG
+++ b/util/scan/dvb-c/at-SalzburgAG
@@ -6,4 +6,3 @@ C 410000000 6900000 NONE QAM64
 C 418000000 6900000 NONE QAM64
 C 426000000 6900000 NONE QAM64
 C 442000000 6900000 NONE QAM64
-C 306000000 6900000 NONE QAM64
diff --git a/util/scan/dvb-c/ch-Rega-Sense b/util/scan/dvb-c/ch-Rega-Sense
new file mode 100644
index 0000000..b072e51
--- /dev/null
+++ b/util/scan/dvb-c/ch-Rega-Sense
@@ -0,0 +1,34 @@
+# Rega Sense, Switzerland
+# freq sr fec mod
+
+# Pay TV
+C 434000000 6900000 NONE QAM64 # Teleclub
+C 714000000 6900000 NONE QAM64
+C 722000000 6900000 NONE QAM64
+
+# 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
+
+# HDTV
+C 642000000 6900000 NONE QAM256
+C 690000000 6900000 NONE QAM256
diff --git a/util/scan/dvb-c/cz-Moravianet b/util/scan/dvb-c/cz-Moravianet
new file mode 100644
index 0000000..39b379a
--- /dev/null
+++ b/util/scan/dvb-c/cz-Moravianet
@@ -0,0 +1,24 @@
+# DVB-C Moravianet (http://www.moravia.net/)
+# Available in villages and cities around Brno:
+# Bohuslavice, Bukovany, Hrusovany u Brna, Hustopece, Ivancice, Jirikovice,
+# Kyjov, Moravsky Krumlov, Mutenice, Neslovice, Nove Branice, Oslavany,
+# Popuvky, Padochov, Troubsko, Rosice, Tisnov, Vojkovice, Svatoborice,
+# Slapanice, Zabcice, Zidlochovice
+# The same content is available also from NejTV where they provide DVB-C.
+# Currently it is in Havlickuv Brod, Breclav, Velke Mezirici
+#
+# 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
diff --git a/util/scan/dvb-c/de-Muenchen b/util/scan/dvb-c/de-Muenchen
index c963c88..e7f5b3a 100644
--- a/util/scan/dvb-c/de-Muenchen
+++ b/util/scan/dvb-c/de-Muenchen
@@ -1,24 +1,27 @@
-# 2008-04-28
+# 2008-06-22
 # Area: Muenchen City
 # Cable Provider: Kabel & Medien Service - http://www.atcable.de
 # Cable Content: Cablevista GmbH - http://www.cablevista.de
 #
 # freq sr fec mod
-C 113000000 6900000 AUTO QAM64
-C 121000000 6900000 AUTO QAM64
-C 346000000 6900000 AUTO QAM64
-C 354000000 6900000 AUTO QAM64
-C 362000000 6900000 AUTO QAM64
-C 370000000 6900000 AUTO QAM64
-C 378000000 6900000 AUTO QAM64
-C 386000000 6900000 AUTO QAM64
-C 394000000 6900000 AUTO QAM64
-C 402000000 6900000 AUTO QAM64
-C 410000000 6900000 AUTO QAM64
-C 418000000 6900000 AUTO QAM64
-C 426000000 6900000 AUTO QAM64
-C 434000000 6900000 AUTO QAM64
-C 442000000 6900000 AUTO QAM64
-C 450000000 6900000 AUTO QAM64
-C 466000000 6900000 AUTO QAM64
-C 458000000 6900000 AUTO QAM256
+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
diff --git a/util/scan/dvb-c/de-Primacom b/util/scan/dvb-c/de-Primacom
index 3f93f75..2d4870f 100644
--- a/util/scan/dvb-c/de-Primacom
+++ b/util/scan/dvb-c/de-Primacom
@@ -1,29 +1,23 @@
 # Primacom
 # freq sr fec mod
-C 306000000 6900000 AUTO QAM64
-C 314000000 6900000 AUTO QAM64
-C 322000000 6900000 AUTO QAM64
-C 330000000 6900000 AUTO QAM64
-C 338000000 6900000 AUTO QAM64
-C 346000000 6900000 AUTO QAM64
-C 354000000 6900000 AUTO QAM64
-C 362000000 6900000 AUTO QAM64
-C 370000000 6900000 AUTO QAM64
-C 378000000 6900000 AUTO QAM64
-C 386000000 6900000 AUTO QAM64
-C 394000000 6900000 AUTO QAM64
-C 402000000 6900000 AUTO QAM64
-C 410000000 6900000 AUTO QAM64
-C 418000000 6900000 AUTO QAM64
-C 426000000 6900000 AUTO QAM64
-C 434000000 6956000 AUTO QAM64
-C 610000000 6900000 AUTO QAM64
-C 746000000 6900000 AUTO QAM64
-C 754000000 6900000 AUTO QAM64
-C 762000000 6900000 AUTO QAM64
-C 802000000 6900000 AUTO QAM64
-C 810000000 6900000 AUTO QAM64
-C 818000000 6900000 AUTO QAM64
-C 826000000 6900000 AUTO QAM64
-C 834000000 6900000 AUTO QAM64
-C 634000000 6900000 AUTO QAM256
+C 121000000 6900000 NONE QAM64
+C 306000000 6900000 NONE QAM64
+C 314000000 6900000 NONE QAM64
+C 322000000 6900000 NONE QAM64
+C 330000000 6900000 NONE QAM64
+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 418000000 6900000 NONE QAM256
+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 610000000 6900000 NONE QAM64
+C 746000000 6900000 NONE QAM64
diff --git a/util/scan/dvb-c/de-Unitymedia b/util/scan/dvb-c/de-Unitymedia
index 96d1d38..3ba9c21 100644
--- a/util/scan/dvb-c/de-Unitymedia
+++ b/util/scan/dvb-c/de-Unitymedia
@@ -2,34 +2,34 @@
 # Created from http://www.unitymedia.de/service/tv/frequenzen.html
 # and http://blob.unitymedia.de/Download/Unitymedia_Senderlineup_digital_2008-05-28.pdf
 # freq sr fec mod
-C 113000000 6900000 AUTO QAM256
-C 121000000 6900000 AUTO QAM256
-C 338000000 6900000 AUTO QAM256
-C 346000000 6900000 AUTO QAM256
-C 354000000 6900000 AUTO QAM64
-C 362000000 6900000 AUTO QAM64
-C 370000000 6900000 AUTO QAM64
-C 378000000 6900000 AUTO QAM64
-C 386000000 6900000 AUTO QAM64
-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 442000000 6900000 AUTO QAM64
-C 450000000 6900000 AUTO QAM64
-C 458000000 6900000 AUTO QAM256
-C 466000000 6900000 AUTO QAM256
-C 474000000 6900000 AUTO QAM64
-C 522000000 6900000 AUTO QAM256
-C 530000000 6900000 AUTO QAM256
-C 538000000 6900000 AUTO QAM256
-C 554000000 6900000 AUTO QAM256
-C 562000000 6900000 AUTO QAM256
-C 570000000 6900000 AUTO QAM256
-C 610000000 6900000 AUTO QAM64
-C 650000000 6900000 AUTO QAM256
-C 658000000 6900000 AUTO QAM256
-C 666000000 6900000 AUTO QAM256
-C 674000000 6900000 AUTO QAM256
+C 113000000 6900000 NONE QAM256
+C 121000000 6900000 NONE QAM256
+C 338000000 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 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 QAM64
+C 450000000 6900000 NONE QAM64
+C 458000000 6900000 NONE QAM256
+C 466000000 6900000 NONE QAM256
+C 474000000 6900000 NONE QAM64
+C 522000000 6900000 NONE QAM256
+C 530000000 6900000 NONE QAM256
+C 538000000 6900000 NONE QAM256
+C 554000000 6900000 NONE QAM256
+C 562000000 6900000 NONE QAM256
+C 570000000 6900000 NONE QAM256
+C 610000000 6900000 NONE QAM64
+C 650000000 6900000 NONE QAM256
+C 658000000 6900000 NONE QAM256
+C 666000000 6900000 NONE QAM256
+C 674000000 6900000 NONE QAM256
diff --git a/util/scan/dvb-c/dk-Copenhagen-AFDK b/util/scan/dvb-c/dk-Copenhagen-AFDK
new file mode 100644
index 0000000..2baa66d
--- /dev/null
+++ b/util/scan/dvb-c/dk-Copenhagen-AFDK
@@ -0,0 +1,11 @@
+# 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
diff --git a/util/scan/dvb-c/dk-Odense b/util/scan/dvb-c/dk-Odense
index 132dd5a..06a00c2 100644
--- a/util/scan/dvb-c/dk-Odense
+++ b/util/scan/dvb-c/dk-Odense
@@ -2,9 +2,9 @@
 # freq sr fec mod
 C 442000000 6900000 NONE QAM64
 C 434000000 6875000 NONE QAM256
-C 255000000 5000000 2/3 QAM256
-C 506000000 6875000 2/3 QAM256
-C 562000000 6875000 2/3 QAM256
-C 610000000 6875000 2/3 QAM256
-C 754000000 6875000 2/3 QAM256
-C 770000000 6875000 2/3 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
diff --git a/util/scan/dvb-c/es-Euskaltel b/util/scan/dvb-c/es-Euskaltel
index 7612425..46603e4 100644
--- a/util/scan/dvb-c/es-Euskaltel
+++ b/util/scan/dvb-c/es-Euskaltel
@@ -3,17 +3,17 @@
 # file automatically generated by w_scan
 # (http://free.pages.at/wirbel4vdr/w_scan/index2.html)
 # freq sr fec mod
-C 714000000 6875000 3/4 QAM64
-C 722000000 6875000 3/4 QAM64
-C 730000000 6875000 3/4 QAM64
-C 738000000 6875000 3/4 QAM64
-C 746000000 6875000 3/4 QAM64
-C 754000000 6875000 3/4 QAM64
-C 762000000 6875000 3/4 QAM64
-C 770000000 6875000 3/4 QAM64
-C 778000000 6875000 3/4 QAM64
-C 786000000 6875000 3/4 QAM64
-C 794000000 6875000 3/4 QAM64
-C 802000000 6875000 3/4 QAM64
-C 810000000 6875000 3/4 QAM64
-C 818000000 6875000 3/4 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 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
diff --git a/util/scan/dvb-c/lu-Ettelbruck-ACE b/util/scan/dvb-c/lu-Ettelbruck-ACE
index ba770c2..a0222b5 100644
--- a/util/scan/dvb-c/lu-Ettelbruck-ACE
+++ b/util/scan/dvb-c/lu-Ettelbruck-ACE
@@ -2,19 +2,19 @@
 # (http://antenne-ettelbruck.lu)
 # Luxembourg - Ettelbruck
 # freq sr fec mod
-C 634000000 6900000 5/6 QAM64
-C 642000000 6900000 5/6 QAM64
-C 650000000 6900000 5/6 QAM64
-C 666000000 6900000 5/6 QAM64
-C 674000000 6900000 5/6 QAM64
-C 682000000 6900000 5/6 QAM64
-C 690000000 6900000 5/6 QAM64
-C 698000000 6900000 5/6 QAM64
-C 706000000 6900000 5/6 QAM64
-C 714000000 6900000 5/6 QAM64
-C 656000000 3450000 5/6 QAM64
-C 660000000 3450000 5/6 QAM64
-C 720000000 3450000 5/6 QAM64
-C 732000000 3450000 5/6 QAM64
-C 724000000 3450000 5/6 QAM64
-C 728000000 3450000 5/6 QAM64
+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
diff --git a/util/scan/dvb-c/no-Oslo-Get b/util/scan/dvb-c/no-Oslo-Get
new file mode 100644
index 0000000..42e17bb
--- /dev/null
+++ b/util/scan/dvb-c/no-Oslo-Get
@@ -0,0 +1,22 @@
+# 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
diff --git a/util/scan/dvb-c/se-Gothnet b/util/scan/dvb-c/se-Gothnet
new file mode 100644
index 0000000..8b04ef7
--- /dev/null
+++ b/util/scan/dvb-c/se-Gothnet
@@ -0,0 +1,23 @@
+# Gothnet DVB-C
+# Updated: 2008-09-19
+# 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
+
+# SPA channels
+C 682000000 6900000 NONE QAM64
+C 690000000 6900000 NONE QAM64
+C 698000000 6900000 NONE QAM64
+C 706000000 6900000 NONE QAM64
+
+# 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