diff options
author | bunnei <bunneidev@gmail.com> | 2017-10-13 23:56:42 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2017-10-13 23:56:42 +0200 |
commit | d62750c46d41df776f87eaf8a19d5800b1be5dec (patch) | |
tree | 259838d03d1952be0c876b0b04aedaf5c17b067f /src | |
parent | Remove more 3DS-specific code. (diff) | |
download | yuzu-d62750c46d41df776f87eaf8a19d5800b1be5dec.tar yuzu-d62750c46d41df776f87eaf8a19d5800b1be5dec.tar.gz yuzu-d62750c46d41df776f87eaf8a19d5800b1be5dec.tar.bz2 yuzu-d62750c46d41df776f87eaf8a19d5800b1be5dec.tar.lz yuzu-d62750c46d41df776f87eaf8a19d5800b1be5dec.tar.xz yuzu-d62750c46d41df776f87eaf8a19d5800b1be5dec.tar.zst yuzu-d62750c46d41df776f87eaf8a19d5800b1be5dec.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/core/hle/service/dsp_dsp.cpp | 9 | ||||
-rw-r--r-- | src/core/hle/service/dsp_dsp.h | 10 | ||||
-rw-r--r-- | src/core/hle/service/gsp_gpu.cpp | 16 | ||||
-rw-r--r-- | src/core/hle/service/gsp_gpu.h | 10 | ||||
-rw-r--r-- | src/core/hw/gpu.cpp | 6 |
5 files changed, 3 insertions, 48 deletions
diff --git a/src/core/hle/service/dsp_dsp.cpp b/src/core/hle/service/dsp_dsp.cpp index 7eb1a01b7..a8958373a 100644 --- a/src/core/hle/service/dsp_dsp.cpp +++ b/src/core/hle/service/dsp_dsp.cpp @@ -13,14 +13,5 @@ namespace DSP_DSP { void SignalPipeInterrupt(DspPipe pipe) { } -//////////////////////////////////////////////////////////////////////////////////////////////////// -// Interface class - -Interface::Interface() { -} - -Interface::~Interface() { -} - } // namespace DSP_DSP } // namespace Service diff --git a/src/core/hle/service/dsp_dsp.h b/src/core/hle/service/dsp_dsp.h index 691d6f716..18ac76d9a 100644 --- a/src/core/hle/service/dsp_dsp.h +++ b/src/core/hle/service/dsp_dsp.h @@ -16,16 +16,6 @@ enum class DspPipe; namespace Service { namespace DSP_DSP { -class Interface final : public Service::Interface { -public: - Interface(); - ~Interface() override; - - std::string GetPortName() const override { - return "dsp::DSP"; - } -}; - /** * Signal a specific DSP related interrupt of type == InterruptType::Pipe, pipe == pipe. * @param pipe The DSP pipe for which to signal an interrupt for. diff --git a/src/core/hle/service/gsp_gpu.cpp b/src/core/hle/service/gsp_gpu.cpp index 757011e26..8f29e04a5 100644 --- a/src/core/hle/service/gsp_gpu.cpp +++ b/src/core/hle/service/gsp_gpu.cpp @@ -7,21 +7,5 @@ namespace Service { namespace GSP { -/** - * Signals that the specified interrupt type has occurred to userland code - * @param interrupt_id ID of interrupt that is being signalled - * @todo This should probably take a thread_id parameter and only signal this thread? - * @todo This probably does not belong in the GSP module, instead move to video_core - */ -void SignalInterrupt(InterruptId interrupt_id) { - UNIMPLEMENTED(); -} - -GSP_GPU::GSP_GPU() { -} - -GSP_GPU::~GSP_GPU() { -} - } // namespace GSP } // namespace Service diff --git a/src/core/hle/service/gsp_gpu.h b/src/core/hle/service/gsp_gpu.h index c6e24073b..3c97763d9 100644 --- a/src/core/hle/service/gsp_gpu.h +++ b/src/core/hle/service/gsp_gpu.h @@ -174,16 +174,6 @@ struct CommandBuffer { }; static_assert(sizeof(CommandBuffer) == 0x200, "CommandBuffer struct has incorrect size"); -class GSP_GPU final : public Interface { -public: - GSP_GPU(); - ~GSP_GPU() override; - - std::string GetPortName() const override { - return "gsp::Gpu"; - } -}; - /** * Signals that the specified interrupt type has occurred to userland code * @param interrupt_id ID of interrupt that is being signalled diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index d1bfe51e6..c828a776e 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp @@ -420,9 +420,9 @@ inline void Write(u32 addr, const T data) { // TODO: hwtest this if (config.GetStartAddress() != 0) { if (!is_second_filler) { - Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PSC0); + //Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PSC0); } else { - Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PSC1); + //Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PSC1); } } @@ -463,7 +463,7 @@ inline void Write(u32 addr, const T data) { } g_regs.display_transfer_config.trigger = 0; - Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PPF); + //Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PPF); } break; } |