From c2cfdcd46dd15ea903e1c430efc39a4e3651d4b7 Mon Sep 17 00:00:00 2001 From: zelda2774 Date: Sat, 28 Aug 2021 00:28:38 +0200 Subject: [PATCH] Warning fixes --- include/functions.h | 6 +++--- include/variables.h | 2 -- include/z64audio.h | 10 +++++----- src/code/audio_load.c | 24 ++++++++++++------------ 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/include/functions.h b/include/functions.h index 959dffcaae..2a8ceb7d7a 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1955,11 +1955,11 @@ void Audio_ProcessLoads(s32 resetStatus); void func_800E301C(void* callback); void Audio_ContextInit(void* heap, u32 heapSize); void Audio_SyncLoadsInit(void); -s32 Audio_SyncLoadSample(s32 arg0, s32 arg1, u8* arg2); -s32 Audio_SyncLoadSeq(s32 seqIdx, u8* ramAddr, u8* arg2); +s32 Audio_SyncLoadSample(s32 arg0, s32 arg1, s8* arg2); +s32 Audio_SyncLoadSeq(s32 seqIdx, u8* ramAddr, s8* arg2); void Audio_AsyncLoadReqInit(void); void func_800E4D94(void); -void func_800E4EEC(s32 tableType, s32 arg1, u8* arg2); +void func_800E4EEC(s32 tableType, s32 arg1, s8* arg2); void func_800E4F58(void); void func_800E4FB0(void); AudioTask* func_800E4FE0(void); diff --git a/include/variables.h b/include/variables.h index b283a81b2b..065ea614e4 100644 --- a/include/variables.h +++ b/include/variables.h @@ -3161,8 +3161,6 @@ extern FaultThreadStruct gFaultStruct; //extern ? D_8016B6B5; //extern ? D_8016B6B8; extern OSMesgQueue D_8016B6E0; -//extern OSMesg D_8016B6F8; -extern u8* D_8016B738[]; //extern u32 D_8016B780; //extern ? D_8016B7A8; //extern ? D_8016B7AC; diff --git a/include/z64audio.h b/include/z64audio.h index 3406d7366c..d998e977f2 100644 --- a/include/z64audio.h +++ b/include/z64audio.h @@ -731,7 +731,7 @@ typedef struct { /* 0x1C */ u32 retMsg; /* 0x20 */ OSMesgQueue* retQueue; /* 0x24 */ OSMesgQueue msgQueue; - /* 0x3C */ OSMesg msg[1]; + /* 0x3C */ OSMesg msg; /* 0x40 */ OSIoMesg ioMesg; } AsyncLoadReq; // size = 0x58 @@ -748,7 +748,7 @@ typedef struct { /* 0x1C */ s8* isDone; /* 0x20 */ AudioBankSample sample; /* 0x30 */ OSMesgQueue msgqueue; - /* 0x48 */ OSMesg msg[1]; + /* 0x48 */ OSMesg msg; /* 0x4C */ OSIoMesg ioMesg; } AudioSyncLoad; // size = 0x64 @@ -827,8 +827,8 @@ typedef struct { s32 unk_04; s32 unk_08; s32 unk_0C; - s32 unk_10; - s32 unk_14; + u32 unk_10; + u32 unk_14; } RelocInfo; typedef enum { @@ -893,7 +893,7 @@ typedef struct { /* 0x2838 */ AudioTable* audioTable; union { /* 0x283C */ u16* unk_283C; - /* 0x283C */ char* unk_283Cb; + /* 0x283C */ u8* unk_283Cb; }; /* 0x2840 */ u16 seqTabEntCnt; // channels used? /* 0x2844 */ CtlEntry* ctlEntries; diff --git a/src/code/audio_load.c b/src/code/audio_load.c index bc2eae373b..f905ba89a1 100644 --- a/src/code/audio_load.c +++ b/src/code/audio_load.c @@ -36,8 +36,8 @@ void Audio_ProcessSyncLoads(s32 resetStatus); void func_800E38F8(s32 arg0, s32 arg1, s32 arg2, s32 arg3); OSMesgQueue D_8016B6E0; -u8 D_8016B6F8[0x40]; -u8* D_8016B738[0x12]; +OSMesg D_8016B6F8[0x10]; +s8* D_8016B738[0x12]; u32 D_8016B780[8]; void func_800E11F0(void) { @@ -1026,7 +1026,7 @@ void Audio_ContextInit(void* heap, u32 heapSize) { { s32 i; - u8* ctxP = &gAudioContext; + u8* ctxP = (u8*)&gAudioContext; for (i = sizeof(gAudioContext); i >= 0; i--) { *ctxP++ = 0; } @@ -1122,7 +1122,7 @@ void Audio_SyncLoadsInit(void) { gAudioContext.syncLoads[1].status = 0; } -s32 Audio_SyncLoadSample(s32 arg0, s32 arg1, u8* isDone) { +s32 Audio_SyncLoadSample(s32 arg0, s32 arg1, s8* isDone) { AudioBankSample* sample; AudioSyncLoad* syncLoad; @@ -1270,7 +1270,7 @@ void func_800E3874(AudioSyncLoad* arg0, s32 size) { void func_800E38F8(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { } -s32 Audio_SyncLoadSeq(s32 seqIdx, u8* ramAddr, u8* isDone) { +s32 Audio_SyncLoadSeq(s32 seqIdx, u8* ramAddr, s8* isDone) { AudioSyncLoad* syncLoad; SequenceTable* seqTable; u32 size; @@ -1368,7 +1368,7 @@ AsyncLoadReq* Audio_InitAsyncReq(u32 devAddr, void* ramAddr, u32 size, s32 arg3, loadReq->unk_01 = 3; loadReq->unk_02 = arg3; loadReq->retMsg = retMsg; - osCreateMesgQueue(&loadReq->msgQueue, loadReq->msg, ARRAY_COUNT(loadReq->msg)); + osCreateMesgQueue(&loadReq->msgQueue, &loadReq->msg, 1); return loadReq; } @@ -1383,8 +1383,8 @@ void Audio_ProcessAsyncLoads(s32 resetStatus) { if (gAudioContext.curAsyncReq == NULL) { if (resetStatus != 0) { do { - } while (osRecvMesg(&gAudioContext.asyncLoadQueue, &loadReq, OS_MESG_NOBLOCK) != -1); - } else if (osRecvMesg(&gAudioContext.asyncLoadQueue, &loadReq, OS_MESG_NOBLOCK) == -1) { + } while (osRecvMesg(&gAudioContext.asyncLoadQueue, (OSMesg*)&loadReq, OS_MESG_NOBLOCK) != -1); + } else if (osRecvMesg(&gAudioContext.asyncLoadQueue, (OSMesg*)&loadReq, OS_MESG_NOBLOCK) == -1) { gAudioContext.curAsyncReq = NULL; } else { gAudioContext.curAsyncReq = loadReq; @@ -1691,7 +1691,7 @@ void func_800E4EDC(void) { void func_800E4EE4(void) { } -void func_800E4EEC(s32 tableType, s32 arg1, u8* arg2) { +void func_800E4EEC(s32 tableType, s32 arg1, s8* arg2) { static u32 D_801304DC = 0; D_8016B738[D_801304DC] = arg2; Audio_AsyncLoad(tableType, arg1, 0, D_801304DC, &D_8016B6E0); @@ -1704,9 +1704,9 @@ void func_800E4EEC(s32 tableType, s32 arg1, u8* arg2) { void func_800E4F58(void) { u32 pad; u32 sp20; - u8* temp_v0; + s8* temp_v0; - if (osRecvMesg(&D_8016B6E0, &sp20, OS_MESG_NOBLOCK) != -1) { + if (osRecvMesg(&D_8016B6E0, (OSMesg*)&sp20, OS_MESG_NOBLOCK) != -1) { pad = sp20 >> 0x18; temp_v0 = D_8016B738[pad]; if (temp_v0 != NULL) { @@ -1716,5 +1716,5 @@ void func_800E4F58(void) { } void func_800E4FB0(void) { - osCreateMesgQueue(&D_8016B6E0, &D_8016B6F8, 0x10); + osCreateMesgQueue(&D_8016B6E0, D_8016B6F8, 0x10); }