summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/core/core.cpp8
-rw-r--r--src/core/hw/hw.cpp7
-rw-r--r--src/core/hw/lcd.cpp9
-rw-r--r--src/core/memory.cpp41
-rw-r--r--src/core/telemetry_session.cpp5
5 files changed, 1 insertions, 69 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index e5f299f26..ae1eb2430 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -4,7 +4,6 @@
#include <memory>
#include <utility>
-#include "audio_core/audio_core.h"
#include "common/logging/log.h"
#include "core/arm/dynarmic/arm_dynarmic.h"
#include "core/arm/unicorn/arm_unicorn.h"
@@ -19,7 +18,6 @@
#include "core/loader/loader.h"
#include "core/memory_setup.h"
#include "core/settings.h"
-#include "network/network.h"
#include "video_core/video_core.h"
namespace Core {
@@ -156,7 +154,6 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
HW::Init();
Kernel::Init(system_mode);
Service::Init();
- AudioCore::Init();
GDBStub::Init();
if (!VideoCore::Init(emu_window)) {
@@ -184,7 +181,6 @@ void System::Shutdown() {
// Shutdown emulation session
GDBStub::Shutdown();
- AudioCore::Shutdown();
VideoCore::Shutdown();
Service::Shutdown();
Kernel::Shutdown();
@@ -193,10 +189,6 @@ void System::Shutdown() {
cpu_core = nullptr;
app_loader = nullptr;
telemetry_session = nullptr;
- if (auto room_member = Network::GetRoomMember().lock()) {
- Network::GameInfo game_info{};
- room_member->SendGameInfo(game_info);
- }
LOG_DEBUG(Core, "Shutdown OK");
}
diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp
index 8499f2ce6..a751b1d62 100644
--- a/src/core/hw/hw.cpp
+++ b/src/core/hw/hw.cpp
@@ -4,8 +4,6 @@
#include "common/common_types.h"
#include "common/logging/log.h"
-#include "core/hw/aes/key.h"
-#include "core/hw/gpu.h"
#include "core/hw/hw.h"
#include "core/hw/lcd.h"
@@ -30,7 +28,6 @@ inline void Read(T& var, const u32 addr) {
case VADDR_GPU + 0xD000:
case VADDR_GPU + 0xE000:
case VADDR_GPU + 0xF000:
- GPU::Read(var, addr);
break;
case VADDR_LCD:
LCD::Read(var, addr);
@@ -59,7 +56,6 @@ inline void Write(u32 addr, const T data) {
case VADDR_GPU + 0xD000:
case VADDR_GPU + 0xE000:
case VADDR_GPU + 0xF000:
- GPU::Write(addr, data);
break;
case VADDR_LCD:
LCD::Write(addr, data);
@@ -86,15 +82,12 @@ void Update() {}
/// Initialize hardware
void Init() {
- AES::InitKeys();
- GPU::Init();
LCD::Init();
LOG_DEBUG(HW, "initialized OK");
}
/// Shutdown hardware
void Shutdown() {
- GPU::Shutdown();
LCD::Shutdown();
LOG_DEBUG(HW, "shutdown OK");
}
diff --git a/src/core/hw/lcd.cpp b/src/core/hw/lcd.cpp
index 2aa89de18..763ac1c4d 100644
--- a/src/core/hw/lcd.cpp
+++ b/src/core/hw/lcd.cpp
@@ -8,7 +8,6 @@
#include "core/hw/hw.h"
#include "core/hw/lcd.h"
#include "core/tracer/recorder.h"
-#include "video_core/debug_utils/debug_utils.h"
namespace LCD {
@@ -40,14 +39,6 @@ inline void Write(u32 addr, const T data) {
}
g_regs[index] = static_cast<u32>(data);
-
- // Notify tracer about the register write
- // This is happening *after* handling the write to make sure we properly catch all memory reads.
- if (Pica::g_debug_context && Pica::g_debug_context->recorder) {
- // addr + GPU VBase - IO VBase + IO PBase
- Pica::g_debug_context->recorder->RegisterWritten<T>(
- addr + HW::VADDR_LCD - 0x1EC00000 + 0x10100000, data);
- }
}
// Explicitly instantiate template functions because we aren't defining this in the header:
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 01ec231f6..74a598852 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -4,7 +4,6 @@
#include <array>
#include <cstring>
-#include "audio_core/audio_core.h"
#include "common/assert.h"
#include "common/common_types.h"
#include "common/logging/log.h"
@@ -311,7 +310,6 @@ u8* GetPhysicalPointer(PAddr address) {
target_pointer = vram.data() + offset_into_region;
break;
case DSP_RAM_PADDR:
- target_pointer = AudioCore::GetDspMemory().data() + offset_into_region;
break;
case FCRAM_PADDR:
for (const auto& region : Kernel::memory_regions) {
@@ -413,53 +411,16 @@ void RasterizerMarkRegionCached(PAddr start, u64 size, int count_delta) {
}
}
-void RasterizerFlushRegion(PAddr start, u64 size) {
- if (VideoCore::g_renderer != nullptr) {
- VideoCore::g_renderer->Rasterizer()->FlushRegion(start, size);
- }
-}
+void RasterizerFlushRegion(PAddr start, u64 size) {}
void RasterizerFlushAndInvalidateRegion(PAddr start, u64 size) {
// Since pages are unmapped on shutdown after video core is shutdown, the renderer may be
// null here
- if (VideoCore::g_renderer != nullptr) {
- VideoCore::g_renderer->Rasterizer()->FlushAndInvalidateRegion(start, size);
- }
}
void RasterizerFlushVirtualRegion(VAddr start, u64 size, FlushMode mode) {
// Since pages are unmapped on shutdown after video core is shutdown, the renderer may be
// null here
- if (VideoCore::g_renderer != nullptr) {
- VAddr end = start + size;
-
- auto CheckRegion = [&](VAddr region_start, VAddr region_end) {
- if (start >= region_end || end <= region_start) {
- // No overlap with region
- return;
- }
-
- VAddr overlap_start = std::max(start, region_start);
- VAddr overlap_end = std::min(end, region_end);
-
- PAddr physical_start = TryVirtualToPhysicalAddress(overlap_start).value();
- u32 overlap_size = static_cast<u32>(overlap_end - overlap_start);
-
- auto* rasterizer = VideoCore::g_renderer->Rasterizer();
- switch (mode) {
- case FlushMode::Flush:
- rasterizer->FlushRegion(physical_start, overlap_size);
- break;
- case FlushMode::FlushAndInvalidate:
- rasterizer->FlushAndInvalidateRegion(physical_start, overlap_size);
- break;
- }
- };
-
- CheckRegion(LINEAR_HEAP_VADDR, LINEAR_HEAP_VADDR_END);
- CheckRegion(NEW_LINEAR_HEAP_VADDR, NEW_LINEAR_HEAP_VADDR_END);
- CheckRegion(VRAM_VADDR, VRAM_VADDR_END);
- }
}
u8 Read8(const VAddr addr) {
diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp
index 560c8af55..4e402bc58 100644
--- a/src/core/telemetry_session.cpp
+++ b/src/core/telemetry_session.cpp
@@ -12,11 +12,6 @@
#include "core/settings.h"
#include "core/telemetry_session.h"
-#ifdef ENABLE_WEB_SERVICE
-#include "web_service/telemetry_json.h"
-#include "web_service/verify_login.h"
-#endif
-
namespace Core {
static const char* CpuVendorToStr(Common::CPUVendor vendor) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 05:47:40 +0100