linux-dvb-apps.git - linux-dvb-apps Debian packaging

pre { line-height: 125%; } td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } .highlight .hll { background-color: #ffffcc } .highlight .c { color: #888888 } /* Comment */ .highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */ .highlight .k { color: #008800; font-weight: bold } /* Keyword */ .highlight .ch { color: #888888 } /* Comment.Hashbang */ .highlight .cm { color: #888888 } /* Comment.Multiline */ .highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ .highlight .cpf { color: #888888 } /* Comment.PreprocFile */ .highlight .c1 { color: #888888 } /* Comment.Single */ .highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ .highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .gr { color: #aa0000 } /* Generic.Error */ .highlight .gh { color: #333333 } /* Generic.Heading */ .highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ .highlight .go { color: #888888 } /* Generic.Output */ .highlight .gp { color: #555555 } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #666666 } /* Generic.Subheading */ .highlight .gt { color: #aa0000 } /* Generic.Traceback */ .highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */

/* $Id$
 * $URL$
 *
 * new style driver for Matrix Orbital serial display modules
 *
 * Copyright (C) 1999, 2000 Michael Reinelt <michael@reinelt.co.at>
 * Copyright (C) 2004 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
 *
 * This file is part of LCD4Linux.
 *
 * LCD4Linux is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2, or (at your option)
 * any later version.
 *
 * LCD4Linux is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 */

/* 
 *
 * exported fuctions:
 *
 * struct DRIVER drv_MatrixOrbital
 *
 */

#include "config.h"

#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <time.h>

#include "debug.h"
#include "cfg.h"
#include "plugin.h"
#include "widget.h"
#include "widget_text.h"
#include "widget_icon.h"
#include "widget_bar.h"
#include "drv.h"
#include "drv_generic_text.h"
#include "drv_generic_gpio.h"
#include "drv_generic_serial.h"


static char Name[] = "MatrixOrbital";

static int Model;
static int Protocol;

static char dispBuffer[4][20];

typedef struct {
    int type;
    char *name;
    int rows;
    int cols;
    int gpis;
    int gpos;
    int protocol;
} MODEL;

/* Fixme #1: number of gpo's should be verified */
/* Fixme #2: protocol should be verified */

static MODEL Models[] = {
    {0x01, "LCD0821", 2, 8, 0, 1, 1},
    {0x03, "LCD2021", 2, 20, 0, 1, 1},
    {0x04, "LCD1641", 4, 16, 0, 1, 1},
    {0x05, "LCD2041", 4, 20, 0, 1, 1},
    {0x06, "LCD4021", 2, 40, 0, 1, 1},
    {0x07, "LCD4041", 4, 40, 0, 1, 1},
    {0x08, "LK202-25", 2, 20, 8, 8, 2},
    {0x09, "LK204-25", 4, 20, 8, 8, 2},
    {0x0a, "LK404-55", 4, 40, 8, 8, 2},
    {0x0b, "VFD2021", 2, 20, 0, 1, 1},
    {0x0c, "VFD2041", 4, 20, 0, 1, 1},
    {0x0d, "VFD4021", 2, 40, 0, 1, 1},
    {0x0e, "VK202-25", 2, 20, 0, 1, 1},
    {0x0f, "VK204-25", 4, 20, 0, 1, 1},
    {0x10, "GLC12232", -1, -1, 0, 1, 1},
    {0x13, "GLC24064", -1, -1, 0, 1, 1},
    {0x15, "GLK24064-25", -1, -1, 0, 1, 1},
    {0x22, "GLK12232-25", -1, -1, 0, 1, 1},
    {0x31, "LK404-AT", 4, 40, 8, 8, 2},
    {0x32, "VFD1621", 2, 16, 0, 1, 1},
    {0x33, "LK402-12", 2, 40, 8, 8, 2},
    {0x34, "LK162-12", 2, 16, 8, 8, 2},
    {0x35, "LK204-25PC", 4, 20, 8, 8, 2},
    {0x36, "LK202-24-USB", 2, 20, 8, 8, 2},
    {0x38, "LK204-24-USB", 4, 20, 8, 8, 2},
    {0x39, "VK204-24-USB", 4, 20, 8, 8, 2},
    {0x40, "DE-LD011", 2, 16, 0, 0, 3},	/* Sure electronics USB LCD board Rev.I */
    {0x41, "DE-LD021", 4, 20, 0, 0, 3},
    {0x42, "DE-LD023", 4, 20, 0, 0, 4},
    {0xff, "Unknown", -1, -1, 0, 0, 0}
};


/****************************************/
/***  hardware dependant functions    ***/
/****************************************/

static void drv_MO_write(const int row, const int col, const char *data, const int len)
{
    char cmd[5] = "\376Gyx";

    if (Models[Model].protocol == 3 || Models[Model].protocol == 4) {	// Sure electronics USB LCD board - full line output
	cmd[2] = (char) 1;
	cmd[3] = (char) row + 1;
	strncpy(&(dispBuffer[row][col]), data, len);
	drv_generic_serial_write(cmd, 4);
	drv_generic_serial_write(dispBuffer[row], Models[Model].cols);
    } else {
	cmd[2] = (char) col + 1;
	cmd[3] = (char) row + 1;
	drv_generic_serial_write(cmd, 4);
	drv_generic_serial_write(data, len);
    }
}


static void drv_MO_clear(void)
{
    int i, j;

    switch (Protocol) {
    case 1:
	drv_generic_serial_write("\014", 1);	/* Clear Screen */
	break;
    case 2:
	drv_generic_serial_write("\376\130", 2);	/* Clear Screen */
	break;

    default:
	/* Sure electronics USB LCD board - clear buffer */
	/* protocol 3 and 4 */
	for (i = 0; i < Models[Model].rows; i++) {
	    for (j = 0; j < Models[Model].cols; j++) {
		dispBuffer[i][j] = ' ';
	    }
	    drv_MO_write(1, i + 1, dispBuffer[i], Models[Model].cols);
	}
	break;
    }
}


static void drv_MO_defchar(const int ascii, const unsigned char *matrix)
{
    int i;
    char cmd[11] = "\376N";

    cmd[2] = (char) ascii;
    for (i = 0; i < 8; i++) {
	cmd[i + 3] = matrix[i] & 0x1f;
    }
    drv_generic_serial_write(cmd, 11);
}


static int drv_MO_contrast(int contrast)
{
    static unsigned char Contrast = 0;
    char cmd[3] = "\376Pn";

    /* -1 is used to query the current contrast */
    if (contrast == -1)
	return Contrast;

    if (contrast < 0)
	contrast = 0;
    if (contrast > 255)
	contrast = 255;
    Contrast = contrast;

    cmd[2] = Contrast;

    drv_generic_serial_write(cmd, 3);

    return Contrast;
}


static int drv_MO_backlight(int backlight)
{
    static unsigned char Backlight = 0;
    char cmd[3] = "\376Bn";

    /* -1 is used to query the current backlight */
    if (backlight == -1)
	return Backlight;

    if (backlight < 0)
	backlight = 0;
    if (backlight > 255)
	backlight = 255;
    Backlight = backlight;

    if (backlight <= 0) {
	/* backlight off */
	drv_generic_serial_write("\376F", 2);
    } else {
	/* backlight on for n minutes */
	cmd[2] = Backlight;
	drv_generic_serial_write(cmd, 3);
    }

    return Backlight;
}


static int drv_MO_GPI(const int num)
{
    static int GPI[8] = { -1, -1, -1, -1, -1, -1, -1, -1 };
    static time_t T[8], now;


    if (num < 0 || num > 7) {
	return 0;
    }

    /* read RPM every two seconds */
    if (time(&now) - T[num] >= 2) {

	char cmd[3];
	unsigned char ans[7];

	T[num] = now;

	cmd[0] = '\376';
	cmd[1] = '\301';
	cmd[2] = (char) num + 1;
	drv_generic_serial_write(cmd, 3);
	usleep(100000);

	if (drv_generic_serial_read((char *) ans, 7) == 7) {
	    if (ans[0] == 0x23 && ans[1] == 0x2a && ans[2] == 0x03 && ans[3] == 0x52 && ans[4] == num + 1) {
		GPI[num] = 18750000 / (256 * ans[5] + ans[6]);
	    } else {
		error("%s: strange answer %02x %02x %02x %02x %02x %02x %02x", Name, ans[0], ans[1], ans[2], ans[3],
		      ans[4], ans[5], ans[6]);
	    }
	}
    }

    return GPI[num];
}


static int drv_MO_GPO(const int num, const int val)
{
    int v = 0;
    char cmd[4];

    switch (Protocol) {
    case 1:
	if (num == 0) {
	    if (val > 0) {
		v = 1;
		drv_generic_serial_write("\376W", 2);	/* GPO on */
	    } else {
		v = 0;
		drv_generic_serial_write("\376V", 2);	/* GPO off */
	    }
	}
	break;

    case 2:
	if (val <= 0) {
	    v = 0;
	    cmd[0] = '\376';
	    cmd[1] = 'V';	/* GPO off */
	    cmd[2] = (char) num + 1;
	    drv_generic_serial_write(cmd, 3);
	} else if (val >=+T 770000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH58: Saorview MUX2
diff --git a/util/scan/dvb-t/ie-Maghera b/util/scan/dvb-t/ie-Maghera
new file mode 100644
index 0000000..8144c38
--- /dev/null
+++ b/util/scan/dvb-t/ie-Maghera
@@ -0,0 +1,5 @@
+# Ireland, Maghera
+# Generated from http://www.comreg.ie/_fileupload/File/Technical%20Parameters_20111004.xlsx
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH48: Saorview MUX1
+T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH55: Saorview MUX2
diff --git a/util/scan/dvb-t/ie-MountLeinster b/util/scan/dvb-t/ie-MountLeinster
new file mode 100644
index 0000000..780ac0a
--- /dev/null
+++ b/util/scan/dvb-t/ie-MountLeinster
@@ -0,0 +1,5 @@
+# Ireland, Mount Leinster
+# Generated from http://www.comreg.ie/_fileupload/File/Technical%20Parameters_20111004.xlsx
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH45: Saorview MUX1
+T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH39: Saorview MUX2
diff --git a/util/scan/dvb-t/ie-Mullaghanish b/util/scan/dvb-t/ie-Mullaghanish
new file mode 100644
index 0000000..aae3e97
--- /dev/null
+++ b/util/scan/dvb-t/ie-Mullaghanish
@@ -0,0 +1,5 @@
+# Ireland, Mullaghanish
+# Generated from http://www.comreg.ie/_fileupload/File/Technical%20Parameters_20111004.xlsx
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH21: Saorview MUX1
+T 498000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH24: Saorview MUX2
diff --git a/util/scan/dvb-t/ie-SpurHill b/util/scan/dvb-t/ie-SpurHill
new file mode 100644
index 0000000..e8db8a5
--- /dev/null
+++ b/util/scan/dvb-t/ie-SpurHill
@@ -0,0 +1,5 @@
+# Ireland, Spur Hill
+# Generated from http://www.comreg.ie/_fileupload/File/Technical%20Parameters_20111004.xlsx
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH45: Saorview MUX1
+T 698000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH49: Saorview MUX2
diff --git a/util/scan/dvb-t/ie-ThreeRock b/util/scan/dvb-t/ie-ThreeRock
new file mode 100644
index 0000000..ba4d43f
--- /dev/null
+++ b/util/scan/dvb-t/ie-ThreeRock
@@ -0,0 +1,5 @@
+# Ireland, Three Rock
+# Generated from http://www.comreg.ie/_fileupload/File/Technical%20Parameters_20111004.xlsx
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH54: Saorview MUX1
+T 770000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH58: Saorview MUX2
diff --git a/util/scan/dvb-t/ie-Truskmore b/util/scan/dvb-t/ie-Truskmore
new file mode 100644
index 0000000..2418f16
--- /dev/null
+++ b/util/scan/dvb-t/ie-Truskmore
@@ -0,0 +1,5 @@
+# Ireland, Truskmore
+# Generated from http://www.comreg.ie/_fileupload/File/Technical%20Parameters_20111004.xlsx
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 730000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH53: Saorview MUX1
+T 762000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH57: Saorview MUX2
diff --git a/util/scan/dvb-t/ie-WoodcockHill b/util/scan/dvb-t/ie-WoodcockHill
new file mode 100644
index 0000000..6ca3d15
--- /dev/null
+++ b/util/scan/dvb-t/ie-WoodcockHill
@@ -0,0 +1,5 @@
+# Ireland, Woodcock Hill
+# Generated from http://www.comreg.ie/_fileupload/File/Technical%20Parameters_20111004.xlsx
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 682000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH47: Saorview MUX1
+T 658000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH44: Saorview MUX2
diff --git a/util/scan/dvb-t/it-All b/util/scan/dvb-t/it-All
new file mode 100644
index 0000000..e1134c3
--- /dev/null
+++ b/util/scan/dvb-t/it-All
@@ -0,0 +1,135 @@
+# This file lists all frequencies used in Western Europe for DVB-T.
+# The transmission parameters listed here are the ones generally used in
+# Italy, broadcast neworks in other countries do use different parameters.
+# Moreover, other countries use a bandwidth of 8 MHz also for Band III
+# channels.
+#
+# Compiled in December 2010 by Marco d'Itri <md@linux.it>.
+#
+# References:
+# http://en.wikipedia.org/wiki/Band_I#Europe
+# http://en.wikipedia.org/wiki/Band_III#Europe
+# http://en.wikipedia.org/wiki/File:VHF_Usage.svg
+# http://en.wikipedia.org/wiki/Television_channel_frequencies
+
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+### VHF - Band III ###
+# 5
+T 177500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 6
+T 184500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 7
+T 191500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 8
+T 198500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 9
+T 205500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 10
+T 212500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 11
+T 219500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 12
+T 226500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+
+### UHF - Band IV ###
+# 21
+T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 22
+T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 23
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 24
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 25
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 26
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 27
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 28
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 29
+T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 30
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 31
+T 554000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 32
+T 562000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 33
+T 570000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 34
+T 578000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 35
+T 586000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 36
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 37
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+
+### UHF - Band V ###
+# 38
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 39
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 40
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 41
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 42
+T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 43
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 44
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 45
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 46
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 47
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 48
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 49
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 50
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 51
+T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 52
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 53
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 54
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 55
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 56
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 57
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 58
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 59
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 60
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 61
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 62
+T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 63
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 64
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 65
+T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 66
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 67
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 68
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# 69
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Aosta b/util/scan/dvb-t/it-Aosta
deleted file mode 100644
index 28c32ae..0000000
--- a/util/scan/dvb-t/it-Aosta
+++ /dev/null
@@ -1,21 +0,0 @@
-# Italia / Aosta (it-Aosta) -- mailto: Marco <lovebuzz@email.it>
-#
-# A me funziona solo il Mux Mediaset 2 non riesco a capire come mai...
-# (magari colpa della mia pinnacle pctv 301i saa7133)
-# Gli altri Mux inseriti li ho inseriti come da sito http://www.digitv.it...
-#
-# Chi avesse news o riuscisse a venirne a capo usando anche gli altri mux potrebbe scrivermi
-#  inviare una maila kaffeine-user@lists.sf.net per aggiornare/correggere questo file...
-#
-# MUX-A RAI
-T 226500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MBONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TIMB1
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Bari b/util/scan/dvb-t/it-Bari
deleted file mode 100644
index efcc852..0000000
--- a/util/scan/dvb-t/it-Bari
+++ /dev/null
@@ -1,18 +0,0 @@
-# Italy, Bari
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# MUX-A RAI
-T 219500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE
-T 226500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MBONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TIMB1
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TeleNorba, TelePuglia, altro...
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Bologna b/util/scan/dvb-t/it-Bologna
deleted file mode 100644
index 8f5a136..0000000
--- a/util/scan/dvb-t/it-Bologna
+++ /dev/null
@@ -1,28 +0,0 @@
-# DVB-T Collserola (Barcelona)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#TeleSanterno
-T 186000000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-#RaiA
-T 203500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Sestarete / Rete 7
-T 212500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Modena
-T 219500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-#ReteA, Camera e Senato
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Sestarete / Rete 7
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#DFree
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mediaset Mux-B
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#La7
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#RaiB
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mediaset Mux-A
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#TeleSanterno
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#LA7-2
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Bolzano b/util/scan/dvb-t/it-Bolzano
deleted file mode 100644
index f4a8e9b..0000000
--- a/util/scan/dvb-t/it-Bolzano
+++ /dev/null
@@ -1,5 +0,0 @@
-# DVB-T Bolzano
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-#RAS DVB-t  NETWORK
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/util/scan/dvb-t/it-Cagliari b/util/scan/dvb-t/it-Cagliari
deleted file mode 100644
index 2cfb4c1..0000000
--- a/util/scan/dvb-t/it-Cagliari
+++ /dev/null
@@ -1,23 +0,0 @@
-# DVB-T Cagliari
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 205500000 7MHz 3/4 NONE QAM64 8k 1/32 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 514000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 562000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Caivano b/util/scan/dvb-t/it-Caivano
deleted file mode 100644
index 86a9847..0000000
--- a/util/scan/dvb-t/it-Caivano
+++ /dev/null
@@ -1,17 +0,0 @@
-# DVB-T Caivano (Naples) 80023
-# 30/10/2008 by Nicola Costanzo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX LA7/MTV
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TIMB1
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-A RAI
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Catania b/util/scan/dvb-t/it-Catania
deleted file mode 100644
index 20bacd6..0000000
--- a/util/scan/dvb-t/it-Catania
+++ /dev/null
@@ -1,27 +0,0 @@
-# it-Catania
-# 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 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 NONE QAM64 8k 1/32 NONE
-
-# MUX RTI (Rete 4,Class News,Sole 24 Ore TV,BBC World)
-T 586000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# MUX MEDIASET 1
-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 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 NONE QAM64 8k 1/32 NONE
-
-# MUX-B RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
-T 482000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Conero b/util/scan/dvb-t/it-Conero
deleted file mode 100644
index 2d48138..0000000
--- a/util/scan/dvb-t/it-Conero
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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 NONE QAM64 8k 1/32 NONE
-# C46
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C21
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Firenze b/util/scan/dvb-t/it-Firenze
deleted file mode 100644
index eca721a..0000000
--- a/util/scan/dvb-t/it-Firenze
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX La7/MTV
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MBON
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX Digitoscana
-T 219500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX Tele37
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Genova b/util/scan/dvb-t/it-Genova
deleted file mode 100644
index 5a1b6dd..0000000
--- a/util/scan/dvb-t/it-Genova
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 219500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX La7/MTV
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX Mediaset
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Livorno b/util/scan/dvb-t/it-Livorno
deleted file mode 100644
index 075d8b4..0000000
--- a/util/scan/dvb-t/it-Livorno
+++ /dev/null
@@ -1,15 +0,0 @@
-# This channel list is made by G.U.L.LI. LIvorno's Linux Users Group
-# 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 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX La7/MTV
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Milano b/util/scan/dvb-t/it-Milano
deleted file mode 100644
index a0a5da2..0000000
--- a/util/scan/dvb-t/it-Milano
+++ /dev/null
@@ -1,49 +0,0 @@
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# MUX-A RAI
-T 800000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-A MEDIASET
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-A MEDIASET-2
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MEDIASET LA 5 
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX La7/MTV
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE 2
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX RETE A
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX STUDIO1
-T 184500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX STUDIO NORD
-T 191500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX VIDEO STAR NOVARA
-T 219500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX TELENOVA
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX TELE 7 LAGHI 
-T 495250000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX VIDEO BERGAMO
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX TELE MILANO
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# RETE 55
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TELE LIBERTA'
-T 735250000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# RSI
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TELE COLOR PRIMARETE
-T 783250000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TELESTAR
-T 807250000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TELECAMPIONE
-T 847250000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Modena b/util/scan/dvb-t/it-Modena
deleted file mode 100644
index 56dd106..0000000
--- a/util/scan/dvb-t/it-Modena
+++ /dev/null
@@ -1,50 +0,0 @@
-# DVB-T Collserola (Barcelona)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#Mux 1 Rai
-T 177500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux 2 Rai
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux 3 Rai
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux 4 Rai
-# T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Timb 1
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Timb 2
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Timb 3
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Mediaset 1
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Mediaset 2
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Mediaset 4
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Mediaset 5
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Mediaset 6
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Rete A 1
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux DFree
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Di. TV
-T 184500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux TV Rete 7
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Telestudio Modena
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Sesta Rete
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Trc Telemodena
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Canale Italia
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Telecentro Emilia Romagna
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Canale 24
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux VMT
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Nuovarete
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Montevergine b/util/scan/dvb-t/it-Montevergine
deleted file mode 100644
index 0d7c30d..0000000
--- a/util/scan/dvb-t/it-Montevergine
+++ /dev/null
@@ -1,18 +0,0 @@
-# DVB-T Montevergine (Avellino) 83100
-# 12/12/2009 by Antonio Galasso anto1714@libero.it
-# (ricordati di mettere il lettore in posizione stop orima di iniziare la scansione dei canali)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# C-MUX
-T 177500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/it-Pagnacco b/util/scan/dvb-t/it-Pagnacco
deleted file mode 100644
index c6f482d..0000000
--- a/util/scan/dvb-t/it-Pagnacco
+++ /dev/null
@@ -1,27 +0,0 @@
-# Italia / Pagnacco (it-Pagnacco)
-# DVB-T Pagnacco (Italia)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# MUX-A RAI
-
-T 602000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE
-
-# MUX-B RAI
-
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE
-T 226500000 8MHz 3/4 NONE QAM64 8k 1/32 NONE
-
-# MUX-Dfree
-
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE
-T 594000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE
-
-# MUX-LA7/MTV
-
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE
-
-# Mediaset
-
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE
-
-# Europa
diff --git a/util/scan/dvb-t/it-Palermo b/util/scan/dvb-t/it-Palermo
deleted file mode 100644
index e375565..0000000
--- a/util/scan/dvb-t/it-Palermo
+++ /dev/null
@@ -1,23 +0,0 @@
-# Palermo, Italy
-# 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 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 NONE QAM64 8k 1/32 NONE
-
-# MUX RTI (Rete 4,Class News,Sole 24 Ore TV,BBC World)
-T 842000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# MUX MEDIASET 2
-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 NONE QAM64 8k 1/32 NONE
-
-# MUX-B RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
-T 482000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Pescara b/util/scan/dvb-t/it-Pescara
deleted file mode 100644
index 1c89646..0000000
--- a/util/scan/dvb-t/it-Pescara
+++ /dev/null
@@ -1,15 +0,0 @@
-# Italy, Pescara San Silvestro
-# Antonio de Vincentiis, www.devincentiis.it, Montesilvano (PE)
-# update 06.02.2009
-# MUX-A RAI canale: VHF-E polarizzazione: O
-T 186000000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI canale: VHF-F polarizzazione: O
-T 194500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1 canale: UHF-69 polarizzazione: V
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE canale: UHF-56 polarizzazione: V
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2 canale: UHF-49 polarizzazione: V
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MBONE canale: UHF-34 polarizzazione: V
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Pisa b/util/scan/dvb-t/it-Pisa
deleted file mode 100644
index 8723d99..0000000
--- a/util/scan/dvb-t/it-Pisa
+++ /dev/null
@@ -1,18 +0,0 @@
-# This channel list is made by G.U.L.LI. LIvorno's Linux Users Group
-# 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 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1
-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 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MBONE
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX TIMB1
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Roma b/util/scan/dvb-t/it-Roma
deleted file mode 100644
index 7e84900..0000000
--- a/util/scan/dvb-t/it-Roma
+++ /dev/null
@@ -1,16 +0,0 @@
-# DVB-T Roma
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# MUX DFREE
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX La7/MTV
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-A RAI
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 186000000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-# SUPER 3
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-S-Stefano_al_mare b/util/scan/dvb-t/it-S-Stefano_al_mare
deleted file mode 100644
index 7dd0275..0000000
--- a/util/scan/dvb-t/it-S-Stefano_al_mare
+++ /dev/null
@@ -1,19 +0,0 @@
-#DVB Santo Stefano al mare (IM)
-#Aggiornato al 10/08/2008
-#Fonte: DGTVI.it
-#s-stefano@email.it
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#MUX-A RAI
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#MUX-B RAI
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#MUX MEDIASET 1
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#MUX MEDIASET 2
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#MUX MBONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#MUX DFREE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#MUX TIMB 1
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Sassari b/util/scan/dvb-t/it-Sassari
deleted file mode 100644
index 23ba817..0000000
--- a/util/scan/dvb-t/it-Sassari
+++ /dev/null
@@ -1,33 +0,0 @@
-# DVB-T Sassari Channels List by frippertronics@alice.it ;)
-# MUX DFREE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX LA7/MTV
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET1
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET2
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-A RAI
-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 NONE QAM64 8k 1/32 NONE
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MBONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TCS
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# VIDEOLINA
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TIMEDIA MUX A
-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 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 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Torino b/util/scan/dvb-t/it-Torino
deleted file mode 100644
index 4587a21..0000000
--- a/util/scan/dvb-t/it-Torino
+++ /dev/null
@@ -1,13 +0,0 @@
-# DVB-T Torino (Italia)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#MUX-A RAI
-T 834000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-#MUX-B RAI
-T 514000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-#MUX RTI
-T 474000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-#MUX LA7
-T 850000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 602000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-#MUX DFREE
-T 650000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/it-Trieste b/util/scan/dvb-t/it-Trieste
deleted file mode 100644
index 0f92785..0000000
--- a/util/scan/dvb-t/it-Trieste
+++ /dev/null
@@ -1,23 +0,0 @@
-# Trieste, Italy
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# MUX MEDIASET 1 (Class News, 24Ore TV, Coming soon, BBC World, Boing, Mediaset Premium)
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#
-# MUX-B RAI (Rai Doc-Futura, RaiSportSAT, RaiNotizie24, Rai EDU1, Sat2000, Radio1, Radio2, Radio3, FDAuditorium)
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#
-# MUX-A RAI (Rai Uno, Rai Due, Rai Tre, Rai Utile)
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#
-# MUX DFREE (Rete 4, Italia 1, Sportitalia, LCI / Prima, Si Live24)
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#
-# MUX (All Music)
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#
-# MUX (Triveneta)
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#
-# MUX (La7 Telemarket Retecapri MTv italia Sitcom Uno)
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Varese b/util/scan/dvb-t/it-Varese
deleted file mode 100644
index 7ee9bb5..0000000
--- a/util/scan/dvb-t/it-Varese
+++ /dev/null
@@ -1,16 +0,0 @@
-# Italia / Varese -- mailto: b.gabriele <gb.dvbch@dveprojects.com>
-#
-# From: http://www.dgtvi.it/copertura.aspx
-#
-# 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 NONE QAM64 8k 1/32 NONE
-# MUX DFREE UHF C50 706 V CAMPO DEI FIORI
-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 NONE QAM64 8k 1/32 NONE
-# MUX RTI UHF C26 514 O CAMPO DEI FIORI PRIMA CAPPELLA
-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 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Venezia b/util/scan/dvb-t/it-Venezia
deleted file mode 100644
index af9f4a1..0000000
--- a/util/scan/dvb-t/it-Venezia
+++ /dev/null
@@ -1,19 +0,0 @@
-# Italia / Venzia (it-Venezia) -- mailto: Rob <rob.davis@libero.it>
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# According to Eurosat 1/2006
-#
-# C50 - MediaSet
-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 NONE QAM64 8k 1/32 NONE
-# C23 -Rai B
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C64 DFree
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C65 La 7
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C58 Mediaset 2
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C36 DFree
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Verona b/util/scan/dvb-t/it-Verona
deleted file mode 100644
index b7df944..0000000
--- a/util/scan/dvb-t/it-Verona
+++ /dev/null
@@ -1,19 +0,0 @@
-# Italia / Verona / Sommacampagna - 02/03/2009
-# Italia / Verona / Zevio - 28/02/2009
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# C26 - TIMB1
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C34 - Mux B Rai
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C41 - Mux  DFree
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C54 - MBone
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C58 - Rete All Music
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C61 - Mux Mediaset 2
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C64 - Mux DFree
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C67 - Mediaset 1
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/pl-Gdansk b/util/scan/dvb-t/pl-Gdansk
new file mode 100644
index 0000000..3b64d73
--- /dev/null
+++ b/util/scan/dvb-t/pl-Gdansk
@@ -0,0 +1,4 @@
+# Gdańsk, Poland
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 610000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+T 722000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/pl-Krakow b/util/scan/dvb-t/pl-Krakow
new file mode 100644
index 0000000..d81b77d
--- /dev/null
+++ b/util/scan/dvb-t/pl-Krakow
@@ -0,0 +1,17 @@
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20091230 1 0 OFDM PL </w_scan>
+#------------------------------------------------------------------------------
+# location and provider: Poland, Krakow
+# date (yyyy-mm-dd)    : 2011-10-29
+# provided by (opt)    : Damian Golda
+#
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
+#------------------------------------------------------------------------------
+T 490000000 8MHz  5/6 NONE    QAM64   8k  1/4 NONE  # Ch.23, Mux2 Tarnow/g.Sw.Marcina
+T 690000000 8MHz  5/6 NONE    QAM64   8k  1/4 NONE    # NW 04 Malopolskie, Ch.48, Mux3 Krakow/Choragwica 2kW
+T 698000000 8MHz  5/6 NONE    QAM64   8k  1/4 NONE  # Ch.49, Mux2 Katowice/Kosztowy
+T 714000000 8MHz  5/6 NONE    QAM64   8k  1/4 NONE  # Ch.51, Mux3 Katowice/Kosztowy 2.5kW
+T 802000000 8MHz  5/6 NONE    QAM64   8k  1/4 NONE    # Ch.62, Mux1 Wisla/Skrzyczne
+T 818000000 8MHz  5/6 NONE    QAM64   8k  1/4 NONE    # TP EmiTel Ch.64, Mux3 Krakow/Choragwica
diff --git a/util/scan/dvb-t/sk-Bratislava b/util/scan/dvb-t/sk-Bratislava
index 8d4fb83..ded67d0 100644
--- a/util/scan/dvb-t/sk-Bratislava
+++ b/util/scan/dvb-t/sk-Bratislava
@@ -7,3 +7,10 @@ T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 
 # 3.st multiplex (public) - on channel 27
 T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+#
+# T- Video Agency
+# (TODO: http://www.zive.sk/bratislava-sa-dockala-novych-programov-v-dvb-t-divaci-si-naladia-uz-aj-ta3/sc-4-a-298830/default.aspx)
+#
+# regional multiplex - on channel 55
+T 746000000 8MHz 2/1 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/uk-CrystalPalace b/util/scan/dvb-t/uk-CrystalPalace
index fc7e55e..9251b81 100644
--- a/util/scan/dvb-t/uk-CrystalPalace
+++ b/util/scan/dvb-t/uk-CrystalPalace
@@ -1,10 +1,17 @@
-# UK, Crystal Palace
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 505833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 481833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 561833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 529833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 537833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20120112 1 0 TERRESTRIAL GB </w_scan>
+#------------------------------------------------------------------------------
+# location and provider: Crystal Palace, UK
+# date (yyyy-mm-dd)    : 2012-02-12
+#
+# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
+#------------------------------------------------------------------------------
+T 481833330 8MHz  2/3 NONE    QAM64   2k 1/32 NONE    # London.
+T 537833330 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
+T 505833330 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
+T 561833330 8MHz  2/3 NONE    QAM64   2k 1/32 NONE    # London.
+T 529833330 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
+T 578166670 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
+T2 0 16435 554000000 8MHz AUTO AUTO     AUTO AUTO AUTO AUTO    # London.
diff --git a/util/scan/dvb-t/uk-EmleyMoor b/util/scan/dvb-t/uk-EmleyMoor
index 16df648..af57649 100644
--- a/util/scan/dvb-t/uk-EmleyMoor
+++ b/util/scan/dvb-t/uk-EmleyMoor
@@ -1,10 +1,7 @@
 # UK, Emley Moor
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 722167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 625833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 649833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 673833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 705833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 697833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 682000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE # PSB1/BBCA
+T 658000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE # PSB2/D3&4
+T 714000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE # COM4/SDN
+T 722000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE # COM5/ARQA
+T 690000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE # COM6/ARQB
diff --git a/util/scan/dvb-t/uk-Tacolneston b/util/scan/dvb-t/uk-Tacolneston
index b062cca..3d0ee06 100644
--- a/util/scan/dvb-t/uk-Tacolneston
+++ b/util/scan/dvb-t/uk-Tacolneston
@@ -1,10 +1,16 @@
-# UK, Tacolneston
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 810000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 786000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 730167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 769833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 794000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 818000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20120128 1 0 TERRESTRIAL GB </w_scan>
+#------------------------------------------------------------------------------
+# location and provider: Tacolneston UK
+# date (yyyy-mm-dd)    : 2012-03-10
+#
+# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
+#------------------------------------------------------------------------------
+T 642000000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE      # East Anglia
+T 745833000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE      # East Anglia
+T 777833000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE      # East Anglia
+T 666000000 8MHz  3/4 NONE    QAM64   8k 1/32 NONE      # East Anglia
+T 706000000 8MHz  3/4 NONE    QAM64   8k 1/32 NONE      # East Anglia
+T2 0 16417 802000000 8MHz AUTO AUTO     AUTO AUTO AUTO AUTO     # East Anglia


context:
space:
mode: