diff options
| author | 2016-12-10 07:51:50 -0500 | |
|---|---|---|
| committer | 2016-12-11 00:07:27 +0000 | |
| commit | 963aedd8ccc207d5b65b97bd46b930771f2bda6e (patch) | |
| tree | ab238398e6f8a37e4cd105d19dcec54f82ec1bb2 /src/audio_core | |
| parent | configure_input: Modernize and cleanup input configuration tab (diff) | |
| download | yuzu-963aedd8ccc207d5b65b97bd46b930771f2bda6e.tar.gz yuzu-963aedd8ccc207d5b65b97bd46b930771f2bda6e.tar.xz yuzu-963aedd8ccc207d5b65b97bd46b930771f2bda6e.zip | |
Add all services to the Service namespace
Previously there was a split where some of the services were in the
Service namespace and others were not.
Diffstat (limited to 'src/audio_core')
| -rw-r--r-- | src/audio_core/audio_core.cpp | 4 | ||||
| -rw-r--r-- | src/audio_core/hle/pipe.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/audio_core/audio_core.cpp b/src/audio_core/audio_core.cpp index 1065e2222..ba6acf28e 100644 --- a/src/audio_core/audio_core.cpp +++ b/src/audio_core/audio_core.cpp | |||
| @@ -23,9 +23,9 @@ static constexpr u64 audio_frame_ticks = 1310252ull; ///< Units: ARM11 cycles | |||
| 23 | static void AudioTickCallback(u64 /*userdata*/, int cycles_late) { | 23 | static void AudioTickCallback(u64 /*userdata*/, int cycles_late) { |
| 24 | if (DSP::HLE::Tick()) { | 24 | if (DSP::HLE::Tick()) { |
| 25 | // TODO(merry): Signal all the other interrupts as appropriate. | 25 | // TODO(merry): Signal all the other interrupts as appropriate. |
| 26 | DSP_DSP::SignalPipeInterrupt(DSP::HLE::DspPipe::Audio); | 26 | Service::DSP_DSP::SignalPipeInterrupt(DSP::HLE::DspPipe::Audio); |
| 27 | // HACK(merry): Added to prevent regressions. Will remove soon. | 27 | // HACK(merry): Added to prevent regressions. Will remove soon. |
| 28 | DSP_DSP::SignalPipeInterrupt(DSP::HLE::DspPipe::Binary); | 28 | Service::DSP_DSP::SignalPipeInterrupt(DSP::HLE::DspPipe::Binary); |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | // Reschedule recurrent event | 31 | // Reschedule recurrent event |
diff --git a/src/audio_core/hle/pipe.cpp b/src/audio_core/hle/pipe.cpp index bc69acbc2..24074a514 100644 --- a/src/audio_core/hle/pipe.cpp +++ b/src/audio_core/hle/pipe.cpp | |||
| @@ -104,7 +104,7 @@ static void AudioPipeWriteStructAddresses() { | |||
| 104 | WriteU16(DspPipe::Audio, addr); | 104 | WriteU16(DspPipe::Audio, addr); |
| 105 | } | 105 | } |
| 106 | // Signal that we have data on this pipe. | 106 | // Signal that we have data on this pipe. |
| 107 | DSP_DSP::SignalPipeInterrupt(DspPipe::Audio); | 107 | Service::DSP_DSP::SignalPipeInterrupt(DspPipe::Audio); |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | void PipeWrite(DspPipe pipe_number, const std::vector<u8>& buffer) { | 110 | void PipeWrite(DspPipe pipe_number, const std::vector<u8>& buffer) { |