all repos — mgba @ cb1b04f1b6839026dc8c24417cce4c2740c02d26

mGBA Game Boy Advance Emulator

DS Memory: Stub out Slot-2 loading for now
Vicki Pfau vi@endrift.com
Fri, 17 Mar 2017 08:35:13 -0700
commit

cb1b04f1b6839026dc8c24417cce4c2740c02d26

parent

632bd566c30321e8cf3cae8252e3ae0aa1095628

1 files changed, 30 insertions(+), 0 deletions(-)

jump to
M src/ds/memory.csrc/ds/memory.c

@@ -314,6 +314,11 @@ break;

case DS_REGION_IO: value = DS7IORead32(ds, address & 0x00FFFFFC); break; + case DS_REGION_SLOT2: + case DS_REGION_SLOT2_EX: + case DS_REGION_SLOT2_SRAM: + value = 0xFFFFFFFF; + break; case DS_REGION_VRAM: if (address < 0x06040000 && memory->vram7[(address & 0x3FFFF) >> 17]) { LOAD_32(value, address & 0x1FFFC, memory->vram7[(address & 0x3FFFF) >> 17]);

@@ -360,6 +365,11 @@ mLOG(DS_MEM, STUB, "Unimplemented DS7 Load16: %08X", address);

case DS_REGION_IO: value = DS7IORead(ds, address & DS_OFFSET_MASK); break; + case DS_REGION_SLOT2: + case DS_REGION_SLOT2_EX: + case DS_REGION_SLOT2_SRAM: + value = 0xFFFF; + break; case DS_REGION_VRAM: if (address < 0x06040000 && memory->vram7[(address & 0x3FFFF) >> 17]) { LOAD_16(value, address & 0x1FFFE, memory->vram7[(address & 0x3FFFF) >> 17]);

@@ -406,6 +416,11 @@ mLOG(DS_MEM, STUB, "Unimplemented DS7 Load8: %08X", address);

break; case DS_REGION_IO: value = (DS7IORead(ds, address & 0xFFFE) >> ((address & 0x0001) << 3)) & 0xFF; + break; + case DS_REGION_SLOT2: + case DS_REGION_SLOT2_EX: + case DS_REGION_SLOT2_SRAM: + value = 0xFF; break; default: mLOG(DS_MEM, STUB, "Unimplemented DS7 Load8: %08X", address);

@@ -839,6 +854,11 @@ }

case DS9_REGION_OAM: LOAD_32(value, address & (DS9_SIZE_OAM - 4), ds->video.oam.raw); break; + case DS_REGION_SLOT2: + case DS_REGION_SLOT2_EX: + case DS_REGION_SLOT2_SRAM: + value = 0xFFFFFFFF; + break; case DS9_REGION_BIOS: // TODO: Fix undersized BIOS // TODO: Fix masking

@@ -915,6 +935,11 @@ }

case DS9_REGION_OAM: LOAD_16(value, address & (DS9_SIZE_OAM - 2), ds->video.oam.raw); break; + case DS_REGION_SLOT2: + case DS_REGION_SLOT2_EX: + case DS_REGION_SLOT2_SRAM: + value = 0xFFFF; + break; case DS9_REGION_BIOS: // TODO: Fix undersized BIOS // TODO: Fix masking

@@ -983,6 +1008,11 @@ }

} break; } + case DS_REGION_SLOT2: + case DS_REGION_SLOT2_EX: + case DS_REGION_SLOT2_SRAM: + value = 0xFF; + break; case DS9_REGION_BIOS: // TODO: Fix undersized BIOS // TODO: Fix masking