From ff290348c5f3734aa897c2d4d6eaa1df50ea270f Mon Sep 17 00:00:00 2001 From: gijs Date: Fri, 20 Oct 2023 18:19:55 +0200 Subject: [PATCH] Rename `obThreadIdle` to `nuThreadIdle` --- include/common.h | 1 - linker_scripts/symbols/addr.txt | 2 +- src/boot.c | 7 ++++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/common.h b/include/common.h index 82face1..045c8fa 100644 --- a/include/common.h +++ b/include/common.h @@ -320,7 +320,6 @@ extern void obMain(void*); extern OSThread obThreadMain; // extern u8 obStackMain[]; -extern OSThread obThreadIdle; extern u8 obStackIdle[]; extern OverlaySomething __OVERLAY_INFO_resets_menu_timer; diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index ba5bf35..9ee0285 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -26,6 +26,7 @@ nuGfxDisplay = 0x800C4BD8; nuSiMesgQ = 0x800E9B88; nuSiMesgBuf = 0x800BBE60; siMgrThread = 0x800BBE80; +nuThreadIdle = 0x800AF440; nuBoot = 0x8007F880; nuScCreateScheduler = 0x80088C50; // rom:0x19050 @@ -1002,7 +1003,6 @@ __virtual_mem_alloc = 0x80070F30; -obThreadIdle = 0x800AF440; obStackIdle = 0x800B17A0; obMain = 0x80071EB0; diff --git a/src/boot.c b/src/boot.c index 66336d3..08cd7ae 100644 --- a/src/boot.c +++ b/src/boot.c @@ -3,13 +3,14 @@ #include "nu/nusys.h" extern u8 obStackMain[]; +extern OSThread nuThreadIdle; void nuIdle(void* arg); void nuBoot(void) { osInitialize(); - osCreateThread(&obThreadIdle, 1, nuIdle, NULL, obStackIdle, 0xA); - osStartThread(&obThreadIdle); + osCreateThread(&nuThreadIdle, 1, nuIdle, NULL, obStackIdle, 0xA); + osStartThread(&nuThreadIdle); } void nuIdle(void* arg) { @@ -23,7 +24,7 @@ void nuIdle(void* arg) { osCreateThread(&obThreadMain, 3, obMain, NULL, obStackMain, 0xA); osStartThread(&obThreadMain); - osSetThreadPri(&obThreadIdle, OS_PRIORITY_IDLE); + osSetThreadPri(&nuThreadIdle, OS_PRIORITY_IDLE); while(1) { if (nuIdleFunc != NULL)