Decomp __osSetHWIntrRoutine and clean up some includes in other os files

lib/asm/exception/__osException.s

@@ -188,9 +188,9 @@ glabel __osException
 /* 0D3B20 800D2F20 2401F7FF */  li    $at, -2049
 /* 0D3B24 800D2F24 02018024 */  and   $s0, $s0, $at
 /* 0D3B28 800D2F28 240A0004 */  li    $t2, 4
-/* 0D3B2C 800D2F2C 3C01800E */  lui   $at, %hi(D_800E48A0) # $at, 0x800e
+/* 0D3B2C 800D2F2C 3C01800E */  lui   $at, %hi(__osHwIntTable) # $at, 0x800e
 /* 0D3B30 800D2F30 002A0821 */  addu  $at, $at, $t2
-/* 0D3B34 800D2F34 8C2A48A0 */  lw    $t2, %lo(D_800E48A0)($at)
+/* 0D3B34 800D2F34 8C2A48A0 */  lw    $t2, %lo(__osHwIntTable)($at)
 /* 0D3B38 800D2F38 3C1D8013 */  lui   $sp, %hi(D_8012AAE0) # $sp, 0x8013
 /* 0D3B3C 800D2F3C 27BDAAE0 */  addiu $sp, %lo(D_8012AAE0) # addiu $sp, $sp, -0x5520
 /* 0D3B40 800D2F40 24040010 */  li    $a0, 16

lib/asm/non_matchings/unknown_0D5390/__osSetHWIntrRoutine.s

@@ -7,13 +7,13 @@ glabel __osSetHWIntrRoutine
 /* 0D5404 800D4804 AFB00018 */   sw    $s0, 0x18($sp)
 /* 0D5408 800D4808 8FAF0028 */  lw    $t7, 0x28($sp)
 /* 0D540C 800D480C 8FAE002C */  lw    $t6, 0x2c($sp)
-/* 0D5410 800D4810 3C01800E */  lui   $at, %hi(D_800E48A0) # $at, 0x800e
+/* 0D5410 800D4810 3C01800E */  lui   $at, %hi(__osHwIntTable) # $at, 0x800e
 /* 0D5414 800D4814 000FC080 */  sll   $t8, $t7, 2
 /* 0D5418 800D4818 00408025 */  move  $s0, $v0
 /* 0D541C 800D481C 00380821 */  addu  $at, $at, $t8
 /* 0D5420 800D4820 02002025 */  move  $a0, $s0
 /* 0D5424 800D4824 0C034960 */  jal   __osRestoreInt
-/* 0D5428 800D4828 AC2E48A0 */   sw    $t6, %lo(D_800E48A0)($at)
+/* 0D5428 800D4828 AC2E48A0 */   sw    $t6, %lo(__osHwIntTable)($at)
 /* 0D542C 800D482C 8FBF001C */  lw    $ra, 0x1c($sp)
 /* 0D5430 800D4830 8FB00018 */  lw    $s0, 0x18($sp)
 /* 0D5434 800D4834 27BD0028 */  addiu $sp, $sp, 0x28

lib/src/al/alCopy.c

@@ -5,7 +5,7 @@
 #include "macros.h"
 
 //TODO: This probably belongs somewhere else
-s32 D_800E48A0[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+s32 __osHwIntTable[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
 void alCopy(void *src, void *dest, s32 len) {
     s32  i;

lib/src/os/__osSetHWIntrRoutine.c

@@ -0,0 +1,13 @@
+/* The comment below is needed for this file to be picked up by generate_ld */
+/* RAM_POS: 0x800D47DC */
+
+#include "libultra_internal.h"
+
+extern s32 (*__osHwIntTable[])(void);
+
+void __osSetHWIntrRoutine(OSHWIntr interrupt, s32 (*handler)(void)) {
+    register u32 saveMask;
+    saveMask = __osDisableInt();
+    __osHwIntTable[interrupt] = handler;
+    __osRestoreInt(saveMask);
+}

lib/src/os/contramread.c

@@ -1,7 +1,6 @@
 /* The comment below is needed for this file to be picked up by generate_ld */
 /* RAM_POS: 0x800CDCA0 */
 
-#include "macros.h"
 #include "libultra_internal.h"
 #include "controller.h"
 #include "siint.h"

lib/src/os/contramwrite.c

@@ -2,7 +2,6 @@
 /* RAM_POS: 0x800CD8F0 */
 
 #include "libultra_internal.h"
-#include "macros.h"
 #include "controller.h"
 #include "siint.h"
 

lib/src/os/crc.c

@@ -2,7 +2,6 @@
 /* RAM_POS: 0x800CD770 */
 
 #include "types.h"
-#include "macros.h"
 
 u8 __osContAddressCrc(u16 addr) {
     u8 temp;

lib/src/os/osAiGetLength.c

@@ -1,8 +1,6 @@
 /* The comment below is needed for this file to be picked up by generate_ld */
 /* RAM_POS: 0x800C8E20 */
 
-#include "types.h"
-#include "macros.h"
 #include "PR/rcp.h"
 
 u32 osAiGetLength(void) {

lib/src/os/osAiSetNextBuffer.c

@@ -2,7 +2,6 @@
 /* RAM_POS: 0x800C8D70 */
 
 #include "types.h"
-#include "macros.h"
 #include <PR/os_internal.h>
 #include <PR/rcp.h>
 #include "osVirtualToPhysical.h"

lib/src/os/osCreateThread.c

@@ -4,8 +4,8 @@
 #include "libultra_internal.h"
 #include "PR/R4300.h"
 
-extern OSThread *__osActiveQueue; //__osActiveQueue;
-void __osCleanupThread(void); //__osCleanupThread
+extern OSThread *__osActiveQueue;
+void __osCleanupThread(void);
 
 void osCreateThread(OSThread *t, OSId id, void (*entry)(void *), void *arg, void *sp, OSPri p) {
     register u32 saveMask;

lib/src/os/osDpGetStatus.c

@@ -2,7 +2,6 @@
 /* RAM_POS: 0x800D18D0 */
 
 #include "types.h"
-#include "macros.h"
 #include "libultra_internal.h"
 
 u32 osDpGetStatus(){

lib/src/os/osDpSetNextBuffer.c

@@ -4,7 +4,7 @@
 #include "libultra_internal.h"
 #include "osVirtualToPhysical.h"
 
-int __osDpDeviceBusy(void);
+s32 __osDpDeviceBusy(void);
 s32 osDpSetNextBuffer(void *bufPtr, u64 size) {
     register u32 stat;
 

lib/src/os/osEepromRead.c

@@ -1,8 +1,6 @@
 /* The comment below is needed for this file to be picked up by generate_ld */
 /* RAM_POS: 0x800CE280 */
 
-#include "types.h"
-#include "macros.h"
 #include "libultra_internal.h"
 #include "PR/rcp.h"
 #include "controller.h"

lib/src/os/osEpiRawStartDma.c

@@ -1,8 +1,6 @@
 /* The comment below is needed for this file to be picked up by generate_ld */
 /* RAM_POS: 0x800D2680 */
 
-#include "types.h"
-#include "macros.h"
 #include "libultra_internal.h"
 #include "PR/rcp.h"
 #include "osVirtualToPhysical.h"

lib/src/os/osGetActiveQueue.c

@@ -1,8 +1,6 @@
 /* The comment below is needed for this file to be picked up by generate_ld */
 /* RAM_POS: 0x800D2470 */
 
-#include "types.h"
-#include "macros.h"
 #include "libultra_internal.h"
 
 extern OSThread *__osActiveQueue;

lib/src/os/osGetCount.c

@@ -1,7 +1,6 @@
 /* The comment below is needed for this file to be picked up by generate_ld */
 /* RAM_POS: 0x800C78D0 */
 
-#include "types.h"
 #include "macros.h"
 
 //I don't believe that can be decompiled

lib/src/os/osInvalDCache.c

@@ -1,7 +1,6 @@
 /* The comment below is needed for this file to be picked up by generate_ld */
 /* RAM_POS: 0x800D17F0 */
 
-#include "types.h"
 #include "macros.h"
 
 //Most likely hand written and unable to be be decomped

lib/src/os/osSetEventMesg.c

@@ -8,7 +8,7 @@ typedef struct __OSEventState {
     OSMesg message;
 } __OSEventState;
 
-__OSEventState __osEventStateTab[15]; // __osEventStateTab[OS_NUM_EVENTS];
+__OSEventState __osEventStateTab[15]; //OS_NUM_EVENTS = 15
 void osSetEventMesg(OSEvent event, OSMesgQueue *mq, OSMesg msg) {
     register u32 saveMask = __osDisableInt();
     __OSEventState *es;

lib/src/os/osSetIntMask.c

@@ -1,7 +1,6 @@
 /* The comment below is needed for this file to be picked up by generate_ld */
 /* RAM_POS: 0x800C9A30 */
 
-#include "types.h"
 #include "macros.h"
 
 //I don't believe it's possible to decomp this one

lib/src/os/osSetTimer.c

@@ -1,7 +1,6 @@
 /* The comment below is needed for this file to be picked up by generate_ld */
 /* RAM_POS: 0x800D4DE0 */
 
-#include "macros.h"
 #include "libultra_internal.h"
 
 extern OSTimer *__osTimerList;