Idle + Main bss and cleanup (#1292)

* Idle bss and cleanup

* main bss and cleanup

* format

* Remove pad comment about sAudioMgr

* PR

* Missed a couple size_t changes

* unused pads

* static

include/functions.h

@@ -4,8 +4,7 @@
 #include "z64.h"
 
 void bootproc(void);
-void Idle_ThreadEntry(void* arg);
-void ViConfig_UpdateVi(u32 mode);
+void ViConfig_UpdateVi(u32 black);
 void ViConfig_UpdateBlack(void);
 s32 DmaMgr_DmaRomToRam(uintptr_t rom, void* ram, size_t size);
 s32 DmaMgr_DmaHandler(OSPiHandle* pihandle, OSIoMesg* mb, s32 direction);
@@ -1514,7 +1513,7 @@ ListAlloc* ListAlloc_Init(ListAlloc* this);
 // void ListAlloc_Alloc(void);
 // void ListAlloc_Free(void);
 void ListAlloc_FreeAll(ListAlloc* this);
-void Main(void* arg);
+
 void Sched_SwapFramebuffer(CfbInfo* cfbInfo);
 void Sched_RetraceUpdateFramebuffer(SchedContext* sched, CfbInfo* cfbInfo);
 void Sched_HandleReset(SchedContext* sched);
@@ -1536,7 +1535,7 @@ void Sched_SendAudioCancelMsg(SchedContext* sched);
 void Sched_SendGfxCancelMsg(SchedContext* sched);
 void Sched_FaultClient(void* param1, void* param2);
 void Sched_ThreadEntry(void* arg);
-void Sched_Init(SchedContext* sched, void* stack, OSPri pri, UNK_TYPE arg3, UNK_TYPE arg4, IrqMgr* irqMgr);
+void Sched_Init(SchedContext* sched, void* stack, OSPri pri, u8 viModeType, UNK_TYPE arg4, IrqMgr* irqMgr);
 // void func_80177390(void);
 void func_801773A0(void* arg0);
 void func_801773C4(void* arg0);

include/idle.h

@@ -0,0 +1,21 @@
+#ifndef IDLE_H
+#define IDLE_H
+
+#include "ultra64.h"
+#include "irqmgr.h"
+
+extern IrqMgr gIrqMgr;
+extern OSMesgQueue gPiMgrCmdQueue;
+extern OSViMode gViConfigMode;
+extern u8 gViConfigModeType;
+
+extern u8 D_80096B20;
+extern vu8 gViConfigUseBlack;
+extern u8 gViConfigAdditionalScanLines;
+extern u32 gViConfigFeatures;
+extern f32 gViConfigXScale;
+extern f32 gViConfigYScale;
+
+void Idle_ThreadEntry(void* arg);
+
+#endif

include/macros.h

@@ -3,6 +3,7 @@
 
 #include "libc/stdint.h"
 #include "ultra64/convert.h"
+#include "main.h"
 
 #define SCREEN_WIDTH  320
 #define SCREEN_HEIGHT 240

include/main.h

@@ -0,0 +1,19 @@
+#ifndef MAIN_H
+#define MAIN_H
+
+#include "ultra64.h"
+#include "scheduler.h"
+#include "padmgr.h"
+
+extern s32 gScreenWidth;
+extern s32 gScreenHeight;
+extern size_t gSystemHeapSize;
+
+extern u32 gSegments[NUM_SEGMENTS];
+extern SchedContext gSchedContext;
+extern OSThread gGraphThread;
+extern PadMgr gPadMgr;
+
+void Main(void* arg);
+
+#endif

include/padmgr.h

@@ -56,8 +56,6 @@ typedef struct {
     /* 0x47E */ u8 isResetting;
 } PadMgr; // size = 0x480
 
-extern PadMgr gPadMgr;
-
 // Initialization
 
 s32 PadSetup_Init(OSMesgQueue* mq, u8* outMask, OSContStatus* status);

include/ultra64/thread.h

@@ -3,7 +3,7 @@
 
 #include "PR/ultratypes.h"
 
-#define OS_PRIORITY_IDLE         10
+#define OS_PRIORITY_IDLE          0
 #define OS_PRIORITY_MAIN         10
 #define OS_PRIORITY_GRAPH        11
 #define OS_PRIORITY_AUDIOMGR     12

include/variables.h

@@ -18,15 +18,8 @@ extern u16 gFramebuffer1[SCREEN_HEIGHT][SCREEN_WIDTH]; // at 0x80000500
 extern u8 D_80025D00[];
 
 // data
-extern u64 rspbootTextStart[];
-extern u8 D_80096B20;
-extern vu8 gViConfigUseDefault;
-extern u8 gViConfigAdditionalScanLines;
-extern u32 gViConfigFeatures;
-extern f32 gViConfigXScale;
-extern f32 gViConfigYScale;
 extern OSPiHandle* gCartHandle;
-extern u32 sDmaMgrDmaBuffSize;
+extern size_t gDmaMgrDmaBuffSize;
 extern vs32 gIrqMgrResetStatus;
 extern volatile OSTime sIrqMgrResetTime;
 extern volatile OSTime sIrqMgrRetraceTime;
@@ -274,11 +267,6 @@ extern char gBuildTeam[];
 extern char gBuildDate[];
 extern char gBuildMakeOption[];
 
-extern IrqMgr gIrqMgr;
-
-extern OSViMode gViConfigMode;
-extern u8 D_8009B290;
-
 extern u8 sYaz0DataBuffer[0x400];
 extern u8* sYaz0CurDataEnd;
 extern u32 sYaz0CurRomStart;
@@ -658,9 +646,7 @@ extern Input* D_801D0D60;
 
 extern u32 retryCount;
 extern u32 cfbIdx[3];
-extern s32 gScreenWidth;
-extern s32 gScreenHeight;
-extern u32 startHeapSize;
+
 extern UNK_PTR D_801D1540;
 extern Vec3f gZeroVec3f;
 extern Vec3s gZeroVec3s;
@@ -2257,11 +2243,6 @@ extern GfxMasterList* gGfxMasterDL;
 extern CfbInfo sGraphCfbInfos[3];
 extern OSTime sGraphTaskStartTime;
 
-extern u32 gSegments[NUM_SEGMENTS];
-extern SchedContext gSchedContext;
-
-extern OSThread gGraphThread;
-
 extern FaultClient sSchedFaultClient;
 extern OSTime sRSPGFXStartTime;
 extern OSTime sRSPAudioStartTime;

include/z64audio.h

@@ -6,6 +6,7 @@
 #include "audiothread_cmd.h"
 #include "libc/stddef.h"
 #include "audio/effects.h"
+#include "sequence.h"
 
 #define NO_LAYER ((SequenceLayer*)(-1))
 

include/z64thread.h

@@ -6,6 +6,8 @@
 #define Z_THREAD_ID_MAIN     3
 #define Z_THREAD_ID_GRAPH    4
 #define Z_THREAD_ID_SCHED    5
+#define Z_THREAD_ID_PADMGR   7
+#define Z_THREAD_ID_AUDIOMGR 10
 #define Z_THREAD_ID_FLASHROM 13
 #define Z_THREAD_ID_DMAMGR  18
 #define Z_THREAD_ID_IRQMGR  19