diff options
| author | Sonic Dreamcaster <alejandro.asenjo88@gmail.com> | 2024-09-17 21:07:20 -0300 |
|---|---|---|
| committer | Sonic Dreamcaster <alejandro.asenjo88@gmail.com> | 2024-09-17 21:07:20 -0300 |
| commit | 684f17c27fef32046246888293e258feffeea293 (patch) | |
| tree | aeece4e117884b7f8f50887e0f0340a837f0a390 /src/audio | |
| parent | 63254ffc5e2693e727617af7a20e16e22e95bb22 (diff) | |
fix merge
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/audio_load.c | 6 | ||||
| -rw-r--r-- | src/audio/audio_thread.c | 17 |
2 files changed, 1 insertions, 22 deletions
diff --git a/src/audio/audio_load.c b/src/audio/audio_load.c index 8ef78f01..75a2222a 100644 --- a/src/audio/audio_load.c +++ b/src/audio/audio_load.c @@ -158,10 +158,6 @@ void AudioLoad_InitSampleDmaBuffers(s32 numNotes) { u8* dma; gSampleDmaBuffSize = 0x2D0; -<<<<<<< HEAD - -======= ->>>>>>> 6fe91928 (Repo upstreamed) for (i = 0; i < (3 * gNumNotes * gAudioBufferParams.count); i++) { dma = AudioHeap_Alloc(&gMiscPool, gSampleDmaBuffSize); gSampleDmas[gSampleDmaCount].ramAddr = dma; @@ -1192,7 +1188,7 @@ void AudioLoad_ProcessAsyncLoad(AudioAsyncLoad* asyncLoad, s32 resetStatus) { } if (asyncLoad->bytesRemaining == 0) { - msg = asyncLoad->retMsg; + msg = asyncLoad->retMsg.data32; tableType = (msg >> 0x10) & 0xFF; tableIndex = (msg >> 8) & 0xFF; loadStatus = msg & 0xFF; diff --git a/src/audio/audio_thread.c b/src/audio/audio_thread.c index 8c287661..e411411f 100644 --- a/src/audio/audio_thread.c +++ b/src/audio/audio_thread.c @@ -73,18 +73,11 @@ SPTask* AudioThread_CreateTask(void) { gCurAudioFrameDmaCount = 0; AudioLoad_DecreaseSampleDmaTtls(); -<<<<<<< HEAD AudioLoad_ProcessLoads(gAudioResetStep); if (MQ_GET_MESG(gAudioSpecQueue, &specId)) { if (gAudioResetStep == 0) { gAudioResetStep = 5; -======= - AudioLoad_ProcessLoads(gResetStatus); - if (osRecvMesg(&gAudioTaskMesgQueue, &sp38, 0) != -1) { - if (gResetStatus == 0) { - gResetStatus = 5; ->>>>>>> edd7dba2 (Fixed all remaining compilation issues) } gAudioSpecId = specId; } @@ -123,14 +116,8 @@ SPTask* AudioThread_CreateTask(void) { gAudioRandom = osGetCount() * (gAudioRandom + gAudioTaskCountQ); gAudioRandom = gAiBuffers[aiBuffIndex][gAudioTaskCountQ & 0xFF] + gAudioRandom; -<<<<<<< HEAD aiBuffIndex = gAudioTaskIndexQ; - gAudioCurTask->msgQueue = NULL; -======= - sp4C = gAudioTaskIndexQ; - ->>>>>>> edd7dba2 (Fixed all remaining compilation issues) gAudioCurTask->msg = OS_MESG_PTR(NULL); task = &gAudioCurTask->task.t; @@ -437,11 +424,7 @@ void AudioThread_ResetAudioHeap(s32 specId) { MQ_CLEAR_QUEUE(gAudioResetQueue); AudioThread_ResetCmdQueue(); -<<<<<<< HEAD osSendMesg(gAudioSpecQueue, OS_MESG_32(specId), OS_MESG_NOBLOCK); -======= - osSendMesg(gAudioSpecQueue, OS_MESG_32(specId), 0); ->>>>>>> edd7dba2 (Fixed all remaining compilation issues) } void AudioThread_PreNMIReset(void) { |