Commit c2fbbcb7 authored by Neil Turton's avatar Neil Turton
Browse files

Version Spin_merge taken

parent a6e338ef
......@@ -12,5 +12,3 @@
| See the License for the specific language governing permissions and
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine export
......@@ -29,8 +29,6 @@ OldOpt SETA {OPT}
; 30-May-96 SMC Added SystemName
; 15-Jul-96 JRH Added ROMCardSupport, CanLiveOnROMCard
; and IOMD_C_ROMCardVpp.
; 31-Oct-96 TMD Added ComboIRQsActiveHigh
; 04-Nov-96 TMD Added MPEGPoduleNTSCNotPALAddress, MPEGPoduleNTSCNotPALMask
GBLS SystemName
SystemName SETS "RISC OS"
......@@ -128,21 +126,8 @@ E2ROMSupport SETL {TRUE}
; Support for 82C710 and 82C711 combo chips in addition to 665
GBLL OldComboSupport
OldComboSupport SETL {FALSE}
OldComboSupport SETL {TRUE}
; Whether combo chip should be configured for active high interrupts
GBLL ComboIRQsActiveHigh
ComboIRQsActiveHigh SETL {FALSE} ; active low on STB2/1
; Address of NTSC/not PAL flag, if on MPEG podule rather than CLINES, else 0
GBLA MPEGPoduleNTSCNotPALAddress
MPEGPoduleNTSCNotPALAddress SETA &88200000
; Bit mask for above (0 if not applicable)
GBLA MPEGPoduleNTSCNotPALMask
MPEGPoduleNTSCNotPALMask SETA 1 :SHL: 7
; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; Allocation of bits in 8bit I/O port at IOMD_CLINES
......
......@@ -29,8 +29,6 @@ OldOpt SETA {OPT}
; 30-May-96 SMC Added SystemName
; 15-Jul-96 JRH Added ROMCardSupport, CanLiveOnROMCard
; and IOMD_C_ROMCardVpp. Set ExtROMis16bit to FALSE
; 31-Oct-96 TMD Added ComboIRQsActiveHigh
; 04-Nov-96 TMD Added MPEGPoduleNTSCNotPALAddress, MPEGPoduleNTSCNotPALMask
GBLS SystemName
SystemName SETS "NC OS"
......@@ -130,19 +128,6 @@ E2ROMSupport SETL {TRUE}
GBLL OldComboSupport
OldComboSupport SETL {FALSE}
; Whether combo chip should be configured for active high interrupts
GBLL ComboIRQsActiveHigh
ComboIRQsActiveHigh SETL {TRUE} ; active high on NC
; Address of NTSC/not PAL flag, if on MPEG podule rather than CLINES, else 0
GBLA MPEGPoduleNTSCNotPALAddress
MPEGPoduleNTSCNotPALAddress SETA 0 ; it's in CLINES
; Bit mask for above (0 if not applicable)
GBLA MPEGPoduleNTSCNotPALMask
MPEGPoduleNTSCNotPALMask SETA 0 ; it's in CLINES
; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; Allocation of bits in 8bit I/O port at IOMD_CLINES
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment