octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DSP/HLE: move implementation of RecvData to audio_core, behind common interface

Browse Source
This commit is contained in:
Weiyi Wang
2018-12-06 07:18:26 -05:00
parent 6d51d95d44
commit 7f568a3c19
5 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/audio_core/hle/hle.cpp
View File

@ -29,6 +29,7 @@ public:
DspState GetDspState() const;
u16 RecvData(u32 register_number);
std::vector<u8> PipeRead(DspPipe pipe_number, u32 length);
std::size_t GetPipeReadableSize(DspPipe pipe_number) const;
void PipeWrite(DspPipe pipe_number, const std::vector<u8>& buffer);
@ -93,6 +94,24 @@ DspState DspHle::Impl::GetDspState() const {
return dsp_state;
}
u16 DspHle::Impl::RecvData(u32 register_number) {
ASSERT_MSG(register_number == 0, "Unknown register_number {}", register_number);
// Application reads this after requesting DSP shutdown, to verify the DSP has indeed shutdown
// or slept.
switch (GetDspState()) {
case AudioCore::DspState::On:
return 0;
case AudioCore::DspState::Off:
case AudioCore::DspState::Sleeping:
return 1;
default:
UNREACHABLE();
break;
}
}
std::vector<u8> DspHle::Impl::PipeRead(DspPipe pipe_number, u32 length) {
const std::size_t pipe_index = static_cast<std::size_t>(pipe_number);
@ -342,8 +361,8 @@ void DspHle::Impl::AudioTickCallback(s64 cycles_late) {
DspHle::DspHle(Memory::MemorySystem& memory) : impl(std::make_unique<Impl>(*this, memory)) {}
DspHle::~DspHle() = default;
DspState DspHle::GetDspState() const {
return impl->GetDspState();
u16 DspHle::RecvData(u32 register_number) {
return impl->RecvData(register_number);
}
std::vector<u8> DspHle::PipeRead(DspPipe pipe_number, u32 length) {