mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-09 18:43:45 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
fig02 2025-05-02 04:44:09 -04:00 • committed by GitHub
parent ed15061de5
commit 7cd59fbdad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
spec/spec
View file

@ -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

16
src/audio/internal/dcache.c
View file

@ -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);
}

19
src/audio/internal/aisetnextbuf.c → src/audio/internal/os.c
View file

@ -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