diff --git a/spec/spec b/spec/spec index ffbd4ac811..60437c4bf9 100644 --- a/spec/spec +++ b/spec/spec @@ -681,8 +681,7 @@ beginseg include "$(BUILD_DIR)/src/audio/internal/heap.o" include "$(BUILD_DIR)/src/audio/internal/load.o" include "$(BUILD_DIR)/src/audio/internal/thread.o" - include "$(BUILD_DIR)/src/audio/internal/dcache.o" - include "$(BUILD_DIR)/src/audio/internal/aisetnextbuf.o" + include "$(BUILD_DIR)/src/audio/internal/os.o" #if OOT_PAL_N64 pad_text pad_text diff --git a/src/audio/internal/dcache.c b/src/audio/internal/dcache.c deleted file mode 100644 index 5c50a69979..0000000000 --- a/src/audio/internal/dcache.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "ultra64.h" -#include "z64audio.h" - -void Audio_InvalDCache(void* buf, s32 size) { - OSIntMask prevMask = osSetIntMask(OS_IM_NONE); - - osInvalDCache(buf, size); - osSetIntMask(prevMask); -} - -void Audio_WritebackDCache(void* buf, s32 size) { - OSIntMask prevMask = osSetIntMask(OS_IM_NONE); - - osWritebackDCache(buf, size); - osSetIntMask(prevMask); -} diff --git a/src/audio/internal/aisetnextbuf.c b/src/audio/internal/os.c similarity index 84% rename from src/audio/internal/aisetnextbuf.c rename to src/audio/internal/os.c index bb6b0f0b73..4bbb0d2fdb 100644 --- a/src/audio/internal/aisetnextbuf.c +++ b/src/audio/internal/os.c @@ -1,4 +1,23 @@ +/** + * Original Filename: os.c + */ + #include "ultra64.h" +#include "z64audio.h" + +void Audio_InvalDCache(void* buf, s32 size) { + OSIntMask prevMask = osSetIntMask(OS_IM_NONE); + + osInvalDCache(buf, size); + osSetIntMask(prevMask); +} + +void Audio_WritebackDCache(void* buf, s32 size) { + OSIntMask prevMask = osSetIntMask(OS_IM_NONE); + + osWritebackDCache(buf, size); + osSetIntMask(prevMask); +} /** * Submits an audio buffer to be consumed by the Audio DAC. The audio interface can queue a second DMA while another