From d5700456315cf00ece392413846c88dd63ed9356 Mon Sep 17 00:00:00 2001 From: gijs Date: Fri, 20 Oct 2023 10:43:13 +0200 Subject: [PATCH] Rename `boot` to `nuBoot` --- include/common.h | 4 +--- linker_scripts/symbols/addr.txt | 2 +- src/boot.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/common.h b/include/common.h index 8730da6..bdb1b8d 100644 --- a/include/common.h +++ b/include/common.h @@ -355,12 +355,10 @@ extern const char STR_EMPTY[]; extern void AddHeap(void* start, u32 length); extern void __some_logging(const char* format, ...); - +extern void nuBoot(void); extern void nuScCreateScheduler(u8 videoMode, u8 numFields); extern void (*D_800E7A18)(); -extern void boot(void); - extern void obIdle(void*); extern void obMain(void*); diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 47d7ed0..c7ab5ab 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -686,6 +686,7 @@ __MAIN_START_BUT_STATE = 0x800E8214; __thread_80089358 = 0x80089358; nusched = 0x800E917C; // size:0x67A +nuBoot = 0x8007F880; nuScCreateScheduler = 0x80088C50; // rom:0x19050 nuPiInit = 0x80089F40; @@ -981,7 +982,6 @@ obMain = 0x80071EB0; obThreadMain = 0x800AF5F0; obStackMain = 0x800C6D60; -boot = 0x8007F880; entry = 0x80070C00; guRotateRPYF = 0x80092A90; diff --git a/src/boot.c b/src/boot.c index 4d64da2..2b00f7a 100644 --- a/src/boot.c +++ b/src/boot.c @@ -2,7 +2,7 @@ extern u8 obStackMain[]; -void boot(void) { +void nuBoot(void) { osInitialize(); osCreateThread(&obThreadIdle, 1, obIdle, NULL, obStackIdle, 0xA); osStartThread(&obThreadIdle);