all repos — mgba @ 357008ff409ae566a115c855ed4e6cf4654bd303

mGBA Game Boy Advance Emulator

GBA: Small cleanup
Jeffrey Pfau jeffrey@endrift.com
Wed, 17 Feb 2016 21:19:53 -0800
commit

357008ff409ae566a115c855ed4e6cf4654bd303

parent

a8beb9f5f38f44e937ff752aee55d9928bf297c4

3 files changed, 5 insertions(+), 5 deletions(-)

jump to
M src/gba/core.csrc/gba/core.c

@@ -154,7 +154,7 @@ }

} static bool _GBACoreLoadROM(struct mCore* core, struct VFile* vf) { - return GBALoadROM2(core->board, vf); + return GBALoadROM(core->board, vf); } static bool _GBACoreLoadBIOS(struct mCore* core, struct VFile* vf, int type) {
M src/gba/gba.csrc/gba/gba.c

@@ -416,7 +416,7 @@ ARMHotplugDetach(gba->cpu, GBA_COMPONENT_DEBUGGER);

gba->cpu->components[GBA_COMPONENT_DEBUGGER] = 0; } -bool GBALoadMB(struct GBA* gba, struct VFile* vf, const char* fname) { +bool GBALoadMB(struct GBA* gba, struct VFile* vf) { GBAUnloadROM(gba); gba->romVf = vf; gba->pristineRomSize = vf->size(vf);

@@ -444,7 +444,7 @@ gba->romCrc32 = doCrc32(gba->pristineRom, gba->pristineRomSize);

return true; } -bool GBALoadROM2(struct GBA* gba, struct VFile* vf) { +bool GBALoadROM(struct GBA* gba, struct VFile* vf) { GBAUnloadROM(gba); gba->romVf = vf; gba->pristineRomSize = vf->size(vf);
M src/gba/gba.hsrc/gba/gba.h

@@ -168,14 +168,14 @@ void GBASetBreakpoint(struct GBA* gba, struct mCPUComponent* component, uint32_t address, enum ExecutionMode mode,

uint32_t* opcode); void GBAClearBreakpoint(struct GBA* gba, uint32_t address, enum ExecutionMode mode, uint32_t opcode); -bool GBALoadROM2(struct GBA* gba, struct VFile* vf); +bool GBALoadROM(struct GBA* gba, struct VFile* vf); bool GBALoadSave(struct GBA* gba, struct VFile* sav); void GBAYankROM(struct GBA* gba); void GBAUnloadROM(struct GBA* gba); void GBALoadBIOS(struct GBA* gba, struct VFile* vf); void GBAApplyPatch(struct GBA* gba, struct Patch* patch); -bool GBALoadMB(struct GBA* gba, struct VFile* vf, const char* fname); +bool GBALoadMB(struct GBA* gba, struct VFile* vf); bool GBAIsROM(struct VFile* vf); bool GBAIsMB(struct VFile* vf);