diff options
author | bunnei <bunneidev@gmail.com> | 2014-12-09 21:41:17 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-12-09 21:41:17 +0100 |
commit | a1f9cde8060b4e047d992896073d10cbdfc7259b (patch) | |
tree | 739ece853edb8488c7a8802290e2187086a4854e | |
parent | Merge pull request #218 from neobrain/pica_debugger (diff) | |
parent | Remove unused NDMA module (diff) | |
download | yuzu-a1f9cde8060b4e047d992896073d10cbdfc7259b.tar yuzu-a1f9cde8060b4e047d992896073d10cbdfc7259b.tar.gz yuzu-a1f9cde8060b4e047d992896073d10cbdfc7259b.tar.bz2 yuzu-a1f9cde8060b4e047d992896073d10cbdfc7259b.tar.lz yuzu-a1f9cde8060b4e047d992896073d10cbdfc7259b.tar.xz yuzu-a1f9cde8060b4e047d992896073d10cbdfc7259b.tar.zst yuzu-a1f9cde8060b4e047d992896073d10cbdfc7259b.zip |
Diffstat (limited to '')
-rw-r--r-- | src/common/log.h | 1 | ||||
-rw-r--r-- | src/common/log_manager.cpp | 1 | ||||
-rw-r--r-- | src/core/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/core/hw/hw.cpp | 13 | ||||
-rw-r--r-- | src/core/hw/ndma.cpp | 47 | ||||
-rw-r--r-- | src/core/hw/ndma.h | 26 |
6 files changed, 0 insertions, 90 deletions
diff --git a/src/common/log.h b/src/common/log.h index ff0295cb0..78f0dae4d 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -65,7 +65,6 @@ enum LOG_TYPE { WII_IPC_HID, KERNEL, SVC, - NDMA, HLE, RENDER, GPU, diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp index 39b1924c7..128c15388 100644 --- a/src/common/log_manager.cpp +++ b/src/common/log_manager.cpp @@ -68,7 +68,6 @@ LogManager::LogManager() m_Log[LogTypes::RENDER] = new LogContainer("RENDER", "RENDER"); m_Log[LogTypes::GPU] = new LogContainer("GPU", "GPU"); m_Log[LogTypes::SVC] = new LogContainer("SVC", "Supervisor Call HLE"); - m_Log[LogTypes::NDMA] = new LogContainer("NDMA", "NDMA"); m_Log[LogTypes::HLE] = new LogContainer("HLE", "High Level Emulation"); m_Log[LogTypes::HW] = new LogContainer("HW", "Hardware"); m_Log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay"); diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f3d7dca9e..8f6792791 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -59,7 +59,6 @@ set(SRCS hle/svc.cpp hw/gpu.cpp hw/hw.cpp - hw/ndma.cpp loader/elf.cpp loader/loader.cpp loader/ncch.cpp @@ -140,7 +139,6 @@ set(HEADERS hle/svc.h hw/gpu.h hw/hw.h - hw/ndma.h loader/elf.h loader/loader.h loader/ncch.h diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp index ea001673a..73a4f1e53 100644 --- a/src/core/hw/hw.cpp +++ b/src/core/hw/hw.cpp @@ -6,7 +6,6 @@ #include "core/hw/hw.h" #include "core/hw/gpu.h" -#include "core/hw/ndma.h" namespace HW { @@ -40,11 +39,6 @@ template <typename T> inline void Read(T &var, const u32 addr) { switch (addr & 0xFFFFF000) { - // TODO(bunnei): What is the virtual address of NDMA? - // case VADDR_NDMA: - // NDMA::Read(var, addr); - // break; - case VADDR_GPU: GPU::Read(var, addr); break; @@ -58,11 +52,6 @@ template <typename T> inline void Write(u32 addr, const T data) { switch (addr & 0xFFFFF000) { - // TODO(bunnei): What is the virtual address of NDMA? - // case VADDR_NDMA - // NDMA::Write(addr, data); - // break; - case VADDR_GPU: GPU::Write(addr, data); break; @@ -87,13 +76,11 @@ template void Write<u8>(u32 addr, const u8 data); /// Update hardware void Update() { GPU::Update(); - NDMA::Update(); } /// Initialize hardware void Init() { GPU::Init(); - NDMA::Init(); NOTICE_LOG(HW, "initialized OK"); } diff --git a/src/core/hw/ndma.cpp b/src/core/hw/ndma.cpp deleted file mode 100644 index 593e5de30..000000000 --- a/src/core/hw/ndma.cpp +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2014 Citra Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include "common/common_types.h" - -#include "core/hw/ndma.h" - -namespace NDMA { - -template <typename T> -inline void Read(T &var, const u32 addr) { - ERROR_LOG(NDMA, "unknown Read%lu @ 0x%08X", sizeof(var) * 8, addr); -} - -template <typename T> -inline void Write(u32 addr, const T data) { - ERROR_LOG(NDMA, "unknown Write%lu 0x%08X @ 0x%08X", sizeof(data) * 8, (u32)data, addr); -} - -// Explicitly instantiate template functions because we aren't defining this in the header: - -template void Read<u64>(u64 &var, const u32 addr); -template void Read<u32>(u32 &var, const u32 addr); -template void Read<u16>(u16 &var, const u32 addr); -template void Read<u8>(u8 &var, const u32 addr); - -template void Write<u64>(u32 addr, const u64 data); -template void Write<u32>(u32 addr, const u32 data); -template void Write<u16>(u32 addr, const u16 data); -template void Write<u8>(u32 addr, const u8 data); - -/// Update hardware -void Update() { -} - -/// Initialize hardware -void Init() { - NOTICE_LOG(GPU, "initialized OK"); -} - -/// Shutdown hardware -void Shutdown() { - NOTICE_LOG(GPU, "shutdown OK"); -} - -} // namespace diff --git a/src/core/hw/ndma.h b/src/core/hw/ndma.h deleted file mode 100644 index d8fa3d40b..000000000 --- a/src/core/hw/ndma.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2014 Citra Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#pragma once - -#include "common/common_types.h" - -namespace NDMA { - -template <typename T> -inline void Read(T &var, const u32 addr); - -template <typename T> -inline void Write(u32 addr, const T data); - -/// Update hardware -void Update(); - -/// Initialize hardware -void Init(); - -/// Shutdown hardware -void Shutdown(); - -} // namespace |