summaryrefslogtreecommitdiff
path: root/src/boot_O2
diff options
context:
space:
mode:
Diffstat (limited to 'src/boot_O2')
-rw-r--r--src/boot_O2/loadfragment2.c2
-rw-r--r--src/boot_O2/stackcheck.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/boot_O2/loadfragment2.c b/src/boot_O2/loadfragment2.c
index 1c706b476..c7c305a7a 100644
--- a/src/boot_O2/loadfragment2.c
+++ b/src/boot_O2/loadfragment2.c
@@ -72,7 +72,7 @@ s32 Load2_LoadOverlay(u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd, u3
if(1);
- Dmamgr_SendRequestAndWait(allocatedVRamAddr, vRomStart, size);
+ DmaMgr_SendRequest0(allocatedVRamAddr, vRomStart, size);
end = (void*)(allocatedVRamAddr + size);
overlayInfo = (OverlayBlockSizes*)((int)end - *(int*)((int)end + -4));
diff --git a/src/boot_O2/stackcheck.c b/src/boot_O2/stackcheck.c
index a938db3f4..50affc8bb 100644
--- a/src/boot_O2/stackcheck.c
+++ b/src/boot_O2/stackcheck.c
@@ -4,15 +4,15 @@
StackEntry* sStackInfoListStart = NULL;
StackEntry* sStackInfoListEnd = NULL;
-void StackCheck_Init(StackEntry* entry, u32 stackTop, u32 stackBottom, u32 initValue, s32 minSpace, char* name) {
+void StackCheck_Init(StackEntry* entry, void* stackTop, void* stackBottom, u32 initValue, s32 minSpace, const char* name) {
StackEntry* iter;
u32* addr;
if (!entry) {
sStackInfoListStart = NULL;
} else {
- entry->head = stackTop;
- entry->tail = stackBottom;
+ entry->head = (u32)stackTop;
+ entry->tail = (u32)stackBottom;
entry->initValue = initValue;
entry->minSpace = minSpace;
entry->name = name;