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

Detect homebrew and force SRAM save type. 

Bug fixes.
This commit is contained in:
profi200 2020-06-15 18:59:09 +02:00
parent a852083583
commit cd99d80e42
No known key found for this signature in database
GPG Key ID: 17B42AE5911139F3
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types.h
View File

@ -30,6 +30,7 @@
#define ALIGN(a) __attribute__((aligned(a))) // Use alignas() instead.
#define NAKED __attribute__((naked))
#define NOINLINE __attribute__((noinline))
#define PACKED __attribute__((packed))
#define TARGET_ARM __attribute__((target("arm")))
#define TARGET_THUMB __attribute__((target("thumb")))

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

@ -39,7 +39,7 @@ static void lgySleepIrqHandler(u32 intSource)
}
}
static Result loadRom(const char *const path, u32 *const rsOut)
static Result loadGbaRom(const char *const path, u32 *const rsOut)
{
Result res;
FHandle f;
@ -57,7 +57,7 @@ static Result loadRom(const char *const path, u32 *const rsOut)
{
*rsOut = romSize;
// Pad ROM area with "open bus" value.
memset((void*)(ROM_LOC + romSize), 0xFFFFFFFFu, romSize);
memset((void*)(ROM_LOC + romSize), 0xFFFFFFFFu, MAX_ROM_SIZE - romSize);
}
}
else res = RES_ROM_TOO_BIG;
@ -71,9 +71,15 @@ 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 u16 tryDetectSaveType(u32 romSize)
{
// TODO: Homebrew detection (always SRAM).
const u32 *romPtr = (u32*)ROM_LOC;
if(romPtr[0xAC / 4] == 0) // If Game Code all zeros --> Homebrew.
{
debug_printf("Detected homebrew. Using SRAM save type.\n");
return SAVE_TYPE_SRAM_256k;
}
romPtr += 0xE4 / 4; // Skip headers.
u16 saveType = SAVE_TYPE_NONE;
const u32 *romPtr = (u32*)(ROM_LOC + 0xE4u); // Skip headers.
for(; romPtr < (u32*)(ROM_LOC + romSize); romPtr++)
{
u32 tmp = *romPtr;
@ -129,14 +135,16 @@ static u16 tryDetectSaveType(u32 romSize)
if(memcmp(romPtr, str, strlen(str)) == 0)
{
debug_printf("Detected save type '%s'.\n", str);
saveType = tmpSaveType;
break;
debug_printf("Detected save type '%s'.\n", str);
goto saveTypeFound;
}
}
}
}
saveTypeFound:
return saveType;
}
@ -156,7 +164,7 @@ Result LGY_prepareGbaMode(bool gbaBios, const char *const romPath, const char *c
{
// Load the ROM image.
u32 romSize;
Result res = loadRom(romPath, &romSize);
Result res = loadGbaRom(romPath, &romSize);
if(res != RES_OK) return res;
// Try to detect the save type.

2
source/arm9/hardware/lgy.c
View File

@ -49,7 +49,7 @@ static void setupBiosOverlay(bool gbaBios)
iomemcpy(REGs_LGY_A7_VECTOR, (u32*)_overlay_stub, (u32)_overlay_stub_size);
NDMA_copy((u32*)ARM7_STUB_LOC9, _arm7_stub_start, (u32)_arm7_stub_size);
// Patch swi 0x10 (RegisterRamReset) to swi 0x26 (HardReset).
// Patch swi 0x01 (RegisterRamReset) to swi 0x26 (HardReset).
if(gbaBios) *((u8*)_arm7_stub_swi) = 0x26;
}