From 947593ae55f65a34f351e92b8c94ec5214e8a3cd Mon Sep 17 00:00:00 2001
From: Ryan Myers <ryan.p.myers@gmail.com>
Date: Thu, 30 Sep 2021 13:06:22 -0400
Subject: [PATCH] Renamed a few variables and files

---
 lib/src/mips1/os/osCreatePiManager.c     |  6 +++---
 lib/src/os/__osSetHWIntrRoutine.c        |  1 +
 lib/src/{unknown_0D3020.c => os/piacs.c} | 14 +++++++-------
 lib/src/os/unknown_0CE200.c              |  2 +-
 {lib/src => src}/unknown_0CEC50.c        |  0
 tools/python/generate_ld.py              |  2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)
 rename lib/src/{unknown_0D3020.c => os/piacs.c} (83%)
 rename {lib/src => src}/unknown_0CEC50.c (100%)

diff --git a/lib/src/mips1/os/osCreatePiManager.c b/lib/src/mips1/os/osCreatePiManager.c
index f61adc56..00fd25cf 100644
--- a/lib/src/mips1/os/osCreatePiManager.c
+++ b/lib/src/mips1/os/osCreatePiManager.c
@@ -5,8 +5,8 @@
 #include "libultra_internal.h"
 #include "stacks.h"
 
-extern OSMesgQueue piAccessQueue; //piAccessQueue
-extern u32 __osPiAccessQueueEnabled; //__osPiAccessQueueEnabled
+extern OSMesgQueue __osPiAccessQueue;
+extern u32 __osPiAccessQueueEnabled;
 extern OSDevMgr __osPiDevMgr;
 void __osDevMgrMain(void);
 
@@ -39,7 +39,7 @@ void osCreatePiManager(OSPri pri, OSMesgQueue *cmdQ, OSMesg *cmdBuf, s32 cmdMsgC
         __osPiDevMgr.thread = &piThread;
         __osPiDevMgr.cmdQueue = cmdQ;
         __osPiDevMgr.evtQueue = &piEventQueue;
-        __osPiDevMgr.acsQueue = &piAccessQueue;
+        __osPiDevMgr.acsQueue = &__osPiAccessQueue;
         __osPiDevMgr.dma = osPiRawStartDma;
         __osPiDevMgr.edma = osEPiRawStartDma;
 
diff --git a/lib/src/os/__osSetHWIntrRoutine.c b/lib/src/os/__osSetHWIntrRoutine.c
index f43cc300..4fde9b8d 100644
--- a/lib/src/os/__osSetHWIntrRoutine.c
+++ b/lib/src/os/__osSetHWIntrRoutine.c
@@ -3,6 +3,7 @@
 
 #include "libultra_internal.h"
 
+//TODO: Figure out a better way to declare this. It's currently randomly declared in another file
 extern s32 (*__osHwIntTable[])(void);
 
 void __osSetHWIntrRoutine(OSHWIntr interrupt, s32 (*handler)(void)) {
diff --git a/lib/src/unknown_0D3020.c b/lib/src/os/piacs.c
similarity index 83%
rename from lib/src/unknown_0D3020.c
rename to lib/src/os/piacs.c
index 0dd6be28..a8d65b15 100644
--- a/lib/src/unknown_0D3020.c
+++ b/lib/src/os/piacs.c
@@ -6,24 +6,24 @@
 #include "libultra_internal.h"
 
 #define PI_Q_BUF_LEN 1
-extern u32 __osPiAccessQueueEnabled;//__osPiAccessQueueEnabled
-extern OSMesg piAccessBuf[PI_Q_BUF_LEN];//piAccessBuf
-extern OSMesgQueue piAccessQueue; //__osPiAccessQueue
+extern u32 __osPiAccessQueueEnabled;
+extern OSMesg piAccessBuf[PI_Q_BUF_LEN];
+extern OSMesgQueue __osPiAccessQueue;
 void __osPiCreateAccessQueue(void) {
     __osPiAccessQueueEnabled = 1;
-    osCreateMesgQueue(&piAccessQueue, piAccessBuf, PI_Q_BUF_LEN);
-    osSendMesg(&piAccessQueue, NULL, OS_MESG_NOBLOCK);
+    osCreateMesgQueue(&__osPiAccessQueue, piAccessBuf, PI_Q_BUF_LEN);
+    osSendMesg(&__osPiAccessQueue, NULL, OS_MESG_NOBLOCK);
 }
 
 void __osPiGetAccess(void) {
     OSMesg dummyMesg;
     if (!__osPiAccessQueueEnabled)
         __osPiCreateAccessQueue();
-    osRecvMesg(&piAccessQueue, &dummyMesg, OS_MESG_BLOCK);
+    osRecvMesg(&__osPiAccessQueue, &dummyMesg, OS_MESG_BLOCK);
 }
 
 void __osPiRelAccess(void) {
-    osSendMesg(&piAccessQueue, NULL, OS_MESG_NOBLOCK);
+    osSendMesg(&__osPiAccessQueue, NULL, OS_MESG_NOBLOCK);
 }
 
 /**********************************************************************/
diff --git a/lib/src/os/unknown_0CE200.c b/lib/src/os/unknown_0CE200.c
index ec79252a..b4c7853e 100644
--- a/lib/src/os/unknown_0CE200.c
+++ b/lib/src/os/unknown_0CE200.c
@@ -26,7 +26,7 @@ u16 D_8012D192;
 s32 D_8012D194[2];
 s32 D_8012D1A0[16];
 s32 piAccessBuf[2]; //Should be static, but this works for now
-s32 piAccessQueue[6];
+s32 __osPiAccessQueue[6];
 OSTimer D_8012D200;
 OSTime __osCurrentTime;
 s32 __osBaseCounter;
diff --git a/lib/src/unknown_0CEC50.c b/src/unknown_0CEC50.c
similarity index 100%
rename from lib/src/unknown_0CEC50.c
rename to src/unknown_0CEC50.c
diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py
index 1e361e50..0dd1af49 100644
--- a/tools/python/generate_ld.py
+++ b/tools/python/generate_ld.py
@@ -24,7 +24,7 @@ LATE_DATA_FILES = [
     BUILD_DIR + '/lib/src/al/alCopy.o',
     BUILD_DIR + '/lib/src/libc/xprintf.o',
     BUILD_DIR + '/lib/src/os/osTimer.o',
-    BUILD_DIR + '/lib/src/unknown_0D3020.o'
+    BUILD_DIR + '/lib/src/os/piacs.o'
 ]
 
 BSS_LIB_ORDER_FILES = [