all repos — mgba @ e344e2efa5fb7766e12cd72317b677da9c39936b

mGBA Game Boy Advance Emulator

GBA I/O: Fix writing to DISPCNT CGB flag (fixes #902)
Vicki Pfau vi@endrift.com
Sun, 14 Jan 2018 21:03:10 -0800
commit

e344e2efa5fb7766e12cd72317b677da9c39936b

parent

4d2f721a8061815f746cfdf345e54a0f926543b4

4 files changed, 11 insertions(+), 1 deletions(-)

jump to
M CHANGESCHANGES

@@ -16,6 +16,7 @@ - 3DS: Fix opening files in directory names with trailing slashes

- GB MBC: Fix MBC2 saves (fixes mgba.io/i/954) - GBA Memory: Fix copy-on-write memory leak - Core: Fix ROM patches not being unloaded when disabled (fixes mgba.io/i/962) + - GBA I/O: Fix writing to DISPCNT CGB flag (fixes mgba.io/i/902) Misc: - GBA: Improve multiboot image detection - GB MBC: Remove erroneous bank 0 wrapping
M src/gba/extra/proxy.csrc/gba/extra/proxy.c

@@ -171,11 +171,16 @@

uint16_t GBAVideoProxyRendererWriteVideoRegister(struct GBAVideoRenderer* renderer, uint32_t address, uint16_t value) { struct GBAVideoProxyRenderer* proxyRenderer = (struct GBAVideoProxyRenderer*) renderer; switch (address) { + case REG_DISPCNT: + value &= 0xFFF7; + break; case REG_BG0CNT: case REG_BG1CNT: + value &= 0xDFFF; + break; case REG_BG2CNT: case REG_BG3CNT: - value &= 0xFFCF; + value &= 0xFFFF; break; case REG_BG0HOFS: case REG_BG0VOFS:
M src/gba/renderers/video-software.csrc/gba/renderers/video-software.c

@@ -147,6 +147,7 @@ static uint16_t GBAVideoSoftwareRendererWriteVideoRegister(struct GBAVideoRenderer* renderer, uint32_t address, uint16_t value) {

struct GBAVideoSoftwareRenderer* softwareRenderer = (struct GBAVideoSoftwareRenderer*) renderer; switch (address) { case REG_DISPCNT: + value &= 0xFFF7; softwareRenderer->dispcnt = value; GBAVideoSoftwareRendererUpdateDISPCNT(softwareRenderer); break;
M src/gba/video.csrc/gba/video.c

@@ -216,6 +216,9 @@

static uint16_t GBAVideoDummyRendererWriteVideoRegister(struct GBAVideoRenderer* renderer, uint32_t address, uint16_t value) { UNUSED(renderer); switch (address) { + case REG_DISPCNT: + value &= 0xFFF7; + break; case REG_BG0CNT: case REG_BG1CNT: value &= 0xDFFF;