Commit 7f243a28 authored by Neil Turton's avatar Neil Turton
Browse files

Version Spin_merge taken

parent 8cb60ffc
SUBT > <wini>arm.Sound1.Version
GBLS Version
Version SETS "1.29"
Version SETS "1.30"
GBLS CurrentDate
CurrentDate SETS "28 Oct 1994"
CurrentDate SETS "09 Oct 1995"
END
......@@ -920,12 +920,12 @@ AttachVoice ENTRY "r2, r5"
CMP r5, #0 ; not loaded?
BEQ %FT10 ; then attach
ADD lr, pc, #4 ; just in case, points to the NOP
Push pc ; @%FT10 + bits - force detach
MOV lr, pc ; just in case
ADD pc, r5, #SoundVoiceFree ; call voice free, with r0=realChannel
; Attempt to instantiate voice for channel r0
NOP
10 CMP r2, #0 ; just detach? return last if so
STRNEB r2, [r10, r0, LSL #SoundChannelCBLSL] ; * SoundChannelb size
LDRNE r5, [r11, r2, LSL #2] ; get new voice pointer
......@@ -933,10 +933,11 @@ AttachVoice ENTRY "r2, r5"
BEQ %FT80 ; exit
MOV r2, r0 ; remember channel no
ADD lr, pc, #4 ; just in case, points to the NOP
Push pc ; @%FT20 + bits
MOV lr, pc ; just in case
ADD pc, r5, #SoundVoiceInst ; call voice inst, with R0=Channel
NOP
20 CMP r0, r2 ; = if OK, changed if fail!
SUBEQ r10, r10, #SoundChannelVoiceIndexB ; if = then success
ADDEQ r10, r10, #SoundChannelFlagsB
......
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