Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 13:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove offset hardcoding from AGBSAVE handling

Browse Source
This commit is contained in:
d0k3 2017-05-26 01:09:33 +02:00
parent 48281307a0
commit 4984df1c08
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/nand/agbsave.c
View File

@ -4,7 +4,9 @@
u32 GetAgbSaveSize(u32 nand_src) { u32 GetAgbSaveSize(u32 nand_src) {
AgbSave* agbsave = (AgbSave*) NAND_BUFFER; AgbSave* agbsave = (AgbSave*) NAND_BUFFER;
if (ReadNandSectors((u8*) agbsave, SECTOR_AGBSAVE, 1, 0x07, nand_src) != 0) NandPartitionInfo info;
if ((GetNandPartitionInfo(&info, NP_TYPE_AGB, NP_SUBTYPE_CTR, 0, nand_src) != 0) ||
(ReadNandSectors((u8*) agbsave, info.sector, 1, info.keyslot, nand_src) != 0))
return 0; return 0;
return agbsave->save_size; // it's recommended to also check the CMAC return agbsave->save_size; // it's recommended to also check the CMAC
} }
@ -13,10 +15,12 @@ u32 CheckAgbSaveCmac(u32 nand_src) {
u8 magic[] = { AGBSAVE_MAGIC }; u8 magic[] = { AGBSAVE_MAGIC };
AgbSave* agbsave = (AgbSave*) NAND_BUFFER; AgbSave* agbsave = (AgbSave*) NAND_BUFFER;
if ((ReadNandSectors((u8*) agbsave, SECTOR_AGBSAVE, 1, 0x07, nand_src) != 0) || NandPartitionInfo info;
if ((GetNandPartitionInfo(&info, NP_TYPE_AGB, NP_SUBTYPE_CTR, 0, nand_src) != 0) ||
(ReadNandSectors((u8*) agbsave, info.sector, 1, info.keyslot, nand_src) != 0) ||
(memcmp(agbsave->magic, magic, sizeof(magic)) != 0) || (memcmp(agbsave->magic, magic, sizeof(magic)) != 0) ||
(0x200 + agbsave->save_size > SIZE_AGBSAVE * 0x200) || (0x200 + agbsave->save_size > info.count * 0x200) ||
(ReadNandBytes(agbsave->savegame, (SECTOR_AGBSAVE+1) * 0x200, agbsave->save_size, 0x07, nand_src) != 0)) (ReadNandBytes(agbsave->savegame, (info.sector+1) * 0x200, agbsave->save_size, info.keyslot, nand_src) != 0))
return 1; return 1;
u8 cmac[16] __attribute__((aligned(32))); u8 cmac[16] __attribute__((aligned(32)));
@ -30,9 +34,11 @@ u32 CheckAgbSaveCmac(u32 nand_src) {
u32 FixAgbSaveCmac(u32 nand_dst) { u32 FixAgbSaveCmac(u32 nand_dst) {
AgbSave* agbsave = (AgbSave*) NAND_BUFFER; AgbSave* agbsave = (AgbSave*) NAND_BUFFER;
if ((ReadNandSectors((u8*) agbsave, SECTOR_AGBSAVE, 1, 0x07, nand_dst) != 0) || NandPartitionInfo info;
(0x200 + agbsave->save_size > SIZE_AGBSAVE * 0x200) || if ((GetNandPartitionInfo(&info, NP_TYPE_AGB, NP_SUBTYPE_CTR, 0, nand_dst) != 0) ||
(ReadNandBytes(agbsave->savegame, (SECTOR_AGBSAVE+1) * 0x200, agbsave->save_size, 0x07, nand_dst) != 0)) (ReadNandSectors((u8*) agbsave, info.sector, 1, info.keyslot, nand_dst) != 0) ||
(0x200 + agbsave->save_size > info.count * 0x200) ||
(ReadNandBytes(agbsave->savegame, (info.sector+1) * 0x200, agbsave->save_size, info.keyslot, nand_dst) != 0))
return 1; return 1;
u8 cmac[16] __attribute__((aligned(32))); u8 cmac[16] __attribute__((aligned(32)));
@ -46,5 +52,5 @@ u32 FixAgbSaveCmac(u32 nand_dst) {
// https://www.3dbrew.org/wiki/CONFIG_Registers#CFG_BOOTENV // https://www.3dbrew.org/wiki/CONFIG_Registers#CFG_BOOTENV
*(u32*) 0x10010000 = 0x7; *(u32*) 0x10010000 = 0x7;
return (WriteNandSectors((u8*) agbsave, SECTOR_AGBSAVE, 1, 0x07, nand_dst) == 0) ? 0 : 1; return (WriteNandSectors((u8*) agbsave, info.sector, 1, info.keyslot, nand_dst) == 0) ? 0 : 1;
} }

2
source/nand/agbsave.h
View File

@ -21,7 +21,7 @@ typedef struct {
u32 unknown1; // has to do with ARM7? u32 unknown1; // has to do with ARM7?
u32 unknown2; // has to do with ARM7? u32 unknown2; // has to do with ARM7?
u8 reserved3[0x198]; // always 0xFF u8 reserved3[0x198]; // always 0xFF
u8 savegame[(SIZE_AGBSAVE-1)*0x200]; u8 savegame[(0x000180-1)*0x200]; // unknown on custom partitions
} __attribute__((packed)) AgbSave; } __attribute__((packed)) AgbSave;
u32 GetAgbSaveSize(u32 nand_src); u32 GetAgbSaveSize(u32 nand_src);