Merge tag 'upstream/0+git20141009.d26b627'

Upstream version 0+git20141009.d26b627

1 files changed, 280 insertions, 35 deletions

diff --git a/dvb-c/de-NetAachen b/dvb-c/de-NetAachen
index 9cf2db9..58ee594 100644
--- a/dvb-c/de-NetAachen
+++ b/dvb-c/de-NetAachen
@@ -10,38 +10,283 @@
 #
 # C[2] [plp_id] [data_slice_id] [system_id] <freq> <sr> <fec> <mod> [# comment]
 #------------------------------------------------------------------------------
-C 113000000 6900000 AUTO QAM256	# NetCologne
-C 642000000 6900000 AUTO QAM256	# NetCologne
-C 618000000 6900000 AUTO QAM256	# NetCologne
-C 634000000 6900000 AUTO QAM256	# NetCologne
-C 626000000 6900000 AUTO QAM256	# NetCologne
-C 562000000 6900000 AUTO QAM256	# NetCologne
-C 402000000 6900000 AUTO QAM256	# NetCologne
-C 121000000 6900000 AUTO QAM256	# NetCologne
-C 570000000 6900000 AUTO QAM256	# NetCologne
-C 394000000 6900000 AUTO QAM256	# NetCologne
-C 586000000 6900000 AUTO QAM256	# NetCologne
-C 650000000 6900000 AUTO QAM256	# NetCologne
-C 658000000 6900000 AUTO QAM256	# NetCologne
-C 666000000 6900000 AUTO QAM256	# NetCologne
-C 674000000 6900000 AUTO QAM256	# NetCologne
-C 682000000 6900000 AUTO QAM256	# NetCologne
-C 690000000 6900000 AUTO QAM256
-C 714000000 6900000 AUTO QAM256
-C 602000000 6900000 AUTO QAM256
-C 410000000 6900000 AUTO QAM256	# NetCologne
-C 418000000 6900000 AUTO QAM256	# NetCologne
-C 530000000 6900000 AUTO QAM256	# NetCologne
-C 538000000 6900000 AUTO QAM256	# NetCologne
-C 346000000 6900000 AUTO QAM256	# NetCologne
-C 338000000 6900000 AUTO QAM256	# NetCologne
-C 129000000 6900000 AUTO QAM256	# NetCologne
-C 354000000 6900000 AUTO QAM64	# BetaDigital
-C 362000000 6900000 AUTO QAM64	# BetaDigital
-C 370000000 6900000 AUTO QAM64	# BetaDigital
-C 386000000 6900000 AUTO QAM64	# BetaDigital
-C 378000000 6900000 AUTO QAM64	# BetaDigital
-C 610000000 6900000 AUTO QAM256
-C 578000000 6900000 AUTO QAM256
-C 698000000 6900000 AUTO QAM256
-C 706000000 6900000 AUTO QAM256
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 113000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 642000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 618000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 634000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 626000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 562000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 402000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 121000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 570000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 394000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 586000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 650000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 658000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 666000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 674000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 682000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 690000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 714000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 602000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 410000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 418000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 530000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 538000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 346000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 338000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[NetCologne]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 129000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[BetaDigital]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 354000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[BetaDigital]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 362000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[BetaDigital]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 370000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[BetaDigital]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 386000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[BetaDigital]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 378000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 610000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 578000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 698000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 706000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = AUTO
+	MODULATION = QAM/256
+	INVERSION = AUTO
+