General Cleanup 2 (#1538)

* Cleanup

* Cleanup variables.h

* Cleanup fault headers

* Some includes/headers cleanup

* Libultra btn wrappers

* Mark differences to original libultra headers

* Remove duplicate include in fault

* format

* Update include/PR/os_voice.h

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* align

---------

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

3 files changed, 19 insertions, 19 deletions

diff --git a/src/audio/lib/load.c b/src/audio/lib/load.c
index 37a68ff4c..c3a101102 100644
--- a/src/audio/lib/load.c
+++ b/src/audio/lib/load.c
@@ -1263,8 +1263,8 @@ void AudioLoad_Init(void* heap, size_t heapSize) {
     gAudioCtx.curAiBufferIndex = 0;
     gAudioCtx.soundMode = SOUNDMODE_STEREO;
     gAudioCtx.curTask = NULL;
-    gAudioCtx.rspTask[0].task.t.dataSize = 0;
-    gAudioCtx.rspTask[1].task.t.dataSize = 0;
+    gAudioCtx.rspTask[0].task.t.data_size = 0;
+    gAudioCtx.rspTask[1].task.t.data_size = 0;
 
     osCreateMesgQueue(&gAudioCtx.syncDmaQueue, &gAudioCtx.syncDmaMesg, 1);
     osCreateMesgQueue(&gAudioCtx.curAudioFrameDmaQueue, gAudioCtx.currAudioFrameDmaMesgBuf,
diff --git a/src/audio/lib/thread.c b/src/audio/lib/thread.c
index e1acb1583..988d1580f 100644
--- a/src/audio/lib/thread.c
+++ b/src/audio/lib/thread.c
@@ -168,21 +168,21 @@ AudioTask* AudioThread_UpdateImpl(void) {
     task = &gAudioCtx.curTask->task.t;
     task->type = M_AUDTASK;
     task->flags = 0;
-    task->ucodeBoot = aspMainTextStart;
-    task->ucodeBootSize = SP_UCODE_SIZE;
-    task->ucodeDataSize = ((aspMainDataEnd - aspMainDataStart) * sizeof(u64)) - 1;
+    task->ucode_boot = aspMainTextStart;
+    task->ucode_boot_size = SP_UCODE_SIZE;
+    task->ucode_data_size = ((aspMainDataEnd - aspMainDataStart) * sizeof(u64)) - 1;
     task->ucode = aspMainTextStart;
-    task->ucodeData = aspMainDataStart;
-    task->ucodeSize = SP_UCODE_SIZE;
-    task->dramStack = (u64*)D_801D6200;
-    task->dramStackSize = 0;
-    task->outputBuff = NULL;
-    task->outputBuffSize = NULL;
+    task->ucode_data = aspMainDataStart;
+    task->ucode_size = SP_UCODE_SIZE;
+    task->dram_stack = (u64*)D_801D6200;
+    task->dram_stack_size = 0;
+    task->output_buff = NULL;
+    task->output_buff_size = NULL;
     if (1) {}
-    task->dataPtr = (u64*)gAudioCtx.abiCmdBufs[index];
-    task->dataSize = numAbiCmds * sizeof(Acmd);
-    task->yieldDataPtr = NULL;
-    task->yieldDataSize = 0;
+    task->data_ptr = (u64*)gAudioCtx.abiCmdBufs[index];
+    task->data_size = numAbiCmds * sizeof(Acmd);
+    task->yield_data_ptr = NULL;
+    task->yield_data_size = 0;
 
     if (gAudioCtx.numAbiCmdsMax < numAbiCmds) {
         gAudioCtx.numAbiCmdsMax = numAbiCmds;
diff --git a/src/audio/voice_internal.c b/src/audio/voice_internal.c
index 3458cd85b..348d2c215 100644
--- a/src/audio/voice_internal.c
+++ b/src/audio/voice_internal.c
@@ -280,7 +280,7 @@ s32 func_801A5808(void) {
             PadMgr_VoiceReleaseSerialEventQueue(serialEventQueue);
 
             if (func_801A51F0(errorCode) == 0) {
-                switch (gVoiceHandle.status) {
+                switch (gVoiceHandle.cmd_status) {
                     case VOICE_STATUS_READY:
                         sVoiceContext.mode = VOICE_MODE_2;
                         break;
@@ -305,10 +305,10 @@ s32 func_801A5808(void) {
 
         case VOICE_MODE_2:
             if (((D_801FD5C8.warning & sVoiceContext.warning) == 0) &&
-                (sVoiceContext.answerNum >= D_801FD5C8.answerNum) &&
+                (sVoiceContext.answerNum >= D_801FD5C8.answer_num) &&
                 (sVoiceContext.distance >= D_801FD5C8.distance[0]) &&
-                (D_801FD5C8.voiceLevel >= sVoiceContext.voiceLevel) &&
-                (D_801FD5C8.voiceRelLevel >= sVoiceContext.voiceRelLevel)) {
+                (D_801FD5C8.voice_level >= sVoiceContext.voiceLevel) &&
+                (D_801FD5C8.voice_sn >= sVoiceContext.voiceRelLevel)) {
                 D_801FD5E8 = D_801FD5C8;
                 sVoiceContext.data = &D_801FD5E8;
             }