Imported Upstream version 1.1.1+rev1457upstream/1.1.1+rev1457

13 files changed, 176 insertions, 58 deletions

diff --git a/util/scan/dvb-c/br-Net-Digital b/util/scan/dvb-c/br-Net-Digital
new file mode 100644
index 0000000..8900124
--- /dev/null
+++ b/util/scan/dvb-c/br-Net-Digital
@@ -0,0 +1,6 @@
+# Net Digital
+# Just the initial transponder is enough
+
+# freq sr fec mod
+# Found on Sao Jose dos Campos, SP
+C 573000000 5217000 NONE QAM256
diff --git a/util/scan/dvb-c/de-Brandenburg-Havel b/util/scan/dvb-c/de-Brandenburg-Havel
new file mode 100644
index 0000000..088f113
--- /dev/null
+++ b/util/scan/dvb-c/de-Brandenburg-Havel
@@ -0,0 +1,30 @@
+# 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
diff --git a/util/scan/dvb-c/de-Primacom b/util/scan/dvb-c/de-Primacom
index 2d4870f..1e99b4c 100644
--- a/util/scan/dvb-c/de-Primacom
+++ b/util/scan/dvb-c/de-Primacom
@@ -1,6 +1,9 @@
 # Primacom
 # freq sr fec mod
 C 121000000 6900000 NONE QAM64
+C 129000000 6900000 NONE QAM256
+C 137000000 6900000 NONE QAM256
+C 145000000 6900000 NONE QAM256
 C 306000000 6900000 NONE QAM64
 C 314000000 6900000 NONE QAM64
 C 322000000 6900000 NONE QAM64
@@ -13,6 +16,8 @@ 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 434000000 6900000 NONE QAM64
 C 442000000 6900000 NONE QAM64
diff --git a/util/scan/dvb-c/de-Unitymedia b/util/scan/dvb-c/de-Unitymedia
index 3ba9c21..b01020d 100644
--- a/util/scan/dvb-c/de-Unitymedia
+++ b/util/scan/dvb-c/de-Unitymedia
@@ -1,35 +1,36 @@
 # Unitymedia
-# Created from http://www.unitymedia.de/service/tv/frequenzen.html
-# and http://blob.unitymedia.de/Download/Unitymedia_Senderlineup_digital_2008-05-28.pdf
+# 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 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 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 QAM64
-C 450000000 6900000 NONE QAM64
+C 442000000 6900000 NONE QAM256
+C 450000000 6900000 NONE QAM256
 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 546000000 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
+C 682000000 6900000 NONE QAM256
+C 690000000 6900000 NONE QAM256
+C 698000000 6900000 NONE QAM256
diff --git a/util/scan/dvb-c/de-komro-Rosenheim b/util/scan/dvb-c/de-komro-Rosenheim
new file mode 100644
index 0000000..624513e
--- /dev/null
+++ b/util/scan/dvb-c/de-komro-Rosenheim
@@ -0,0 +1,30 @@
+# 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
diff --git a/util/scan/dvb-c/de-neftv b/util/scan/dvb-c/de-neftv
index 59e7658..4de6b42 100644
--- a/util/scan/dvb-c/de-neftv
+++ b/util/scan/dvb-c/de-neftv
@@ -1,7 +1,8 @@
 # Cable conf for NEFtv
-# (Nuernberg, Erlangen, Fuerth and Herzogenaurach)
+# (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
@@ -10,14 +11,24 @@ C 378000000 6875000 NONE QAM64
 C 386000000 6875000 NONE QAM64
 C 394000000 6875000 NONE QAM64
 C 402000000 6875000 NONE QAM64
-C 410000000 6875000 NONE QAM64
+C 410000000 6900000 NONE QAM64
 C 418000000 6875000 NONE QAM64
-C 426000000 6875000 NONE QAM64
-C 434000000 6875000 NONE QAM64
-C 450000000 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
+# 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
diff --git a/util/scan/dvb-c/dk-Aarhus-Antenneforening b/util/scan/dvb-c/dk-Aarhus-Antenneforening
new file mode 100644
index 0000000..2a2f464
--- /dev/null
+++ b/util/scan/dvb-c/dk-Aarhus-Antenneforening
@@ -0,0 +1,2 @@
+# freq sr fec mod
+C 346000000 6900000 NONE QAM64
diff --git a/util/scan/dvb-c/fi-3ktv b/util/scan/dvb-c/fi-3ktv
deleted file mode 100644
index 1ec2278..0000000
--- a/util/scan/dvb-c/fi-3ktv
+++ /dev/null
@@ -1,20 +0,0 @@
-# 3KTV network reference channels
-# freq      sr      fec  mod
-C 154000000 6875000 NONE QAM128
-C 162000000 6875000 NONE QAM128
-C 170000000 6875000 NONE QAM128
-C 232000000 6875000 NONE QAM128
-C 298000000 6875000 NONE QAM128
-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 370000000 6875000 NONE QAM128
-C 378000000 6875000 NONE QAM128
-C 394000000 6875000 NONE QAM128
-C 402000000 6875000 NONE QAM128
-C 450000000 6875000 NONE QAM128
diff --git a/util/scan/dvb-c/fi-Turku b/util/scan/dvb-c/fi-Turku
index b6b435a..d11c11f 100644
--- a/util/scan/dvb-c/fi-Turku
+++ b/util/scan/dvb-c/fi-Turku
@@ -3,6 +3,13 @@
 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
@@ -14,4 +21,3 @@ C 410000000 6900000 NONE QAM128
 C 418000000 6900000 NONE QAM128
 C 426000000 6900000 NONE QAM128
 C 442000000 6900000 NONE QAM128
-C 354000000 6900000 NONE QAM256
diff --git a/util/scan/dvb-c/fi-dna b/util/scan/dvb-c/fi-dna
new file mode 100644
index 0000000..38a3afb
--- /dev/null
+++ b/util/scan/dvb-c/fi-dna
@@ -0,0 +1,34 @@
+# DNA network reference channels
+# updated 2011-04-08 Antti Palosaari <crope@iki.fi>
+# 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
diff --git a/util/scan/dvb-c/hu-Digikabel b/util/scan/dvb-c/hu-Digikabel
index c885bff..3442d52 100644
--- a/util/scan/dvb-c/hu-Digikabel
+++ b/util/scan/dvb-c/hu-Digikabel
@@ -1,24 +1,25 @@
-# Digikabel, Hungary

-# For the following cities:

-#  Budapest, Dorog, Hatvan, Kiskunhalas, Debrecen, Szekesfehervar, Pecs,

-#  Veszprem, Dunaujvaros, Miskolc, Gyongyos, Tatabanya, Varpalota, Nagykanizsa,

-#  Salgotarjan, Batonyterenye, Szolnok, Szentistvan, Nyiregyhaza, Gyor,

-#  Szazhalombatta, Bekescsaba, Bekes, Eger, Komlo, Oroszlany

-# In some of the cities not all the frequencies are available.

-# freq sr fec mod

-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 770000000 6900000 NONE QAM256

-C 778000000 6900000 NONE QAM256

-C 786000000 6900000 NONE QAM256

-C 794000000 6900000 NONE QAM256

-C 834000000 6900000 NONE QAM256

-C 842000000 6900000 NONE QAM256

-C 850000000 6900000 NONE QAM256

-C 858000000 6900000 NONE QAM256

+# Digikabel, Hungary
+# For the following cities:
+#  Budapest, Dorog, Hatvan, Kiskunhalas, Debrecen, Szekesfehervar, Pecs,
+#  Veszprem, Dunaujvaros, Miskolc, Gyongyos, Tatabanya, Varpalota, Nagykanizsa,
+#  Salgotarjan, Batonyterenye, Szolnok, Szentistvan, Nyiregyhaza, Gyor,
+#  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
diff --git a/util/scan/dvb-c/nl-Delta b/util/scan/dvb-c/nl-Delta
new file mode 100644
index 0000000..ac6548f
--- /dev/null
+++ b/util/scan/dvb-c/nl-Delta
@@ -0,0 +1,8 @@
+# Initial Tuning file for nl-DELTA
+# This file only lists the main
+# frequency. You still need to do
+# a network scan to find other
+# transponders.
+#
+#
+C 402000000 6875000 NONE QAM64 # Main Frequency
diff --git a/util/scan/dvb-c/nl-REKAM-CAIW_Gouda b/util/scan/dvb-c/nl-REKAM-CAIW_Gouda
new file mode 100644
index 0000000..1f9d01c
--- /dev/null
+++ b/util/scan/dvb-c/nl-REKAM-CAIW_Gouda
@@ -0,0 +1,4 @@
+# REKAM / Caiway, Gouda, Netherlands
+# freq sr fec mod
+C 163000000 6875000 NONE QAM64
+C 770000000 6900000 NONE QAM64