more cleanup

include/PR/controller.h

@@ -202,7 +202,7 @@ extern OSPifRam __osContPifRam;
 extern u8 __osContLastPoll;
 extern u8 __osMaxControllers;
 extern OSMesgQueue __osEepromTimerQ;
-extern OSMesg __osEepromTimerMsg;
+extern OSMesg __osEepromTimerMsg[];
 extern OSPifRam __osPfsPifRam;
 
 #endif

include/PR/os_internal.h

@@ -6,19 +6,9 @@
 #include "os_pi.h"
 
 
-typedef struct {
+typedef struct __osHwInt {
     /* 0x00 */ OSMesgQueue* queue;
     /* 0x04 */ OSMesg msg;
 } __osHwInt; // size = 0x08
 
-typedef struct {
-    /* 0x00 */ u32 initialized;
-    /* 0x04 */ OSThread* mgrThread;
-    /* 0x08 */ OSMesgQueue* cmdQueue;
-    /* 0x0C */ OSMesgQueue* eventQueue;
-    /* 0x10 */ OSMesgQueue* accessQueue;
-    /* 0x14 */ s32 (*piDmaCallback)(s32, uintptr_t, void*, size_t);
-    /* 0x18 */ s32 (*epiDmaCallback)(OSPiHandle*, s32, uintptr_t, void*, size_t);
-} OSMgrArgs; // size = 0x1C
-
 #endif

include/PR/os_pi.h

@@ -60,8 +60,8 @@ typedef struct {
     /* 0x14 */ OSPiHandle* piHandle;
 } OSIoMesg; // size = 0x88
 
-typedef struct {
-    /* 0x00 */ s32 active; // u32 maybe? need to check
+typedef struct OSDevMgr {
+    /* 0x00 */ s32 active;
     /* 0x04 */ OSThread* thread;
     /* 0x08 */ OSMesgQueue* cmdQueue;
     /* 0x0C */ OSMesgQueue* evtQueue;

include/PR/osint.h

@@ -34,7 +34,7 @@ void __osTimerServicesInit(void);
 extern __osHwInt __osHwIntTable[];
 extern __OSEventState __osEventStateTab[OS_NUM_EVENTS];
 
-extern OSThread* __osThreadTail;
+extern __OSThreadTail __osThreadTail;
 extern OSThread* __osRunQueue;
 extern OSThread* __osActiveQueue;
 extern OSThread* __osRunningThread;

include/PR/ucode.h

@@ -23,9 +23,4 @@ extern u64 gspF3DZEX2_NoN_PosLight_fifoTextEnd[];
 extern u64 gspF3DZEX2_NoN_PosLight_fifoDataStart[];
 extern u64 gspF3DZEX2_NoN_PosLight_fifoDataEnd[];
 
-extern u64 gspS2DEX2_fifoTextStart[];
-extern u64 gspS2DEX2_fifoTextEnd[];
-extern u64 gspS2DEX2_fifoDataStart[];
-extern u64 gspS2DEX2_fifoDataEnd[];
-
 #endif

include/variables.h

@@ -76,7 +76,6 @@ extern u32 sRandFloat;
 
 extern DmaEntry dmadata[1568];
 // extern UNK_TYPE1 D_80186028;
-extern u64 aspMainTextStart[];
 
 extern u8 sDropTable[DROP_TABLE_SIZE * DROP_TABLE_NUMBER];
 extern u8 sDropTableAmounts[DROP_TABLE_SIZE * DROP_TABLE_NUMBER];