From c75dae767edf741cfb9de0d10a94afc00d3ef633 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Thu, 30 Nov 2023 04:38:32 -0800 Subject: [PATCH] Build fixes Former-commit-id: 04d06aec008ca8ae0254256e2c09a30c087bee06 --- configure.py | 2 +- src/musyx/runtime/dolphin/hw_dolphin.c | 4 ++-- src/musyx/runtime/{ => dolphin}/hw_dspctrl.c | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) rename src/musyx/runtime/{ => dolphin}/hw_dspctrl.c (99%) diff --git a/configure.py b/configure.py index bb5d929e..5c08ac32 100755 --- a/configure.py +++ b/configure.py @@ -1194,7 +1194,7 @@ config.libs = [ Object(Matching, "musyx/runtime/synth_vsamples.c"), Object(Matching, "musyx/runtime/synth_dbtab.c"), Object(Matching, "musyx/runtime/s_data.c"), - Object(NonMatching, "musyx/runtime/hw_dspctrl.c"), + Object(NonMatching, "musyx/runtime/dolphin/hw_dspctrl.c"), Object(Matching, "musyx/runtime/hw_volconv.c"), Object(Matching, "musyx/runtime/snd3d.c"), Object(Matching, "musyx/runtime/snd_init.c"), diff --git a/src/musyx/runtime/dolphin/hw_dolphin.c b/src/musyx/runtime/dolphin/hw_dolphin.c index 4f6a9325..3ce7e12c 100644 --- a/src/musyx/runtime/dolphin/hw_dolphin.c +++ b/src/musyx/runtime/dolphin/hw_dolphin.c @@ -140,8 +140,8 @@ void salStartDsp(u16* cmdList) { ; } -void salCtrlDsp(u32 unk) { - salBuildCommandList(unk, salGetStartDelay()); +void salCtrlDsp(u16* dest) { + salBuildCommandList(dest, salGetStartDelay()); salStartDsp(dspCmdList); } diff --git a/src/musyx/runtime/hw_dspctrl.c b/src/musyx/runtime/dolphin/hw_dspctrl.c similarity index 99% rename from src/musyx/runtime/hw_dspctrl.c rename to src/musyx/runtime/dolphin/hw_dspctrl.c index 78db0fe7..65c91f9c 100644 --- a/src/musyx/runtime/hw_dspctrl.c +++ b/src/musyx/runtime/dolphin/hw_dspctrl.c @@ -15,7 +15,10 @@ */ -#include "musyx/musyx_priv.h" +#include "musyx/assert.h" +#include "musyx/dspvoice.h" +#include "musyx/hardware.h" +#include "musyx/sal.h" #ifdef _DEBUG static u32 dbgActiveVoicesMax = 0;