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

Small bug fixes/improvements for previous commit.

This commit is contained in:
profi200 2020-06-13 17:33:01 +02:00
parent 9002291e8a
commit ffee972238
No known key found for this signature in database
GPG Key ID: 17B42AE5911139F3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/arm11/hardware/lgy.c
View File

@ -71,7 +71,7 @@ static Result loadRom(const char *const path, u32 *const rsOut)
}
// Code based on: https://github.com/Gericom/GBARunner2/blob/master/arm9/source/save/Save.vram.cpp
static void tryDetectSaveType(u32 romSize, u16 *const stOut)
static u16 tryDetectSaveType(u32 romSize)
{
#ifndef NDEBUG
ee_puts("Trying to detect save type...");
@ -158,13 +158,17 @@ static void tryDetectSaveType(u32 romSize, u16 *const stOut)
#ifndef NDEBUG
ee_printf("Found save type %s.", str);
#endif
*stOut = saveType;
return saveType;
}
}
}
else
{
#ifndef NDEBUG
else ee_puts("Could not identify save type. Using none.");
ee_puts("Could not identify save type. Using none.");
#endif
return SAVE_TYPE_NONE;
}
}
static void setupFcramForGbaMode(void)
@ -187,11 +191,10 @@ Result LGY_prepareGbaMode(bool gbaBios, const char *const romPath, const char *c
if(res != RES_OK) return res;
// Try to detect the save type.
u16 saveType = SAVE_TYPE_NONE;
tryDetectSaveType(romSize, &saveType);
const u16 saveType = tryDetectSaveType(romSize);
// Prepare ARM9 for GBA mode + settings and save loading.
u32 cmdBuf[2];
u32 cmdBuf[4];
cmdBuf[0] = (u32)savePath;
cmdBuf[1] = strlen(savePath) + 1;
cmdBuf[2] = gbaBios;
@ -223,13 +226,13 @@ Result LGY_prepareGbaMode(bool gbaBios, const char *const romPath, const char *c
Result LGY_setGbaRtc(const GbaRtc rtc)
{
return PXI_sendCmd(IPC_CMD9_SET_GBA_RTC, (u32*)&rtc, 2);
return PXI_sendCmd(IPC_CMD9_SET_GBA_RTC, (u32*)&rtc, sizeof(GbaRtc) / 4);
}
Result LGY_getGbaRtc(GbaRtc *const out)
{
const u32 cmdBuf[2] = {(u32)out, sizeof(GbaRtc)};
return PXI_sendCmd(IPC_CMD9_GET_GBA_RTC, cmdBuf, sizeof(GbaRtc) / 4);
return PXI_sendCmd(IPC_CMD9_GET_GBA_RTC, cmdBuf, 2);
}
void LGY_switchMode(void)