From 94c8f704af3fe2f4849a7f3187d3977ea6c763c5 Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Thu, 24 Aug 2023 14:40:56 -0400 Subject: `z_std_dma.c` (#75) * C file * func_80026A64_jp, DmaMgr_RequestSync * func_80026714_jp, func_80026814_jp, func_800269E4_jp, func_80026C4C_jp, func_80026DA0_jp, func_80026DCC_jp, func_80026E10_jp * func_80026770_jp, func_800267DC_jp, func_80026BC0_jp, func_80026C00_jp, func_80026C28_jp * DmaMgr_DmaRomToRam * func_800266C4_jp, func_80026828_jp * func_800263F0_jp * func_80026CAC_jp * migrate other strings * Fix some warnings * start renamings * Improve func_800263F0_jp * steal stuff from OoT * dmaEntryMsgBufs * name the remaining stuff * format * minor cleanups * review * format * review --- src/boot/O2/loadfragment2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/boot/O2') diff --git a/src/boot/O2/loadfragment2.c b/src/boot/O2/loadfragment2.c index fdb6938..3b4a888 100644 --- a/src/boot/O2/loadfragment2.c +++ b/src/boot/O2/loadfragment2.c @@ -13,15 +13,15 @@ void DoRelocation(void* allocatedRamAddr, OverlayRelocationSection* ovlRelocs, void* vramStart); // original name unknown -s32 Overlay_Load(RomOffset vromStart, RomOffset vromEnd, void* ovlStart, void* ovlEnd, void* vramStart, void* vramEnd, - void* allocatedRamAddr, OverlayRelocationSection* ovlRelocs) { +s32 Overlay_Load(RomOffset vromStart, RomOffset vromEnd, RomOffset ovlStart, RomOffset ovlEnd, void* vramStart, + void* vramEnd, void* allocatedRamAddr, OverlayRelocationSection* ovlRelocs) { OverlayRelocationSection* ovl = ovlRelocs; s32 vromSize = vromEnd - vromStart; - s32 ovlSize = (uintptr_t)ovlEnd - (uintptr_t)ovlStart; + s32 ovlSize = ovlEnd - ovlStart; s32 vramSize = (uintptr_t)vramEnd - (uintptr_t)vramStart; void* end = (void*)((uintptr_t)allocatedRamAddr + vromSize); - DmaMgr_RequestSync(allocatedRamAddr, (void*)vromStart, vromSize); + DmaMgr_RequestSync(allocatedRamAddr, vromStart, vromSize); DmaMgr_RequestSync(ovl, ovlStart, ovlSize); DoRelocation(allocatedRamAddr, ovl, vramStart); -- cgit v1.2.3