mirror of
https://github.com/PabloMK7/citra.git
synced 2025-10-31 05:40:04 +00:00
Merge pull request #3322 from MerryMage/DSP
audio_core: Remove global state
This commit is contained in:
James Rowe
GitHub
commit
33fe6c30e0
35 changed files with 714 additions and 657 deletions
|
|
@ -5,10 +5,12 @@
|
|||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <cinttypes>
|
||||
#include "audio_core/hle/pipe.h"
|
||||
#include "audio_core/audio_types.h"
|
||||
#include "audio_core/dsp_interface.h"
|
||||
#include "common/assert.h"
|
||||
#include "common/hash.h"
|
||||
#include "common/logging/log.h"
|
||||
#include "core/core.h"
|
||||
#include "core/hle/ipc.h"
|
||||
#include "core/hle/kernel/event.h"
|
||||
#include "core/hle/kernel/handle_table.h"
|
||||
|
|
@ -16,7 +18,7 @@
|
|||
#include "core/hle/service/dsp_dsp.h"
|
||||
#include "core/memory.h"
|
||||
|
||||
using DspPipe = DSP::HLE::DspPipe;
|
||||
using DspPipe = AudioCore::DspPipe;
|
||||
|
||||
namespace Service {
|
||||
namespace DSP_DSP {
|
||||
|
|
@ -44,7 +46,7 @@ public:
|
|||
return one;
|
||||
case InterruptType::Pipe: {
|
||||
const size_t pipe_index = static_cast<size_t>(dsp_pipe);
|
||||
ASSERT(pipe_index < DSP::HLE::NUM_DSP_PIPE);
|
||||
ASSERT(pipe_index < AudioCore::num_dsp_pipe);
|
||||
return pipe[pipe_index];
|
||||
}
|
||||
}
|
||||
|
|
@ -73,7 +75,7 @@ private:
|
|||
/// Currently unknown purpose
|
||||
Kernel::SharedPtr<Kernel::Event> one = nullptr;
|
||||
/// Each DSP pipe has an associated interrupt
|
||||
std::array<Kernel::SharedPtr<Kernel::Event>, DSP::HLE::NUM_DSP_PIPE> pipe = {{}};
|
||||
std::array<Kernel::SharedPtr<Kernel::Event>, AudioCore::num_dsp_pipe> pipe = {{}};
|
||||
};
|
||||
|
||||
static InterruptEvents interrupt_events;
|
||||
|
|
@ -216,7 +218,7 @@ static void RegisterInterruptEvents(Service::Interface* self) {
|
|||
u32 pipe_index = cmd_buff[2];
|
||||
u32 event_handle = cmd_buff[4];
|
||||
|
||||
ASSERT_MSG(type_index < NUM_INTERRUPT_TYPE && pipe_index < DSP::HLE::NUM_DSP_PIPE,
|
||||
ASSERT_MSG(type_index < NUM_INTERRUPT_TYPE && pipe_index < AudioCore::num_dsp_pipe,
|
||||
"Invalid type or pipe: type = %u, pipe = %u", type_index, pipe_index);
|
||||
|
||||
InterruptType type = static_cast<InterruptType>(cmd_buff[1]);
|
||||
|
|
@ -289,7 +291,7 @@ static void WriteProcessPipe(Service::Interface* self) {
|
|||
u32 size = cmd_buff[2];
|
||||
u32 buffer = cmd_buff[4];
|
||||
|
||||
DSP::HLE::DspPipe pipe = static_cast<DSP::HLE::DspPipe>(pipe_index);
|
||||
AudioCore::DspPipe pipe = static_cast<AudioCore::DspPipe>(pipe_index);
|
||||
|
||||
if (IPC::StaticBufferDesc(size, 1) != cmd_buff[3]) {
|
||||
LOG_ERROR(Service_DSP, "IPC static buffer descriptor failed validation (0x%X). pipe=%u, "
|
||||
|
|
@ -312,12 +314,12 @@ static void WriteProcessPipe(Service::Interface* self) {
|
|||
// The likely reason for this is that games tend to pass in garbage at these bytes
|
||||
// because they read random bytes off the stack.
|
||||
switch (pipe) {
|
||||
case DSP::HLE::DspPipe::Audio:
|
||||
case AudioCore::DspPipe::Audio:
|
||||
ASSERT(message.size() >= 4);
|
||||
message[2] = 0;
|
||||
message[3] = 0;
|
||||
break;
|
||||
case DSP::HLE::DspPipe::Binary:
|
||||
case AudioCore::DspPipe::Binary:
|
||||
ASSERT(message.size() >= 8);
|
||||
message[4] = 1;
|
||||
message[5] = 0;
|
||||
|
|
@ -326,7 +328,7 @@ static void WriteProcessPipe(Service::Interface* self) {
|
|||
break;
|
||||
}
|
||||
|
||||
DSP::HLE::PipeWrite(pipe, message);
|
||||
Core::DSP().PipeWrite(pipe, message);
|
||||
|
||||
cmd_buff[0] = IPC::MakeHeader(0xD, 1, 0);
|
||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||
|
|
@ -338,7 +340,7 @@ static void WriteProcessPipe(Service::Interface* self) {
|
|||
* DSP_DSP::ReadPipeIfPossible service function
|
||||
* A pipe is a means of communication between the ARM11 and DSP that occurs on
|
||||
* hardware by writing to/reading from the DSP registers at 0x10203000.
|
||||
* Pipes are used for initialisation. See also DSP::HLE::PipeRead.
|
||||
* Pipes are used for initialisation. See also DspInterface::PipeRead.
|
||||
* Inputs:
|
||||
* 1 : Pipe Number
|
||||
* 2 : Unknown
|
||||
|
|
@ -356,7 +358,7 @@ static void ReadPipeIfPossible(Service::Interface* self) {
|
|||
u32 size = cmd_buff[3] & 0xFFFF; // Lower 16 bits are size
|
||||
VAddr addr = cmd_buff[0x41];
|
||||
|
||||
DSP::HLE::DspPipe pipe = static_cast<DSP::HLE::DspPipe>(pipe_index);
|
||||
AudioCore::DspPipe pipe = static_cast<AudioCore::DspPipe>(pipe_index);
|
||||
|
||||
ASSERT_MSG(Memory::IsValidVirtualAddress(addr),
|
||||
"Invalid addr: pipe=0x%08X, unknown=0x%08X, size=0x%X, buffer=0x%08X", pipe_index,
|
||||
|
|
@ -364,8 +366,8 @@ static void ReadPipeIfPossible(Service::Interface* self) {
|
|||
|
||||
cmd_buff[0] = IPC::MakeHeader(0x10, 1, 2);
|
||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||
if (DSP::HLE::GetPipeReadableSize(pipe) >= size) {
|
||||
std::vector<u8> response = DSP::HLE::PipeRead(pipe, size);
|
||||
if (Core::DSP().GetPipeReadableSize(pipe) >= size) {
|
||||
std::vector<u8> response = Core::DSP().PipeRead(pipe, size);
|
||||
|
||||
Memory::WriteBlock(addr, response.data(), response.size());
|
||||
|
||||
|
|
@ -400,14 +402,14 @@ static void ReadPipe(Service::Interface* self) {
|
|||
u32 size = cmd_buff[3] & 0xFFFF; // Lower 16 bits are size
|
||||
VAddr addr = cmd_buff[0x41];
|
||||
|
||||
DSP::HLE::DspPipe pipe = static_cast<DSP::HLE::DspPipe>(pipe_index);
|
||||
AudioCore::DspPipe pipe = static_cast<AudioCore::DspPipe>(pipe_index);
|
||||
|
||||
ASSERT_MSG(Memory::IsValidVirtualAddress(addr),
|
||||
"Invalid addr: pipe=0x%08X, unknown=0x%08X, size=0x%X, buffer=0x%08X", pipe_index,
|
||||
unknown, size, addr);
|
||||
|
||||
if (DSP::HLE::GetPipeReadableSize(pipe) >= size) {
|
||||
std::vector<u8> response = DSP::HLE::PipeRead(pipe, size);
|
||||
if (Core::DSP().GetPipeReadableSize(pipe) >= size) {
|
||||
std::vector<u8> response = Core::DSP().PipeRead(pipe, size);
|
||||
|
||||
Memory::WriteBlock(addr, response.data(), response.size());
|
||||
|
||||
|
|
@ -441,11 +443,11 @@ static void GetPipeReadableSize(Service::Interface* self) {
|
|||
u32 pipe_index = cmd_buff[1];
|
||||
u32 unknown = cmd_buff[2];
|
||||
|
||||
DSP::HLE::DspPipe pipe = static_cast<DSP::HLE::DspPipe>(pipe_index);
|
||||
AudioCore::DspPipe pipe = static_cast<AudioCore::DspPipe>(pipe_index);
|
||||
|
||||
cmd_buff[0] = IPC::MakeHeader(0xF, 2, 0);
|
||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||
cmd_buff[2] = static_cast<u32>(DSP::HLE::GetPipeReadableSize(pipe));
|
||||
cmd_buff[2] = static_cast<u32>(Core::DSP().GetPipeReadableSize(pipe));
|
||||
|
||||
LOG_DEBUG(Service_DSP, "pipe=%u, unknown=0x%08X, return cmd_buff[2]=0x%08X", pipe_index,
|
||||
unknown, cmd_buff[2]);
|
||||
|
|
@ -511,12 +513,12 @@ static void RecvData(Service::Interface* self) {
|
|||
|
||||
cmd_buff[0] = IPC::MakeHeader(0x1, 2, 0);
|
||||
cmd_buff[1] = RESULT_SUCCESS.raw;
|
||||
switch (DSP::HLE::GetDspState()) {
|
||||
case DSP::HLE::DspState::On:
|
||||
switch (Core::DSP().GetDspState()) {
|
||||
case AudioCore::DspState::On:
|
||||
cmd_buff[2] = 0;
|
||||
break;
|
||||
case DSP::HLE::DspState::Off:
|
||||
case DSP::HLE::DspState::Sleeping:
|
||||
case AudioCore::DspState::Off:
|
||||
case AudioCore::DspState::Sleeping:
|
||||
cmd_buff[2] = 1;
|
||||
break;
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -7,11 +7,9 @@
|
|||
#include <string>
|
||||
#include "core/hle/service/service.h"
|
||||
|
||||
namespace DSP {
|
||||
namespace HLE {
|
||||
namespace AudioCore {
|
||||
enum class DspPipe;
|
||||
}
|
||||
}
|
||||
|
||||
namespace Service {
|
||||
namespace DSP_DSP {
|
||||
|
|
@ -30,7 +28,7 @@ public:
|
|||
* Signal a specific DSP related interrupt of type == InterruptType::Pipe, pipe == pipe.
|
||||
* @param pipe The DSP pipe for which to signal an interrupt for.
|
||||
*/
|
||||
void SignalPipeInterrupt(DSP::HLE::DspPipe pipe);
|
||||
void SignalPipeInterrupt(AudioCore::DspPipe pipe);
|
||||
|
||||
} // namespace DSP_DSP
|
||||
} // namespace Service
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue