ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GBA I/O: SOUNDCNT_HI is readable when sound is off

This commit is contained in:
RidgeX 2018-11-27 12:34:00 +00:00 committed by endrift
parent df497cf336
commit d8c3236c85
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -139,6 +139,7 @@ Bugfixes:
- GBA Savedata: Fix EEPROM writing codepath when savetype is not EEPROM - GBA Savedata: Fix EEPROM writing codepath when savetype is not EEPROM
- Core: Reroot timing list when (de)scheduling - Core: Reroot timing list when (de)scheduling
- GB Video: Changing LYC while LCDC off doesn't affect STAT (fixes mgba.io/i/1224) - GB Video: Changing LYC while LCDC off doesn't affect STAT (fixes mgba.io/i/1224)
- GBA I/O: SOUNDCNT_HI is readable when sound is off
Misc: Misc:
- mGUI: Add SGB border configuration option - mGUI: Add SGB border configuration option
- mGUI: Add support for different settings types - mGUI: Add support for different settings types

2
src/gba/io.c
View File

@ -841,7 +841,6 @@ uint16_t GBAIORead(struct GBA* gba, uint32_t address) {
case REG_SOUND4CNT_LO: case REG_SOUND4CNT_LO:
case REG_SOUND4CNT_HI: case REG_SOUND4CNT_HI:
case REG_SOUNDCNT_LO: case REG_SOUNDCNT_LO:
case REG_SOUNDCNT_HI:
if (!GBAudioEnableIsEnable(gba->memory.io[REG_SOUNDCNT_X >> 1])) { if (!GBAudioEnableIsEnable(gba->memory.io[REG_SOUNDCNT_X >> 1])) {
// TODO: Is writing allowed when the circuit is disabled? // TODO: Is writing allowed when the circuit is disabled?
return 0; return 0;
@ -858,6 +857,7 @@ uint16_t GBAIORead(struct GBA* gba, uint32_t address) {
case REG_WINOUT: case REG_WINOUT:
case REG_BLDCNT: case REG_BLDCNT:
case REG_BLDALPHA: case REG_BLDALPHA:
case REG_SOUNDCNT_HI:
case REG_SOUNDCNT_X: case REG_SOUNDCNT_X:
case REG_WAVE_RAM0_LO: case REG_WAVE_RAM0_LO:
case REG_WAVE_RAM0_HI: case REG_WAVE_RAM0_HI: