File remerged to what it should be

s/Module

@@ -69,8 +69,8 @@ EASISpace       SETL    True
                 GBLL    ExtensionROMs
 ExtensionROMs   SETL    ExtROMSupport			; System build option
 
-	; We only know how to fake up STB2 MPEG1, MPEG2 (and MPEG0) podules
-	ASSERT (FakePodule0 = 0) :LOR: (FakePodule0 = ProdType_STB2_MPEG1) :LOR: (FakePodule0 = ProdType_STB2_MPEG2)
+	; We only know how to fake up STB2 MPEG1 (and MPEG0) podules
+	ASSERT (FakePodule0 = 0) :LOR: (FakePodule0 = ProdType_STB2_MPEG1)
 
         [       :LNOT: ReleaseVersion
         !       0, "This version supports " :CC: ((:STR:NumberOfPodules) :RIGHT: 1) :CC: " podules"
@@ -184,11 +184,11 @@ EndOfROM        *       &04000000
    ]
  ]
 
- [ FakePodule0 <> 0
+ [ FakePodule0 = ProdType_STB2_MPEG1
 MachineConfig   *       (IOMD_Base + IOMD_CLINES)
 MPEGfittedbit   *       IOMD_C_MPEGfitted
 MPEGIDByte      *       0
- ]
+        ]
 
 maxint          *       &7FFFFFFF
 
@@ -358,7 +358,7 @@ $PoduleString
 PoduleString    SETS    "ROMNodeChainHead * Podule" :CC: ((:STR: PoduleInstance) :RIGHT: 1) :CC: " + PoduleNode_Link"
 $PoduleString
 
- [       FakePodule0 <> 0
+        [       FakePodule0 = ProdType_STB2_MPEG1
 MPEG0descoff	*       (MPEG0desc - MPEG0contents)/4		; offset of description from start
 MPEG0desclen	*       (MPEG0end  - MPEG0desc)/4		; length of description
 MPEG0contents	DCD     &00, &02, &00, (ProdType_STB2_MPEG0 :AND: &FF), (ProdType_STB2_MPEG0 :SHR: 8)
@@ -371,7 +371,6 @@ MPEG0desc	DCD     'I', 'n', 't', 'e', 'r', 'n', 'a', 'l'
                 DCD     'a', 'r', 'd', 'w', 'a', 'r', 'e',  0
 MPEG0end
                 ALIGN
-  [	FakePodule0 = ProdType_STB2_MPEG1
 
 MPEG1descoff	*       (MPEG1desc - MPEG1contents)/4		; offset of description from start
 MPEG1desclen	*       (MPEG1end  - MPEG1desc)/4		; length of description
@@ -385,22 +384,7 @@ MPEG1desc	DCD     'I', 'n', 't', 'e', 'r', 'n', 'a', 'l'
                 DCD     'a', 'r', 'd', 'w', 'a', 'r', 'e',  0
 MPEG1end
                 ALIGN
-  |
-; it's the STB2/2
-MPEG1descoff	*       (MPEG1desc - MPEG1contents)/4		; offset of description from start
-MPEG1desclen	*       (MPEG1end  - MPEG1desc)/4		; length of description
-MPEG1contents	DCD     &00, &02, &00, (ProdType_STB2_MPEG2 :AND: &FF), (ProdType_STB2_MPEG2 :SHR: 8)
-		DCD	(Manf_OnlineMedia :AND: &FF), (Manf_OnlineMedia :SHR: 8), &00
-                DCD     0, 0, 0, 0, 0, 0, 0, 0
-                DCD     &f5, MPEG1desclen, &00, &00, MPEG1descoff, &00, &00, &00
-                DCD     0, 0, 0, 0, 0, 0, 0, 0
-MPEG1desc	DCD     'I', 'n', 't', 'e', 'r', 'n', 'a', 'l'
-                DCD     ' ', 'M', 'P', 'E', 'G', '2', ' ', 'h'
-                DCD     'a', 'r', 'd', 'w', 'a', 'r', 'e',  0
-MPEG1end
-                ALIGN
-  ]
- ]
+        ]
 
 ; *****************************************************************************************************************
 ;
@@ -650,7 +634,7 @@ InitialisationLoop
  ]
 ;	If this is a Set-Top Box, then we know we've got MPEG hardware fitted as Podule0 but without the (EP)ROM
 ;	We'll make if look like its a real podule
- [ FakePodule0 <> 0
+ [ FakePodule0 = ProdType_STB2_MPEG1
         ADRL    r0, NormalPoduleNodeOffsets		; work out address of podule0 node
         LDR     r0, [r0]
         ADD     r0, r0, r2				; make it an absolute address