summaryrefslogtreecommitdiff
path: root/src/common/logging
diff options
context:
space:
mode:
authorGravatar bunnei2015-01-07 15:30:46 -0500
committerGravatar bunnei2015-01-07 15:30:46 -0500
commit3eca33c6a430a004a9ffe2fc5265143fdf6503f3 (patch)
treeed1972f2121bfdb011e0a566015272aa5dbd5473 /src/common/logging
parentMerge pull request #440 from yuriks/lifetime-fix (diff)
parentCoreTiming: Ported the CoreTiming namespace from PPSSPP (diff)
downloadyuzu-3eca33c6a430a004a9ffe2fc5265143fdf6503f3.tar.gz
yuzu-3eca33c6a430a004a9ffe2fc5265143fdf6503f3.tar.xz
yuzu-3eca33c6a430a004a9ffe2fc5265143fdf6503f3.zip
Merge pull request #425 from Subv/coretiming
Ported the CoreTiming namespace from PPSSPP
Diffstat (limited to 'src/common/logging')
-rw-r--r--src/common/logging/backend.cpp1
-rw-r--r--src/common/logging/log.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 7ac30ad50..83ebb42d9 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -22,6 +22,7 @@ static std::shared_ptr<Logger> global_logger;
22 SUB(Common, Memory) \ 22 SUB(Common, Memory) \
23 CLS(Core) \ 23 CLS(Core) \
24 SUB(Core, ARM11) \ 24 SUB(Core, ARM11) \
25 SUB(Core, Timing) \
25 CLS(Config) \ 26 CLS(Config) \
26 CLS(Debug) \ 27 CLS(Debug) \
27 SUB(Debug, Emulated) \ 28 SUB(Debug, Emulated) \
diff --git a/src/common/logging/log.h b/src/common/logging/log.h
index 06b99b07a..bda3d633a 100644
--- a/src/common/logging/log.h
+++ b/src/common/logging/log.h
@@ -41,6 +41,7 @@ enum class Class : ClassType {
41 Common_Memory, ///< Memory mapping and management functions 41 Common_Memory, ///< Memory mapping and management functions
42 Core, ///< LLE emulation core 42 Core, ///< LLE emulation core
43 Core_ARM11, ///< ARM11 CPU core 43 Core_ARM11, ///< ARM11 CPU core
44 Core_Timing, ///< CoreTiming functions
44 Config, ///< Emulator configuration (including commandline) 45 Config, ///< Emulator configuration (including commandline)
45 Debug, ///< Debugging tools 46 Debug, ///< Debugging tools
46 Debug_Emulated, ///< Debug messages from the emulated programs 47 Debug_Emulated, ///< Debug messages from the emulated programs