Merge tag 'upstream/0+git20141009.d26b627'

Upstream version 0+git20141009.d26b627

1 files changed, 120 insertions, 10 deletions

diff --git a/dvb-t/es-Huesca b/dvb-t/es-Huesca
index aaada34..678677d 100644
--- a/dvb-t/es-Huesca
+++ b/dvb-t/es-Huesca
@@ -3,13 +3,123 @@
 # T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
 #------------------------------------------------------------------------------
 
-T 650000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE	# CH 43  HTV-HuescaTelevision
-T 658000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE	# CH 44  La Sexta 2
-T 666000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE	# CH 45  TVE HD
-T 690000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE	# CH 48  NITRO
-T 738000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE	# CH 54  BOING
-T 762000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE	# CH 57  ARAGON TV
-T 794000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE	# CH 61  TVE
-T 842000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE	# CH 67
-T 850000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE	# CH 68
-T 858000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE	# CH 69
+[CH 43  HTV-HuescaTelevision]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CH 44  La Sexta 2]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CH 45  TVE HD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CH 48  NITRO]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CH 54  BOING]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CH 57  ARAGON TV]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CH 61  TVE]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 794000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CH 67]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 842000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CH 68]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 850000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CH 69]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 858000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+