devraza/rustboyadvance-ng
Archived
1
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Fix bios infinite loop caused by changes in f5a8ca8de8a5b007ace879f50fb97ead3e976347 [formerly e885e9ff1393dd14f5e4132c71a7641d658399cb]

Browse source 
This commit removed the dummy iomem buffer, and the bios busy waits on
REG_SOUNDBIAS in order to proceed.


Former-commit-id: 1fb8e2b621bed22da55781adcaae748aaaf845b9
This commit is contained in:
Michel Heily 2019-11-21 17:33:08 +02:00
parent 9856f04e05
commit 42904782f7
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/iodev.rs
View file

@ -26,6 +26,7 @@ pub struct IoDevices {
pub post_boot_flag: bool, pub post_boot_flag: bool,
pub waitcnt: WaitControl, // TODO also implement 4000800 pub waitcnt: WaitControl, // TODO also implement 4000800
pub haltcnt: HaltState, pub haltcnt: HaltState,
pub sound_bias: u16,
mem: BoxedMemory, mem: BoxedMemory,
} }
@ -42,6 +43,7 @@ impl IoDevices {
haltcnt: HaltState::Running, haltcnt: HaltState::Running,
keyinput: keypad::KEYINPUT_ALL_RELEASED, keyinput: keypad::KEYINPUT_ALL_RELEASED,
waitcnt: WaitControl(0), waitcnt: WaitControl(0),
sound_bias: 0x200,
} }
} }
} }
@ -96,6 +98,8 @@ impl Bus for IoDevices {
REG_DMA2CNT_H => io.dmac.channels[2].ctrl.0, REG_DMA2CNT_H => io.dmac.channels[2].ctrl.0,
REG_DMA3CNT_H => io.dmac.channels[3].ctrl.0, REG_DMA3CNT_H => io.dmac.channels[3].ctrl.0,
REG_SOUNDBIAS => io.sound_bias,
REG_WAITCNT => io.waitcnt.0, REG_WAITCNT => io.waitcnt.0,
REG_POSTFLG => io.post_boot_flag as u16, REG_POSTFLG => io.post_boot_flag as u16,
@ -234,6 +238,8 @@ impl Bus for IoDevices {
io.dmac.write_16(channel_id, ofs % 12, value) io.dmac.write_16(channel_id, ofs % 12, value)
} }
REG_SOUNDBIAS => io.sound_bias = value & 0xc3fe,
REG_WAITCNT => io.waitcnt.0 = value, REG_WAITCNT => io.waitcnt.0 = value,
REG_POSTFLG => io.post_boot_flag = value != 0, REG_POSTFLG => io.post_boot_flag = value != 0,