diff --git a/src/boot_O2_g3/boot_main.c b/src/boot_O2_g3/boot_main.c index 9bcdcca0cd..81daac81cc 100644 --- a/src/boot_O2_g3/boot_main.c +++ b/src/boot_O2_g3/boot_main.c @@ -2,13 +2,13 @@ #include void bootproc(void) { - StackCheck_Init(&sBootThreadInfo, (u32)sBootThreadStack, (u32)&sBootThreadStack[1024], 0, -1, "boot"); + StackCheck_Init(&sBootThreadInfo, sBootThreadStack, &sBootThreadStack[1024], 0, -1, "boot"); osMemSize = osGetMemSize(); func_800818F4(); osInitialize(); osUnmapTLBAll(); gCartHandle = osCartRomInit(); - StackCheck_Init(&sIdleThreadInfo, (u32)sIdleThreadStack, (u32)&sIdleThreadStack[1024], 0, 256, "idle"); + StackCheck_Init(&sIdleThreadInfo, sIdleThreadStack, &sIdleThreadStack[1024], 0, 256, "idle"); osCreateThread(&sIdleThread, 1, (osCreateThread_func)Idle_ThreadEntry, 0, &sIdleThreadStack[1024], 12); osStartThread(&sIdleThread); } diff --git a/src/boot_O2_g3/idle.c b/src/boot_O2_g3/idle.c index 6202df871e..02a3ad68e7 100644 --- a/src/boot_O2_g3/idle.c +++ b/src/boot_O2_g3/idle.c @@ -69,7 +69,7 @@ GLOBAL_ASM("./asm/non_matchings/idle/Idle_InitCodeAndMemory.asm") #endif void Main_ThreadEntry(void* arg) { - StackCheck_Init(&irqmgrStackEntry, (u32)&irqmgrStack, (u32)&irqmgrStack[1280], 0, 256, "irqmgr"); + StackCheck_Init(&irqmgrStackEntry, &irqmgrStack, &irqmgrStack[1280], 0, 256, "irqmgr"); IrqMgr_Create(&irqmgrContext, &irqmgrStackEntry, 18, 1); Dmamgr_Start(); Idle_InitCodeAndMemory(); @@ -106,7 +106,7 @@ void func_8008038C(void) { void Idle_ThreadEntry(void* arg) { func_8008038C(); osCreatePiManager(150, &D_8009B228, D_8009B160, 50); - StackCheck_Init(&mainStackEntry, (u32)&mainStack, (u32)&mainStack[2304], 0, 1024, "main"); + StackCheck_Init(&mainStackEntry, &mainStack, &mainStack[2304], 0, 1024, "main"); osCreateThread(&mainOSThread, 3, (osCreateThread_func)Main_ThreadEntry, arg, &mainStack[2304], 12); osStartThread(&mainOSThread); osSetThreadPri(NULL, 0); diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c index 56dcefc401..692c446073 100644 --- a/src/boot_O2_g3/z_std_dma.c +++ b/src/boot_O2_g3/z_std_dma.c @@ -165,7 +165,7 @@ s32 DmaMgr_SendRequestImpl(DmaRequest* request, u32 vramStart, u32 vromStart, u3 } request->vromStart = vromStart; - request->dramAddr = vramStart; + request->dramAddr = (void*)vramStart; request->size = size; request->unk14 = 0; request->notifyQueue = callback; @@ -208,7 +208,7 @@ void Dmamgr_Start() { osCreateMesgQueue(&dmamgrMsq, dmamgrMsqMessages, 32); - StackCheck_Init(&dmamgrStackEntry, (u32)&dmamgrStack, (u32)&dmamgrStack[1280], 0, 256, dmamgrThreadName); + StackCheck_Init(&dmamgrStackEntry, &dmamgrStack, &dmamgrStack[1280], 0, 256, dmamgrThreadName); osCreateThread(&dmamgrOSThread, 18, Dmamgr_ThreadEntry, NULL, &dmamgrStack[1280], 17);