From 3452359c0c1eda44348ff4b71b036531c9cfa4ec Mon Sep 17 00:00:00 2001 From: Ash Logan Date: Sat, 4 May 2019 20:56:31 +1000 Subject: [PATCH] cafe: remove snd_core and snd_user --- CHANGELOG.md | 1 + Makefile | 2 +- cafe/snd_core.def | 272 --------------------------------- cafe/snd_user.def | 379 ---------------------------------------------- 4 files changed, 2 insertions(+), 652 deletions(-) delete mode 100644 cafe/snd_core.def delete mode 100644 cafe/snd_user.def diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ff09b2..ad479ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ###### Breaking changes - coreinit's `exit` is no longer defined in ``. Please use `` instead, which pulls in newlib's exit. - RPL import sections (`.fimport_coreinit` etc.) are now garbage-collected when using wut-tools 1.1.0 or above (required). Code relying on weak links to Cafe functions may exhibit different behaviour. + - `snd_core` and `snd_user` are no longer linked, due to naming conflicts with `sndcore2` and `snduser2`. wut has never shipped headers for these libraries, but if you are using them, please switch to `sndcore2` and `snduser2`. - Changes to CMake's linker flags may cause existing build trees to fail. Please delete any old build files and re-run CMake. - Two new symbols, `__rpx_start` and `__rpl_start`, are now used internally by the toolchain, while `_start` is now undefined. As usual, applications are strongly discouraged from prefixing any symbol with two underscores, in order to avoid conflicts of this type. diff --git a/Makefile b/Makefile index 14446d1..0c74993 100644 --- a/Makefile +++ b/Makefile @@ -88,7 +88,7 @@ export OFILES_SRC := $(DEFFILES:.def=.o) $(SFILES:.s=.o) $(CFILES:.c=.o) $(CPPFI export OFILES := $(OFILES_BIN) $(OFILES_SRC) export HFILES := $(addsuffix .h,$(subst .,_,$(BINFILES))) -export STUB_LIBS := $(addprefix lib/stubs/lib,$(DEFFILES:.def=.a)) lib/stubs/libnn_swkbd.a lib/stubs/libwhb.a lib/stubs/libgfd.a +export STUB_LIBS := $(addprefix lib/stubs/lib,$(DEFFILES:.def=.a)) lib/stubs/libnn_swkbd.a lib/stubs/libwhb.a lib/stubs/libgfd.a lib/stubs/libsnd_core.a lib/stubs/libsnd_user.a export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ diff --git a/cafe/snd_core.def b/cafe/snd_core.def deleted file mode 100644 index 0e4419a..0000000 --- a/cafe/snd_core.def +++ /dev/null @@ -1,272 +0,0 @@ -:NAME snd_core - -:TEXT -AI2CheckInit -AI2GetDMABytesLeft -AI2GetDMAEnableFlag -AI2GetDMALength -AI2GetDMAStartAddr -AI2GetDSPSampleRate -AI2Init -AI2InitDMA -AI2RegisterDMACallback -AI2Reset -AI2SetDSPSampleRate -AI2StartDMA -AI2StopDMA -AICheckInit -AIDRCGetDMALength -AIDRCGetDMAStartAddr -AIDRCRegisterDMACallback -AIGetAudioFrameCount -AIGetDMABytesLeft -AIGetDMAEnableFlag -AIGetDMALength -AIGetDMARange -AIGetDMAStartAddr -AIGetDSPSampleRate -AII2S3Init -AII2S5Init -AIInit -AIInitDMA -AIQuit -AIRegisterDMABuffer -AIRegisterDMACallback -AIReset -AISetChannel -AISetCloneMode -AISetDSPSampleRate -AISetFormatChangeState -AIStartDMA -AIStopDMA -AXAcquireVoice -AXAcquireVoiceEx -AXCheckVoiceOffsets -AXComputeLpfCoefs -AXDecodeAdpcmData -AXDeregisterAppFrameCallback -AXFreeVoice -AXGetAdpcmData -AXGetAdpcmOutputSize -AXGetAdpcmWorkSize -AXGetAuxACallback -AXGetAuxAReturnVolume -AXGetAuxBCallback -AXGetAuxBReturnVolume -AXGetAuxCCallback -AXGetAuxCReturnVolume -AXGetAuxCallback -AXGetAuxDRCCallback -AXGetAuxReturnVolume -AXGetDRCAuxReturnVolume -AXGetDRCVSMode -AXGetDSPCyclesFudgeFactor -AXGetDefaultMixerSelect -AXGetDeviceChannelCount -AXGetDeviceFinalMixCallback -AXGetDeviceFinalOutput -AXGetDeviceMode -AXGetDeviceRemixMatrix -AXGetDeviceUpsampleStage -AXGetDeviceVolume -AXGetDroppedVoiceCount -AXGetDspCycles -AXGetDspLoad -AXGetDspLoadLimit -AXGetMasterDRCVolume -AXGetMasterVolume -AXGetMaxDspCycles -AXGetMaxDspVoices -AXGetMaxVoices -AXGetMode -AXGetNumDspVoices -AXGetNumVoices -AXGetPostFinalMixCallback -AXGetPpcLoad -AXGetPpcLoadLimit -AXGetProfile -AXGetSwapProfile -AXGetVoiceCurrentOffsetEx -AXGetVoiceLoopCount -AXGetVoiceMixerSelect -AXGetVoiceOffsets -AXGetVoiceOffsetsEx -AXGlitch_GetCount -AXGlitch_PrintTrace -AXGlitch_RegisterCatcher -AXGlitch_trace -AXInit -AXInitEx -AXInitExSpecifyMem -AXInitProfile -AXInitSpecifyMem -AXIsAudioOutReady -AXIsInit -AXIsTransitionAudioDone -AXIsVoiceRunning -AXMakeCompressorTable -AXMixGetSwapProfile -AXPrepareEfxData -AXQuit -AXRegisterAppFrameCallback -AXRegisterAuxACallback -AXRegisterAuxBCallback -AXRegisterAuxCCallback -AXRegisterAuxCallback -AXRegisterAuxDRCCallback -AXRegisterCallback -AXRegisterDRCCallback -AXRegisterDeviceFinalMixCallback -AXRegisterExceedCallback -AXRegisterFrameCallback -AXRegisterPostFinalMixCallback -AXRmtAdvancePtr -AXRmtGetSamples -AXRmtGetSamplesLeft -AXSetAuxAReturnVolume -AXSetAuxBReturnVolume -AXSetAuxCReturnVolume -AXSetAuxReturnVolume -AXSetDRCAuxReturnVolume -AXSetDRCVSDownmixBalance -AXSetDRCVSLC -AXSetDRCVSLimiter -AXSetDRCVSLimiterThreshold -AXSetDRCVSMode -AXSetDRCVSOutputGain -AXSetDRCVSSpeakerPosition -AXSetDRCVSSurroundDepth -AXSetDRCVSSurroundLevelGain -AXSetDSPCyclesFudgeFactor -AXSetDefaultMixerSelect -AXSetDeviceCompressor -AXSetDeviceCompressorTable -AXSetDeviceLinearUpsampler -AXSetDeviceMode -AXSetDeviceRemixMatrix -AXSetDeviceUpsampleStage -AXSetDeviceVolume -AXSetDspLoadLimit -AXSetMasterDRCVolume -AXSetMasterVolume -AXSetMaxDspCycles -AXSetMaxDspVoices -AXSetMaxVoices -AXSetMode -AXSetPpcLoadLimit -AXSetStepMode -AXSetUpTransitionAudio -AXSetVoiceAdpcm -AXSetVoiceAdpcmLoop -AXSetVoiceBiquad -AXSetVoiceBiquadCoefs -AXSetVoiceCurrentOffset -AXSetVoiceCurrentOffsetEx -AXSetVoiceDRCMix -AXSetVoiceDeviceMix -AXSetVoiceEndOffset -AXSetVoiceEndOffsetEx -AXSetVoiceItdOn -AXSetVoiceItdTarget -AXSetVoiceLoop -AXSetVoiceLoopOffset -AXSetVoiceLoopOffsetEx -AXSetVoiceLpf -AXSetVoiceLpfCoefs -AXSetVoiceMix -AXSetVoiceMixerSelect -AXSetVoiceOffsets -AXSetVoiceOffsetsEx -AXSetVoicePriority -AXSetVoiceRmtIIR -AXSetVoiceRmtIIRCoefs -AXSetVoiceRmtMix -AXSetVoiceRmtOn -AXSetVoiceRmtSrc -AXSetVoiceSamplesAddr -AXSetVoiceSrc -AXSetVoiceSrcRatio -AXSetVoiceSrcType -AXSetVoiceState -AXSetVoiceType -AXSetVoiceVe -AXSetVoiceVeDelta -AXStartTransitionAudio -AXUpdateDeviceModes -AXUserBegin -AXUserEnd -AXUserIsProtected -AXVoiceBegin -AXVoiceEnd -AXVoiceIsProtected -DRCVS_GetVersion -DRCVS_Initialize -DRCVS_Process -DRCVS_Quit -DRCVS_SetDirectionFilterCoef -DRCVS_SetDownmixBalance -DRCVS_SetEqCoef -DRCVS_SetHeadphoneGain -DRCVS_SetLimiter -DRCVS_SetLimiterThreshold -DRCVS_SetOutputMode -DRCVS_SetSampleFreq -DRCVS_SetSlevGain -DRCVS_SetSpacialFilterCoef -DRCVS_SetSpeakerGain -DRCVS_SetSurroundDepth -DSPAddTask -DSPAssertInt -DSPAssertTask -DSPCancelTask -DSPCheckInit -DSPCheckMailFromDSP -DSPCheckMailToDSP -DSPGetDMAStatus -DSPH_RunTask -DSPH_WaitTaskComplete -DSPHalt -DSPInit -DSPQuit -DSPReadCPUToDSPMbox -DSPReadMailFromDSP -DSPReset -DSPSendMailToDSP -DSPUnhalt -ISRREnable -ISRRGetMsgQ -ISRRGetNewMsg -ISRRInit -ISRRQuit -ISRSendMessage -_CheckMailFromDSP -_CheckMailToDSP -_InitDsp -_ReadMailFromDSP -_SendMailToDSP -__AXGetAppIoMode -__AXGetMixMode -__AXSetAppIoMode -aiBSPHardwareVersion -axDspSlave -axDspSlaveBalanced -axDspSlaveBalancedLength -axDspSlaveLength -check_os_audio_transition_flag -dsp_os_switch -dsp_os_switchLength -dump_dsp_data -ex_addr_reg_stat -pcd -ppf_dn_e_coef -ppf_dn_o_coef -ppf_up_0_coef -ppf_up_1_coef -ppf_up_2_coef -s_board_type -set_os_audio_transition_flag -slaveData -slaveLength -start_os_audio_transition -stop_os_audio_transition -vs diff --git a/cafe/snd_user.def b/cafe/snd_user.def deleted file mode 100644 index 02cf236..0000000 --- a/cafe/snd_user.def +++ /dev/null @@ -1,379 +0,0 @@ -:NAME snd_user - -:TEXT -AXART3DSound -AXARTAddArticulator -AXARTAddSound -AXARTCents -AXARTInit -AXARTInitArt3D -AXARTInitArtAuxAVolume -AXARTInitArtAuxAVolumeEnv -AXARTInitArtAuxAVolumeMod -AXARTInitArtAuxBVolume -AXARTInitArtAuxBVolumeEnv -AXARTInitArtAuxBVolumeMod -AXARTInitArtAuxCVolume -AXARTInitArtAuxCVolumeEnv -AXARTInitArtAuxCVolumeMod -AXARTInitArtFader -AXARTInitArtItd -AXARTInitArtLpf -AXARTInitArtPanning -AXARTInitArtPitch -AXARTInitArtPitchEnv -AXARTInitArtPitchMod -AXARTInitArtRmt -AXARTInitArtRmtAuxVolume -AXARTInitArtRmtFader -AXARTInitArtSrctype -AXARTInitArtVolume -AXARTInitArtVolumeEnv -AXARTInitArtVolumeMod -AXARTInitLfo -AXARTInitSound -AXARTLfo -AXARTLpf -AXARTNoise -AXARTPitchEnv -AXARTQuit -AXARTRemoveArticulator -AXARTRemoveSound -AXARTReverseSaw -AXARTSaw -AXARTServiceSound -AXARTServiceSounds -AXARTSet3DDistanceScale -AXARTSet3DDopplerScale -AXARTSine -AXARTSquare -AXARTTriangle -AXARTVolumeEnv -AXFX2GetMemAllocFns -AXFX2SetMemAllocFns -AXFX2chChorusCallback -AXFX2chChorusGetMemSize -AXFX2chChorusInit -AXFX2chChorusSettings -AXFX2chChorusSettingsUpdate -AXFX2chChorusShutdown -AXFX2chMultiDelayCallback -AXFX2chMultiDelayGetMemSize -AXFX2chMultiDelayInit -AXFX2chMultiDelaySettingsUpdate -AXFX2chMultiDelayShutdown -AXFX2chReverbCallback -AXFX2chReverbGetMemSize -AXFX2chReverbInit -AXFX2chReverbParametersPreset -AXFX2chReverbSettingsUpdate -AXFX2chReverbShutdown -AXFX4chChorusCallback -AXFX4chChorusGetMemSize -AXFX4chChorusInit -AXFX4chChorusSettings -AXFX4chChorusSettingsUpdate -AXFX4chChorusShutdown -AXFX4chMultiDelayCallback -AXFX4chMultiDelayGetMemSize -AXFX4chMultiDelayInit -AXFX4chMultiDelaySettingsUpdate -AXFX4chMultiDelayShutdown -AXFX4chReverbCallback -AXFX4chReverbGetMemSize -AXFX4chReverbInit -AXFX4chReverbParametersPreset -AXFX4chReverbSettingsUpdate -AXFX4chReverbShutdown -AXFX6ch6chReverbCallback -AXFX6ch6chReverbGetMemSize -AXFX6ch6chReverbInit -AXFX6ch6chReverbParametersPreset -AXFX6ch6chReverbSettingsUpdate -AXFX6ch6chReverbShutdown -AXFX6chChorusCallback -AXFX6chChorusGetMemSize -AXFX6chChorusInit -AXFX6chChorusSettings -AXFX6chChorusSettingsUpdate -AXFX6chChorusShutdown -AXFX6chMultiDelayCallback -AXFX6chMultiDelayGetMemSize -AXFX6chMultiDelayInit -AXFX6chMultiDelaySettingsUpdate -AXFX6chMultiDelayShutdown -AXFX6chReverbCallback -AXFX6chReverbGetMemSize -AXFX6chReverbInit -AXFX6chReverbParametersPreset -AXFX6chReverbSettingsUpdate -AXFX6chReverbShutdown -AXFXChorusCallback -AXFXChorusCallbackDpl2 -AXFXChorusExpCallback -AXFXChorusExpCallbackDpl2 -AXFXChorusExpGetMemSize -AXFXChorusExpGetMemSizeDpl2 -AXFXChorusExpInit -AXFXChorusExpInitDpl2 -AXFXChorusExpSettings -AXFXChorusExpSettingsDpl2 -AXFXChorusExpSettingsUpdate -AXFXChorusExpSettingsUpdateDpl2 -AXFXChorusExpShutdown -AXFXChorusExpShutdownDpl2 -AXFXChorusGetMemSize -AXFXChorusGetMemSizeDpl2 -AXFXChorusInit -AXFXChorusInitDpl2 -AXFXChorusSettings -AXFXChorusSettingsDpl2 -AXFXChorusShutdown -AXFXChorusShutdownDpl2 -AXFXDelayCallback -AXFXDelayCallbackDpl2 -AXFXDelayExpCallback -AXFXDelayExpCallbackDpl2 -AXFXDelayExpGetMemSize -AXFXDelayExpGetMemSizeDpl2 -AXFXDelayExpInit -AXFXDelayExpInitDpl2 -AXFXDelayExpSettings -AXFXDelayExpSettingsDpl2 -AXFXDelayExpSettingsUpdate -AXFXDelayExpSettingsUpdateDpl2 -AXFXDelayExpShutdown -AXFXDelayExpShutdownDpl2 -AXFXDelayGetMemSize -AXFXDelayGetMemSizeDpl2 -AXFXDelayInit -AXFXDelayInitDpl2 -AXFXDelaySettings -AXFXDelaySettingsDpl2 -AXFXDelayShutdown -AXFXDelayShutdownDpl2 -AXFXGetHooks -AXFXMultiChChorusCallback -AXFXMultiChChorusGetMemSize -AXFXMultiChChorusInit -AXFXMultiChChorusSettings -AXFXMultiChChorusSettingsUpdate -AXFXMultiChChorusSettingsUpdateNoReset -AXFXMultiChChorusShutdown -AXFXMultiChDelayCallback -AXFXMultiChDelayGetMemSize -AXFXMultiChDelayInit -AXFXMultiChDelaySettingsUpdate -AXFXMultiChDelaySettingsUpdateNoReset -AXFXMultiChDelayShutdown -AXFXMultiChReverbCallback -AXFXMultiChReverbGetMemSize -AXFXMultiChReverbInit -AXFXMultiChReverbParametersPreset -AXFXMultiChReverbSettingsUpdate -AXFXMultiChReverbSettingsUpdateNoReset -AXFXMultiChReverbShutdown -AXFXReverbHiCallback -AXFXReverbHiCallbackDpl2 -AXFXReverbHiExpCallback -AXFXReverbHiExpCallbackDpl2 -AXFXReverbHiExpGetMemSize -AXFXReverbHiExpGetMemSizeDpl2 -AXFXReverbHiExpInit -AXFXReverbHiExpInitDpl2 -AXFXReverbHiExpSettings -AXFXReverbHiExpSettingsDpl2 -AXFXReverbHiExpSettingsUpdate -AXFXReverbHiExpSettingsUpdateDpl2 -AXFXReverbHiExpShutdown -AXFXReverbHiExpShutdownDpl2 -AXFXReverbHiGetMemSize -AXFXReverbHiGetMemSizeDpl2 -AXFXReverbHiInit -AXFXReverbHiInitDpl2 -AXFXReverbHiSettings -AXFXReverbHiSettingsDpl2 -AXFXReverbHiShutdown -AXFXReverbHiShutdownDpl2 -AXFXReverbSettingsUpdate -AXFXReverbSettingsUpdateNoReset -AXFXReverbStdCallback -AXFXReverbStdCallbackDpl2 -AXFXReverbStdExpCallback -AXFXReverbStdExpCallbackDpl2 -AXFXReverbStdExpGetMemSize -AXFXReverbStdExpGetMemSizeDpl2 -AXFXReverbStdExpInit -AXFXReverbStdExpInitDpl2 -AXFXReverbStdExpSettings -AXFXReverbStdExpSettingsDpl2 -AXFXReverbStdExpSettingsUpdate -AXFXReverbStdExpSettingsUpdateDpl2 -AXFXReverbStdExpShutdown -AXFXReverbStdExpShutdownDpl2 -AXFXReverbStdGetMemSize -AXFXReverbStdGetMemSizeDpl2 -AXFXReverbStdInit -AXFXReverbStdInitDpl2 -AXFXReverbStdSettings -AXFXReverbStdSettingsDpl2 -AXFXReverbStdShutdown -AXFXReverbStdShutdownDpl2 -AXFXSetHooks -AXFX_AllPass_Free -AXFX_AllPass_GetLen -AXFX_AllPass_Initialize -AXFX_AllPass_SetCoef -AXFX_AllPass_Tick -AXFX_Delay_Clear -AXFX_Delay_Free -AXFX_Delay_GetDelay -AXFX_Delay_GetMaximumDelay -AXFX_Delay_Initialize -AXFX_Delay_NextOut -AXFX_Delay_SetDelay -AXFX_Delay_TapOut -AXFX_Delay_TapOut_Interpolate -AXFX_Delay_Tick -AXFX_PS_Delay_Clear -AXFX_PS_Delay_Free -AXFX_PS_Delay_GetDelay -AXFX_PS_Delay_GetMaximumDelay -AXFX_PS_Delay_Initialize -AXFX_PS_Delay_NextOut -AXFX_PS_Delay_SetDelay -AXFX_PS_Delay_TapOut -AXFX_PS_Delay_TapOut_Interpolate -AXFX_PS_Delay_Tick -AXFX_PS_Dual_Delay_TapOut -AXFX_PS_Single_Delay_TapOut -ArticulationMutex -MIXAdjustAuxA -MIXAdjustAuxB -MIXAdjustAuxC -MIXAdjustDeviceAux -MIXAdjustDeviceFader -MIXAdjustDeviceLFE -MIXAdjustDevicePan -MIXAdjustDeviceSPan -MIXAdjustFader -MIXAdjustInput -MIXAdjustPan -MIXAdjustSPan -MIXAssignChannel -MIXAuxAIsPostFader -MIXAuxAPostFader -MIXAuxAPreFader -MIXAuxBIsPostFader -MIXAuxBPostFader -MIXAuxBPreFader -MIXAuxCIsPostFader -MIXAuxCPostFader -MIXAuxCPreFader -MIXDRCAdjustAux -MIXDRCAdjustFader -MIXDRCAdjustPan -MIXDRCAuxIsPostFader -MIXDRCAuxPostFader -MIXDRCAuxPreFader -MIXDRCGetAux -MIXDRCGetFader -MIXDRCGetPan -MIXDRCInitChannel -MIXDRCSetAux -MIXDRCSetFader -MIXDRCSetPan -MIXDeviceAuxIsPostFader -MIXDeviceAuxPostFader -MIXDeviceAuxPreFader -MIXGetAuxA -MIXGetAuxB -MIXGetAuxC -MIXGetDeviceAux -MIXGetDeviceFader -MIXGetDeviceLFE -MIXGetDevicePan -MIXGetDeviceSPan -MIXGetDeviceSoundMode -MIXGetFader -MIXGetInput -MIXGetPan -MIXGetSPan -MIXGetSoundMode -MIXInit -MIXInitChannel -MIXInitDeviceControl -MIXInitInputControl -MIXInitSpecifyMem -MIXIsMute -MIXMute -MIXQuit -MIXReleaseChannel -MIXResetAllDeviceControls -MIXResetControls -MIXResetDeviceControl -MIXRmtAdjustAux -MIXRmtAdjustFader -MIXRmtAuxIsPostFader -MIXRmtAuxPostFader -MIXRmtAuxPreFader -MIXRmtGetAux -MIXRmtGetFader -MIXRmtSetAux -MIXRmtSetFader -MIXRmtSetVolumes -MIXSetAuxA -MIXSetAuxB -MIXSetAuxC -MIXSetDeviceAux -MIXSetDeviceFader -MIXSetDeviceLFE -MIXSetDevicePan -MIXSetDeviceSPan -MIXSetDeviceSoundMode -MIXSetFader -MIXSetInput -MIXSetPan -MIXSetSPan -MIXSetSoundMode -MIXUnMute -MIXUpdateSettings -SEQAddSequence -SEQDRCGetVolume -SEQDRCSetVolume -SEQGetMixerSelect -SEQGetState -SEQGetTempo -SEQGetVolume -SEQInit -SEQQuit -SEQRegisterControllerCallback -SEQRemoveSequence -SEQRunAudioFrame -SEQSetMixerSelect -SEQSetState -SEQSetTempo -SEQSetVolume -SPGetSoundEntry -SPInitSoundTable -SPPrepareEnd -SPPrepareSound -SYNDRCGetMasterVolume -SYNDRCSetMasterVolume -SYNGetActiveNotes -SYNGetMasterVolume -SYNGetMidiController -SYNGetMixerSelect -SYNInit -SYNInitSpecifyMem -SYNInitSynth -SYNMidiInput -SYNQuit -SYNQuitSynth -SYNRunAudioFrame -SYNSetInitCallback -SYNSetMasterVolume -SYNSetMixerSelect -SYNSetUpdateCallback -SeqMutex -SynthMutex