From d62750c46d41df776f87eaf8a19d5800b1be5dec Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Fri, 13 Oct 2017 17:56:42 -0400
Subject: Remove more 3DS-specific code.

---
 src/core/hle/service/dsp_dsp.cpp |  9 ---------
 src/core/hle/service/dsp_dsp.h   | 10 ----------
 src/core/hle/service/gsp_gpu.cpp | 16 ----------------
 src/core/hle/service/gsp_gpu.h   | 10 ----------
 src/core/hw/gpu.cpp              |  6 +++---
 5 files changed, 3 insertions(+), 48 deletions(-)

(limited to 'src/core')

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;
     }
-- 
cgit v1.2.3