PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add hw_lib_dummy for completeness 

Former-commit-id: acdd04a1e0f5fa069c6bbc5f6d9ba9de44838e93
This commit is contained in:
Phillip Stephens 2023-10-21 10:48:50 -07:00
parent a29290780b
commit 4606f494f9
6 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.py
View File

@ -1194,6 +1194,7 @@ config.libs = [
Object(Matching, "musyx/runtime/dsp_import.c"), Object(Matching, "musyx/runtime/dsp_import.c"),
Object(Matching, "musyx/runtime/hw_dolphin.c"), Object(Matching, "musyx/runtime/hw_dolphin.c"),
Object(Matching, "musyx/runtime/hw_memory.c"), Object(Matching, "musyx/runtime/hw_memory.c"),
Object(Matching, "musyx/runtime/hw_lib_dummy.c"),
Object(Matching, "musyx/runtime/CheapReverb/creverb_fx.c"), Object(Matching, "musyx/runtime/CheapReverb/creverb_fx.c"),
Object(Matching, "musyx/runtime/CheapReverb/creverb.c"), Object(Matching, "musyx/runtime/CheapReverb/creverb.c"),
Object(Matching, "musyx/runtime/StdReverb/reverb_fx.c"), Object(Matching, "musyx/runtime/StdReverb/reverb_fx.c"),

2
include/musyx/hardware.h
View File

@ -35,6 +35,8 @@ void hwSetFilter(unsigned long v, unsigned char mode, unsigned short coefA, unsi
void hwLowPassFrqToCoef(unsigned long frq, unsigned short* _a0, unsigned short* _b1); void hwLowPassFrqToCoef(unsigned long frq, unsigned short* _a0, unsigned short* _b1);
#endif #endif
extern u32 aramSize;
extern u8* aramBase;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
include/musyx/musyx_priv.h
View File

@ -513,7 +513,7 @@ typedef struct SYNTH_VOICE {
u32 id; // offset 0xF4, size 0x4 u32 id; // offset 0xF4, size 0x4
VID_LIST* vidList; // offset 0xF8, size 0x4 VID_LIST* vidList; // offset 0xF8, size 0x4
VID_LIST* vidMasterList; // offset 0xFC, size 0x4 VID_LIST* vidMasterList; // offset 0xFC, size 0x4
#if MUSY_VERSION <= MUSY_VERSION_CHECK(2, 0, 0) #if MUSY_VERSION > MUSY_VERSION_CHECK(1, 5, 3) && MUSY_VERSION <= MUSY_VERSION_CHECK(2, 0, 0)
u16 allocId; // offset 0x100, size 0x2 u16 allocId; // offset 0x100, size 0x2
#else #else
u32 allocId; u32 allocId;

2
include/musyx/synth.h
View File

@ -36,7 +36,7 @@ bool synthIsFadeOutActive(u8 vGroup);
/* TODO: Move this where it belongs */ /* TODO: Move this where it belongs */
void hwSetAUXProcessingCallbacks(u8 studio, SND_AUX_CALLBACK auxA, void* userA, void hwSetAUXProcessingCallbacks(u8 studio, SND_AUX_CALLBACK auxA, void* userA,
SND_AUX_CALLBACK auxB, void* userB); SND_AUX_CALLBACK auxB, void* userB);
u32 voiceBlock(u8 prio);
MSTEP* dataGetMacro(u16 mid); MSTEP* dataGetMacro(u16 mid);
u32 voiceAllocate(u8 priority, u8 maxVoices, u16 allocId, u8 fxFlag); u32 voiceAllocate(u8 priority, u8 maxVoices, u16 allocId, u8 fxFlag);

4
src/musyx/runtime/hw_lib_dummy.c Normal file
View File

@ -0,0 +1,4 @@
#include "musyx/musyx.h"
u32 aramSize = 0;
u8* aramBase = NULL;

2
src/musyx/runtime/synthvoice.c
View File

@ -350,7 +350,7 @@ void synthInitAllocationAids() {
voiceMusicRunning = 0; voiceMusicRunning = 0;
} }
u32 voiceBlock(unsigned char prio) { u32 voiceBlock(u8 prio) {
u32 voice; u32 voice;
if ((voice = voiceAllocate(prio, 0xFF, 0xFFFF, 1)) != 0xFFFFFFFF) { if ((voice = voiceAllocate(prio, 0xFF, 0xFFFF, 1)) != 0xFFFFFFFF) {