diff --git a/include/d/d_main.h b/include/d/d_main.h index 09537513..12d3a150 100644 --- a/include/d/d_main.h +++ b/include/d/d_main.h @@ -4,10 +4,12 @@ #include "rvl/OS.h" namespace dMain { - void Create(); - void Execute(); - void *main01(void *arg); - OSTime g_InitialTime; -}; + +void Create(); +void Execute(); +void *main01(void *arg); +OSTime g_InitialTime; + +}; // namespace dMain #endif // D_MAIN_H diff --git a/src/d/d_main.cpp b/src/d/d_main.cpp index 9ad27e41..aac41dd6 100644 --- a/src/d/d_main.cpp +++ b/src/d/d_main.cpp @@ -1,10 +1,11 @@ #include "d/d_main.h" #include "d/d_sys.h" -#include "rvl/OS.h" #include "toBeSorted/d_lib.h" #include "toBeSorted/mpls.h" +#include "rvl/OS.h" + OSThread MAIN_THREAD; #define STACK_SIZE 0xF000 @@ -28,7 +29,7 @@ void *dMain::main01(void *arg) { void main(int argc, char **argv) { u8 pStackBase[STACK_SIZE] __attribute__((aligned(32))); - + fn_80006C20(); dMain::g_InitialTime = OSGetTime(); dSystem::fixHeaps(); @@ -38,15 +39,7 @@ void main(int argc, char **argv) { OSThread *curThread = OSGetCurrentThread(); OSPriority curPrio = OSGetThreadPriority(curThread); - OSCreateThread( - &MAIN_THREAD, - dMain::main01, - nullptr, - &pStackBase[STACK_SIZE], - STACK_SIZE, - curPrio, - 0 - ); + OSCreateThread(&MAIN_THREAD, dMain::main01, nullptr, &pStackBase[STACK_SIZE], STACK_SIZE, curPrio, 0); OSResumeThread(&MAIN_THREAD); OSSetThreadPriority(curThread, 31);