Merge tag 'upstream/0+git20141009.d26b627'

Upstream version 0+git20141009.d26b627

1 files changed, 408 insertions, 68 deletions

diff --git a/atsc/us-ATSC-center-frequencies-8VSB b/atsc/us-ATSC-center-frequencies-8VSB
index 2e39de1..e744878 100644
--- a/atsc/us-ATSC-center-frequencies-8VSB
+++ b/atsc/us-ATSC-center-frequencies-8VSB
@@ -1,70 +1,410 @@
 # US ATSC center frequencies, use if in doubt
 
-A  57028615 8VSB
-A  63028615 8VSB
-A  69028615 8VSB
-A  79028615 8VSB
-A  85028615 8VSB
-A 177028615 8VSB
-A 183028615 8VSB
-A 189028615 8VSB
-A 195028615 8VSB
-A 201028615 8VSB
-A 207028615 8VSB
-A 213028615 8VSB
-A 473028615 8VSB
-A 479028615 8VSB
-A 485028615 8VSB
-A 491028615 8VSB
-A 497028615 8VSB
-A 503028615 8VSB
-A 509028615 8VSB
-A 515028615 8VSB
-A 521028615 8VSB
-A 527028615 8VSB
-A 533028615 8VSB
-A 539028615 8VSB
-A 545028615 8VSB
-A 551028615 8VSB
-A 557028615 8VSB
-A 563028615 8VSB
-A 569028615 8VSB
-A 575028615 8VSB
-A 581028615 8VSB
-A 587028615 8VSB
-A 593028615 8VSB
-A 599028615 8VSB
-A 605028615 8VSB
-A 611028615 8VSB
-A 617028615 8VSB
-A 623028615 8VSB
-A 629028615 8VSB
-A 635028615 8VSB
-A 641028615 8VSB
-A 647028615 8VSB
-A 653028615 8VSB
-A 659028615 8VSB
-A 665028615 8VSB
-A 671028615 8VSB
-A 677028615 8VSB
-A 683028615 8VSB
-A 689028615 8VSB
-A 695028615 8VSB
-A 701028615 8VSB
-A 707028615 8VSB
-A 713028615 8VSB
-A 719028615 8VSB
-A 725028615 8VSB
-A 731028615 8VSB
-A 737028615 8VSB
-A 743028615 8VSB
-A 749028615 8VSB
-A 755028615 8VSB
-A 761028615 8VSB
-A 767028615 8VSB
-A 773028615 8VSB
-A 779028615 8VSB
-A 785028615 8VSB
-A 791028615 8VSB
-A 797028615 8VSB
-A 803028615 8VSB
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 57028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 63028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 69028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 79028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 85028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 177028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 183028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 189028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 195028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 201028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 207028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 213028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 473028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 479028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 485028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 491028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 497028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 503028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 509028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 515028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 521028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 527028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 533028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 539028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 545028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 551028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 557028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 563028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 569028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 575028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 581028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 587028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 593028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 599028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 605028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 611028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 617028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 623028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 629028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 635028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 641028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 647028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 653028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 659028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 665028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 671028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 677028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 683028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 689028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 695028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 701028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 707028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 713028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 719028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 725028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 731028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 737028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 743028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 749028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 755028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 761028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 767028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 773028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 779028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 785028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 791028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 797028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 803028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+