Fix some libultra struct types (#677)

Makefile

@@ -279,14 +279,20 @@ GLOBAL_ASM_RACING_O_FILES = $(foreach file,$(GLOBAL_ASM_RACING_C_FILES),$(BUILD_
 
 # detect prefix for MIPS toolchain
 ifneq ($(CROSS),)
-else ifneq      ($(call find-command,mips-linux-gnu-ld),)
-	CROSS := mips-linux-gnu-
-else ifneq ($(call find-command,mips64-linux-gnu-ld),)
-	CROSS := mips64-linux-gnu-
 else ifneq ($(call find-command,mips64-elf-ld),)
-	CROSS := mips64-elf-
+  CROSS := mips64-elf-
+# else ifneq ($(call find-command,mips-n64-ld),)
+#   CROSS := mips-n64-
+else ifneq ($(call find-command,mips64-ld),)
+  CROSS := mips64-
+else ifneq ($(call find-command,mips-linux-gnu-ld),)
+  CROSS := mips-linux-gnu-
+else ifneq ($(call find-command,mips64-linux-gnu-ld),)
+  CROSS := mips64-linux-gnu-
+else ifneq ($(call find-command,mips-ld),)
+  CROSS := mips-
 else
-	$(error Unable to detect a suitable MIPS toolchain installed)
+  $(error Unable to detect a suitable MIPS toolchain installed)
 endif
 
 AS      := $(CROSS)as

mk64.ld

@@ -356,7 +356,7 @@ SECTIONS
       BUILD_DIR/src/os/osContInit.o(.bss*);
       BUILD_DIR/src/os/osPfsIsPlug.o(.bss*);
       BUILD_DIR/src/os/guRotateF.o(.bss*);
-      BUILD_DIR/src/os/leointerrupt.o(.bss*);
+      BUILD_DIR/src/os/__osLeoInterrupt.o(.bss*);
       BUILD_DIR/src/os/osTimer.o(.bss*);
       BUILD_DIR/src/os/__osPiCreateAccessQueue.o(.bss*);
       BUILD_DIR/src/os/__osSiCreateAccessQueue.o(.bss*);

src/os/__osDequeueThread.c

@@ -1,23 +1,24 @@
 #include "libultra_internal.h"
 
-NO_REORDER OSThread* __osThreadTail = NULL;
-NO_REORDER u32 __osTest = -1;
-NO_REORDER OSThread* __osRunQueue = (OSThread*) &__osThreadTail;
-NO_REORDER OSThread* __osActiveQueue = (OSThread*) &__osThreadTail;
-OSThread* __osRunningThread = NULL;
-OSThread* __osFaultedThread = NULL;
+struct __osThreadTail __osThreadTail = { NULL, -1 };
+OSThread *__osRunQueue = (OSThread *) &__osThreadTail;
+OSThread *__osActiveQueue = (OSThread *) &__osThreadTail;
+OSThread *__osRunningThread = { 0 };
+OSThread *__osFaultedThread = { 0 };
 
-void __osDequeueThread(OSThread** queue, OSThread* thread) {
-    register OSThread** a2;
-    register OSThread* a3;
-    a2 = queue;
-    a3 = *a2;
-    while (a3 != NULL) {
-        if (a3 == thread) {
-            *a2 = thread->next;
+void __osDequeueThread(register OSThread **queue, register OSThread *t) {
+    register OSThread *pred;
+    register OSThread *succ;
+
+    pred = (OSThread *) queue;
+    succ = pred->next;
+
+    while (succ != NULL) {
+        if (succ == t) {
+            pred->next = t->next;
             return;
         }
-        a2 = &a3->next;
-        a3 = *a2;
+        pred = succ;
+        succ = pred->next;
     }
 }

src/os/__osLeoInterrupt.c

@@ -5,10 +5,10 @@
 
 static void __osLeoResume(void);
 static void __osLeoAbnormalResume(void);
-extern u8 leoDiskStack[OS_PIM_STACKSIZE]; // technically should have a OS_LEO_STACKSIZE or something..
-
 extern u32 D_800EA5F0;
 
+u8 leoDiskStack[OS_PIM_STACKSIZE]; // technically should have a OS_LEO_STACKSIZE or something..
+
 s32 __osLeoInterrupt() {
     u32 stat;
     volatile u32 pistat;

src/os/libultra_internal.h

@@ -9,14 +9,11 @@ typedef struct __OSEventState {
     OSMesg message;
 } __OSEventState;
 
-typedef struct // __osThreadTail
+extern struct __osThreadTail
 {
-    /* 0x00 */ OSThread* next;
-    /* 0x04 */ OSPri priority;
-    /* 0x08 */ OSThread* queue;
-    /* 0x0c */ OSThread* tlnext;
-
-} OSThreadTail;
+    OSThread *next;
+    OSPri priority;
+} __osThreadTail;
 
 /*
  * This define is needed because the original definitions in __osDequeueThread.c are declared
@@ -34,10 +31,10 @@ typedef struct {
 } OSThread_ListHead;
 
 // Original OSThread_ListHead definitions
-extern OSThread* __osThreadTail;
-extern OSThread* __osActiveQueue;
-extern OSThread* __osRunQueue;
-extern OSThread* __osRunningThread;
+extern OSThread *__osRunningThread;
+extern OSThread *__osActiveQueue;
+extern OSThread *__osFaultedThread;
+extern OSThread *__osRunQueue;
 
 // Original EEPROM definitions
 extern u32 D_80365E00[15];