summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2017-10-13 17:56:42 -0400
committerGravatar bunnei2017-10-13 17:56:42 -0400
commitd62750c46d41df776f87eaf8a19d5800b1be5dec (patch)
tree259838d03d1952be0c876b0b04aedaf5c17b067f /src
parentRemove more 3DS-specific code. (diff)
downloadyuzu-d62750c46d41df776f87eaf8a19d5800b1be5dec.tar.gz
yuzu-d62750c46d41df776f87eaf8a19d5800b1be5dec.tar.xz
yuzu-d62750c46d41df776f87eaf8a19d5800b1be5dec.zip
Remove more 3DS-specific code.
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/dsp_dsp.cpp9
-rw-r--r--src/core/hle/service/dsp_dsp.h10
-rw-r--r--src/core/hle/service/gsp_gpu.cpp16
-rw-r--r--src/core/hle/service/gsp_gpu.h10
-rw-r--r--src/core/hw/gpu.cpp6
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 {
13void SignalPipeInterrupt(DspPipe pipe) { 13void SignalPipeInterrupt(DspPipe pipe) {
14} 14}
15 15
16////////////////////////////////////////////////////////////////////////////////////////////////////
17// Interface class
18
19Interface::Interface() {
20}
21
22Interface::~Interface() {
23}
24
25} // namespace DSP_DSP 16} // namespace DSP_DSP
26} // namespace Service 17} // 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;
16namespace Service { 16namespace Service {
17namespace DSP_DSP { 17namespace DSP_DSP {
18 18
19class Interface final : public Service::Interface {
20public:
21 Interface();
22 ~Interface() override;
23
24 std::string GetPortName() const override {
25 return "dsp::DSP";
26 }
27};
28
29/** 19/**
30 * Signal a specific DSP related interrupt of type == InterruptType::Pipe, pipe == pipe. 20 * Signal a specific DSP related interrupt of type == InterruptType::Pipe, pipe == pipe.
31 * @param pipe The DSP pipe for which to signal an interrupt for. 21 * @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 @@
7namespace Service { 7namespace Service {
8namespace GSP { 8namespace GSP {
9 9
10/**
11 * Signals that the specified interrupt type has occurred to userland code
12 * @param interrupt_id ID of interrupt that is being signalled
13 * @todo This should probably take a thread_id parameter and only signal this thread?
14 * @todo This probably does not belong in the GSP module, instead move to video_core
15 */
16void SignalInterrupt(InterruptId interrupt_id) {
17 UNIMPLEMENTED();
18}
19
20GSP_GPU::GSP_GPU() {
21}
22
23GSP_GPU::~GSP_GPU() {
24}
25
26} // namespace GSP 10} // namespace GSP
27} // namespace Service 11} // 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 {
174}; 174};
175static_assert(sizeof(CommandBuffer) == 0x200, "CommandBuffer struct has incorrect size"); 175static_assert(sizeof(CommandBuffer) == 0x200, "CommandBuffer struct has incorrect size");
176 176
177class GSP_GPU final : public Interface {
178public:
179 GSP_GPU();
180 ~GSP_GPU() override;
181
182 std::string GetPortName() const override {
183 return "gsp::Gpu";
184 }
185};
186
187/** 177/**
188 * Signals that the specified interrupt type has occurred to userland code 178 * Signals that the specified interrupt type has occurred to userland code
189 * @param interrupt_id ID of interrupt that is being signalled 179 * @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) {
420 // TODO: hwtest this 420 // TODO: hwtest this
421 if (config.GetStartAddress() != 0) { 421 if (config.GetStartAddress() != 0) {
422 if (!is_second_filler) { 422 if (!is_second_filler) {
423 Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PSC0); 423 //Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PSC0);
424 } else { 424 } else {
425 Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PSC1); 425 //Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PSC1);
426 } 426 }
427 } 427 }
428 428
@@ -463,7 +463,7 @@ inline void Write(u32 addr, const T data) {
463 } 463 }
464 464
465 g_regs.display_transfer_config.trigger = 0; 465 g_regs.display_transfer_config.trigger = 0;
466 Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PPF); 466 //Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PPF);
467 } 467 }
468 break; 468 break;
469 } 469 }