diff --git a/spec b/spec index a8a6dbb534..5ab17d2ee1 100644 --- a/spec +++ b/spec @@ -36,7 +36,7 @@ beginseg include "build/src/libultra/os/initialize.o" include "build/src/libultra/libc/ll.o" include "build/src/libultra/os/exceptasm.o" - include "build/src/libultra/os/dequeuethread.o" + include "build/src/libultra/os/thread.o" include "build/src/libultra/os/destroythread.o" include "build/src/libultra/libc/bzero.o" include "build/src/libultra/os/parameters.o" diff --git a/src/libultra/os/createthread.c b/src/libultra/os/createthread.c index c8fd4c6b6b..8d54fb9871 100644 --- a/src/libultra/os/createthread.c +++ b/src/libultra/os/createthread.c @@ -1,12 +1,6 @@ #include "global.h" #include "ultra64/asm.h" -__OSThreadTail __osThreadTail = { NULL, OS_PRIORITY_THREADTAIL }; -OSThread* __osRunQueue = (OSThread*)&__osThreadTail; -OSThread* __osActiveQueue = (OSThread*)&__osThreadTail; -OSThread* __osRunningThread = NULL; -OSThread* __osFaultedThread = NULL; - void osCreateThread(OSThread* thread, OSId id, void (*entry)(void*), void* arg, void* sp, OSPri pri) { register u32 prevInt; OSIntMask mask; diff --git a/src/libultra/os/dequeuethread.c b/src/libultra/os/thread.c similarity index 56% rename from src/libultra/os/dequeuethread.c rename to src/libultra/os/thread.c index 14e9d346d8..c78a34e4ec 100644 --- a/src/libultra/os/dequeuethread.c +++ b/src/libultra/os/thread.c @@ -1,5 +1,11 @@ #include "global.h" +__OSThreadTail __osThreadTail = { NULL, OS_PRIORITY_THREADTAIL }; +OSThread* __osRunQueue = (OSThread*)&__osThreadTail; +OSThread* __osActiveQueue = (OSThread*)&__osThreadTail; +OSThread* __osRunningThread = NULL; +OSThread* __osFaultedThread = NULL; + void __osDequeueThread(OSThread** queue, OSThread* thread) { register OSThread** a2 = queue; register OSThread* a3 = *a2;