all repos — mgba @ 20cadd8cf1971e677d8be2ddd4881307119c410d

mGBA Game Boy Advance Emulator

GBA Audio: Implement missing flags on SOUNDCNT_X register
Jeffrey Pfau jeffrey@endrift.com
Mon, 26 Oct 2015 20:31:22 -0700
commit

20cadd8cf1971e677d8be2ddd4881307119c410d

parent

5dccfcd7069f3182a99f86c735a1a606c27f26c8

3 files changed, 10 insertions(+), 0 deletions(-)

jump to
M CHANGESCHANGES

@@ -1,6 +1,8 @@

0.3.2: (Future) Bugfixes: - Qt: Use safer isLoaded check in GameController +Misc: + - GBA Audio: Implement missing flags on SOUNDCNT_X register 0.3.1: (2015-10-24) Bugfixes:
M src/gba/audio.csrc/gba/audio.c

@@ -283,6 +283,12 @@ audio->playingCh4 = 0;

} } } + + audio->p->memory.io[REG_SOUNDCNT_X >> 1] &= ~0x000F; + audio->p->memory.io[REG_SOUNDCNT_X >> 1] |= audio->playingCh1; + audio->p->memory.io[REG_SOUNDCNT_X >> 1] |= audio->playingCh2 << 1; + audio->p->memory.io[REG_SOUNDCNT_X >> 1] |= audio->playingCh3 << 2; + audio->p->memory.io[REG_SOUNDCNT_X >> 1] |= audio->playingCh4 << 2; } audio->nextSample -= audio->eventDiff;
M src/gba/io.csrc/gba/io.c

@@ -351,6 +351,8 @@ GBAAudioWriteSOUNDCNT_HI(&gba->audio, value);

break; case REG_SOUNDCNT_X: GBAAudioWriteSOUNDCNT_X(&gba->audio, value); + value &= 0xFFFF; + value |= gba->memory.io[REG_SOUNDCNT_X >> 1] & 0xF; break; case REG_SOUNDBIAS: GBAAudioWriteSOUNDBIAS(&gba->audio, value);