Audio internal lib: Merge dcache.c and aisetnextbuf.c into os.c (#2522)

2 files changed, 19 insertions, 16 deletions

diff --git a/src/audio/internal/dcache.c b/src/audio/internal/dcache.c
deleted file mode 100644
index 5c50a6997..000000000
--- 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
index bb6b0f0b7..4bbb0d2fd 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