Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

service/dsp: Clean up global state

Browse source
This commit is contained in:
NarcolepticK 2018-07-24 15:54:33 -04:00
parent 14878a17d9
commit b840c63386
5 changed files with 39 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/audio_core/dsp_interface.h
View file

@ -11,6 +11,12 @@
#include "common/common_types.h"
#include "core/memory.h"
namespace Service {
namespace DSP {
class DSP_DSP;
} // namespace DSP
} // namespace Service
namespace AudioCore {
class Sink;
@ -60,6 +66,9 @@ public:
/// Returns a reference to the array backing DSP memory
virtual std::array<u8, Memory::DSP_RAM_SIZE>& GetDspMemory() = 0;
/// Sets the dsp class that we trigger interrupts for
virtual void SetDspToInterrupt(std::shared_ptr<Service::DSP::DSP_DSP> dsp) = 0;
/// Select the sink to use based on sink id.
void SetSink(const std::string& sink_id, const std::string& audio_device);
/// Get the current sink

27
src/audio_core/hle/hle.cpp
View file

@ -13,7 +13,9 @@
#include "common/common_types.h"
#include "common/logging/log.h"
#include "core/core_timing.h"
#include "core/hle/service/dsp/dsp_dsp.h"
using InterruptType = Service::DSP::DSP_DSP::InterruptType;
using Service::DSP::DSP_DSP;
namespace AudioCore {
@ -32,6 +34,8 @@ public:
std::array<u8, Memory::DSP_RAM_SIZE>& GetDspMemory();
void SetDspToInterrupt(std::shared_ptr<DSP_DSP> dsp);
private:
void ResetPipes();
void WriteU16(DspPipe pipe_number, u16 value);
@ -60,6 +64,8 @@ private:
DspHle& parent;
CoreTiming::EventType* tick_event;
std::shared_ptr<DSP_DSP> dsp_dsp;
};
DspHle::Impl::Impl(DspHle& parent_) : parent(parent_) {
@ -187,6 +193,10 @@ std::array<u8, Memory::DSP_RAM_SIZE>& DspHle::Impl::GetDspMemory() {
return dsp_memory.raw_memory;
}
void DspHle::Impl::SetDspToInterrupt(std::shared_ptr<DSP_DSP> dsp) {
dsp_dsp = std::move(dsp);
}
void DspHle::Impl::ResetPipes() {
for (auto& data : pipe_data) {
data.clear();
@ -231,7 +241,8 @@ void DspHle::Impl::AudioPipeWriteStructAddresses() {
WriteU16(DspPipe::Audio, addr);
}
// Signal that we have data on this pipe.
Service::DSP::SignalPipeInterrupt(DspPipe::Audio);
if (dsp_dsp)
dsp_dsp->SignalInterrupt(InterruptType::Pipe, DspPipe::Audio);
}
size_t DspHle::Impl::CurrentRegionIndex() const {
@ -307,9 +318,11 @@ bool DspHle::Impl::Tick() {
void DspHle::Impl::AudioTickCallback(int cycles_late) {
if (Tick()) {
// TODO(merry): Signal all the other interrupts as appropriate.
Service::DSP::SignalPipeInterrupt(DspPipe::Audio);
// HACK(merry): Added to prevent regressions. Will remove soon.
Service::DSP::SignalPipeInterrupt(DspPipe::Binary);
if (dsp_dsp) {
dsp_dsp->SignalInterrupt(InterruptType::Pipe, DspPipe::Audio);
// HACK(merry): Added to prevent regressions. Will remove soon.
dsp_dsp->SignalInterrupt(InterruptType::Pipe, DspPipe::Binary);
}
}
// Reschedule recurrent event
@ -339,4 +352,8 @@ std::array<u8, Memory::DSP_RAM_SIZE>& DspHle::GetDspMemory() {
return impl->GetDspMemory();
}
void DspHle::SetDspToInterrupt(std::shared_ptr<DSP_DSP> dsp) {
impl->SetDspToInterrupt(std::move(dsp));
}
} // namespace AudioCore

3
src/audio_core/hle/hle.h
View file

@ -10,6 +10,7 @@
#include "audio_core/audio_types.h"
#include "audio_core/dsp_interface.h"
#include "common/common_types.h"
#include "core/hle/service/dsp/dsp_dsp.h"
#include "core/memory.h"
namespace AudioCore {
@ -27,6 +28,8 @@ public:
std::array<u8, Memory::DSP_RAM_SIZE>& GetDspMemory() override;
void SetDspToInterrupt(std::shared_ptr<Service::DSP::DSP_DSP> dsp) override;
private:
struct Impl;
friend struct Impl;