summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wasserka <NeoBrainX@gmail.com>2014-07-22 13:49:25 +0200
committerTony Wasserka <NeoBrainX@gmail.com>2014-07-23 00:44:31 +0200
commitafcb250b3140fa2f37efa800f5346aabbde5db2a (patch)
tree2a80ff39f2d165d75b73a608a4d22ab055129a83
parentGPU: Clarify display transfer code. (diff)
downloadyuzu-afcb250b3140fa2f37efa800f5346aabbde5db2a.tar
yuzu-afcb250b3140fa2f37efa800f5346aabbde5db2a.tar.gz
yuzu-afcb250b3140fa2f37efa800f5346aabbde5db2a.tar.bz2
yuzu-afcb250b3140fa2f37efa800f5346aabbde5db2a.tar.lz
yuzu-afcb250b3140fa2f37efa800f5346aabbde5db2a.tar.xz
yuzu-afcb250b3140fa2f37efa800f5346aabbde5db2a.tar.zst
yuzu-afcb250b3140fa2f37efa800f5346aabbde5db2a.zip
-rw-r--r--src/core/hle/config_mem.h6
-rw-r--r--src/core/hw/gpu.h4
-rw-r--r--src/core/hw/hw.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hle/config_mem.h b/src/core/hle/config_mem.h
index da396a3e6..fa01b5cdb 100644
--- a/src/core/hle/config_mem.h
+++ b/src/core/hle/config_mem.h
@@ -1,10 +1,10 @@
// Copyright 2014 Citra Emulator Project
// Licensed under GPLv2
-// Refer to the license.txt file included.
+// Refer to the license.txt file included.
#pragma once
-// Configuration memory stores various hardware/kernel configuration settings. This memory page is
+// Configuration memory stores various hardware/kernel configuration settings. This memory page is
// read-only for ARM11 processes. I'm guessing this would normally be written to by the firmware/
// bootrom. Because we're not emulating this, and essentially just "stubbing" the functionality, I'm
// putting this as a subset of HLE for now.
@@ -16,6 +16,6 @@
namespace ConfigMem {
template <typename T>
-inline void Read(T &var, const u32 addr);
+void Read(T &var, const u32 addr);
} // namespace
diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h
index 3078e4142..42f18a0e7 100644
--- a/src/core/hw/gpu.h
+++ b/src/core/hw/gpu.h
@@ -235,10 +235,10 @@ u32 GetFramebufferAddr(const u32 address);
FramebufferLocation GetFramebufferLocation(u32 address);
template <typename T>
-inline void Read(T &var, const u32 addr);
+void Read(T &var, const u32 addr);
template <typename T>
-inline void Write(u32 addr, const T data);
+void Write(u32 addr, const T data);
/// Update hardware
void Update();
diff --git a/src/core/hw/hw.h b/src/core/hw/hw.h
index 92e9304ca..1055ed94f 100644
--- a/src/core/hw/hw.h
+++ b/src/core/hw/hw.h
@@ -9,10 +9,10 @@
namespace HW {
template <typename T>
-inline void Read(T &var, const u32 addr);
+void Read(T &var, const u32 addr);
template <typename T>
-inline void Write(u32 addr, const T data);
+void Write(u32 addr, const T data);
/// Update hardware
void Update();