From 6eb644c5cf7656ba83fc877e914b05851643d7e6 Mon Sep 17 00:00:00 2001 From: gijs Date: Fri, 20 Oct 2023 17:58:51 +0200 Subject: [PATCH] Rename `__controller_thread_80089D9C` to `nuSiMgrThread` --- include/common.h | 1 - linker_scripts/symbols/addr.txt | 2 +- src/_ob_icy_coast.c | 6 ++++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/common.h b/include/common.h index 5c2e794..de0fe59 100644 --- a/include/common.h +++ b/include/common.h @@ -173,7 +173,6 @@ extern void __calls_osViBlack(bool black); extern void __osViSwapBuffer_3(void** buffers); extern s32 func_80089CF8(s16 arg0, s32 arg1); -extern void __controller_thread_80089D9C(void*); extern void __start_copy_global_controller_data(void); extern void __end_copy_global_controller_data(void); diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index efc4601..e68be75 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -57,6 +57,7 @@ nuGfxFuncSet = 0x80089990; nuGfxDisplayOff = 0x80089BC0; nuGfxDisplayOn = 0x80089C50; nuSiMgrInit = 0x80089C60; +nuSiMgrThread = 0x80089D9C; obCurrentTime = 0x800C47D0; @@ -995,7 +996,6 @@ __ERROR_BAD_TABLE = 0x800AE338; __VIRTUAL_MEMORY_EXHAUSTED = 0x800AE35C; __virtual_mem_alloc = 0x80070F30; -__controller_thread_80089D9C = 0x80089D9C; diff --git a/src/_ob_icy_coast.c b/src/_ob_icy_coast.c index 788ee0d..32890ee 100644 --- a/src/_ob_icy_coast.c +++ b/src/_ob_icy_coast.c @@ -2,6 +2,8 @@ #include "nu/nusys.h" +void nuSiMgrThread(void* arg); + /* 1A060 80089C60 */ u8 nuSiMgrInit(void) { u8 pattern; @@ -12,7 +14,7 @@ u8 nuSiMgrInit(void) { osContInit(&nuSiMesgQ, &pattern, status); - osCreateThread(&siMgrThread, 5, __controller_thread_80089D9C, NULL, &MQ_800BE030, 0x73); + osCreateThread(&siMgrThread, 5, nuSiMgrThread, NULL, &MQ_800BE030, NU_SI_THREAD_PRI); osStartThread(&siMgrThread); return pattern; @@ -50,7 +52,7 @@ void __start_controller_thread(void) { osStartThread(&siMgrThread); } -INCLUDE_ASM(const s32, "_ob_icy_coast", __controller_thread_80089D9C); +INCLUDE_ASM(const s32, "_ob_icy_coast", nuSiMgrThread); void nuPiInit(void) { osCreatePiManager(OS_PRIORITY_PIMGR, &MQ_800BE030, OSMESG_800BE048, sizeof(OSMESG_800BE048) / sizeof(OSMesg));