mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-20 02:13:23 +02:00
Merge pull request #266 from yuriks/remove-ndma
Remove unused NDMA module.
This commit is contained in:
commit
a1f9cde806
@ -65,7 +65,6 @@ enum LOG_TYPE {
|
|||||||
WII_IPC_HID,
|
WII_IPC_HID,
|
||||||
KERNEL,
|
KERNEL,
|
||||||
SVC,
|
SVC,
|
||||||
NDMA,
|
|
||||||
HLE,
|
HLE,
|
||||||
RENDER,
|
RENDER,
|
||||||
GPU,
|
GPU,
|
||||||
|
@ -68,7 +68,6 @@ LogManager::LogManager()
|
|||||||
m_Log[LogTypes::RENDER] = new LogContainer("RENDER", "RENDER");
|
m_Log[LogTypes::RENDER] = new LogContainer("RENDER", "RENDER");
|
||||||
m_Log[LogTypes::GPU] = new LogContainer("GPU", "GPU");
|
m_Log[LogTypes::GPU] = new LogContainer("GPU", "GPU");
|
||||||
m_Log[LogTypes::SVC] = new LogContainer("SVC", "Supervisor Call HLE");
|
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::HLE] = new LogContainer("HLE", "High Level Emulation");
|
||||||
m_Log[LogTypes::HW] = new LogContainer("HW", "Hardware");
|
m_Log[LogTypes::HW] = new LogContainer("HW", "Hardware");
|
||||||
m_Log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay");
|
m_Log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay");
|
||||||
|
@ -59,7 +59,6 @@ set(SRCS
|
|||||||
hle/svc.cpp
|
hle/svc.cpp
|
||||||
hw/gpu.cpp
|
hw/gpu.cpp
|
||||||
hw/hw.cpp
|
hw/hw.cpp
|
||||||
hw/ndma.cpp
|
|
||||||
loader/elf.cpp
|
loader/elf.cpp
|
||||||
loader/loader.cpp
|
loader/loader.cpp
|
||||||
loader/ncch.cpp
|
loader/ncch.cpp
|
||||||
@ -140,7 +139,6 @@ set(HEADERS
|
|||||||
hle/svc.h
|
hle/svc.h
|
||||||
hw/gpu.h
|
hw/gpu.h
|
||||||
hw/hw.h
|
hw/hw.h
|
||||||
hw/ndma.h
|
|
||||||
loader/elf.h
|
loader/elf.h
|
||||||
loader/loader.h
|
loader/loader.h
|
||||||
loader/ncch.h
|
loader/ncch.h
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
|
|
||||||
#include "core/hw/hw.h"
|
#include "core/hw/hw.h"
|
||||||
#include "core/hw/gpu.h"
|
#include "core/hw/gpu.h"
|
||||||
#include "core/hw/ndma.h"
|
|
||||||
|
|
||||||
namespace HW {
|
namespace HW {
|
||||||
|
|
||||||
@ -40,11 +39,6 @@ template <typename T>
|
|||||||
inline void Read(T &var, const u32 addr) {
|
inline void Read(T &var, const u32 addr) {
|
||||||
switch (addr & 0xFFFFF000) {
|
switch (addr & 0xFFFFF000) {
|
||||||
|
|
||||||
// TODO(bunnei): What is the virtual address of NDMA?
|
|
||||||
// case VADDR_NDMA:
|
|
||||||
// NDMA::Read(var, addr);
|
|
||||||
// break;
|
|
||||||
|
|
||||||
case VADDR_GPU:
|
case VADDR_GPU:
|
||||||
GPU::Read(var, addr);
|
GPU::Read(var, addr);
|
||||||
break;
|
break;
|
||||||
@ -58,11 +52,6 @@ template <typename T>
|
|||||||
inline void Write(u32 addr, const T data) {
|
inline void Write(u32 addr, const T data) {
|
||||||
switch (addr & 0xFFFFF000) {
|
switch (addr & 0xFFFFF000) {
|
||||||
|
|
||||||
// TODO(bunnei): What is the virtual address of NDMA?
|
|
||||||
// case VADDR_NDMA
|
|
||||||
// NDMA::Write(addr, data);
|
|
||||||
// break;
|
|
||||||
|
|
||||||
case VADDR_GPU:
|
case VADDR_GPU:
|
||||||
GPU::Write(addr, data);
|
GPU::Write(addr, data);
|
||||||
break;
|
break;
|
||||||
@ -87,13 +76,11 @@ template void Write<u8>(u32 addr, const u8 data);
|
|||||||
/// Update hardware
|
/// Update hardware
|
||||||
void Update() {
|
void Update() {
|
||||||
GPU::Update();
|
GPU::Update();
|
||||||
NDMA::Update();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Initialize hardware
|
/// Initialize hardware
|
||||||
void Init() {
|
void Init() {
|
||||||
GPU::Init();
|
GPU::Init();
|
||||||
NDMA::Init();
|
|
||||||
NOTICE_LOG(HW, "initialized OK");
|
NOTICE_LOG(HW, "initialized OK");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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
|
|
@ -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
|
|
Loading…
Reference in New Issue
Block a user